* gnus-art.el (gnus-treat-emphasize): Ignore Emacs version number.

(gnus-mime-button-map): Don't set keymap parent.
(gnus-button-ctan-directory-regexp): Use shy grouping.
(gnus-prev-page-map): Don't set keymap parent.
(gnus-prev-page-map): Remove duplicated one.
(gnus-next-page-map): Don't set keymap parent.
(gnus-mime-security-button-map): Ditto.

* nnheader.el (nnheader-directory-files-is-safe): Ignore Emacs version number.

* sha1-el.el (sha1-string-external): Use with-temp-buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e68d87a..56b99b2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2004-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-treat-emphasize): Ignore Emacs version number.
+       (gnus-mime-button-map): Don't set keymap parent.
+       (gnus-button-ctan-directory-regexp): Use shy grouping.
+       (gnus-prev-page-map): Don't set keymap parent.
+       (gnus-prev-page-map): Remove duplicated one.
+       (gnus-next-page-map): Don't set keymap parent.
+       (gnus-mime-security-button-map): Ditto.
+
+       * nnheader.el (nnheader-directory-files-is-safe): Ignore Emacs
+       version number.
+
+       * sha1-el.el (sha1-string-external): Use with-temp-buffer.
+
 2004-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * canlock.el (canlock-sha1-function): Remove.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8e358c4..2352803 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -894,8 +894,7 @@ See Info node `(gnus)Customizing Articles' for details."
 
 (defcustom gnus-treat-emphasize
   (and (or window-system
-          (featurep 'xemacs)
-          (>= (string-to-number emacs-version) 21))
+          (featurep 'xemacs))
        50000)
   "Emphasize text.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -3892,9 +3891,6 @@ General format specifiers can also be used.  See Info node
 
 (defvar gnus-mime-button-map
   (let ((map (make-sparse-keymap)))
-    (unless (>= (string-to-number emacs-version) 21)
-      ;; XEmacs doesn't care.
-      (set-keymap-parent map gnus-article-mode-map))
     (define-key map gnus-mouse-2 'gnus-article-push-button)
     (define-key map gnus-down-mouse-3 'gnus-mime-button-menu)
     (dolist (c gnus-mime-button-commands)
@@ -5730,7 +5726,7 @@ The function must take one argument, the string naming the URL."
 
 (defcustom gnus-button-ctan-directory-regexp
   (concat
-   "\\("; Cannot use `\(?: ... \)' (compatibility with Emacs 20).
+   "\\(?:"
    "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|"
    "indexing\\|info\\|language\\|macros\\|support\\|systems\\|"
    "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete"
@@ -6669,13 +6665,16 @@ specified by `gnus-button-alist'."
 
 (defvar gnus-prev-page-map
   (let ((map (make-sparse-keymap)))
-    (unless (>= emacs-major-version 21)
-      ;; XEmacs doesn't care.
-      (set-keymap-parent map gnus-article-mode-map))
     (define-key map gnus-mouse-2 'gnus-button-prev-page)
     (define-key map "\r" 'gnus-button-prev-page)
     map))
 
+(defvar gnus-next-page-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map gnus-mouse-2 'gnus-button-next-page)
+    (define-key map "\r" 'gnus-button-next-page)
+    map))
+
 (defun gnus-insert-prev-page-button ()
   (let ((b (point))
        (buffer-read-only nil))
@@ -6693,24 +6692,6 @@ specified by `gnus-button-alist'."
      :action 'gnus-button-prev-page
      :button-keymap gnus-prev-page-map)))
 
-(defvar gnus-prev-page-map
-  (let ((map (make-sparse-keymap)))
-    (unless (>= emacs-major-version 21)
-      ;; XEmacs doesn't care.
-      (set-keymap-parent map gnus-article-mode-map))
-    (define-key map gnus-mouse-2 'gnus-button-prev-page)
-    (define-key map "\r" 'gnus-button-prev-page)
-    map))
-
-(defvar gnus-next-page-map
-  (let ((map (make-sparse-keymap)))
-    (unless (>= emacs-major-version 21)
-      ;; XEmacs doesn't care.
-      (set-keymap-parent map gnus-article-mode-map))
-    (define-key map gnus-mouse-2 'gnus-button-next-page)
-    (define-key map "\r" 'gnus-button-next-page)
-    map))
-
 (defun gnus-button-next-page (&optional args more-args)
   "Go to the next page."
   (interactive)
@@ -6967,8 +6948,6 @@ For example:
 
 (defvar gnus-mime-security-button-map
   (let ((map (make-sparse-keymap)))
-    (unless (>= (string-to-number emacs-version) 21)
-      (set-keymap-parent map gnus-article-mode-map))
     (define-key map gnus-mouse-2 'gnus-article-push-button)
     (define-key map "\r" 'gnus-article-press-button)
     map))

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index caf55f0..9e12f11 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -680,8 +680,7 @@ the line could be found."
 
 (defvar nnheader-directory-files-is-safe
   (or (eq system-type 'windows-nt)
-      (and (not (featurep 'xemacs))
-          (> emacs-major-version 20)))
+      (not (featurep 'xemacs)))
   "If non-nil, Gnus believes `directory-files' is safe.
 It has been reported numerous times that `directory-files' fails with
 an alarming frequency on NFS mounted file systems. If it is nil,

diff --git a/lisp/sha1-el.el b/lisp/sha1-el.el
index 9564c7b..760c2d0 100644 (file)
--- a/lisp/sha1-el.el
+++ b/lisp/sha1-el.el
@@ -88,30 +88,22 @@ If this variable is set to nil, use internal function only."
   :group 'sha1)
 
 (defun sha1-string-external (string &optional binary)
-  ;; `with-temp-buffer' is new in v20, so we do not use it.
-  (save-excursion
-    (let (buffer)
-      (unwind-protect
-         (let (prog args digest)
-           (if (consp sha1-program)
-               (setq prog (car sha1-program)
-                     args (cdr sha1-program))
-             (setq prog sha1-program
-                   args nil))
-           (setq buffer (set-buffer
-                         (generate-new-buffer " *sha1 external*")))
-           (insert string)
-           (apply (function call-process-region)
-                  (point-min)(point-max)
-                  prog t t nil args)
-           ;; SHA1 is 40 bytes long in hexadecimal form.
-           (setq digest (buffer-substring (point-min)(+ (point-min) 40)))
-           (if binary
-               (decode-hex-string digest)
-             digest))
-       (and buffer
-            (buffer-name buffer)
-            (kill-buffer buffer))))))
+  (let (prog args digest default-enable-multibyte-characters)
+    (if (consp sha1-program)
+       (setq prog (car sha1-program)
+             args (cdr sha1-program))
+      (setq prog sha1-program
+           args nil))
+    (with-temp-buffer
+      (insert string)
+      (apply (function call-process-region)
+            (point-min)(point-max)
+            prog t t nil args)
+      ;; SHA1 is 40 bytes long in hexadecimal form.
+      (setq digest (buffer-substring (point-min)(+ (point-min) 40))))
+    (if binary
+       (decode-hex-string digest)
+      digest)))
 
 (defun sha1-region-external (beg end &optional binary)
   (sha1-string-external (buffer-substring-no-properties beg end) binary))