X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-summary.el;h=d1c6670479661eb424f84fbfdba66ebf949d2397;hb=824fe18b2ad090f609041a4af11de484bdb7e3a8;hp=5d1f808167b2d0ddc392627897612f6b3688c8bf;hpb=47b752addd6948e942ff3c3548e86b9c3c2b95d1;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 5d1f808..d1c6670 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -37,6 +37,7 @@
 
 (require 'elmo)
 (require 'elmo-multi)
+(eval-when-compile (require 'elmo-filter))
 (require 'wl-message)
 (require 'wl-vars)
 (require 'wl-highlight)
@@ -69,8 +70,8 @@
 (defvar wl-summary-buffer-elmo-folder nil)
 
 (defmacro wl-summary-buffer-folder-name ()
-  (` (and wl-summary-buffer-elmo-folder
-	  (elmo-folder-name-internal wl-summary-buffer-elmo-folder))))
+  `(and wl-summary-buffer-elmo-folder
+	(elmo-folder-name-internal wl-summary-buffer-elmo-folder)))
 
 (defvar wl-summary-buffer-disp-msg    nil)
 (defvar wl-summary-buffer-disp-folder nil)
@@ -197,7 +198,7 @@
 (defvar wl-persistent-mark)
 
 (defmacro wl-summary-sticky-buffer-name (name)
-  (` (concat wl-summary-buffer-name ":" (, name))))
+  `(concat wl-summary-buffer-name ":" ,name))
 
 (defun wl-summary-default-subject (subject-string)
   (if (string-match "^[ \t]*\\[[^:]+[,: ][0-9]+\\][ \t]*" subject-string)
@@ -290,7 +291,8 @@ See also variable `wl-use-petname'."
      ["Resend bounced mail" wl-summary-resend-bounced-mail t]
      ["Enter the message" wl-summary-jump-to-current-message t]
      ["Pipe message" wl-summary-pipe-message t]
-     ["Print message" wl-summary-print-message t])
+     ["Print message" wl-summary-print-message t]
+     ["View raw message" wl-summary-display-raw t])
     ("Thread Operation"
      ["Open or Close" wl-thread-open-close (eq wl-summary-buffer-view 'thread)]
      ["Open all"     wl-thread-open-all (eq wl-summary-buffer-view 'thread)]
@@ -386,6 +388,7 @@ See also variable `wl-use-petname'."
   ;; basic commands
   (define-key wl-summary-mode-map " "    'wl-summary-read)
   (define-key wl-summary-mode-map "."    'wl-summary-redisplay)
+  (define-key wl-summary-mode-map ","    'wl-summary-display-raw)
   (define-key wl-summary-mode-map "<"    'wl-summary-display-top)
   (define-key wl-summary-mode-map ">"    'wl-summary-display-bottom)
   (define-key wl-summary-mode-map "\177" 'wl-summary-prev-page)
@@ -602,6 +605,10 @@ See also variable `wl-use-petname'."
       (setq wl-summary-buffer-message-ring
 	    (cdr wl-summary-buffer-message-ring)))))
 
+(defmacro wl-summary-message-status (&optional number)
+  `(elmo-message-status wl-summary-buffer-elmo-folder
+			(or ,number (wl-summary-message-number))))
+
 (defun wl-summary-update-mark-and-highlight-window (&optional win beg)
   "A function to be called as window-scroll-functions."
   (with-current-buffer (window-buffer win)
@@ -821,6 +828,7 @@ you."
 	wl-summary-highlight
 	temp persistent)
     (with-temp-buffer
+      (set-buffer-multibyte t)
       (setq wl-summary-buffer-number-column column
 	    wl-summary-buffer-line-formatter formatter
 	    wl-summary-buffer-weekday-name-lang lang)
@@ -999,7 +1007,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	       (count (elmo-find-list-match-value
 		       elmo-mailing-list-count-spec-list
 		       getter)))
-	  (cons name (and count (string-to-int count)))))))
+	  (cons name (and count (string-to-number count)))))))
 
 (defun wl-summary-overview-entity-compare-by-list-info (x y)
   "Compare entity X and Y by mailing-list info."
@@ -1013,41 +1021,30 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
       (string< (or (car list-info-x) "")
 	       (or (car list-info-y) "")))))
 
-(defun wl-summary-sort-by-date (reverse)
-  "Sort summary lines into the order by message date; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "date" reverse))
-(defun wl-summary-sort-by-number (reverse)
-  "Sort summary lines into the order by message number; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "number" reverse))
-(defun wl-summary-sort-by-subject (reverse)
-  "Sort summary lines into the order by subject; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "subject" reverse))
-(defun wl-summary-sort-by-from (reverse)
-  "Sort summary lines into the order by from; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "from" reverse))
-(defun wl-summary-sort-by-list-info (reverse)
-  "Sort summary lines into the order by mailing list info; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "list-info" reverse))
-(defun wl-summary-sort-by-size (reverse)
-  "Sort summary lines into the order by message size; argument means descending order."
-  (interactive "P")
-  (wl-summary-rescan "size" reverse))
+(defun wl-summary-define-sort-command ()
+  "Define functions to sort summary lines by `wl-summary-sort-specs'."
+  (interactive)
+  (dolist (sort-by wl-summary-sort-specs)
+    (fset (intern (format "wl-summary-sort-by-%s" sort-by))
+	  `(lambda (&optional reverse)
+	     ,(format "\
+Sort summary lines into the order by %s.
+If optional argument REVERSE is non-nil, sort into descending order.
+
+This function is defined by `wl-summary-define-sort-command'." sort-by)
+	     (interactive "P")
+	     (wl-summary-rescan ,(symbol-name sort-by) reverse)))))
 
 (defun wl-summary-sort-function-from-spec (spec reverse)
-  (let (funtion)
+  (let (function)
     (when (string-match "^!\\(.+\\)$" spec)
       (setq spec (match-string 1 spec)
 	    reverse (not reverse)))
-    (setq funtion
+    (setq function
 	  (intern (format "wl-summary-overview-entity-compare-by-%s" spec)))
     (if reverse
-	`(lambda (x y) (not (,funtion x y)))
-      funtion)))
+	`(lambda (x y) (not (,function x y)))
+      function)))
 
 (defun wl-summary-sort-messages (numbers sort-by reverse)
   (let* ((functions (mapcar
@@ -1087,7 +1084,6 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	 (and disable-thread wl-summary-search-parent-by-subject-regexp))
 	(wl-summary-divide-thread-when-subject-changed
 	 (and disable-thread wl-summary-divide-thread-when-subject-changed))
-	(i 0)
 	num
 	expunged)
     (erase-buffer)
@@ -1108,20 +1104,14 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	  wl-summary-buffer-temp-mark-list nil
 	  wl-summary-delayed-update nil)
     (elmo-kill-buffer wl-summary-search-buf-name)
-    (while numbers
-      (wl-summary-insert-message (elmo-message-entity
-				  wl-summary-buffer-elmo-folder
-				  (car numbers))
-				 wl-summary-buffer-elmo-folder
-				 nil)
-      (setq numbers (cdr numbers))
-      (when (> num elmo-display-progress-threshold)
-	(setq i (+ i 1))
-	(if (or (zerop (% i 5)) (= i num))
-	    (elmo-display-progress
-	     'wl-summary-rescan "Constructing summary structure..."
-	     (/ (* i 100) num)))))
-    (when wl-summary-delayed-update
+    (elmo-with-progress-display (wl-summary-insert-line num)
+	"Constructing summary structure"
+      (dolist (number numbers)
+	(wl-summary-insert-message (elmo-message-entity
+				    wl-summary-buffer-elmo-folder
+				    number)
+				   wl-summary-buffer-elmo-folder
+				   nil))
       (while wl-summary-delayed-update
 	(message "Parent (%d) of message %d is no entity"
 		 (caar wl-summary-delayed-update)
@@ -1131,12 +1121,8 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	 (cdar wl-summary-delayed-update)
 	 wl-summary-buffer-elmo-folder nil t)
 	(setq wl-summary-delayed-update (cdr wl-summary-delayed-update))))
-    (message "Constructing summary structure...done")
-    (if (eq wl-summary-buffer-view 'thread)
-	(progn
-	  (message "Inserting thread...")
-	  (wl-thread-insert-top)
-	  (message "Inserting thread...done")))
+    (when (eq wl-summary-buffer-view 'thread)
+      (wl-thread-insert-top))
     (when wl-use-scoring
       (wl-summary-score-headers (wl-summary-rescore-msgs
 				 wl-summary-buffer-number-list)
@@ -1267,9 +1253,9 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
   (when wl-summary-buffer-temp-mark-list
     (wl-summary-exec-with-confirmation
      (format "Execute marks in %s? (answer \"n\" to discard them) "
-	     (wl-summary-buffer-folder-name)))
-    (wl-summary-delete-all-temp-marks 'no-msg)
-    (setq wl-summary-scored nil)))
+	     (wl-summary-buffer-folder-name))))
+  (wl-summary-delete-all-temp-marks 'no-msg)
+  (setq wl-summary-scored nil))
 
 ;; a subroutine for wl-summary-exit/wl-save-status
 ;; Note that folder is not commited here.
@@ -1397,6 +1383,8 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	 (msgdb-dir (elmo-folder-msgdb-path folder))
 	 (range (or force-range (wl-summary-input-range
 				 (elmo-folder-name-internal folder)))))
+    (when (symbolp range)
+      (setq range (symbol-name range)))
     (cond ((string-match "rescan" range)
 	   (let ((msg (wl-summary-message-number))
 		 (wl-use-scoring (if (string-match "noscore" range)
@@ -1556,25 +1544,27 @@ If ARG is non-nil, checking is omitted."
   "All uncached messages are cached."
   (interactive)
   (unless (elmo-folder-local-p wl-summary-buffer-elmo-folder)
-    (let ((targets (elmo-folder-list-flagged wl-summary-buffer-elmo-folder
-					     'uncached 'in-msgdb))
-	  (count 0)
-	  wl-prefetch-confirm
-	  wl-prefetch-threshold
-	  (elmo-inhibit-display-retrieval-progress t)
-	  length msg)
+    (let* ((targets (elmo-folder-list-flagged wl-summary-buffer-elmo-folder
+					      'uncached 'in-msgdb))
+	   (count 0)
+	   wl-prefetch-confirm
+	   wl-prefetch-threshold
+	   (length (length targets))
+	   msg)
       (save-excursion
-	(goto-char (point-min))
-	(setq length (length targets))
-	(dolist (target targets)
-	  (when (if (not (wl-thread-entity-parent-invisible-p
-			  (wl-thread-get-entity target)))
-		    (progn
-		      (wl-summary-jump-to-msg target)
-		      (wl-summary-prefetch-msg
-		       (wl-summary-message-number)))
-		  (wl-summary-prefetch-msg target))
-	    (message "Retrieving... %d/%d" (incf count) length)))
+	(elmo-with-progress-display (wl-summary-prefetch-message length)
+	    "Retrieving"
+	  (goto-char (point-min))
+	  (dolist (target targets)
+	    (when (if (not (wl-thread-entity-parent-invisible-p
+			    (wl-thread-get-entity target)))
+		      (progn
+			(wl-summary-jump-to-msg target)
+			(wl-summary-prefetch-msg
+			 (wl-summary-message-number)))
+		    (wl-summary-prefetch-msg target))
+	      (incf count))
+	    (elmo-progress-notify 'wl-summary-prefetch-message)))
 	(message "Retrieved %d/%d message(s)" count length)))))
 
 (defun wl-summary-prefetch-msg (number &optional arg)
@@ -1843,7 +1833,7 @@ If ARG is non-nil, checking is omitted."
       (wl-summary-update-modeline)
       (message "Resuming cache status...done"))))
 
-(defun wl-summary-delete-messages-on-buffer (msgs &optional deleting-info)
+(defun wl-summary-delete-messages-on-buffer (msgs)
   (interactive)
   (save-excursion
     (let ((inhibit-read-only t)
@@ -1851,7 +1841,6 @@ If ARG is non-nil, checking is omitted."
 	  (msgs2 msgs)
 	  (len (length msgs))
 	  (i 0)
-	  ;(deleting-info (or deleting-info "Deleting..."))
 	  update-list)
       (elmo-kill-buffer wl-summary-search-buf-name)
       (while msgs
@@ -1869,17 +1858,13 @@ If ARG is non-nil, checking is omitted."
 		(delete-char 1) ; delete '\n'
 		(setq wl-summary-buffer-number-list
 		      (delq (car msgs) wl-summary-buffer-number-list)))))
-;	(when (> len elmo-display-progress-threshold)
-;	  (setq i (1+ i))
-;	  (if (or (zerop (% i 5)) (= i len))
-;	      (elmo-display-progress
-;	       'wl-summary-delete-messages-on-buffer deleting-info
-;	       (/ (* i 100) len))))
 	(setq msgs (cdr msgs)))
       (when (eq wl-summary-buffer-view 'thread)
-	(wl-thread-update-line-msgs (elmo-uniq-list update-list))
-	(wl-thread-cleanup-symbols msgs2))
-      ;;(message (concat deleting-info "done"))
+	(let ((updates (elmo-uniq-list update-list)))
+	  (elmo-with-progress-display (wl-thread-update-line (length updates))
+	      "Updating deleted thread"
+	    (wl-thread-update-line-msgs updates)
+	    (wl-thread-cleanup-symbols msgs2))))
       (wl-summary-count-unread)
       (wl-summary-update-modeline)
       (wl-summary-folder-info-update))))
@@ -1991,8 +1976,7 @@ This function is defined for `window-scroll-functions'"
 			  (not wl-summary-lazy-highlight)))
 		    append-list delete-list
 		    update-thread update-top-list
-		    num diff entity
-		    (i 0))
+		    num diff entity)
 		;; Setup sync-all
 		(if sync-all (wl-summary-sync-all-init))
 		(setq diff (elmo-list-diff (elmo-folder-list-messages
@@ -2014,28 +1998,22 @@ This function is defined for `window-scroll-functions'"
 		(setq num (length append-list))
 		(setq wl-summary-delayed-update nil)
 		(elmo-kill-buffer wl-summary-search-buf-name)
-		(dolist (number append-list)
-		  (setq entity (elmo-message-entity folder number))
-		  (when (setq update-thread
-			      (wl-summary-insert-message
-			       entity folder
-			       (not sync-all)))
-		    (wl-append update-top-list update-thread))
-		  (if elmo-use-database
-		      (elmo-database-msgid-put
-		       (elmo-message-entity-field entity 'message-id)
-		       (elmo-folder-name-internal folder)
-		       (elmo-message-entity-number entity)))
-		  (when (> num elmo-display-progress-threshold)
-		    (setq i (+ i 1))
-		    (if (or (zerop (% i 5)) (= i num))
-			(elmo-display-progress
-			 'wl-summary-sync-update
-			 (if (eq wl-summary-buffer-view 'thread)
-			     "Making thread..."
-			   "Inserting message...")
-			 (/ (* i 100) num)))))
-		(when wl-summary-delayed-update
+		(elmo-with-progress-display (wl-summary-insert-line num)
+		    (if (eq wl-summary-buffer-view 'thread)
+			"Making thread"
+		      "Inserting message")
+		  (dolist (number append-list)
+		    (setq entity (elmo-message-entity folder number))
+		    (when (setq update-thread
+				(wl-summary-insert-message
+				 entity folder
+				 (not sync-all)))
+		      (wl-append update-top-list update-thread))
+		    (if elmo-use-database
+			(elmo-database-msgid-put
+			 (elmo-message-entity-field entity 'message-id)
+			 (elmo-folder-name-internal folder)
+			 (elmo-message-entity-number entity))))
 		  (while wl-summary-delayed-update
 		    (message "Parent (%d) of message %d is no entity"
 			     (caar wl-summary-delayed-update)
@@ -2053,16 +2031,11 @@ This function is defined for `window-scroll-functions'"
 			   update-top-list)
 		  (wl-thread-update-indent-string-thread
 		   (elmo-uniq-list update-top-list)))
-		(message (if (eq wl-summary-buffer-view 'thread)
-			     "Making thread...done"
-			   "Inserting message...done"))
 		(when (or delete-list append-list)
 		  (wl-summary-set-message-modified))
 		(when (and sync-all (eq wl-summary-buffer-view 'thread))
 		  (elmo-kill-buffer wl-summary-search-buf-name)
-		  (message "Inserting message...")
-		  (wl-thread-insert-top)
-		  (message "Inserting message...done"))
+		  (wl-thread-insert-top))
 		(if elmo-use-database
 		    (elmo-database-close))
 		(run-hooks 'wl-summary-sync-updated-hook)
@@ -2171,28 +2144,20 @@ This function is defined for `window-scroll-functions'"
 
 (defun wl-summary-highlight-msgs (msgs)
   (save-excursion
-    (let ((len (length msgs))
-	  i)
-      (message "Hilighting...")
-      (setq i 0)
+    (elmo-with-progress-display (wl-summary-highlight-line (length msgs))
+	"Hilighting"
       (while msgs
 	(if (wl-summary-jump-to-msg (car msgs))
 	    (wl-highlight-summary-current-line))
 	(setq msgs (cdr msgs))
-	(when (> len elmo-display-progress-threshold)
-	  (setq i (+ i 1))
-	  (if (or (zerop (% i 5)) (= i len))
-	      (elmo-display-progress
-	       'wl-summary-highlight-msgs "Highlighting..."
-	       (/ (* i 100) len)))))
-      (message "Highlighting...done"))))
+	(elmo-progress-notify 'wl-summary-highlight-line)))))
 
 (defun wl-summary-message-number ()
   (save-excursion
     (beginning-of-line)
     (if (or (re-search-forward "\r\\(-?[0-9]+\\)" (point-at-eol) t)
 	    (re-search-forward "^ *\\(-?[0-9]+\\)" (point-at-eol) t))
-	(string-to-int (wl-match-buffer 1))
+	(string-to-number (wl-match-buffer 1))
       nil)))
 
 (defun wl-summary-delete-all-msgs ()
@@ -2336,7 +2301,7 @@ If ARG, without confirm."
     (wl-summary-mode)
     (wl-summary-buffer-set-folder folder)
     (let ((buffer-read-only nil))
-      (insert-buffer cur-buf))
+      (insert-buffer-substring cur-buf))
     (set-buffer-modified-p nil)
     (while copy-variables
       (set (car copy-variables)
@@ -2356,9 +2321,13 @@ If ARG, without confirm."
       (beginning-of-line))))
 
 (defun wl-summary-get-buffer (folder)
-  (or (and folder
-	   (get-buffer (wl-summary-sticky-buffer-name folder)))
-      (get-buffer wl-summary-buffer-name)))
+  (and folder
+       (or (get-buffer (wl-summary-sticky-buffer-name folder))
+	   (let ((buffer (get-buffer wl-summary-buffer-name)))
+	     (and buffer
+		  (with-current-buffer buffer
+		    (string= (wl-summary-buffer-folder-name) folder))
+		  buffer)))))
 
 (defun wl-summary-get-buffer-create (name &optional force-sticky)
   (if force-sticky
@@ -2413,10 +2382,13 @@ If ARG, without confirm."
 	       (eq major-mode 'wl-summary-mode)) ; called in summary.
       (setq wl-summary-last-visited-folder (wl-summary-buffer-folder-name))
       (run-hooks 'wl-summary-exit-pre-hook)
-      (if (or force-exit (not (wl-summary-sticky-p)))
+      (let ((discard-contents (or force-exit (not (wl-summary-sticky-p)))))
+	(when discard-contents
 	  (wl-summary-cleanup-temp-marks))
-      (wl-summary-save-view)
-      (elmo-folder-commit wl-summary-buffer-elmo-folder)
+	(wl-summary-save-view)
+	(if discard-contents
+	    (elmo-folder-close wl-summary-buffer-elmo-folder)
+	  (elmo-folder-commit wl-summary-buffer-elmo-folder)))
       (if (and (wl-summary-sticky-p) force-exit)
 	  (kill-buffer (current-buffer))))
     (setq buf (wl-summary-get-buffer-create (elmo-folder-name-internal folder)
@@ -2632,6 +2604,7 @@ If ARG, without confirm."
        (save-excursion (beginning-of-line)(point))
        (save-excursion (end-of-line)(point))
        'mouse-face nil))
+  (elmo-progress-notify 'wl-summary-insert-line)
   (ignore-errors
     (run-hooks 'wl-summary-line-inserted-hook)))
 
@@ -2659,13 +2632,13 @@ If ARG, without confirm."
 	   (funcall wl-summary-subject-filter-function subject2)))
 
 (defmacro wl-summary-put-alike (alike)
-  (` (elmo-set-hash-val (format "#%d" (wl-count-lines))
-			(, alike)
-			wl-summary-alike-hashtb)))
+  `(elmo-set-hash-val (format "#%d" (wl-count-lines))
+		      ,alike
+		      wl-summary-alike-hashtb))
 
 (defmacro wl-summary-get-alike ()
-  (` (elmo-get-hash-val (format "#%d" (wl-count-lines))
-			wl-summary-alike-hashtb)))
+  `(elmo-get-hash-val (format "#%d" (wl-count-lines))
+		      wl-summary-alike-hashtb))
 
 (defun wl-summary-insert-headers (folder func &optional mime-decode)
   (let ((numbers (elmo-folder-list-messages folder 'visible t))
@@ -4251,8 +4224,7 @@ Return t if message exists."
 	     nil)))))
 
 (defun wl-summary-reply (&optional arg without-setup-hook)
-  "Reply to current message. Default is \"wide\" reply.
-Reply to author if invoked with ARG."
+  "Reply to current message. See also `wl-draft-reply'."
   (interactive "P")
   (let ((folder wl-summary-buffer-elmo-folder)
 	(number (wl-summary-message-number))
@@ -4274,11 +4246,10 @@ Reply to author if invoked with ARG."
       (with-current-buffer summary-buf (run-hooks 'wl-summary-reply-hook))
       t)))
 
-(defun wl-summary-write ()
+(defun wl-summary-write (folder)
   "Write a new draft from Summary."
-  (interactive)
-  (wl-draft (list (cons 'To ""))
-	    nil nil nil nil (wl-summary-buffer-folder-name))
+  (interactive (list (wl-summary-buffer-folder-name)))
+  (wl-draft (list (cons 'To "")) nil nil nil nil folder)
   (run-hooks 'wl-mail-setup-hook)
   (mail-position-on-field "To"))
 
@@ -4290,12 +4261,10 @@ Reply to author if invoked with ARG."
 Call from `wl-summary-write-current-folder'.
 When guess function return nil, challenge next guess-function.")
 
-(defun wl-summary-write-current-folder (&optional folder)
+(defun wl-summary-write-current-folder (folder)
   "Write message to current FOLDER's newsgroup or mailing-list.
 Use function list is `wl-summary-write-current-folder-functions'."
-  (interactive)
-  ;; default FOLDER is current buffer folder
-  (setq folder (or folder (wl-summary-buffer-folder-name)))
+  (interactive (list (wl-summary-buffer-folder-name)))
   (let ((func-list wl-summary-write-current-folder-functions)
 	guess-list guess-func)
     (while func-list
@@ -4305,7 +4274,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	(setq guess-func (car func-list))
 	(setq func-list nil)))
     (if (null guess-func)
-	(wl-summary-write)
+	(wl-summary-write folder)
       (unless (or (stringp (nth 0 guess-list))
 		  (stringp (nth 1 guess-list))
 		  (stringp (nth 2 guess-list)))
@@ -4444,36 +4413,34 @@ Use function list is `wl-summary-write-current-folder-functions'."
 		(wl-summary-entity-info-msg next-entity finfo)))))))))
 
 (defun wl-summary-get-prev-folder ()
-  (let ((folder-buf (get-buffer wl-folder-buffer-name))
-	last-entity cur-id)
+  (let ((folder-buf (get-buffer wl-folder-buffer-name)))
     (when folder-buf
-      (setq cur-id (save-excursion (set-buffer folder-buf)
-				   wl-folder-buffer-cur-entity-id))
-      (wl-folder-get-prev-folder cur-id))))
+      (wl-folder-get-prev-folder
+       (with-current-buffer folder-buf
+	 wl-folder-buffer-cur-entity-id)))))
 
 (defun wl-summary-get-next-folder ()
-  (let ((folder-buf (get-buffer wl-folder-buffer-name))
-	cur-id)
+  (let ((folder-buf (get-buffer wl-folder-buffer-name)))
     (when folder-buf
-      (setq cur-id (save-excursion (set-buffer folder-buf)
-				   wl-folder-buffer-cur-entity-id))
-      (wl-folder-get-next-folder cur-id))))
+      (wl-folder-get-next-folder
+       (with-current-buffer folder-buf
+	 wl-folder-buffer-cur-entity-id)))))
 
 (defun wl-summary-get-next-unread-folder ()
-  (let ((folder-buf (get-buffer wl-folder-buffer-name))
-	cur-id)
+  (let ((folder-buf (get-buffer wl-folder-buffer-name)))
     (when folder-buf
-      (setq cur-id (save-excursion (set-buffer folder-buf)
-				   wl-folder-buffer-cur-entity-id))
-      (wl-folder-get-next-folder cur-id 'unread))))
+      (wl-folder-get-next-folder
+       (with-current-buffer folder-buf
+	 wl-folder-buffer-cur-entity-id)
+       'unread))))
 
 (defun wl-summary-get-prev-unread-folder ()
-  (let ((folder-buf (get-buffer wl-folder-buffer-name))
-	cur-id)
+  (let ((folder-buf (get-buffer wl-folder-buffer-name)))
     (when folder-buf
-      (setq cur-id (save-excursion (set-buffer folder-buf)
-				   wl-folder-buffer-cur-entity-id))
-      (wl-folder-get-prev-folder cur-id 'unread))))
+      (wl-folder-get-prev-folder
+       (with-current-buffer folder-buf
+	 wl-folder-buffer-cur-entity-id)
+       'unread))))
 
 (defun wl-summary-down (&optional interactive skip-no-unread)
   (interactive)
@@ -4777,6 +4744,31 @@ If ARG is numeric number, decode message as following:
 	(if message-buf (set-buffer message-buf))
 	(wl-draft-edit-string (buffer-substring (point-min) (point-max)))))))
 
+(defun wl-summary-display-raw (&optional arg)
+  "Display current message in raw format."
+  (interactive)
+  (let ((number (wl-summary-message-number))
+	(folder wl-summary-buffer-elmo-folder))
+    (if number
+	(let ((raw (elmo-message-fetch-string 
+		    folder number
+		    (elmo-find-fetch-strategy folder number)))
+	      (raw-buffer (get-buffer-create "*wl:raw message*"))
+	      (raw-mode-map (make-sparse-keymap)))
+	  (with-current-buffer raw-buffer
+	    (toggle-read-only -1)
+	    (erase-buffer)
+	    (princ raw raw-buffer)
+	    (toggle-read-only t)
+	    (goto-char (point-min))
+	    (switch-to-buffer-other-window raw-buffer)
+	    (define-key raw-mode-map "l" 'toggle-truncate-lines)
+	    (define-key raw-mode-map "q" 'kill-buffer-and-window)
+	    (define-key raw-mode-map "," 'kill-buffer-and-window)
+	    (use-local-map raw-mode-map)))
+      (message "No message to display."))
+    number))
+
 (defun wl-summary-save (&optional arg wl-save-dir)
   "Save current message to disk."
   (interactive)
@@ -4833,8 +4825,8 @@ If ARG is numeric number, decode message as following:
   (interactive (list current-prefix-arg nil))
   (if (null (wl-summary-message-number))
       (message "No message.")
-    (setq command (read-string "Shell command on message: "
-			       wl-summary-shell-command-last))
+    (setq command (wl-read-shell-command "Shell command on message: "
+					 wl-summary-shell-command-last))
     (if (y-or-n-p "Send this message to pipe? ")
 	(wl-summary-pipe-message-subr prefix command))))
 
@@ -4843,8 +4835,9 @@ If ARG is numeric number, decode message as following:
   (interactive (list current-prefix-arg nil))
   (if (null wl-summary-buffer-target-mark-list)
       (message "No marked message.")
-    (setq command (read-string "Shell command on each marked message: "
-			       wl-summary-shell-command-last))
+    (setq command (wl-read-shell-command
+		   "Shell command on each marked message: "
+		   wl-summary-shell-command-last))
     (when (y-or-n-p "Send each marked message to pipe? ")
       (while (car wl-summary-buffer-target-mark-list)
 	(let ((num (car wl-summary-buffer-target-mark-list)))
@@ -5061,14 +5054,27 @@ If ARG is numeric number, decode message as following:
 ;; 					    sum))
 ;; 	(message "Dropping...done"))))
 
+(defun wl-summary-previous-message-number (msg)
+  "Return a message number previous to the message specified by MSG."
+  (let ((list wl-summary-buffer-number-list)
+	previous)
+    (while (and list (not (eq msg (car list))))
+      (setq previous (car list))
+      (setq list (cdr list)))
+    previous))
+
+(defun wl-summary-next-message-number (msg)
+  "Return a message number next to the message specified by MSG."
+  (cadr (memq msg wl-summary-buffer-number-list)))
+
 (defun wl-summary-default-get-next-msg (msg)
   (or (wl-summary-next-message msg
 			       (if wl-summary-move-direction-downward 'down
 				 'up)
 			       nil)
-      (cadr (memq msg (if wl-summary-move-direction-downward
-			  wl-summary-buffer-number-list
-			(reverse wl-summary-buffer-number-list))))))
+      (if wl-summary-move-direction-downward
+	  (wl-summary-next-message-number msg)
+	(wl-summary-previous-message-number msg))))
 
 (defun wl-summary-save-current-message ()
   "Save current message for `wl-summary-yank-saved-message'."