Merge changes made in Gnus trunk.

gnus-picon.el (gnus-picon-create-glyph): Set the background XPM colour explicitly.
message.el (message-cite-prefix-regexp): Remove } from the cite prefix.
gnus-win.el (gnus-window-to-buffer-helper, gnus-all-windows-visible-p): Function needn't be a symbol.
mail-source.el (mail-source-value): Function needn't be a symbol.
tls.el (open-tls-stream): Don't query killing process.
gnus-win.el: Revert previous patch, since it made Gnus backtrace.
nnimap.el: Look up IMAP credentials based on both the virtual and physical server names.
mail-source.el (mail-source-value): Revert previous patch.

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 46a7d8fd7eff5279568b51558a78cd5573405f9e..1914fb0bc740459579ab909ffc50cc27866920cd 100644 (file)
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -27333,9 +27333,7 @@ The revised Gnus @acronym{FAQ} is included in the manual,
 @acronym{TLS} wrapper shipped with Gnus
 
 @acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and
-@acronym{NNTP} via @file{tls.el} and GNUTLS.  The old
-@acronym{TLS}/@acronym{SSL} support via (external third party)
-@file{ssl.el} and OpenSSL still works.
+@acronym{NNTP} via @file{tls.el} and GNUTLS.
 
 @item
 Improved anti-spam features.

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 6b9224765968e6777b564b0d84d3dde4ea22e561..ad56520f8923165bb4a3e77bbf95e99b5338af7e 100644 (file)
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1090,11 +1090,11 @@ the passphrase prompt.
 @subsection Using PGP/MIME
 
 @acronym{PGP/MIME} requires an external OpenPGP implementation, such
-as @uref{http://www.gnupg.org/, GNU Privacy Guard}.  Pre-OpenPGP
-implementations such as PGP 2.x and PGP 5.x are also supported.  One
+as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP
+implementations such as PGP 2.x and PGP 5.x are also supported. One
 Emacs interface to the PGP implementations, PGG (@pxref{Top, ,PGG,
-pgg, PGG Manual}), is included, but Mailcrypt and Florian Weimer's
-@code{gpg.el} are also supported.  @xref{PGP Compatibility}.
+pgg, PGG Manual}), is included, but Mailcrypt is also supported.
+@xref{PGP Compatibility}.
 
 @cindex gpg-agent
 Message internally calls GnuPG (the @command{gpg} command) to perform

diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 79a8b3776f2d9d7d7ed942a1ed1a395ff97c9ac9..504ca4f0aa07d851d9891b8f929f0a1b1fadeb87 100644 (file)
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -1,3 +1,7 @@
+2009-02-07  Dave Love  <fx@gnu.org>
+
+       * net/tls.el (open-tls-stream): Don't query killing process.
+
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.1.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 47e2ed3453aee2a27a6cb58fd79b8df9f8e11ac8..a50d6db20facfd3a2a8861be132afea019d3f229 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,32 @@
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mail-source.el (mail-source-value): Revert previous patch.
+
+       * nnimap.el (nnimap-credentials): Allow inhibiting the password query
+       on failure.
+       (nnimap-open-connection): Look up both virtual and physical server name
+       credentials.
+
+       * gnus-win.el: Revert previous patch, since it made Gnus backtrace.
+
+2009-02-08  Dave Love  <fx@gnu.org>
+
+       * gnus-win.el (gnus-window-to-buffer-helper,
+       gnus-all-windows-visible-p): Function needn't be a symbol.
+
+       * mail-source.el (mail-source-value): Function needn't be a symbol.
+
+2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-cite-prefix-regexp): Remove } from the cite
+       prefix.
+
+       * gnus-art.el (gnus-treatment-function-alist): Do picons before
+       highlight again, so that the highlight is correct.
+
+       * gnus-picon.el (gnus-picon): Remove again.
+       (gnus-picon-create-glyph): Set the background XPM colour explicitly.
+
        * gnus-art.el (gnus-treatment-function-alist): Insert picons after
        doing the header highlightling, so that the background colour of the
        picon is correct.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b0cfb5b814cc74ef593ea67afa811cf95ac21b91..ad6ccb213cfa2c238b892bb37bdd053c2068850d 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1691,14 +1691,14 @@ This requires GNU Libidn, and by default only enabled if it is found."
     (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-from-picon gnus-treat-from-picon)
+    (gnus-treat-mail-picon gnus-treat-mail-picon)
+    (gnus-treat-newsgroups-picon gnus-treat-newsgroups-picon)
     (gnus-treat-strip-pem gnus-article-hide-pem)
     (gnus-treat-from-gravatar gnus-treat-from-gravatar)
     (gnus-treat-mail-gravatar gnus-treat-mail-gravatar)
     (gnus-treat-highlight-headers gnus-article-highlight-headers)
     (gnus-treat-highlight-signature gnus-article-highlight-signature)
-    (gnus-treat-from-picon gnus-treat-from-picon)
-    (gnus-treat-mail-picon gnus-treat-mail-picon)
-    (gnus-treat-newsgroups-picon gnus-treat-newsgroups-picon)
     (gnus-treat-strip-trailing-blank-lines
      gnus-article-remove-trailing-blank-lines)
     (gnus-treat-strip-leading-blank-lines

diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 2f70eae3cd0307cb4d69a3a04e2128ab7738f2f8..97cd8207162c621721f45995f1a70c5ae368d573 100644 (file)
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -85,10 +85,6 @@ added right to the textual representation."
                 (const right))
   :group 'gnus-picon)
 
