X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-summary.el;h=f719f8a390a8152105c38571b9eb783c7835e444;hb=6444631eeac4bef1933e27202080f62ac536aada;hp=476b6f7cf260b80d1c53d4001609c00908ed7169;hpb=12f1baf26945a43185396ef6f3285eb8f71aa444;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 476b6f7..f719f8a 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -690,13 +690,21 @@ See also variable `wl-use-petname'."
      'cache-changed
      (current-buffer)
      (elmo-define-signal-handler (buffer folder number)
-       (wl-summary-update-persistent-mark-on-event buffer (list number))))))
+       (wl-summary-update-persistent-mark-on-event buffer (list number))))
+    (elmo-connect-signal
+     wl-summary-buffer-elmo-folder
+     'update-overview
+     (current-buffer)
+     (elmo-define-signal-handler (buffer folder number)
+       (with-current-buffer buffer
+	 (wl-summary-rescan-message number))))))
 
 (defun wl-summary-buffer-detach ()
   (when (and (eq major-mode 'wl-summary-mode)
 	     wl-summary-buffer-elmo-folder)
     (elmo-disconnect-signal 'flag-changed (current-buffer))
-    (elmo-disconnect-signal 'cache-changed (current-buffer))))
+    (elmo-disconnect-signal 'cache-changed (current-buffer))
+    (elmo-disconnect-signal 'update-overview (current-buffer))))
 
 (defun wl-status-update ()
   (interactive)
@@ -1144,6 +1152,49 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
     (forward-line -1)
     (set-buffer-modified-p nil)))
 
+(defun wl-summary-rescan-message (number &optional reparent)
+  "Rescan current message without updating."
+  (interactive (list (wl-summary-message-number)))
+  (let ((start-number (wl-summary-message-number))
+	(start-column (current-column)))
+    (when (wl-summary-jump-to-msg number)
+      (let* ((folder wl-summary-buffer-elmo-folder)
+	     (entity (elmo-message-entity folder number))
+	     (inhibit-read-only t))
+	(if (eq wl-summary-buffer-view 'thread)
+	    (let* ((thread-entity (wl-thread-get-entity number))
+		   (descendant (wl-thread-entity-get-descendant thread-entity))
+		   (thread-parent (wl-thread-entity-get-parent thread-entity))
+		   (entity-parent (elmo-message-entity-number
+				   (elmo-message-entity-parent folder entity)))
+		   update-top-list)
+	      (if (and (not reparent)
+		       (eq thread-parent entity-parent))
+		  (progn
+		    (wl-thread-entity-set-linked thread-entity nil)
+		    (wl-thread-update-line-on-buffer-sub nil number))
+		(wl-thread-delete-message number 'deep 'update)
+		(dolist (number (cons number descendant))
+		  (setq update-top-list
+			(nconc
+			 update-top-list
+			 (wl-summary-insert-thread
+			  (elmo-message-entity folder number)
+			  folder
+			  'update))))
+		(when update-top-list
+		  (wl-thread-update-indent-string-thread
+		   (elmo-uniq-list update-top-list)))))
+	    (delete-region (point-at-bol) (1+ (point-at-eol)))
+	    (wl-summary-insert-line
+	     (wl-summary-create-line entity nil
+				     (wl-summary-temp-mark number)
+				     (elmo-message-flags folder number)
+				     (elmo-message-cached-p folder number)))))
+      (wl-summary-set-message-modified)
+      (wl-summary-jump-to-msg start-number)
+      (move-to-column start-column))))
+
 (defun wl-summary-next-folder-or-exit (&optional next-entity upward)
   (if (and next-entity
 	   wl-auto-select-next)
@@ -1385,18 +1436,17 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
       (if body (setq candidates (append candidates body)))
       (setq fields (cdr fields)))
     (setq candidates (elmo-uniq-list candidates))
-    (elmo-set-work-buf
-     (set-buffer-multibyte default-enable-multibyte-characters)
-     (mapcar (function
-	      (lambda (x)
-		(setq components (std11-extract-address-components x))
-		(cons (nth 1 components)
-		      (and (car components)
-			   (eword-decode-string
-			    (decode-mime-charset-string
-			     (car components)
-			     mime-charset))))))
-	     candidates))))
+    (elmo-with-enable-multibyte
+      (mapcar (function
+	       (lambda (x)
+		 (setq components (std11-extract-address-components x))
+		 (cons (nth 1 components)
+		       (and (car components)
+			    (eword-decode-string
+			     (decode-mime-charset-string
+			      (car components)
+			      mime-charset))))))
+	      candidates))))
 
 (defun wl-summary-edit-addresses-subr (the-email name-in-addr)
   ;; returns nil if there's no change.
@@ -1933,7 +1983,7 @@ This function is defined for `window-scroll-functions'"
 					    (not disable-killed)
 					    'in-msgdb)
 					   wl-summary-buffer-number-list))
-		(setq append-list (car diff))
+		(setq append-list (sort (car diff) #'<))
 		(setq delete-list (cadr diff))
 
 		(when delete-list