[Mew-dist 1311] Re: mew-1.86 & im-46 beta release

[Yuuichi Teranishi 寺西裕一]

寺西＠ＮＴＴ情報研です。

Kazu> (3) Xemacs でまだ統合していない機能はありますか？ > 寺西さん

とりあえず、
以前ここに流した XEmacs で virtual-mode するパッチを
mew-1.86 版にしてみました。

--
Yuuichi Teranishi (寺西裕一) Email: teranisi at example.com
Location: NTT Information and Communication Systems Laboratories
TEL: 0468-59-2839 FAX: 0468-59-2768 PHS: 050-106-7597
MyCar: RAV4J (23000km since Nov.1995) 

-------------- next part --------------
--- mew-summary.el.orig	Mon Jul 21 22:30:43 1997
+++ mew-summary.el	Tue Jul 22 13:53:32 1997
@@ -392,41 +392,38 @@
 ;;;
     
 (defun mew-summary-message-number ()
-  (cond 
-   ((equal major-mode 'mew-summary-mode)
-    (let ((event last-command-event)
-	  ret str)
-      (if (and mew-icon-p	
-	       ;; exclude press button 2 in summary buffer.
-	       ;; exclude pulldown menu in Summary mode.
-	       ;; exclude popup menu of multipart icon because
-	       ;; the cursor has already moved.
-	       (or (button-press-event-p event)     ;; right button
-		   (button-release-event-p event))) ;; left button
-	  (if last-pressed-toolbar-button
-	      (progn
-		(setq str (toolbar-button-help-string 
-			   last-pressed-toolbar-button))
-		(if (string-match "^\\([0-9]+\\) " str)
-		    (setq ret (mew-match 1 str)))
-		)))
-      (if ret
-	  ret
-	(save-excursion
-	  (beginning-of-line)
+  (let ((event last-command-event)
+	ret str)
+    (if (and mew-icon-p	
+	     ;; exclude press button 2 in summary buffer.
+	     ;; exclude pulldown menu in Summary mode.
+	     ;; exclude popup menu of multipart icon because
+	     ;; the cursor has already moved.
+	     (or (button-press-event-p event)     ;; right button
+		 (button-release-event-p event))) ;; left button
+	(if last-pressed-toolbar-button
+	    (progn
+	      (setq str (toolbar-button-help-string 
+			 last-pressed-toolbar-button))
+	      (if (string-match "^\\([0-9]+\\) " str)
+		  (setq ret (mew-match 1 str)))
+	      )))
+    (if ret
+	ret
+      (save-excursion
+	(beginning-of-line)
+	(cond 
+	 ((equal major-mode 'mew-summary-mode)
 	  (if (looking-at mew-summary-message-regex)
 	      (mew-match 1)
 	    nil)
-	  ))
-      ))
-   ((equal major-mode 'mew-virtual-mode)
-    (save-excursion
-      (beginning-of-line)
-      (if (looking-at ".*\r \\(\\+.*\\) \\(.*\\)$")
-	  (mew-match 2)
-	nil)))
-   (t nil)
-   ))
+	  )
+	 ((equal major-mode 'mew-virtual-mode)
+	  (if (looking-at ".*\r \\(\\+.*\\) \\(.*\\)$")
+	      (mew-match 2)
+	    nil))
+	 (t nil)))
+      )))
 
 (defun mew-summary-part-number ()
   (let ((event last-command-event)
@@ -625,7 +622,8 @@
 	 (opart (mew-current-get 'part))
 	 (buf (buffer-name))
 	 (next nil))
-    (if (not (file-exists-p (mew-expand-folder fld msg)))
+    (if (not (file-exists-p (mew-expand-folder (if fld fld (car ofld-msg))
+					       (if msg msg (cdr ofld-msg)))))
 	(message "File does not exist.")
       (mew-summary-toggle-disp-msg 'on)
       (unwind-protect
-------------- next part --------------
--- mew-virtual.el.orig	Mon Jul 21 22:30:57 1997
+++ mew-virtual.el	Tue Jul 22 13:25:14 1997
@@ -66,6 +66,9 @@
   (define-key mew-virtual-mode-map "\ea"  'mew-summary-toggle-analysis)
   (define-key mew-virtual-mode-map "\C-c\C-x" 'mew-summary-x-face)
   (define-key mew-virtual-mode-map "\C-c\C-q" 'mew-kill-buffer)
+  (if mew-xemacs-p
+      (define-key mew-virtual-mode-map 'button2 'mew-summary-mouse-show)
+    (define-key mew-virtual-mode-map [mouse-2] 'mew-summary-mouse-show))
   )
 
 ;;;
@@ -170,6 +173,7 @@
 	(if mew-icon-p
 	    (set-specifier default-toolbar
 			   (cons (current-buffer) mew-summary-toolbar)))
+        (set-specifier scrollbar-height (cons (current-buffer) 0))
         (set-buffer-menubar current-menubar)
         (add-submenu nil mew-summary-mode-menu-spec)
 	))
-------------- next part --------------
--- mew-xemacs.el.orig	Wed Jun 18 21:29:55 1997
+++ mew-xemacs.el	Tue Jul 22 13:35:13 1997
@@ -257,8 +257,11 @@
 	(part (mew-summary-part-number))
 	(botton (event-button last-command-event)))
     (goto-char (point-min))
-    (if (re-search-forward (format "^[ ]*%s" msg) nil t)
-	(re-search-forward (format "^\t%s" part) nil t))
+    (if (equal major-mode 'mew-virtual-mode)
+	(if (re-search-forward (format "\r.*%s" msg) nil t)
+	    (re-search-forward (format "^\t+%s" part) nil t))
+	(if (re-search-forward (format "^[ ]*%s" msg) nil t)
+	    (re-search-forward (format "^\t+%s" part) nil t)))
     (beginning-of-line)
     (mew-summary-recenter)
     (mew-summary-underline-lines)
@@ -275,7 +278,7 @@
   (let ((fld (mew-summary-folder-name))
 	(ofld-msg (mew-current-get 'message))
 	(buf (buffer-name)))
-    (if (or (not (equal (cons fld msg) ofld-msg)) (null part))
+    (if (null part) 
 	(message "No message")
       (mew-summary-toggle-disp-msg 'on)
       (unwind-protect