[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-group.el

[Juanma Barranquero]

Index: emacs/lisp/gnus/gnus-group.el
diff -c emacs/lisp/gnus/gnus-group.el:1.21 emacs/lisp/gnus/gnus-group.el:1.22
*** emacs/lisp/gnus/gnus-group.el:1.21  Wed Jan 15 20:19:02 2003
--- emacs/lisp/gnus/gnus-group.el       Tue Feb  4 08:06:38 2003
***************
*** 822,828 ****
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
  (defun gnus-group-make-tool-bar ()
!   (if (and 
         (condition-case nil (require 'tool-bar) (error nil))
         (fboundp 'tool-bar-add-item-from-menu)
         (default-value 'tool-bar-mode)
--- 822,828 ----
  
  ;; Emacs 21 tool bar.  Should be no-op otherwise.
  (defun gnus-group-make-tool-bar ()
!   (if (and
         (condition-case nil (require 'tool-bar) (error nil))
         (fboundp 'tool-bar-add-item-from-menu)
         (default-value 'tool-bar-mode)
***************
*** 938,944 ****
    (let ((item (assoc method gnus-group-name-charset-method-alist))
        (alist gnus-group-name-charset-group-alist)
        result)
!     (if item 
        (cdr item)
        (while (setq item (pop alist))
        (if (string-match (car item) group)
--- 938,944 ----
    (let ((item (assoc method gnus-group-name-charset-method-alist))
        (alist gnus-group-name-charset-group-alist)
        result)
!     (if item
        (cdr item)
        (while (setq item (pop alist))
        (if (string-match (car item) group)
***************
*** 1099,1107 ****
            (gnus-add-text-properties
             (point) (prog1 (1+ (point))
                       (insert " " mark "     *: "
!                              (gnus-group-name-decode group 
                                                       (gnus-group-name-charset
!                                                       nil group)) 
                               "\n"))
             (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
                   'gnus-unread t
--- 1099,1107 ----
            (gnus-add-text-properties
             (point) (prog1 (1+ (point))
                       (insert " " mark "     *: "
!                              (gnus-group-name-decode group
                                                       (gnus-group-name-charset
!                                                       nil group))
                               "\n"))
             (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
                   'gnus-unread t
***************
*** 1112,1120 ****
        (gnus-add-text-properties
         (point) (prog1 (1+ (point))
                   (insert " " mark "     *: "
!                          (gnus-group-name-decode group 
                                                   (gnus-group-name-charset
!                                                   nil group)) 
                           "\n"))
         (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
               'gnus-unread t
--- 1112,1120 ----
        (gnus-add-text-properties
         (point) (prog1 (1+ (point))
                   (insert " " mark "     *: "
!                          (gnus-group-name-decode group
                                                   (gnus-group-name-charset
!                                                   nil group))
                           "\n"))
         (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb)
               'gnus-unread t
***************
*** 1168,1174 ****
                                                    gnus-tmp-method)
    "Insert a group line in the group buffer."
    (let* ((gnus-tmp-method
!         (gnus-server-get-method gnus-tmp-group gnus-tmp-method)) 
         (group-name-charset (gnus-group-name-charset gnus-tmp-method
                                                      gnus-tmp-group))
         (gnus-tmp-active (gnus-active gnus-tmp-group))
--- 1168,1174 ----
                                                    gnus-tmp-method)
    "Insert a group line in the group buffer."
    (let* ((gnus-tmp-method
!         (gnus-server-get-method gnus-tmp-group gnus-tmp-method))
         (group-name-charset (gnus-group-name-charset gnus-tmp-method
                                                      gnus-tmp-group))
         (gnus-tmp-active (gnus-active gnus-tmp-group))
***************
*** 1188,1200 ****
                ((<= gnus-tmp-level gnus-level-unsubscribed) ?U)
                ((= gnus-tmp-level gnus-level-zombie) ?Z)
                (t ?K)))
!        (gnus-tmp-qualified-group 
          (gnus-group-name-decode (gnus-group-real-name gnus-tmp-group)
                                  group-name-charset))
         (gnus-tmp-newsgroup-description
          (if gnus-description-hashtb
              (or (gnus-group-name-decode
!                  (gnus-gethash gnus-tmp-group gnus-description-hashtb) 
                   group-name-charset) "")
            ""))
         (gnus-tmp-moderated
--- 1188,1200 ----
                ((<= gnus-tmp-level gnus-level-unsubscribed) ?U)
                ((= gnus-tmp-level gnus-level-zombie) ?Z)
                (t ?K)))
!        (gnus-tmp-qualified-group
          (gnus-group-name-decode (gnus-group-real-name gnus-tmp-group)
                                  group-name-charset))
         (gnus-tmp-newsgroup-description
          (if gnus-description-hashtb
              (or (gnus-group-name-decode
!                  (gnus-gethash gnus-tmp-group gnus-description-hashtb)
                   group-name-charset) "")
            ""))
         (gnus-tmp-moderated
***************
*** 1840,1850 ****
       (test-marked
        (goto-char (point-min))
        (let (found)
!       (while (and (not found) 
                    (gnus-goto-char
                     (text-property-any
                      (point) (point-max)
!                     'gnus-group 
                      (gnus-intern-safe group gnus-active-hashtb))))
          (if (gnus-group-mark-line-p)
              (setq found t)
--- 1840,1850 ----
       (test-marked
        (goto-char (point-min))
        (let (found)
!       (while (and (not found)
                    (gnus-goto-char
                     (text-property-any
                      (point) (point-max)
!                     'gnus-group
                      (gnus-intern-safe group gnus-active-hashtb))))
          (if (gnus-group-mark-line-p)
              (setq found t)
***************
*** 2308,2314 ****
            default-login 'gnus-group-warchive-login-history)
           user-mail-address))
         (method
!         `(nnwarchive ,address 
                       (nnwarchive-type ,(intern type))
                       (nnwarchive-login ,login))))
      (gnus-group-make-group group method)))
--- 2308,2314 ----
            default-login 'gnus-group-warchive-login-history)
           user-mail-address))
         (method
!         `(nnwarchive ,address
                       (nnwarchive-type ,(intern type))
                       (nnwarchive-login ,login))))
      (gnus-group-make-group group method)))
***************
*** 3175,3181 ****
        (gnus-add-text-properties
         (point) (prog1 (1+ (point))
                 (insert "       *: "
!                        (gnus-group-name-decode group 
                                                 (gnus-group-name-charset
                                                  nil group))
                         "\n"))
--- 3175,3181 ----
        (gnus-add-text-properties
         (point) (prog1 (1+ (point))
                 (insert "       *: "
!                        (gnus-group-name-decode group
                                                 (gnus-group-name-charset
                                                  nil group))
                         "\n"))
***************
*** 3338,3344 ****
       (lambda (group)
         (setq b (point))
         (let ((charset (gnus-group-name-charset nil (symbol-name group))))
!        (insert (format "      *: %-20s %s\n" 
                         (gnus-group-name-decode
                          (symbol-name group) charset)
                         (gnus-group-name-decode
--- 3338,3344 ----
       (lambda (group)
         (setq b (point))
         (let ((charset (gnus-group-name-charset nil (symbol-name group))))
!        (insert (format "      *: %-20s %s\n"
                         (gnus-group-name-decode
                          (symbol-name group) charset)
                         (gnus-group-name-decode
***************
*** 3709,3715 ****
        ""
        (gnus-time-iso8601 time))))
  
! (defun gnus-group-prepare-flat-list-dead-predicate 
    (groups level mark predicate)
    (let (group)
      (if predicate
--- 3709,3715 ----
        ""
        (gnus-time-iso8601 time))))
  
! (defun gnus-group-prepare-flat-list-dead-predicate
    (groups level mark predicate)
    (let (group)
      (if predicate
***************
*** 3719,3726 ****
          (when (funcall predicate group)
            (gnus-add-text-properties
             (point) (prog1 (1+ (point))
!                      (insert " " mark "     *: " 
!                              (gnus-group-name-decode group 
                                                       (gnus-group-name-charset
                                                        nil group))
                               "\n"))
--- 3719,3726 ----
          (when (funcall predicate group)
            (gnus-add-text-properties
             (point) (prog1 (1+ (point))
!                      (insert " " mark "     *: "
!                              (gnus-group-name-decode group
                                                       (gnus-group-name-charset
                                                        nil group))
                               "\n"))
***************
*** 3789,3799 ****
                                      (assq 'cache marks)))
                                lowest
                                #'(lambda (group)
!                                   (or (gnus-gethash group 
                                                      gnus-cache-active-hashtb)
!                                       ;; Cache active file might use "." 
                                        ;; instead of ":".
!                                       (gnus-gethash 
                                         (mapconcat 'identity
                                                    (split-string group ":")
                                                    ".")
--- 3789,3799 ----
                                      (assq 'cache marks)))
                                lowest
                                #'(lambda (group)
!                                   (or (gnus-gethash group
                                                      gnus-cache-active-hashtb)
!                                       ;; Cache active file might use "."
                                        ;; instead of ":".
!                                       (gnus-gethash
                                         (mapconcat 'identity
                                                    (split-string group ":")
                                                    ".")