X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-group.el;h=5fb04d8592972577aeaefe66afa1dbecff0fa4b0;hb=26c1b062894eb187922a9cd6890a7cc5c2927c01;hp=e06fcb8f3791c945830cb80bb241af927d3eccf4;hpb=df99ee2952e7f597741e2e1878e455a8569c2d77;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index e06fcb8..5fb04d8 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -145,7 +145,7 @@ list."
 			 (function-item gnus-group-sort-by-rank)
 			 (function :tag "other" nil))))
 
-(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)%l %O\n"
+(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)%O\n"
   "*Format of group lines.
 It works along the same lines as a normal formatting string,
 with some simple extensions.
@@ -174,7 +174,6 @@ with some simple extensions.
 %P    Topic indentation (string)
 %m    Whether there is new(ish) mail in the group (char, \"%\")
 %w    Number of new(ish) mails in the group (integer)
-%l    Whether there are GroupLens predictions for this group (string)
 %n    Select from where (string)
 %z    A string that look like `<%s:%n>' if a foreign select method is used
 %d    The date the group was last entered.
@@ -3383,12 +3382,10 @@ The killed newsgroups can be yanked by using \\[gnus-group-yank-group]."
 	   (count-lines
 	    (progn
 	      (goto-char begin)
-	      (beginning-of-line)
-	      (point))
+	      (point-at-bol))
 	    (progn
 	      (goto-char end)
-	      (beginning-of-line)
-	      (point))))))
+	      (point-at-bol))))))
     (goto-char begin)
     (beginning-of-line)			;Important when LINES < 1
     (gnus-group-kill-group lines)))
@@ -3960,10 +3957,8 @@ The hook `gnus-suspend-gnus-hook' is called before actually suspending."
   (let ((group-buf (get-buffer gnus-group-buffer)))
     (mapcar (lambda (buf)
 	      (unless (or (member buf (list group-buf gnus-dribble-buffer))
-			  (progn
-			    (save-excursion
-			      (set-buffer buf)
-			      (eq major-mode 'message-mode))))
+			  (with-current-buffer buf
+			    (eq major-mode 'message-mode)))
 		(gnus-kill-buffer buf)))
 	    (gnus-buffers))
     (setq gnus-backlog-articles nil)