APPROVE COMMIT Norbert, one more to come, just waiting on Aiden. NOTE: This patch has been committed. gnus patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: ChangeLog Source files diff command: cvs -q diff -uN Files affected: lisp/gnus-util.el Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v retrieving revision 1.85 diff -u -p -U0 -r1.85 ChangeLog --- ChangeLog 13 Mar 2005 01:39:15 -0000 1.85 +++ ChangeLog 13 Mar 2005 02:19:40 -0000 ＠＠ -2,0 +3,5 ＠＠ + * lisp/gnus-util.el (gnus-emacs-version): Support SXEmacs in + `gnus-extended-version'. + +2005-03-13 Steve Youngs <steve(a)sxemacs.org&gt; + Index: lisp/gnus-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-util.el,v retrieving revision 1.8 diff -u -p -u -r1.8 gnus-util.el --- lisp/gnus-util.el 13 Mar 2005 00:23:30 -0000 1.8 +++ lisp/gnus-util.el 13 Mar 2005 02:19:06 -0000 ＠＠ -1506,7 +1506,8 ＠＠ predicate on the elements." (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 ＠＠ predicate on the elements." (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) -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|