Merge gnus-6_7-tomo.

[elisp/gnus.git-] / lisp / gnus.el

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 9104200..fe6072e 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1987,88,89,90,93,94,95,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Copyright (C) 1987,88,89,90,93,94,95,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>

-;;     Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;;     Lars Magne Ingebrigtsen <larsi@gnus.org>

 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.
 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.

@@ -41,6 +41,10 @@
   :group 'news
   :group 'mail)
 
   :group 'news
   :group 'mail)
 

+(defgroup gnus-cache nil
+  "Cache interface."
+  :group 'gnus)
+

 (defgroup gnus-start nil
   "Starting your favorite newsreader."
   :group 'gnus)
 (defgroup gnus-start nil
   "Starting your favorite newsreader."
   :group 'gnus)

@@ -246,11 +250,11 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 

-(defconst gnus-version-number "6.1.1"
+(defconst gnus-version-number "6.8.0"

   "Version number for this version of gnus.")
 
 (defconst gnus-version
   "Version number for this version of gnus.")
 
 (defconst gnus-version

-  (format "Semi-gnus %s (based on Gnus 5.6.3; for SEMI 1.1)"
+  (format "Chao-gnus %s (based on Gnus 5.6.22; for SEMI 1.8/FLIM 1.8)"

           gnus-version-number)
   "Version string for this version of gnus.")
 
           gnus-version-number)
   "Version string for this version of gnus.")
 

@@ -704,7 +708,12 @@ All other Gnus path variables are initialized from this variable."
 
 (defcustom gnus-directory (or (getenv "SAVEDIR")
                              (nnheader-concat gnus-home-directory "News/"))
 
 (defcustom gnus-directory (or (getenv "SAVEDIR")
                              (nnheader-concat gnus-home-directory "News/"))

-  "*Directory variable from which all other Gnus file variables are derived."
+  "*Directory variable from which all other Gnus file variables are derived.
+
+Note that Gnus is mostly loaded when the `.gnus.el' file is read.
+This means that other directory variables that are initialized from
+this variable won't be set properly if you set this variable in `.gnus.el'.
+Set this variable in `.emacs' instead."

   :group 'gnus-files
   :type 'directory)
 
   :group 'gnus-files
   :type 'directory)
 

@@ -1100,6 +1109,7 @@ slower."
   :group 'gnus-summary-format
   :type '(radio (function-item gnus-extract-address-components)
                (function-item mail-extract-address-components)
   :group 'gnus-summary-format
   :type '(radio (function-item gnus-extract-address-components)
                (function-item mail-extract-address-components)

+               (function-item std11-extract-address-components)

                (function :tag "Other")))
 
 (defcustom gnus-carpal nil
                (function :tag "Other")))
 
 (defcustom gnus-carpal nil

@@ -1127,7 +1137,7 @@ slower."
     ("nnsoup" post-mail address)
     ("nndraft" post-mail)
     ("nnfolder" mail respool address)
     ("nnsoup" post-mail address)
     ("nndraft" post-mail)
     ("nnfolder" mail respool address)

-    ("nngateway" none address prompt-address physical-address)
+    ("nngateway" post-mail address prompt-address physical-address)

     ("nnweb" none)
     ("nnlistserv" none)
     ("nnagent" post-mail))
     ("nnweb" none)
     ("nnlistserv" none)
     ("nnagent" post-mail))

@@ -1403,12 +1413,19 @@ want."
 (defvar gnus-server-alist nil
   "List of available servers.")
 
 (defvar gnus-server-alist nil
   "List of available servers.")
 

+(defcustom gnus-cache-directory
+  (nnheader-concat gnus-directory "cache/")
+  "*The directory where cached articles will be stored."
+  :group 'gnus-cache
+  :type 'directory)
+

 (defvar gnus-predefined-server-alist
   `(("cache"
      (nnspool "cache"
 (defvar gnus-predefined-server-alist
   `(("cache"
      (nnspool "cache"

-             (nnspool-spool-directory "~/News/cache/")
-             (nnspool-nov-directory "~/News/cache/")
-             (nnspool-active-file "~/News/cache/active"))))
+             (nnspool-spool-directory gnus-cache-directory)
+             (nnspool-nov-directory gnus-cache-directory)
+             (nnspool-active-file
+              (nnheader-concat gnus-cache-directory "active")))))

   "List of predefined (convenience) servers.")
 
 (defvar gnus-topic-indentation "") ;; Obsolete variable.
   "List of predefined (convenience) servers.")
 
 (defvar gnus-topic-indentation "") ;; Obsolete variable.

@@ -1677,7 +1694,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
      ("gnus-agent" gnus-open-agent gnus-agent-get-function
       gnus-agent-save-groups gnus-agent-save-active gnus-agent-method-p
       gnus-agent-get-undownloaded-list gnus-agent-fetch-session
      ("gnus-agent" gnus-open-agent gnus-agent-get-function
       gnus-agent-save-groups gnus-agent-save-active gnus-agent-method-p
       gnus-agent-get-undownloaded-list gnus-agent-fetch-session

-      gnus-summary-set-agent-mark)
+      gnus-summary-set-agent-mark gnus-agent-save-group-info)

      ("gnus-agent" :interactive t
       gnus-unplugged gnus-agentize gnus-agent-batch)
      ("gnus-vm" :interactive t gnus-summary-save-in-vm
      ("gnus-agent" :interactive t
       gnus-unplugged gnus-agentize gnus-agent-batch)
      ("gnus-vm" :interactive t gnus-summary-save-in-vm

@@ -1810,14 +1827,6 @@ This restriction may disappear in later versions of Gnus."
   "Set GROUP's active info."
   `(gnus-sethash ,group ,active gnus-active-hashtb))
 
   "Set GROUP's active info."
   `(gnus-sethash ,group ,active gnus-active-hashtb))
 

-(defun gnus-alive-p ()
-  "Say whether Gnus is running or not."
-  (and gnus-group-buffer
-       (get-buffer gnus-group-buffer)
-       (save-excursion
-        (set-buffer gnus-group-buffer)
-        (eq major-mode 'gnus-group-mode))))
-

 ;; Info access macros.
 
 (defmacro gnus-info-group (info)
 ;; Info access macros.
 
 (defmacro gnus-info-group (info)

@@ -2196,11 +2205,11 @@ that that variable is buffer-local to the summary buffers."
 
 (defun gnus-ephemeral-group-p (group)
   "Say whether GROUP is ephemeral or not."
 
 (defun gnus-ephemeral-group-p (group)
   "Say whether GROUP is ephemeral or not."

-  (gnus-group-get-parameter group 'quit-config))
+  (gnus-group-get-parameter group 'quit-config t))

 
 (defun gnus-group-quit-config (group)
   "Return the quit-config of GROUP."
 
 (defun gnus-group-quit-config (group)
   "Return the quit-config of GROUP."

-  (gnus-group-get-parameter group 'quit-config))
+  (gnus-group-get-parameter group 'quit-config t))

 
 (defun gnus-kill-ephemeral-group (group)
   "Remove ephemeral GROUP from relevant structures."
 
 (defun gnus-kill-ephemeral-group (group)
   "Remove ephemeral GROUP from relevant structures."

@@ -2386,30 +2395,41 @@ You should probably use `gnus-find-method-for-group' instead."
   "Say whether the group is secondary or not."
   (gnus-secondary-method-p (gnus-find-method-for-group group)))
 
   "Say whether the group is secondary or not."
   (gnus-secondary-method-p (gnus-find-method-for-group group)))
 

-(defun gnus-group-find-parameter (group &optional symbol)
+(defun gnus-group-find-parameter (group &optional symbol allow-list)

   "Return the group parameters for GROUP.
 If SYMBOL, return the value of that symbol in the group parameters."
   (save-excursion
     (set-buffer gnus-group-buffer)
     (let ((parameters (funcall gnus-group-get-parameter-function group)))
       (if symbol
   "Return the group parameters for GROUP.
 If SYMBOL, return the value of that symbol in the group parameters."
   (save-excursion
     (set-buffer gnus-group-buffer)
     (let ((parameters (funcall gnus-group-get-parameter-function group)))
       (if symbol

-         (gnus-group-parameter-value parameters symbol)
+         (gnus-group-parameter-value parameters symbol allow-list)

        parameters))))
 
        parameters))))
 

-(defun gnus-group-get-parameter (group &optional symbol)
+(defun gnus-group-get-parameter (group &optional symbol allow-list)

   "Return the group parameters for GROUP.
 If SYMBOL, return the value of that symbol in the group parameters.
 Most functions should use `gnus-group-find-parameter', which
 also examines the topic parameters."
   (let ((params (gnus-info-params (gnus-get-info group))))
     (if symbol
   "Return the group parameters for GROUP.
 If SYMBOL, return the value of that symbol in the group parameters.
 Most functions should use `gnus-group-find-parameter', which
 also examines the topic parameters."
   (let ((params (gnus-info-params (gnus-get-info group))))
     (if symbol

-       (gnus-group-parameter-value params symbol)
+       (gnus-group-parameter-value params symbol allow-list)

       params)))
 
       params)))
 

-(defun gnus-group-parameter-value (params symbol)
+(defun gnus-group-parameter-value (params symbol &optional allow-list)

   "Return the value of SYMBOL in group PARAMS."
   "Return the value of SYMBOL in group PARAMS."

-  (or (car (memq symbol params))       ; It's either a simple symbol
-      (cdr (assq symbol params))))     ; or a cons.
+  ;; We only wish to return group parameters (dotted lists) and
+  ;; not local variables, which may have the same names.
+  ;; But first we handle single elements...
+  (or (car (memq symbol params))
+      ;; Handle alist.
+      (let (elem)
+       (catch 'found
+         (while (setq elem (pop params))
+           (when (and (consp elem)
+                      (eq (car elem) symbol)
+                      (or allow-list
+                          (atom (cdr elem))))
+             (throw 'found (cdr elem))))))))

 
 (defun gnus-group-add-parameter (group param)
   "Add parameter PARAM to GROUP."
 
 (defun gnus-group-add-parameter (group param)
   "Add parameter PARAM to GROUP."

@@ -2442,7 +2462,7 @@ also examines the topic parameters."
        (when params
          (setq params (delq name params))
          (while (assq name params)
        (when params
          (setq params (delq name params))
          (while (assq name params)

-           (setq params (delq (assq name params) params)))
+           (gnus-pull name params))

          (gnus-info-set-params info params))))))
 
 (defun gnus-group-add-score (group &optional score)
          (gnus-info-set-params info params))))))
 
 (defun gnus-group-add-score (group &optional score)

@@ -2457,7 +2477,10 @@ If SCORE is nil, add 1 to the score of GROUP."
   "Collapse GROUP name LEVELS.
 Select methods are stripped and any remote host name is stripped down to
 just the host name."
   "Collapse GROUP name LEVELS.
 Select methods are stripped and any remote host name is stripped down to
 just the host name."

-  (let* ((name "") (foreign "") (depth -1) (skip 1)
+  (let* ((name "")
+        (foreign "")
+        (depth 0)
+        (skip 1)

         (levels (or levels
                     (progn
                       (while (string-match "\\." group skip)
         (levels (or levels
                     (progn
                       (while (string-match "\\." group skip)

@@ -2677,7 +2700,7 @@ Allow completion over sensible values."
 
 ;;;###autoload
 (defun gnus-slave-no-server (&optional arg)
 
 ;;;###autoload
 (defun gnus-slave-no-server (&optional arg)

-  "Read network news as a slave, without connecting to local server"
+  "Read network news as a slave, without connecting to local server."

   (interactive "P")
   (gnus-no-server arg t))
 
   (interactive "P")
   (gnus-no-server arg t))