From 6e71fdf19f7311d59405079a9bce60445063bd7d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 22 Jan 2003 00:22:13 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/gnus-art.el | 57 +++++------------------------------------------------- lisp/gnus-sum.el | 2 -- lisp/gnus.el | 1 - 4 files changed, 19 insertions(+), 55 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50ac925..c5dbea5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2003-01-22 Jesper Harder + + * gnus-sum.el (gnus-summary-wash-hide-map): Remove + gnus-article-hide-pgp. + (gnus-summary-make-menu-bar): do. + + * gnus-art.el (gnus-treat-strip-pgp): Make obsolete. + (gnus-treatment-function-alist): Remove gnus-treat-strip-pgp and + gnus-article-hide-pgp. + (article-hide-pgp): Remove. + (gnus-article-hide): Remove gnus-article-hide-pgp. + + * gnus.el: Remove gnus-article-hide-pgp + 2003-01-21 Lars Magne Ingebrigtsen * message.el (message-required-headers): Doc fix. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 9176ba2..71be935 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -593,10 +593,8 @@ The following additional specs are available: :type 'hook :group 'gnus-article-various) -(defcustom gnus-article-hide-pgp-hook nil - "*A hook called after successfully hiding a PGP signature." - :type 'hook - :group 'gnus-article-various) +(defvar gnus-article-hide-pgp-hook nil) +(make-obsolete-variable 'gnus-article-hide-pgp-hook "" "Gnus 5.10") (defcustom gnus-article-button-face 'bold "Face used for highlighting buttons in the article buffer. @@ -1015,13 +1013,7 @@ See Info node `(gnus)Customizing Articles' for details." :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) -(defcustom gnus-treat-strip-pgp t - "Strip PGP signatures. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-custom) +(make-obsolete-variable 'gnus-treat-strip-pgp "" "Gnus 5.10") (defcustom gnus-treat-strip-pem nil "Strip PEM signatures. @@ -1461,7 +1453,6 @@ It is a string, such as \"PGP\". If nil, ask user." (gnus-treat-hide-signature gnus-article-hide-signature) (gnus-treat-strip-list-identifiers gnus-article-hide-list-identifiers) (gnus-treat-leading-whitespace gnus-article-remove-leading-whitespace) - (gnus-treat-strip-pgp gnus-article-hide-pgp) (gnus-treat-strip-pem gnus-article-hide-pem) (gnus-treat-from-picon gnus-treat-from-picon) (gnus-treat-mail-picon gnus-treat-mail-picon) @@ -2442,42 +2433,6 @@ The `gnus-list-identifiers' variable specifies what to do." "^Subject: +\\(\\(R[Ee]: +\\)+\\)R[Ee]: +" nil t) (delete-region (match-beginning 1) (match-end 1)))))))) -(defun article-hide-pgp () - "Remove any PGP headers and signatures in the current article." - (interactive) - (save-excursion - (save-restriction - (let ((inhibit-point-motion-hooks t) - buffer-read-only beg end) - (article-goto-body) - ;; Hide the "header". - (when (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\n" nil t) - (gnus-add-wash-type 'pgp) - (delete-region (match-beginning 0) (match-end 0)) - ;; Remove armor headers (rfc2440 6.2) - (delete-region (point) (or (re-search-forward "^[ \t]*\n" nil t) - (point))) - (setq beg (point)) - ;; Hide the actual signature. - (and (search-forward "\n-----BEGIN PGP SIGNATURE-----\n" nil t) - (setq end (1+ (match-beginning 0))) - (delete-region - end - (if (search-forward "\n-----END PGP SIGNATURE-----\n" nil t) - (match-end 0) - ;; Perhaps we shouldn't hide to the end of the buffer - ;; if there is no end to the signature? - (point-max)))) - ;; Hide "- " PGP quotation markers. - (when (and beg end) - (narrow-to-region beg end) - (goto-char (point-min)) - (while (re-search-forward "^- " nil t) - (delete-region - (match-beginning 0) (match-end 0))) - (widen)) - (gnus-run-hooks 'gnus-article-hide-pgp-hook)))))) - (defun article-hide-pem (&optional arg) "Toggle hiding of any PEM headers and signatures in the current article. If given a negative prefix, always show; if given a positive prefix, @@ -3579,7 +3534,6 @@ If variable `gnus-use-long-file-name' is non-nil, it is article-wash-html article-unsplit-urls article-hide-list-identifiers - article-hide-pgp article-strip-banner article-babel article-hide-pem @@ -5415,13 +5369,12 @@ the entire article will be yanked." (defun gnus-article-hide (&optional arg force) "Hide all the gruft in the current article. -This means that PGP stuff, signatures, cited text and (some) -headers will be hidden. +This means that signatures, cited text and (some) headers will be +hidden. If given a prefix, show the hidden text instead." (interactive (append (gnus-article-hidden-arg) (list 'force))) (gnus-article-hide-headers arg) (gnus-article-hide-list-identifiers arg) - (gnus-article-hide-pgp arg) (gnus-article-hide-citation-maybe arg force) (gnus-article-hide-signature arg)) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index a78e30c..dca8555 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1831,7 +1831,6 @@ increase the score of each group you read." "c" gnus-article-hide-citation "C" gnus-article-hide-citation-in-followups "l" gnus-article-hide-list-identifiers - "p" gnus-article-hide-pgp "B" gnus-article-strip-banner "P" gnus-article-hide-pem "\C-c" gnus-article-hide-citation-maybe) @@ -2042,7 +2041,6 @@ increase the score of each group you read." ["Signature" gnus-article-hide-signature t] ["Citation" gnus-article-hide-citation t] ["List identifiers" gnus-article-hide-list-identifiers t] - ["PGP" gnus-article-hide-pgp t] ["Banner" gnus-article-strip-banner t] ["Boring headers" gnus-article-hide-boring-headers t]) ("Highlight" diff --git a/lisp/gnus.el b/lisp/gnus.el index 80cef8a..6787076 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2507,7 +2507,6 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-article-decode-HZ gnus-article-wash-html gnus-article-unsplit-urls - gnus-article-hide-pgp gnus-article-hide-pem gnus-article-hide-signature gnus-article-strip-leading-blank-lines gnus-article-date-local gnus-article-date-original gnus-article-date-lapsed -- 1.7.10.4