(gnus-summary-limit-to-singletons): Fix typo.

[gnus] / lisp / gnus-group.el

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 6e4de2c..e24cf00 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -135,7 +135,7 @@ for the groups to be sorted.  Pre-made functions include
 `gnus-group-sort-by-score', `gnus-group-sort-by-method',
 `gnus-group-sort-by-server', and `gnus-group-sort-by-rank'.
 
 `gnus-group-sort-by-score', `gnus-group-sort-by-method',
 `gnus-group-sort-by-server', and `gnus-group-sort-by-rank'.
 

-This variable can also be a list of sorting functions. In that case,
+This variable can also be a list of sorting functions.  In that case,

 the most significant sort function should be the last function in the
 list."
   :group 'gnus-group-listing
 the most significant sort function should be the last function in the
 list."
   :group 'gnus-group-listing


@@ -197,7 +197,7 @@ with some simple extensions.
 
 Note that this format specification is not always respected.  For
 reasons of efficiency, when listing killed groups, this specification
 
 Note that this format specification is not always respected.  For
 reasons of efficiency, when listing killed groups, this specification

-is ignored altogether. If the spec is changed considerably, your
+is ignored altogether.  If the spec is changed considerably, your

 output may end up looking strange when listing both alive and killed
 groups.
 
 output may end up looking strange when listing both alive and killed
 groups.
 


@@ -1034,9 +1034,11 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
   '((gnus-group-post-news "mail/compose")
     ;; Some useful agent icons?  I don't use the agent so agent users should
     ;; suggest useful commands:
   '((gnus-group-post-news "mail/compose")
     ;; Some useful agent icons?  I don't use the agent so agent users should
     ;; suggest useful commands:

-    (gnus-agent-toggle-plugged "connect" t
-                              :visible (and gnus-agent (not gnus-plugged)))

     (gnus-agent-toggle-plugged "disconnect" t
     (gnus-agent-toggle-plugged "disconnect" t

+                              :help "Gnus is currently unplugged.  Click to work online."
+                              :visible (and gnus-agent (not gnus-plugged)))
+    (gnus-agent-toggle-plugged "connect" t
+                              :help "Gnus is currently plugged.  Click to work offline."

                               :visible (and gnus-agent gnus-plugged))
     ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar)
     ;; should have a better help text.
                               :visible (and gnus-agent gnus-plugged))
     ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar)
     ;; should have a better help text.


@@ -1090,17 +1092,6 @@ See `gmm-tool-bar-from-list' for the format of the list."
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
 
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
 

-;; FIXME: Moving through the Group buffer (in topic mode) e.g. with C-n
-;; doesn't update the state (enabled/disabled) of the icon
-;; `gnus-group-describe-group'.  After `C-l' the state is correct.
-;; See the following report on emacs-devel
-;; <http://thread.gmane.org/v9acdmrcse.fsf@marauder.physik.uni-ulm.de>:
-;; From: Reiner Steib
-;; Subject: tool bar icons not updated according to :active condition
-;; Newsgroups: gmane.emacs.devel
-;; Date: Mon, 23 Jan 2006 19:59:13 +0100
-;; Message-ID: <v9acdmrcse.fsf@marauder.physik.uni-ulm.de>
-

 (defcustom gnus-group-tool-bar-zap-list t
   "List of icon items from the global tool bar.
 These items are not displayed in the Gnus group mode tool bar.
 (defcustom gnus-group-tool-bar-zap-list t
   "List of icon items from the global tool bar.
 These items are not displayed in the Gnus group mode tool bar.


@@ -1142,7 +1133,7 @@ When FORCE, rebuild the tool bar."
 
 All normal editing commands are switched off.
 \\<gnus-group-mode-map>
 
 All normal editing commands are switched off.
 \\<gnus-group-mode-map>

-The group buffer lists (some of) the groups available. For instance,
+The group buffer lists (some of) the groups available.  For instance,

 `\\[gnus-group-list-groups]' will list all subscribed groups with unread articles, while `\\[gnus-group-list-zombies]'
 lists all zombie groups.
 
 `\\[gnus-group-list-groups]' will list all subscribed groups with unread articles, while `\\[gnus-group-list-zombies]'
 lists all zombie groups.
 


@@ -1507,6 +1498,17 @@ if it is a string, only list groups matching REGEXP."
                (gnus-range-difference (list active) (gnus-info-read info))
                seen))))))
 
                (gnus-range-difference (list active) (gnus-info-read info))
                seen))))))
 

