[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-util.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-util.el
diff -c emacs/lisp/gnus/gnus-util.el:1.33 emacs/lisp/gnus/gnus-util.el:1.34
*** emacs/lisp/gnus/gnus-util.el:1.33   Wed Aug 31 13:04:53 2005
--- emacs/lisp/gnus/gnus-util.el        Mon Sep  5 23:58:07 2005
***************
*** 1,7 ****
  ;;; gnus-util.el --- utility functions for Gnus
  
! ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! ;;   2005 Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
--- 1,7 ----
  ;;; gnus-util.el --- utility functions for Gnus
  
! ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
! ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
***************
*** 1517,1557 ****
        (nconc (nreverse res) list1 list2))))
  
  (eval-when-compile
!   (defvar xemacs-codename))
  
  (defun gnus-emacs-version ()
    "Stringified Emacs version."
!   (let ((system-v
!        (cond
!         ((eq gnus-user-agent 'emacs-gnus-config)
!          system-configuration)
!         ((eq gnus-user-agent 'emacs-gnus-type)
!          (symbol-name system-type))
!         (t nil))))
      (cond
!      ((eq gnus-user-agent 'gnus)
        nil)
       ((string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
        (concat "Emacs/" (match-string 1 emacs-version)
              (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 ")")
              ")"))
-        "")))
       (t emacs-version))))
  
  (defun gnus-rename-file (old-path new-path &optional trim)
--- 1517,1564 ----
        (nconc (nreverse res) list1 list2))))
  
  (eval-when-compile
!   (defvar xemacs-codename)
!   (defvar sxemacs-codename)
!   (defvar emacs-program-version))
  
  (defun gnus-emacs-version ()
    "Stringified Emacs version."
!   (let* ((lst (if (listp gnus-user-agent)
!                 gnus-user-agent
!               '(gnus emacs type)))
!        (system-v (cond ((memq 'config lst)
!                         system-configuration)
!                        ((memq 'type lst)
!                         (symbol-name system-type))
!                        (t nil)))
!        codename emacsname)
!     (cond ((featurep 'sxemacs)
!          (setq emacsname "SXEmacs"
!                codename sxemacs-codename))
!         ((featurep 'xemacs)
!          (setq emacsname "XEmacs"
!                codename xemacs-codename))
!         (t
!          (setq emacsname "Emacs")))
      (cond
!      ((not (memq 'emacs lst))
        nil)
       ((string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
+       ;; Emacs:
        (concat "Emacs/" (match-string 1 emacs-version)
              (if system-v
                  (concat " (" system-v ")")
                "")))
!      ((or (featurep 'sxemacs) (featurep 'xemacs))
!       ;; XEmacs or SXEmacs:
!       (concat emacsname "/" emacs-program-version
!             " ("
!             (when (and (memq 'codename lst)
!                        codename)
!               (concat codename
!                       (when system-v ", ")))
!             (when system-v system-v)
              ")"))
       (t emacs-version))))
  
  (defun gnus-rename-file (old-path new-path &optional trim)