# HG changeset patch # User Miles Bader # Date 1109296329 0 # Node ID bbe4bd573f0c624e883a0e06d4c6f46fda177d3a # Parent b88558eeedbb906c78ba933e9db57e75c315e277 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-128 Merge from gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-28 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-30 Update from CVS 2005-02-24 Reiner Steib * lisp/gnus/nnheader.el (nnheader-find-file-noselect): Added doc string. * lisp/gnus/nnfolder.el (nnfolder-read-folder): Use RAWFILE for `nnheader-find-file-noselect' to avoid `large-file-warning-threshold'. * lisp/gnus/gnus-sum.el (gnus-summary-caesar-message): Apply `gnus-treat-article' after rotation. * lisp/gnus/gnus-group.el (gnus-group-clear-data): Mention process/prefix in doc string. 2005-02-22 Arne J,Ax(Brgensen * lisp/gnus/smime.el (smime-sign-buffer): Signal an error if `smime-sign-region' fails. (smime-encrypt-buffer): Signal an error if `smime-encrypt-region' fails. diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/ChangeLog Fri Feb 25 01:52:09 2005 +0000 @@ -1,3 +1,24 @@ +2005-02-24 Reiner Steib + + * nnheader.el (nnheader-find-file-noselect): Added doc string. + + * nnfolder.el (nnfolder-read-folder): Use RAWFILE for + `nnheader-find-file-noselect' to avoid + `large-file-warning-threshold'. + + * gnus-sum.el (gnus-summary-caesar-message): Apply + `gnus-treat-article' after rotation. + + * gnus-group.el (gnus-group-clear-data): Mention process/prefix in + doc string. + +2005-02-22 Arne J,Ax(Brgensen + + * smime.el (smime-sign-buffer): Signal an error if + `smime-sign-region' fails. + (smime-encrypt-buffer): Signal an error if `smime-encrypt-region' + fails. + 2005-02-21 Reiner Steib * gnus-art.el (gnus-parse-news-url, gnus-button-handle-news): @@ -12,8 +33,8 @@ * mml.el (mime-to-mml): Ditto. - * rfc2047.el (rfc2047-encode-parameter): Use ietf-drums-tspecials. - (rfc2047-quote-decoded-words-containing-tspecials): New variable. + * rfc2047.el (rfc2047-quote-decoded-words-containing-tspecials): + New variable. (rfc2047-decode-region): Quote decoded words containing special characters when rfc2047-quote-decoded-words-containing-tspecials is non-nil. diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/gnus-art.el --- a/lisp/gnus/gnus-art.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/gnus-art.el Fri Feb 25 01:52:09 2005 +0000 @@ -6683,8 +6683,12 @@ (save-excursion (set-buffer gnus-summary-buffer) (if server - (let ((gnus-refer-article-method (list (list 'nntp server))) + (let ((gnus-refer-article-method + (nconc (list (list 'nntp server)) + gnus-refer-article-method)) (nntp-port-number (or port "nntp"))) + (gnus-message 7 "Fetching %s with %s" + message-id gnus-refer-article-method) (gnus-summary-refer-article message-id)) (gnus-summary-refer-article message-id)))) (group diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/gnus-group.el --- a/lisp/gnus/gnus-group.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/gnus-group.el Fri Feb 25 01:52:09 2005 +0000 @@ -3028,7 +3028,8 @@ ;;; Clearing data (defun gnus-group-clear-data (&optional arg) - "Clear all marks and read ranges from the current group." + "Clear all marks and read ranges from the current group. +Obeys the process/prefix convention." (interactive "P") (gnus-group-iterate arg (lambda (group) diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/gnus-sum.el --- a/lisp/gnus/gnus-sum.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/gnus-sum.el Fri Feb 25 01:52:09 2005 +0000 @@ -8859,7 +8859,9 @@ (let ((start (window-start)) buffer-read-only) (message-caesar-buffer-body arg) - (set-window-start (get-buffer-window (current-buffer)) start)))))) + (set-window-start (get-buffer-window (current-buffer)) start))))) + ;; Create buttons and stuff... + (gnus-treat-article nil)) (autoload 'unmorse-region "morse" "Convert morse coded text in region to ordinary ASCII text." diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/nnfolder.el --- a/lisp/gnus/nnfolder.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/nnfolder.el Fri Feb 25 01:52:09 2005 +0000 @@ -873,7 +873,7 @@ (buffer (set-buffer (let ((nnheader-file-coding-system nnfolder-file-coding-system)) - (nnheader-find-file-noselect file))))) + (nnheader-find-file-noselect file t))))) (mm-enable-multibyte) ;; Use multibyte buffer for future copying. (if (equal (cadr (assoc group nnfolder-scantime-alist)) (nth 5 (file-attributes file))) diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/nnheader.el --- a/lisp/gnus/nnheader.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/nnheader.el Fri Feb 25 01:52:09 2005 +0000 @@ -951,6 +951,8 @@ (nnheader-insert-file-contents file))))))) (defun nnheader-find-file-noselect (&rest args) + "Open a file with some variables bound. +See `find-file-noselect' for the arguments." (let ((format-alist nil) (auto-mode-alist (mm-auto-mode-alist)) (default-major-mode 'fundamental-mode) diff -r b88558eeedbb -r bbe4bd573f0c lisp/gnus/smime.el --- a/lisp/gnus/smime.el Fri Feb 25 00:23:25 2005 +0000 +++ b/lisp/gnus/smime.el Fri Feb 25 01:52:09 2005 +0000 @@ -332,16 +332,17 @@ KEYFILE should contain a PEM encoded key and certificate." (interactive) (with-current-buffer (or buffer (current-buffer)) - (smime-sign-region - (point-min) (point-max) - (if keyfile - keyfile - (smime-get-key-with-certs-by-email - (completing-read - (concat "Sign using which key? " - (if smime-keys (concat "(default " (caar smime-keys) ") ") - "")) - smime-keys nil nil (car-safe (car-safe smime-keys)))))))) + (unless (smime-sign-region + (point-min) (point-max) + (if keyfile + keyfile + (smime-get-key-with-certs-by-email + (completing-read + (concat "Sign using which key? " + (if smime-keys (concat "(default " (caar smime-keys) ") ") + "")) + smime-keys nil nil (car-safe (car-safe smime-keys)))))) + (error "Signing failed")))) (defun smime-encrypt-buffer (&optional certfiles buffer) "S/MIME encrypt BUFFER for recipients specified in CERTFILES. @@ -350,11 +351,12 @@ nil." (interactive) (with-current-buffer (or buffer (current-buffer)) - (smime-encrypt-region - (point-min) (point-max) - (or certfiles - (list (read-file-name "Recipient's S/MIME certificate: " - smime-certificate-directory nil)))))) + (unless (smime-encrypt-region + (point-min) (point-max) + (or certfiles + (list (read-file-name "Recipient's S/MIME certificate: " + smime-certificate-directory nil)))) + (error "Encryption failed")))) ;; Verify+decrypt region