From: yamaoka Date: Wed, 7 Jan 2004 06:50:35 +0000 (+0000) Subject: Synch to No Gnus 200401070644. X-Git-Tag: t-gnus-6_17_4-quimby-~1155 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=daf60363812706b3691c4a13bdef1e8ed8dc8318;p=elisp%2Fgnus.git- Synch to No Gnus 200401070644. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e68d87a..56b99b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,20 @@ 2004-01-07 Katsumi Yamaoka + * 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 + * canlock.el (canlock-sha1-function): Remove. (canlock-sha1-function-for-verify): Remove. (canlock-openssl-program): Remove. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 3cd840d..4765444 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -951,8 +951,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. @@ -4275,9 +4274,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) @@ -6238,7 +6234,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" @@ -7222,13 +7218,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) @@ -7248,15 +7247,6 @@ specified by `gnus-button-alist'." :action 'gnus-button-prev-page :button-keymap gnus-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) @@ -7533,8 +7523,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 ddd87ad..eb7bdd0 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -1250,8 +1250,7 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')." (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,