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  <Reiner.Steib@gmx.de>

   * 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\e,Ax\e(Brgensen  <arne@arnested.dk>

   * 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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 387f2a8f4e0ce08723eeec4f6a23f53b1445fd56..b994e6520dbafefda5c944f1219fa2837a23b292 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2005-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * 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\e,Ax\e(Brgensen  <arne@arnested.dk>
+
+       * 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  <Reiner.Steib@gmx.de>
 
        * 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 --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0cfc433bd5e0c0f7e4c888486e2bbb9ef5910d28..1fe9348f759fa0b42697a8100e419f7ca499cef0 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6683,8 +6683,12 @@ specified by `gnus-button-alist'."
       (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 --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 5892235deac096c0967b4eb533ff245d924dc5da..767bdacb78e724efc88bd3850d20a7608b60e398 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3028,7 +3028,8 @@ sort in reverse order."
 ;;; 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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b5467aa5921fe75e368fd183451e97828b267829..7748a3529faf55bf89d98e27629ea58f81313413 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8859,7 +8859,9 @@ forward."
        (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 --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index bf8fc9bac9abae66eec9997fcbc3fb998e94f0f1..f50530ab459e6639246c530fb604335b7dbc28d4 100644 (file)
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -873,7 +873,7 @@ deleted.  Point is left where the deleted region was."
         (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 --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 7df5ecae205b60dcb3b065ca842e1c1e1bb98c0d..6224f9718f112b9c0abf732476021647a2403b3f 100644 (file)
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -951,6 +951,8 @@ find-file-hooks, etc.
             (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 --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 1d20a3f5c589981024ed965f376968ba28d84b1b..cd9217190452de6971b28a4bbdbd79551011c129 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -332,16 +332,17 @@ is expected to contain of a PEM encoded certificate."
 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 @@ a PEM encoded key and certificate.  Uses current buffer if BUFFER is
 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