+;; Moving through the Group buffer (in topic mode) e.g. with C-n doesn't
+;; update the state (enabled/disabled) of the icon `gnus-group-describe-group'
+;; automatically.  After `C-l' the state is correct.  See the following report
+;; on emacs-devel
+;; <http://thread.gmane.org/v9acdmrcse.fsf@marauder.physik.uni-ulm.de>:
+;; From: Reiner Steib
+;; Subject: tool bar icons not updated according to :active condition
+;; Newsgroups: gmane.emacs.devel
+;; Date: Mon, 23 Jan 2006 19:59:13 +0100
+;; Message-ID: <v9acdmrcse.fsf@marauder.physik.uni-ulm.de>
+

 (defcustom gnus-group-update-tool-bar
   (and (not (featurep 'xemacs))
        (boundp 'tool-bar-mode)
 (defcustom gnus-group-update-tool-bar
   (and (not (featurep 'xemacs))
        (boundp 'tool-bar-mode)


@@ -2028,7 +2030,7 @@ and with point over the group in question."
 If the prefix argument ALL is non-nil, already read articles become
 readable.  IF ALL is a number, fetch this number of articles.  If the
 optional argument NO-ARTICLE is non-nil, no article will be
 If the prefix argument ALL is non-nil, already read articles become
 readable.  IF ALL is a number, fetch this number of articles.  If the
 optional argument NO-ARTICLE is non-nil, no article will be

-auto-selected upon group entry.         If GROUP is non-nil, fetch that
+auto-selected upon group entry.  If GROUP is non-nil, fetch that

 group."
   (interactive "P")
   (let ((no-display (eq all 0))
 group."
   (interactive "P")
   (let ((no-display (eq all 0))


@@ -2069,11 +2071,11 @@ articles in the group."
     (forward-line -1))
   (gnus-group-read-group all t))
 
     (forward-line -1))
   (gnus-group-read-group all t))
 

-(defun gnus-group-quick-select-group (&optional all)
-  "Select the current group \"quickly\".
-This means that no highlighting or scoring will be performed.
-If ALL (the prefix argument) is 0, don't even generate the summary
-buffer.
+(defun gnus-group-quick-select-group (&optional all group)
+  "Select the GROUP \"quickly\".
+This means that no highlighting or scoring will be performed.  If
+ALL (the prefix argument) is 0, don't even generate the summary
+buffer.  If GROUP is nil, use current group.

 
 This might be useful if you want to toggle threading
 before entering the group."
 
 This might be useful if you want to toggle threading
 before entering the group."


@@ -2084,7 +2086,7 @@ before entering the group."
        gnus-home-score-file
        gnus-apply-kill-hook
        gnus-summary-expunge-below)
        gnus-home-score-file
        gnus-apply-kill-hook
        gnus-summary-expunge-below)

-    (gnus-group-read-group all t)))
+    (gnus-group-read-group all t group)))

 
 (defun gnus-group-visible-select-group (&optional all)
   "Select the current group without hiding any articles."
 
 (defun gnus-group-visible-select-group (&optional all)
   "Select the current group without hiding any articles."


@@ -2124,13 +2126,14 @@ be permanent."
 ;;;###autoload
 (defun gnus-fetch-group (group &optional articles)
   "Start Gnus if necessary and enter GROUP.
 ;;;###autoload
 (defun gnus-fetch-group (group &optional articles)
   "Start Gnus if necessary and enter GROUP.

+If ARTICLES, display those articles.

 Returns whether the fetching was successful or not."
   (interactive (list (completing-read "Group name: " gnus-active-hashtb
                                      nil nil nil nil
                                      (group-name-at-point))))
   (unless (get-buffer gnus-group-buffer)
     (gnus-no-server))
 Returns whether the fetching was successful or not."
   (interactive (list (completing-read "Group name: " gnus-active-hashtb
                                      nil nil nil nil
                                      (group-name-at-point))))
   (unless (get-buffer gnus-group-buffer)
     (gnus-no-server))

-  (gnus-group-read-group articles nil group))
+  (gnus-group-read-group (if articles nil t) nil group articles))

 
 ;;;###autoload
 (defun gnus-fetch-group-other-frame (group)
 
 ;;;###autoload
 (defun gnus-fetch-group-other-frame (group)


@@ -2752,13 +2755,18 @@ If called with a prefix argument, ask for the file type."
                          (t (setq err (format "%c unknown. " char))
                             nil))))
       (setq type found)))
                          (t (setq err (format "%c unknown. " char))
                             nil))))
       (setq type found)))

