9 files changed, 106 insertions, 39 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2445d554417..0f065ec2a31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-22  Naohiro Aota  <nao.aota@gmail.com>  (tiny change)
+
+        * net/tls.el (tls-program): Add -ign_eof argument to call the
+        openssl commands.
+        (tls-checktrust): Ditto.
+
 2008-04-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 535271a2556..4b19735f824 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,37 @@
+2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el (message-signature-separator, message-cite-function):
+        Change custom version.
+
+2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mm-decode.el (mm-display-external): Make temp file read-only.
+
+2008-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-diary.el (gnus-article-edit-mode-map, message-mode-map): Remove
+        binding for `gnus-diary-version'.  Bind `gnus-diary-check-message' to
+        `C-c C-f d'.
+
+2008-04-12  Adrian Aichner  <adrian@xemacs.org>
+
+        * gnus-sum.el (gnus-summary-goto-subject): Typo fix.
+
+2008-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Added docs.
+        (auth-sources): Modified format to support server.
+        (auth-source-pick, auth-source-user-or-password)
+        (auth-source-user-or-password-imap)
+        (auth-source-user-or-password-pop3, auth-source-user-or-password-ssh)
+        (auth-source-user-or-password-sftp)
+        (auth-source-user-or-password-smtp): Add server parameter.
+
+2008-04-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-registry.el: Initialize the registry when gnus-registry-install
+        is t.
+
 2008-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * compface.el (uncompface): Make buffer unibyte.
@@ -1393,8 +1427,11 @@
         (message-fix-before-sending): Add `bogus-recipient'.
 
         * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): Add "alpine".
-        (gnus-treat-emphasize, gnus-treat-body-boundary): Don't test
-        window-system.
+        (gnus-treat-body-boundary): Don't test window-system.
+
+2007-10-28  Leo <sdl.web@gmail.com>  (tiny change)
+
+        * gnus-art.el (gnus-treat-emphasize): Don't test window-system.
 
 2007-10-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index f37e0368845..9883eb64acc 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -28,6 +28,19 @@
 ;; authenticate in a single place.  Simplicity is the goal.  Instead
 ;; of providing 5000 options, we'll stick to simple, easy to
 ;; understand options.
