* gnus-clfns.el (last, butlast): Undo the last change; always use a macro.

* gnus-srart.el (gnus-product-quick-file-format): Remove a trailing whitespace.

diff --git a/ChangeLog b/ChangeLog
index b33ff5f..0c6d42c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,6 @@
        * lisp/gnus-clfns.el (butlast): Fix a serious bug that it behaved
        like `nbutlast'.  Special thanks to Keiichi-san for the great
        discovery.
-       (last, butlast): Use the native function if Emacs 21+ is used.
 
        * lisp/gnus.el (gnus-product-variable-file-list): Add a check for
        the value of `gnus-use-correct-string-widths' in the forms.

diff --git a/lisp/gnus-clfns.el b/lisp/gnus-clfns.el
index 8f927bc..60b35c8 100644 (file)
--- a/lisp/gnus-clfns.el
+++ b/lisp/gnus-clfns.el
@@ -37,8 +37,7 @@
 
   (define-compiler-macro butlast (&whole form x &optional n)
     (if (and (fboundp 'butlast)
-            (or (>= emacs-major-version 21)
-                (subrp (symbol-function 'butlast))))
+            (subrp (symbol-function 'butlast)))
        form
       (if n
          `(let ((x ,x)
@@ -94,8 +93,7 @@
 
   (define-compiler-macro last (&whole form x &optional n)
     (if (and (fboundp 'last)
-            (or (>= emacs-major-version 21)
-                (subrp (symbol-function 'last))))
+            (subrp (symbol-function 'last)))
        form
       (if n
          `(let* ((x ,x)

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index a5d2904..6fc26cc 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2646,7 +2646,7 @@ The backup file \".newsrc.eld_\" will be created before re-reading."
              "\t0)\n"
              "    (error \"This file was created by later version of "
              "gnus.\"))\n"))
-    (insert "(setq gnus-product-file-version \n"
+    (insert "(setq gnus-product-file-version\n"
            "      '((product-version . "
            (prin1-to-string (product-version product)) ")\n"
            "\t(emacs-version . "