(gnus-group-redraw-when-idle): Rename from

gnus-group-redraw-line-number.
(gnus-group-redraw-check): Simplify.
(gnus-group-tool-bar-update): Remove redraw check.
(gnus-group-make-tool-bar): Add redraw check.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd4906a..e213bf8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-01  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-group.el (gnus-group-redraw-when-idle): Rename from
+       gnus-group-redraw-line-number.
+       (gnus-group-redraw-check): Simplify.
+       (gnus-group-tool-bar-update): Remove redraw check.
+       (gnus-group-make-tool-bar): Add redraw check.
+
 2006-03-01  Michael Piotrowski  <mxp@dynalabs.de>  (tiny change)
 
        * gnus-art.el (gnus-button): Add missing parentheses.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 096e05d..545df6d 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1001,28 +1001,22 @@ simple manner.")
 
 ;; Work around for Emacs not updating the tool bar, see
 ; http://www.google.com/groups?as_umsgid=v9u0an3hti.fsf@marauder.physik.uni-ulm.de
-(defvar gnus-group-redraw-line-number nil
+(defvar gnus-group-redraw-when-idle 2
   "When non-nil, redraw the Group buffer frame when idle.
 Internal variable.")
 ;; Don't make this customizable yet.
 
 (defun gnus-group-redraw-check ()
   "Check if we need to redraw the frame."
-  (when (and gnus-group-redraw-line-number
+  (when (and gnus-group-redraw-when-idle
             (not (featurep 'xemacs))
             (boundp 'tool-bar-mode)
             tool-bar-mode)
-    (let ((no (if (fboundp 'line-number-at-pos) ;; Emacs 22 only
-                 (line-number-at-pos)
-               ;; Not equivalent to `line-number-at-pos' but good enough
-               ;; here:
-               (1+ (count-lines (point-min) (point))))))
-      (unless (eq gnus-group-redraw-line-number no)
-       (setq gnus-group-redraw-line-number no)
-       ;; (run-with-idle-timer 1 nil 'menu-bar-update-buffers t)
-       ;; (run-with-idle-timer 1 nil 'redraw-frame (selected-frame))
-       (run-with-idle-timer 1 nil 'force-window-update)
-        t))))
+    ;;(run-with-idle-timer gnus-group-redraw-when-idle
+    ;;                  nil 'redraw-frame (selected-frame))
+    (run-with-idle-timer gnus-group-redraw-when-idle
+                        nil 'force-window-update)
+    t))
 
 (defun gnus-group-tool-bar-update (&optional symbol value)
   "Update group buffer toolbar.
@@ -1033,9 +1027,6 @@ Setter function for custom variables."
   ;; (use-local-map gnus-group-mode-map)
   (when (gnus-alive-p)
     (with-current-buffer gnus-group-buffer
-      (when gnus-group-redraw-line-number
-       (add-to-list (make-local-variable 'post-command-hook)
-                    'gnus-group-redraw-check))
       (gnus-group-make-tool-bar t))))
 
 ;; The default will be changed when the new icons have been checked in:
@@ -1143,6 +1134,9 @@ When FORCE, rebuild the tool bar."
             ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode).
             ;; Why?  --rsteib
             (or (not gnus-group-tool-bar-map) force))
+    (when gnus-group-redraw-when-idle
+      (add-to-list (make-local-variable 'post-command-hook)
+                  'gnus-group-redraw-check))
     (let* ((load-path
            (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
                                 'load-path))