-  (let* ((file (expand-file-name file))
-        (name (gnus-generate-new-group-name
-               (gnus-group-prefixed-name
-                (file-name-nondirectory file) '(nndoc "")))))
+  (setq file (expand-file-name file))
+  (let ((name (gnus-generate-new-group-name
+              (gnus-group-prefixed-name
+               (file-name-nondirectory file) '(nndoc ""))))
+       (encodable (mm-coding-system-p 'utf-8)))

     (gnus-group-make-group
     (gnus-group-make-group

-     (gnus-group-real-name name)
-     (list 'nndoc file
+     (if encodable
+        (mm-encode-coding-string (gnus-group-real-name name) 'utf-8)
+       (gnus-group-real-name name))
+     (list 'nndoc (if encodable
+                     (mm-encode-coding-string file 'utf-8)
+                   file)

           (list 'nndoc-address file)
           (list 'nndoc-article-type (or type 'guess))))))
 
           (list 'nndoc-address file)
           (list 'nndoc-article-type (or type 'guess))))))
 


@@ -2892,7 +2900,7 @@ Given a prefix, create a full group."
 (defun gnus-group-make-directory-group (dir)
   "Create an nndir group.
 The user will be prompted for a directory.  The contents of this
 (defun gnus-group-make-directory-group (dir)
   "Create an nndir group.
 The user will be prompted for a directory.  The contents of this

-directory will be used as a newsgroup. The directory should contain
+directory will be used as a newsgroup.  The directory should contain

 mail messages or news articles in files that have numeric names."
   (interactive
    (list (read-file-name "Create group from directory: ")))
 mail messages or news articles in files that have numeric names."
   (interactive
    (list (read-file-name "Create group from directory: ")))


@@ -3227,7 +3235,7 @@ sort in reverse order."
 (defun gnus-group-sort-by-unread (info1 info2)
   "Sort by number of unread articles."
   (let ((n1 (gnus-group-unread (gnus-info-group info1)))
 (defun gnus-group-sort-by-unread (info1 info2)
   "Sort by number of unread articles."
   (let ((n1 (gnus-group-unread (gnus-info-group info1)))

-       (n2 (gnus-group-unread (gnus-info-group info1))))
+       (n2 (gnus-group-unread (gnus-info-group info2))))

     (< (or (and (numberp n1) n1) 0)
        (or (and (numberp n2) n2) 0))))
 
     (< (or (and (numberp n1) n1) 0)
        (or (and (numberp n2) n2) 0))))
 


@@ -3564,7 +3572,7 @@ group line."
 
 (defun gnus-group-transpose-groups (n)
   "Move the current newsgroup up N places.
 
 (defun gnus-group-transpose-groups (n)
   "Move the current newsgroup up N places.

-If given a negative prefix, move down instead. The difference between
+If given a negative prefix, move down instead.  The difference between

 N and the number of steps taken is returned."
   (interactive "p")
   (unless (gnus-group-group-name)
 N and the number of steps taken is returned."
   (interactive "p")
   (unless (gnus-group-group-name)


@@ -4277,7 +4285,7 @@ and the second element is the address."
        (unless entry
          (error "Trying to change non-existent group %s" method-only-group))
        ;; We have received parts of the actual group info - either the
        (unless entry
          (error "Trying to change non-existent group %s" method-only-group))
        ;; We have received parts of the actual group info - either the

-       ;; select method or the group parameters.        We first check
+       ;; select method or the group parameters.  We first check

        ;; whether we have to extend the info, and if so, do that.
        (let ((len (length info))
              (total (if (eq part 'method) 5 6)))
        ;; whether we have to extend the info, and if so, do that.
        (let ((len (length info))
              (total (if (eq part 'method) 5 6)))