From b151f94f60fc13ac148dc7a1744650f320e7a8d9 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 13 Apr 2003 23:01:16 +0000 Subject: [PATCH] Synch to Oort Gnus 200304132043. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/gnus-art.el | 33 ++++++++++++++++++--------------- lisp/gnus-sum.el | 4 ++++ lisp/mm-util.el | 10 ++++++++-- texi/ChangeLog | 4 ++++ texi/gnus-ja.texi | 16 ++++++++++++++++ texi/gnus.texi | 16 ++++++++++++++++ 7 files changed, 80 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f7a578e..32b7fd9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2003-04-13 Reiner Steib + + * mm-util.el (mm-sort-coding-systems-predicate): Convert elements + of `mm-coding-system-priorities' to base coding system. + + * gnus-sum.el: Added coding cookie ("middle dot" in + gnus-summary-morse-message). + +2003-04-13 Simon Josefsson + + * gnus-art.el (article-fill-long-lines) + (article-verify-x-pgp-sig, article-decode-group-name) + (gnus-mime-button-menu): Split >80 character lines. + 2003-04-13 Jesper Harder * gnus-sum.el (gnus-summary-local-variables): Use defvar since diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 9cbfe5b..5215415 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2272,23 +2272,23 @@ If PROMPT (the prefix), prompt for a coding system to use." (article-narrow-to-head) (with-current-buffer gnus-original-article-buffer (goto-char (point-min))) - (while (re-search-forward "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" - nil t) + (while (re-search-forward + "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" nil t) (replace-match (save-match-data - (gnus-decode-newsgroups - ;; XXX how to use data in article buffer? - (with-current-buffer gnus-original-article-buffer - (re-search-forward - "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" - nil t) - (match-string 1)) - gnus-newsgroup-name method)) + (gnus-decode-newsgroups + ;; XXX how to use data in article buffer? + (with-current-buffer gnus-original-article-buffer + (re-search-forward + "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" + nil t) + (match-string 1)) + gnus-newsgroup-name method)) t t nil 1)) (goto-char (point-min)) (with-current-buffer gnus-original-article-buffer (goto-char (point-min))) - (while (re-search-forward "^Followup-To:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" - nil t) + (while (re-search-forward + "^Followup-To:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" nil t) (replace-match (save-match-data (gnus-decode-newsgroups ;; XXX how to use data in article buffer? @@ -3493,7 +3493,8 @@ If variable `gnus-use-long-file-name' is non-nil, it is ;; Don't verify multiple headers. (setq headers (mapconcat (lambda (header) (concat header ": " - (mail-fetch-field header) "\n")) + (mail-fetch-field header) + "\n")) (split-string (nth 1 items) ",") ""))) (delete-region (point-min) (point-max)) (insert "-----BEGIN PGP SIGNED MESSAGE-----\n\n") @@ -4198,10 +4199,12 @@ General format specifiers can also be used. See Info node (define-key map (cadr c) (car c))) map)) -(easy-menu-define gnus-mime-button-menu gnus-mime-button-map "MIME button menu." +(easy-menu-define + gnus-mime-button-menu gnus-mime-button-map "MIME button menu." `("MIME Part" ,@(mapcar (lambda (c) - (vector (caddr c) (car c) :enable t)) gnus-mime-button-commands))) + (vector (caddr c) (car c) :enable t)) + gnus-mime-button-commands))) (eval-when-compile (define-compiler-macro popup-menu (&whole form diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index f2bb80a..70f9935 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -11872,4 +11872,8 @@ If ALL is a number, fetch this number of articles." (run-hooks 'gnus-sum-load-hook) +;; Local Variables: +;; coding: iso-8859-1 +;; End: + ;;; gnus-sum.el ends here diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 8964fbc..ac8b77b 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -505,8 +505,14 @@ If the charset is `composition', return the actual one." (not inconvertible)))) (defun mm-sort-coding-systems-predicate (a b) - (> (length (memq a mm-coding-system-priorities)) - (length (memq b mm-coding-system-priorities)))) + (let ((priorities + (mapcar (lambda (cs) + ;; Note: invalid entries are dropped silently + (and (coding-system-p cs) + (coding-system-base cs))) + mm-coding-system-priorities))) + (> (length (memq a priorities)) + (length (memq b priorities))))) (defun mm-find-mime-charset-region (b e &optional hack-charsets) "Return the MIME charsets needed to encode the region between B and E. diff --git a/texi/ChangeLog b/texi/ChangeLog index 93b7209..6533b81 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-04-13 Simon Josefsson + + * gnus.texi (Security): Add text about PGP key snarf. + 2003-04-13 Lars Magne Ingebrigtsen * gnus.texi (Misc Article): Addition. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b19428e..bbff24a 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -9960,6 +9960,22 @@ Symbol indicating elisp interface to OpenPGP implementation for PGP/MIME messages. The default is @code{pgg}, but @code{mailcrypt} and @code{gpg} are also supported although deprecated. @end table + +@cindex snarfing keys +@cindex importing PGP keys +@cindex PGP key ring import +Snarfing OpenPGP keys (i.e., importing keys from articles into your +key ring) is not supported explicitly through a menu item or command, +rather Gnus do detect and label keys as @samp{application/pgp-keys}, +allowing you to specify whatever action you think is appropriate +through the usual MIME infrastructure. You can use a +@file{~/.mailcap} entry (@pxref{mailcap, , mailcap, emacs-mime, The +Emacs MIME Manual}) such as the following to import keys using GNU +Privacy Guard when you click on the MIME button (@pxref{Using MIME}). + +@example +application/pgp-keys; gpg --import --interactive --verbose; needsterminal +@end example @end ignore @node Mailing List diff --git a/texi/gnus.texi b/texi/gnus.texi index 690dba5..13ad2c7 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10495,6 +10495,22 @@ and @code{gpg} are also supported although deprecated. @end table +@cindex snarfing keys +@cindex importing PGP keys +@cindex PGP key ring import +Snarfing OpenPGP keys (i.e., importing keys from articles into your +key ring) is not supported explicitly through a menu item or command, +rather Gnus do detect and label keys as @samp{application/pgp-keys}, +allowing you to specify whatever action you think is appropriate +through the usual MIME infrastructure. You can use a +@file{~/.mailcap} entry (@pxref{mailcap, , mailcap, emacs-mime, The +Emacs MIME Manual}) such as the following to import keys using GNU +Privacy Guard when you click on the MIME button (@pxref{Using MIME}). + +@example +application/pgp-keys; gpg --import --interactive --verbose; needsterminal +@end example + @node Mailing List @section Mailing List -- 1.7.10.4