[mew-dist 24321] Re: mew-nmzでzp,znを動かすパッチ

[Hideyuki SHIRAI ( 白井秀行 )]

From: Hideyuki SHIRAI (白井秀行) <shirai at example.com> 曰く
Subject: [mew-dist 24309] Re: mew-nmzでzp,znを動かすパッチ
Message-ID: <20040104.212151.102295407.shirai at example.com>
Date: Sun, 04 Jan 2004 21:21:51 +0900 (JST)

> こいつもお願いします。(_ _)

"zu" の修理＋細かい修正です。

-- 
白井秀行 (mailto:shirai at example.com)

--- mew-nmz.el.orig	Tue Jan  6 20:18:02 2004
+++ mew-nmz.el	Tue Jan  6 18:05:46 2004
@@ -8,7 +8,7 @@
 ;; (eval-after-load "mew" '(require 'mew-nmz))
 ;;
 
-(defconst mew-nmz-version "mew-nmz.el 0.70")
+(defconst mew-nmz-version "mew-nmz.el 0.80")
 
 (eval-when-compile
   (require 'mew)
@@ -401,15 +401,14 @@
 	     (with-temp-buffer
 	       (message "checking %s..." (file-name-nondirectory ufname))
 	       (insert-file-contents ufname)
-	       (while (re-search-forward "/\\([1-9][0-9]*\\)$" nil t)
+	       (while (re-search-forward "/\\([0-9]+\\)$" nil t)
 		 (setq msgnums (cons (string-to-number (match-string 1)) msgnums))))
 	     (message "checking %s..." (buffer-name))
 	     (goto-char (point-min))
 	     (while (not (eobp))
-	       (if (and
-		    (looking-at "^[^\r]*\r [^ ]+ \\([0-9]+\\)")
-		    (not (memq (string-to-number (match-string 1)) msgnums))
-		    (not (mew-in-decode-syntax-p)))
+	       (if (and (mew-sumsyn-match mew-regex-sumsyn-short)
+			(not (memq (string-to-number (mew-sumsyn-message-number)) msgnums))
+			(not (mew-in-decode-syntax-p)))
 		   (progn
 		     (setq umsgs (1+ umsgs))
 		     (if (mew-summary-marked-p)
@@ -531,16 +530,15 @@
 		))))
 	(if (null range)
 	    (message "No message found.")
-	  (if (mew-virtual-p)
-	      (save-excursion
-		(goto-char (point-min))
-		(if (re-search-forward
+	  (when (mew-virtual-p)
+	    (save-excursion
+	      (goto-char (point-min))
+	      (when (re-search-forward
 		     (concat "\r \\(" (regexp-quote fld) "\\)? +" (car range) " ") nil t)
-		    (progn
-		      (setq fld (buffer-name))
-		      (goto-char (match-beginning 0))
-		      (beginning-of-line)
-		      (setq pos (point))))))
+		(setq fld (buffer-name))
+		(goto-char (match-beginning 0))
+		(beginning-of-line)
+		(setq pos (point)))))
 	  (if (listp (car range))
 	      (setq fld (car (car range))
 		    mess (car (cdr (car range))))