From 46d9a5f3f3a9fab4c1416b93e55e50e684da24e0 Mon Sep 17 00:00:00 2001 From: morioka Date: Thu, 30 Apr 1998 22:03:07 +0000 Subject: [PATCH] (gnus-version-number): Update to 6.2.4. Sync up with Gnus 5.6.7. --- lisp/gnus.el | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/lisp/gnus.el b/lisp/gnus.el index 482420a..682359f 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,11 +250,11 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "6.2.3" +(defconst gnus-version-number "6.2.4" "Version number for this version of gnus.") (defconst gnus-version - (format "Semi-gnus %s (based on Gnus 5.6.6; for SEMI 1.3)" + (format "Semi-gnus %s (based on Gnus 5.6.7; for SEMI 1.3)" gnus-version-number) "Version string for this version of gnus.") @@ -708,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/")) - "*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) @@ -2411,10 +2416,19 @@ also examines the topic parameters." (defun gnus-group-parameter-value (params symbol &optional allow-list) "Return the value of SYMBOL in group PARAMS." - (or (car (memq symbol params)) ; It's either a simple symbol, - (and (or allow-list - (atom (cdr (assq symbol params)))) ; and it's not a local variable - (cdr (assq symbol params))))) ; but 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." -- 1.7.10.4