Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1abb743..b593eb8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-05  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-agent.el (gnus-agent-read-servers): If getting method from
+       a named server fails, ignore the server.
+
+       * mml1991.el (mml1991-pgg-sign): Do QP.
+
+       * pgg-gpg.el (pgg-gpg-encrypt-region): Make signencrypt really
+       work.
+
 2002-10-04  Simon Josefsson  <jas@extundo.com>
 
        * pgg-gpg.el (pgg-gpg-encrypt-region): Make signencrypt work.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 1530eac..742d3b2 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -652,13 +652,16 @@ be a select method."
 
 (defun gnus-agent-read-servers ()
   "Read the alist of covered servers."
-  (setq gnus-agent-covered-methods
-       (mapcar (lambda (m)
-                 (gnus-server-get-method
-                  nil
-                  (or m "native")))
-               (gnus-agent-read-file
-                (nnheader-concat gnus-agent-directory "lib/servers")))))
+  (mapcar (lambda (m)
+           (let ((server (gnus-server-get-method
+                          nil
+                          (or m "native"))))
+             (if server
+                 (push server gnus-agent-covered-methods)
+               (message "Ignoring disappeared server `%s'" m)
+               (sit-for 1))))
+         (gnus-agent-read-file
+          (nnheader-concat gnus-agent-directory "lib/servers"))))
 
 (defun gnus-agent-write-servers ()
   "Write the alist of covered servers."

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 90d9e0f..fe19c8b 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -209,14 +209,17 @@
       (setq headers (buffer-substring (point-min) (point)))
       (forward-line) ;; skip header/body separator
       (kill-region (point-min) (point)))
+    (quoted-printable-decode-region (point-min) (point-max))
     (unless (let ((pgg-gpg-user-id (message-options-get 'message-sender)))
              (pgg-sign-region (point-min) (point-max) t))
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
     (kill-region (point-min) (point-max))
+    (insert-buffer pgg-output-buffer)
+    (quoted-printable-encode-region (point-min) (point-max))
+    (goto-char (point-min))
     (if headers (insert headers))
     (insert "\n")
-    (insert-buffer pgg-output-buffer)
     t))
 
 (defun mml1991-pgg-encrypt (cont)