Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1161

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7ce34cd043a180541e248f58e4ddd1318ed8bf9c..cb4c451c7deba058a11df918d97963a548f08390 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nnimap.el (nnimap-open-connection): Fix login/password bug.
+
+       * nnrss.el (nnrss-normalize-date): Accept Unix-style epoch timestamps.
+
+       * auth-source.el: Preliminary Tramp docs.
+       (auth-sources): Change the default auth-sources to use
+       EPA .gpg files.
+
 2008-05-09  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * nntp.el: Autoload `auth-source-user-or-password'.

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 2bf2bf0ad628fbc2ac2b7f357edac768fa53831f..d336d7f498196e7c19ebcc40304a370619a6f9ee 100644 (file)
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -47,6 +47,15 @@
 ;;; digest).  If you want finer controls, explore the url-auth source
 ;;; code and variables.
 
+;;; (Tramp patch pending for this!)
+;;; For tramp authentication, use:
+
+;;; machine yourmachine.com port tramp login testuser password testpass
+
+;;; Note that the port can be scp or ssh, for example, to match only
+;;; those protocols.  When you use port = tramp, you match any Tramp
+;;; protocol.
+
 ;;; Code:
 
 (require 'gnus-util)
@@ -83,8 +92,7 @@
                    p)))
          auth-source-protocols))
 
-;;; this default will be changed to ~/.authinfo.gpg
-(defcustom auth-sources '((:source "~/.authinfo.enc" :host t :protocol t))
+(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t))
   "List of authentication sources.
 
 Each entry is the authentication type with optional properties."

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 11396fcec78d5115911feb32b7988c325ac53f59..ceaf5107debf37eec67600ab38c12ac138f8434b 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -810,7 +810,7 @@ If EXAMINE is non-nil the group is selected read-only."
                   (list port)
                   (list "imap" "imaps" "143" "993"))))
           (passwd (or 
-                   (auth-source-user-or-password "login" server port) ; this is preferred to netrc-*
+                   (auth-source-user-or-password "password" server port) ; this is preferred to netrc-*
                    (netrc-machine-user-or-password
                     "password"
                     list

diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 67417cbb481034750963f7459932d8c82623d747..ea8197d27dbb2fbe0e7ab3125e450122138de3b0 100644 (file)
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -498,8 +498,11 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 This function handles the ISO 8601 date format described in
 <URL:http://www.w3.org/TR/NOTE-datetime>, and also the RFC822 style
 which RSS 2.0 allows."
-  (let (case-fold-search vector year month day time zone cts)
-    (cond ((null date))
+  (let (case-fold-search vector year month day time zone cts given)
+    (cond ((null date))                        ; do nothing for this case
+         ;; if the date is just digits (unix time stamp):
+         ((string-match "^[0-9]+$" date)
+          (setq given (seconds-to-time (string-to-number date))))
          ;; RFC822
          ((string-match " [0-9]+ " date)
           (setq vector (timezone-parse-date date)
@@ -557,7 +560,7 @@ which RSS 2.0 allows."
                  (if zone
                      (concat " " zone)
                    "")))
-      (message-make-date))))
+      (message-make-date given))))
 
 ;;; data functions