From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 31 Jan 2011 04:21:20 +0000 (-0800)
Subject: Try to avoid having point move around by not using save-window-excursion.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=6448d6cb1d4ba0bc592b81b72a94215ce0aea338

Try to avoid having point move around by not using save-window-excursion.

It seems to work...
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d3f79fe3..aea00e817 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-art.el (article-update-date-lapsed): Try to avoid having point
+	move around by not using save-window-excursion.  It seems to work...
+
 2011-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (article-make-date-line): Work for user-defined format.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 71e9e18e6..0fdd6bd28 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3646,31 +3646,31 @@ function and want to see what the date was before converting."
 (defun article-update-date-lapsed ()
   "Function to be run from a timer to update the lapsed time line."
   (save-match-data
-    (let (deactivate-mark)
-      (save-window-excursion
-	(ignore-errors
-	 (walk-windows
-	  (lambda (w)
-	    (set-buffer (window-buffer w))
-	    (when (eq major-mode 'gnus-article-mode)
-	      (let ((old-line (count-lines (point-min) (point)))
-		    (old-column (current-column)))
-		(goto-char (point-min))
-		(while (re-search-forward "^Date:" nil t)
-		  (let ((type (get-text-property (match-beginning 0) 'gnus-date-type)))
-		    (when (memq type '(lapsed combined-lapsed user-format))
-		      (save-excursion
-			(article-date-ut type t (match-beginning 0)))
-		      (forward-line 1))))
-		(goto-char (point-min))
-		(when (> old-column 0)
-		  (setq old-line (1- old-line)))
-		(forward-line old-line)
-		(end-of-line)
-		(when (> (current-column) old-column)
-		  (beginning-of-line)
-		  (forward-char old-column)))))
-	  nil 'visible))))))
+    (let ((buffer (current-buffer)))
+      (ignore-errors
+	(walk-windows
+	 (lambda (w)
+	   (set-buffer (window-buffer w))
+	   (when (eq major-mode 'gnus-article-mode)
+	     (let ((old-line (count-lines (point-min) (point)))
+		   (old-column (current-column)))
+	       (goto-char (point-min))
+	       (while (re-search-forward "^Date:" nil t)
+		 (let ((type (get-text-property (match-beginning 0) 'gnus-date-type)))
+		   (when (memq type '(lapsed combined-lapsed user-format))
+		     (save-excursion
+		       (article-date-ut type t (match-beginning 0)))
+		     (forward-line 1))))
+	       (goto-char (point-min))
+	       (when (> old-column 0)
+		 (setq old-line (1- old-line)))
+	       (forward-line old-line)
+	       (end-of-line)
+	       (when (> (current-column) old-column)
+		 (beginning-of-line)
+		 (forward-char old-column)))))
+	 nil 'visible))
+      (set-buffer buffer))))
 
 (defun gnus-start-date-timer (&optional n)
   "Start a timer to update the Date headers in the article buffers.