-(defface gnus-picon '((t (:foreground "black" :background "white")))
-  "Face to show picon in."
-  :group 'gnus-picon)
-
 ;;; Internal variables:
 
 (defvar gnus-picon-glyph-alist nil
@@ -151,13 +147,13 @@ replacement is added."
       (insert glyph)
     (gnus-add-wash-type category)
     (gnus-add-image category (car glyph))
-    (let ((start (point)))
-      (gnus-put-image (car glyph) (unless nostring (cdr glyph)) category)
-      (put-text-property start (point) 'face 'gnus-picon))))
+    (gnus-put-image (car glyph) (unless nostring (cdr glyph)) category)))
 
 (defun gnus-picon-create-glyph (file)
   (or (cdr (assoc file gnus-picon-glyph-alist))
-      (cdar (push (cons file (gnus-create-image file))
+      (cdar (push (cons file (gnus-create-image
+                             file nil nil
+                             :color-symbols '(("None" . "white"))))
                  gnus-picon-glyph-alist))))
 
 ;;; Functions that does picon transformations:

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 243e0ddadff9f6263d2e446fd3d5633d21467bba..2f4e6b8ef4c300c25abc4baa449ff35546138cbd 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -626,29 +626,23 @@ Done before generating the new subject of a forward."
   :type 'regexp)
 
 (defcustom message-cite-prefix-regexp
-  ;; Default to the value of `mail-citation-prefix-regexp' if available.
-  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
-  ;; unless sendmail.el is loaded.
-  (cond ((boundp 'mail-citation-prefix-regexp)
-        mail-citation-prefix-regexp)
-       ((string-match "[[:digit:]]" "1")
-        ;; Support POSIX?  XEmacs 21.5.27 doesn't.
-        "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+")
-       (t
-        ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
-        (let (non-word-constituents)
-          (with-syntax-table text-mode-syntax-table
-            (setq non-word-constituents
-                  (concat
-                   (if (string-match "\\w" "_")  "" "_")
-                   (if (string-match "\\w" ".")  "" "."))))
-          (if (equal non-word-constituents "")
-              "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"
-            (concat "\\([ \t]*\\(\\w\\|["
-                    non-word-constituents
-                    "]\\)+>+\\|[ \t]*[]>|}]\\)+")))))
+  (if (string-match "[[:digit:]]" "1")
+      ;; Support POSIX?  XEmacs 21.5.27 doesn't.
+      "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|]\\)+"
+    ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
+    (let (non-word-constituents)
+      (with-syntax-table text-mode-syntax-table
+       (setq non-word-constituents
+             (concat
+              (if (string-match "\\w" "_")  "" "_")
+              (if (string-match "\\w" ".")  "" "."))))
+      (if (equal non-word-constituents "")
+         "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|]\\)+"
+       (concat "\\([ \t]*\\(\\w\\|["
+               non-word-constituents
+               "]\\)+>+\\|[ \t]*[]>|]\\)+"))))
   "*Regexp matching the longest possible citation prefix on a line."
-  :version "23.2"
+  :version "24.1"
   :group 'message-insertion
   :link '(custom-manual "(message)Insertion Variables")
   :type 'regexp

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f3cb77f5201f90407cb5f6276519f85046f40c79..8c3e6ea9a5704ae65c3d438bbad5b9f29fe0b3c9 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -238,7 +238,7 @@ some servers.")
                     ?s host
                     ?p port)))))
 
-(defun nnimap-credentials (address ports)
+(defun nnimap-credentials (address ports &optional inhibit-create)
   (let (port credentials)
     ;; Request the credentials from all ports, but only query on the
     ;; last port if all the previous ones have failed.
@@ -246,7 +246,10 @@ some servers.")
                (setq port (pop ports)))
       (setq credentials
            (auth-source-user-or-password
-            '("login" "password") address port nil (null ports))))
+            '("login" "password") address port nil
+            (if inhibit-create
+                nil
+              (null ports)))))
     credentials))
 
 (defun nnimap-keepalive ()
@@ -318,16 +321,21 @@ some servers.")
          (when (eq nnimap-stream 'starttls)
            (nnimap-command "STARTTLS")
            (starttls-negotiate (nnimap-process nnimap-object)))
+         (when nnimap-server-port
+           (push (format "%s" nnimap-server-port) ports))
          (unless (equal connection-result "PREAUTH")
            (if (not (setq credentials
                           (if (eq nnimap-authenticator 'anonymous)
                               (list "anonymous"
                                     (message-make-address))
-                            (nnimap-credentials
-                             nnimap-address
-                             (if nnimap-server-port
-                                 (cons (format "%s" nnimap-server-port) ports)
-                               ports)))))
+                            (or
+                             ;; First look for the credentials based
+                             ;; on the virtual server name.
+                             (nnimap-credentials
+                              (nnoo-current-server 'nnimap) ports t)
+                             ;; Then look them up based on the
+                             ;; physical address.
+                             (nnimap-credentials nnimap-address ports)))))
                (setq nnimap-object nil)
              (setq login-result (nnimap-command "LOGIN %S %S"
                                                 (car credentials)

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 821daba6f6bf30a9cec8b6157a3d4a4b55535be8..d4fa8c2e73cb6e2dd8ff25c28d1e6c81ed87e2f3 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -238,6 +238,10 @@ Fourth arg PORT is an integer specifying a port to connect to."
          (setq process (start-process
                         name buffer shell-file-name shell-command-switch
                         formatted-cmd))
+         (funcall (if (fboundp 'set-process-query-on-exit-flag)
+                      'set-process-query-on-exit-flag
+                    'process-kill-without-query)
+                  process nil)
          (while (and process
                      (memq (process-status process) '(open run))
                      (progn