+
+;; Easy setup:
+;; (require 'auth-source)
+;; (customize-variable 'auth-sources) ;; optional
+
+;; now, whatever sources you've defined for password have to be available
+
+;; if you want encrypted sources, which is strongly recommended, do
+;; (require 'epa-file)
+;; (epa-file-mode)
+
+;; before you put some data in ~/.authinfo.gpg (the default place)
+
 ;;; Code:
 
 (eval-when-compile (require 'cl))
@@ -73,10 +86,15 @@ Each entry is the authentication type with optional properties."
                  (list :tag "Source definition"
                        (const :format "" :value :source)
                        (string :tag "Authentication Source")
+                       (const :format "" :value :server)
+                       (choice :tag "Server (logical name) choice"
+                               (const :tag "Any" t)
+                               (regexp :tag "Server regular expression (TODO)")
+                               (const :tag "Fallback" nil))
                        (const :format "" :value :host)
-                       (choice :tag "Host choice"
+                       (choice :tag "Host (machine) choice"
                                (const :tag "Any" t)
-                               (regexp :tag "Host regular expression (TODO)")
+                               (regexp :tag "Host (machine) regular expression (TODO)")
                                (const :tag "Fallback" nil))
                        (const :format "" :value :protocol)
                        (choice :tag "Protocol"
@@ -100,16 +118,20 @@ Each entry is the authentication type with optional properties."
 ;; (auth-source-user-or-password-imap "password" "imap.myhost.com")
 ;; (auth-source-protocol-defaults 'imap)
 
-(defun auth-source-pick (host protocol &optional fallback)
-  "Parse `auth-sources' for HOST and PROTOCOL matches.
+(defun auth-source-pick (server host protocol &optional fallback)
+  "Parse `auth-sources' for SERVER, HOST, and PROTOCOL matches.
 
-Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t."
+Returns fallback choices (where SERVER. PROTOCOL or HOST are nil) with FALLBACK t."
   (interactive "sHost: \nsProtocol: \n") ;for testing
   (let (choices)
     (dolist (choice auth-sources)
-      (let ((h (plist-get choice :host))
+      (let ((s (plist-get choice :server))
+            (h (plist-get choice :host))
             (p (plist-get choice :protocol)))
         (when (and
+               (or (equal t s)
+                   (and (stringp s) (string-match s server))
+                   (and fallback (equal s nil)))
                (or (equal t h)
                    (and (stringp h) (string-match h host))
                    (and fallback (equal h nil)))
@@ -120,12 +142,12 @@ Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t."
     (if choices
         choices
       (unless fallback
-        (auth-source-pick host protocol t)))))
+        (auth-source-pick server host protocol t)))))
 
-(defun auth-source-user-or-password (mode host protocol)
-  "Find user or password (from the string MODE) matching HOST and PROTOCOL."
+(defun auth-source-user-or-password (mode server host protocol)
+  "Find user or password (from the string MODE) matching SERVER, HOST, and PROTOCOL."
   (let (found)
-    (dolist (choice (auth-source-pick host protocol))
+    (dolist (choice (auth-source-pick server host protocol))
       (setq found (netrc-machine-user-or-password 
                    mode
                    (plist-get choice :source)
@@ -139,20 +161,20 @@ Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t."
   "Return a list of default ports and names for PROTOCOL."
   (cdr-safe (assoc protocol auth-source-protocols)))
 
-(defun auth-source-user-or-password-imap (mode host)
-  (auth-source-user-or-password mode host 'imap))
+(defun auth-source-user-or-password-imap (mode server host)
+  (auth-source-user-or-password mode server host 'imap))
 
-(defun auth-source-user-or-password-pop3 (mode host)
-  (auth-source-user-or-password mode host 'pop3))
+(defun auth-source-user-or-password-pop3 (mode server host)
+  (auth-source-user-or-password mode server host 'pop3))
 
-(defun auth-source-user-or-password-ssh (mode host)
-  (auth-source-user-or-password mode host 'ssh))
+(defun auth-source-user-or-password-ssh (mode server host)
+  (auth-source-user-or-password mode server host 'ssh))
 
-(defun auth-source-user-or-password-sftp (mode host)
-  (auth-source-user-or-password mode host 'sftp))
+(defun auth-source-user-or-password-sftp (mode server host)
+  (auth-source-user-or-password mode server host 'sftp))
 
-(defun auth-source-user-or-password-smtp (mode host)
-  (auth-source-user-or-password mode host 'smtp))
+(defun auth-source-user-or-password-smtp (mode server host)
+  (auth-source-user-or-password mode server host 'smtp))
 
 (provide 'auth-source)
 
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index db7f7135e5f..183214f9220 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -390,8 +390,8 @@ If ARG (or prefix) is non-nil, force prompting for all fields."
 (add-hook 'nndiary-request-accept-article-hooks
           (lambda () (gnus-diary-check-message nil)))
 
-(define-key message-mode-map "\C-cDc" 'gnus-diary-check-message)
-(define-key gnus-article-edit-mode-map "\C-cDc" 'gnus-diary-check-message)
+(define-key message-mode-map "\C-c\C-fd" 'gnus-diary-check-message)
+(define-key gnus-article-edit-mode-map "\C-c\C-fd" 'gnus-diary-check-message)
 
 
 ;; The end ==================================================================
@@ -401,10 +401,6 @@ If ARG (or prefix) is non-nil, force prompting for all fields."
   (interactive)
   (message "NNDiary version %s" nndiary-version))
 
-(define-key message-mode-map "\C-cDv" 'gnus-diary-version)
-(define-key gnus-article-edit-mode-map "\C-cDv" 'gnus-diary-version)
-
-
 (provide 'gnus-diary)
 
 ;; arch-tag: 98467e70-337e-4ddc-b92d-45d403ff1b4b
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index b5ec4e1ae5f..fd08d4d1e39 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1115,7 +1115,8 @@ Returns the first place where the trail finds a group name."
 ;;; we could call it here: (customize-variable 'gnus-registry-install)
   gnus-registry-install)
 
-(when (gnus-registry-install-p)
+(when (or (eq gnus-registry-install t)
+          (gnus-registry-install-p))
   (gnus-registry-initialize))
 
 ;; TODO: a few things
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 0d76e63bf74..6b9f9c65f22 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7445,7 +7445,7 @@ If optional argument UNREAD is non-nil, only unread article is selected."
   (gnus-summary-position-point))
 
 (defun gnus-summary-goto-subject (article &optional force silent)
-  "Go the subject line of ARTICLE.
+  "Go to the subject line of ARTICLE.
 If FORCE, also allow jumping to articles not currently shown."
   (interactive "nArticle number: ")
   (unless (numberp article)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 117ac00e5ba..f35b9a336bb 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -425,7 +425,7 @@ whitespace)."
   :type '(choice (const :tag "strict" "^-- $")
                  (const :tag "loose" "^-- *$")
                  regexp)
-  :version "23.1" ;; No Gnus (changed default)
+  :version "22.3" ;; Gnus 5.10.12 (changed default)
   :link '(custom-manual "(message)Various Message Variables")
   :group 'message-various)
 
@@ -1018,6 +1018,7 @@ Used by `message-yank-original' via `message-yank-cite'."
   :link '(custom-manual "(message)Insertion Variables")
   :type 'integer)
 
+;;;###autoload
 (defcustom message-cite-function 'message-cite-original-without-signature
   "*Function for citing an original message.
 Predefined functions include `message-cite-original' and
@@ -1028,7 +1029,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
                 (function-item sc-cite-original)
                 (function :tag "Other"))
   :link '(custom-manual "(message)Insertion Variables")
-  :version "23.1" ;; No Gnus (changed default)
+  :version "22.3" ;; Gnus 5.10.12 (changed default)
   :group 'message-insertion)
 
 (defcustom message-indent-citation-function 'message-indent-citation
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index a0b55421428..56258b96b61 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -799,7 +799,7 @@ external if displayed external."
                (copiousoutput (assoc "copiousoutput" mime-info))
                file buffer)
           ;; We create a private sub-directory where we store our files.
-          (set-file-modes dir 448)
+          (set-file-modes dir #o700)
           (if filename
               (setq file (expand-file-name
                           (gnus-map-function mm-file-name-rewrite-functions
@@ -819,6 +819,10 @@ external if displayed external."
                                             nil suffix))))
           (let ((coding-system-for-write mm-binary-coding-system))
             (write-region (point-min) (point-max) file nil 'nomesg))
+          ;; The file is deleted after the viewer exists.  If the users edits
+          ;; the file, changes will be lost.  Set file to read-only to make it
+          ;; clear.
+          (set-file-modes file #o400)
           (message "Viewing with %s" method)
           (cond
            (needsterm
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 64a0460e08c..4cdc00c448b 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -80,7 +80,7 @@ and `gnutls-cli' (version 2.0.1) output."
 
 (defcustom tls-program '("gnutls-cli -p %p %h"
                          "gnutls-cli -p %p %h --protocols ssl3"
-                         "openssl s_client -connect %h:%p -no_ssl2")
+                         "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
 %h is replaced with server hostname, %p with port to connect to.
@@ -97,23 +97,23 @@ successful negotiation."
           :value
           ("gnutls-cli -p %p %h"
            "gnutls-cli -p %p %h --protocols ssl3"
-           "openssl s_client -connect %h:%p -no_ssl2")
+           "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
           (set :inline t
                ;; FIXME: add brief `:tag "..."' descriptions.
                ;; (repeat :inline t :tag "Other" (string))
                ;; See `tls-checktrust':
                (const "gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h")
                (const "gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3")
-               (const "openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2")
+               (const "openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof")
                ;; No trust check:
                (const "gnutls-cli -p %p %h")
                (const "gnutls-cli -p %p %h --protocols ssl3")
-               (const "openssl s_client -connect %h:%p -no_ssl2"))
+               (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
           (repeat :inline t :tag "Other" (string)))
     (const :tag "Default list of commands"
            ("gnutls-cli -p %p %h"
             "gnutls-cli -p %p %h --protocols ssl3"
-            "openssl s_client -connect %h:%p -no_ssl2"))
+            "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
     (list :tag "List of commands"
           (repeat :tag "Command" (string))))
   :version "22.1"
@@ -144,7 +144,7 @@ consider trustworthy, e.g.:
 \(setq tls-program
       '(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\"
         \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\"
-        \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2\"))"
+        \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))"
   :type '(choice (const :tag "Always" t)
                  (const :tag "Never" nil)
                  (const :tag "Ask" ask))