Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52fea33..2e22611 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2002-04-11  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Force
+       viewing of security buttons.  Thanks to Nicolas Kowalski
+       <Nicolas.Kowalski@imag.fr>.
+
+       * smime.el (smime-CA-directory): Fix doc.  Thanks to Arne
+       J\e,Ax\e(Brgensen <arne+usenet@daimi.au.dk>.
+       (smime-sign-buffer): Work in XEmacs.  Thanks to Nicolas Kowalski
+       <Nicolas.Kowalski@imag.fr>.
+       (smime-decrypt-buffer): Ditto.
+
+2002-04-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-art.el (gnus-article-prepare): Place point on the emtpy
+       header line.
+
+2002-04-11  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * gnus.el (gnus-refer-article-method): Change `dejanews' to `google'.
+
 2002-04-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-summary-delete-marked-with): Fix typo.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b67befb..f11b514 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3873,6 +3873,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
                   gnus-article-mime-handle-alist))
              (gnus-set-mode-line 'article))
            (article-goto-body)
+           (unless (bobp)
+             (forward-line -1))
            (set-window-point (get-buffer-window (current-buffer)) (point))
            (gnus-configure-windows 'article)
            t))))))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index faf4e2f..b5a6ae7 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6711,7 +6711,10 @@ be displayed."
 (defun gnus-summary-force-verify-and-decrypt ()
   (interactive)
   (let ((mm-verify-option 'known)
-       (mm-decrypt-option 'known))
+       (mm-decrypt-option 'known)
+       (gnus-buttonized-mime-types (append (list "multipart/signed"
+                                                 "multipart/encrypted")
+                                           gnus-buttonized-mime-types)))
     (gnus-summary-select-article nil 'force)))
 
 (defun gnus-summary-set-current-mark (&optional current-mark)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2999da7..2833e5a 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1232,15 +1232,15 @@ It can also be a list of select methods, as well as the special symbol
 list, Gnus will try all the methods in the list until it finds a match."
   :group 'gnus-server
   :type '(choice (const :tag "default" nil)
-                (const :tag "DejaNews" (nnweb "refer" (nnweb-type dejanews)))
+                (const :tag "Google" (nnweb "refer" (nnweb-type google)))
                 gnus-select-method
                 (repeat :menu-tag "Try multiple"
                         :tag "Multiple"
-                        :value (current (nnweb "refer" (nnweb-type dejanews)))
+                        :value (current (nnweb "refer" (nnweb-type google)))
                         (choice :tag "Method"
                                 (const current)
-                                (const :tag "DejaNews"
-                                       (nnweb "refer" (nnweb-type dejanews)))
+                                (const :tag "Google"
+                                       (nnweb "refer" (nnweb-type google)))
                                 gnus-select-method))))
 
 (defcustom gnus-group-faq-directory

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 071ecc1..23ddee0 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -269,6 +269,10 @@ This is taken from RFC 2396.")
     (let ((name buffer-file-name))
       (prog1
          (url-insert-file-contents url)
+       (save-excursion
+         (goto-char (point-min))
+         (while (re-search-forward "\r 1000\r ?" nil t)
+           (replace-match "")))
        (setq buffer-file-name name)))))
 
 (defun mm-url-insert-file-contents-external (url)

diff --git a/lisp/smime.el b/lisp/smime.el
index 1d3e832..364e3b7 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -140,7 +140,7 @@ certificates to be sent with every message to each address."
 Directory should contain files (in PEM format) named to the X.509
 hash of the certificate.  This can be done using OpenSSL such as:
 
-$ ln -s ca.pem `openssl x509 -noout -hash -in ca.pem`
+$ ln -s ca.pem `openssl x509 -noout -hash -in ca.pem`.0
 
 where `ca.pem' is the file containing a PEM encoded X.509 CA
 certificate."
@@ -314,10 +314,10 @@ KEYFILE should contain a PEM encoded key and certificate."
         keyfile
        (smime-get-key-by-email
        (completing-read
-        (concat "Sign using which signature? "
+        (concat "Sign using which key? "
                 (if smime-keys (concat "(default " (caar smime-keys) ") ")
                   ""))
-        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))))
+        smime-keys nil nil (car-safe (car-safe smime-keys))))))))
 
 (defun smime-encrypt-buffer (&optional certfiles buffer)
   "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
@@ -438,7 +438,7 @@ in the buffer specified by `smime-details-buffer'."
            (concat "Decipher using which key? "
                    (if smime-keys (concat "(default " (caar smime-keys) ") ")
                      ""))
-           smime-keys nil nil nil nil (car-safe (car-safe smime-keys)))))))))
+           smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations