User: youngs Date: 05/03/13 03:20:48 Modified: packages/xemacs-packages/gnus/lisp gnus-util.el Log: 2005-03-13 Steve Youngs <steve(a)sxemacs.org&gt; * lisp/gnus-util.el (gnus-emacs-version): Support SXEmacs in `gnus-extended-version'. Revision Changes Path 1.86 +5 -0 XEmacs/packages/xemacs-packages/gnus/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ChangeLog 2005/03/13 01:39:15 1.85 +++ ChangeLog 2005/03/13 02:20:37 1.86 ＠＠ -1,5 +1,10 ＠＠ 2005-03-13 Steve Youngs <steve(a)sxemacs.org&gt; + * lisp/gnus-util.el (gnus-emacs-version): Support SXEmacs in + `gnus-extended-version'. + +2005-03-13 Steve Youngs <steve(a)sxemacs.org&gt; + * lisp/gnus.el: Don't try and mark `gnus-agent-save-groups' as an autoloaded function. From: Andrey Slusar <anrays(a)gmail.com&gt;. 1.9 +16 -17 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-util.el Index: gnus-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-util.el,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnus-util.el 2005/03/13 00:23:30 1.8 +++ gnus-util.el 2005/03/13 02:20:46 1.9 ＠＠ -1506,7 +1506,8 ＠＠ (nconc (nreverse res) list1 list2)))) (eval-when-compile - (defvar xemacs-codename)) + (defvar xemacs-codename) + (defvar sxemacs-codename) (defun gnus-emacs-version () "Stringified Emacs version." ＠＠ -1525,22 +1526,20 ＠＠ (if system-v (concat " (" system-v ")") ""))) - ((string-match - "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?" - emacs-version) - (concat - (match-string 1 emacs-version) - (format "/%d.%d" emacs-major-version emacs-minor-version) - (if (match-beginning 3) - (match-string 3 emacs-version) - "") - (if (boundp 'xemacs-codename) - (concat - " (" xemacs-codename - (if system-v - (concat ", " system-v ")") - ")")) - ""))) + ((featurep 'sxemacs) + (concat "SXEmacs/" emacs-program-version + (when system-v + (concat " (" + (when sxemacs-codename + (concat sxemacs-codename ", ")) + system-v ")")))) + ((featurep 'xemacs) + (concat "XEmacs/" emacs-program-version + (when system-v + (concat " (" + (when xemacs-codename + (concat xemacs-codename ", ")) + system-v ")")))) (t emacs-version)))) (defun gnus-rename-file (old-path new-path &optional trim)