[Emacs-diffs] /srv/bzr/emacs/trunk r103270: nnimap.el (nnimap-inhibit-logging): New variable.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103270
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-14 04:23:59 +0000
message:
  nnimap.el (nnimap-inhibit-logging): New variable.
   (nnimap-log-command): Don't log login commands.
  auth-source.el (auth-source-netrc-search): The asserts seem to want to have 
more parameters.
  nnimap.el (nnimap-send-command): Mark the command time for each command, so 
that we don't get NOOPs stepping on our toes.
  gnus-art.el (article-date-ut): Get the date from the Date header on `t'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/gnus-art.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-14 01:38:00 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-14 04:23:59 +0000
@@ -1,3 +1,17 @@
+2011-02-14  Lars Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-inhibit-logging): New variable.
+       (nnimap-log-command): Don't log login commands.
+
+       * auth-source.el (auth-source-netrc-search): The asserts seem to want
+       to have more parameters.
+
+       * nnimap.el (nnimap-send-command): Mark the command time for each
+       command, so that we don't get NOOPs stepping on our toes.
+
+       * gnus-art.el (article-date-ut): Get the date from the Date header on
+       `t'.
+
 2011-02-14  Katsumi Yamaoka  <address@hidden>
 
        * auth-source.el (auth-source-search): Use copy-sequence instead of

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-02-14 01:38:00 +0000
+++ b/lisp/gnus/auth-source.el  2011-02-14 04:23:59 +0000
@@ -483,7 +483,7 @@
 
       (assert
        (or (eq t create) (listp create)) t
-       "Invalid auth-source :create parameter (must be nil, t, or a list)")
+       "Invalid auth-source :create parameter (must be nil, t, or a list): %s 
%s")
 
       (setq filtered-backends (copy-sequence backends))
       (dolist (backend backends)
@@ -779,7 +779,7 @@
 See `auth-source-search' for details on SPEC."
   ;; just in case, check that the type is correct (null or same as the backend)
   (assert (or (null type) (eq type (oref backend type)))
-          t "Invalid netrc search")
+          t "Invalid netrc search: %s %s")
 
   (let ((results (auth-source-netrc-normalize
                   (auth-source-netrc-parse

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2011-02-13 23:30:55 +0000
+++ b/lisp/gnus/gnus-art.el     2011-02-14 04:23:59 +0000
@@ -3404,6 +3404,7 @@
         (inhibit-read-only t)
         (inhibit-point-motion-hooks t)
         (first t)
+        (visible-date (mail-fetch-field "Date"))
         pos date bface eface)
     (save-excursion
       (save-restriction
@@ -3427,6 +3428,9 @@
            (delete-region (point-at-bol) (progn
                                            (gnus-article-forward-header)
                                            (point))))
+         (when (and (not date)
+                    visible-date)
+           (setq date visible-date))
          (when date
            (article-transform-date date type bface eface)))))))
 

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-02-13 13:44:06 +0000
+++ b/lisp/gnus/nnimap.el       2011-02-14 04:23:59 +0000
@@ -142,6 +142,8 @@
 (defvar nnimap-quirks
   '(("QRESYNC" "Zimbra" "QRESYNC ")))
 
+(defvar nnimap-inhibit-logging nil)
+
 (defun nnimap-buffer ()
   (nnimap-find-process-buffer nntp-server-buffer))
 
@@ -389,8 +391,9 @@
                                  nnimap-address)
                                 ports t))))
                  (setq nnimap-object nil)
-               (setq login-result
-                     (nnimap-login (car credentials) (cadr credentials)))
+               (let ((nnimap-inhibit-logging t))
+                 (setq login-result
+                       (nnimap-login (car credentials) (cadr credentials))))
                (unless (car login-result)
                  ;; If the login failed, then forget the credentials
                  ;; that are now possibly cached.
@@ -1565,6 +1568,7 @@
 (defvar nnimap-sequence 0)
 
 (defun nnimap-send-command (&rest args)
+  (setf (nnimap-last-command-time nnimap-object) (current-time))
   (process-send-string
    (get-buffer-process (current-buffer))
    (nnimap-log-command
@@ -1583,12 +1587,14 @@
 (defun nnimap-log-command (command)
   (with-current-buffer (get-buffer-create "*imap log*")
     (goto-char (point-max))
-    (insert (format-time-string "%H:%M:%S") " " command))
+    (insert (format-time-string "%H:%M:%S") " "
+           (if nnimap-inhibit-logging
+               "(inhibited)"
+             command)))
   command)
 
 (defun nnimap-command (&rest args)
   (erase-buffer)
-  (setf (nnimap-last-command-time nnimap-object) (current-time))
   (let* ((sequence (apply #'nnimap-send-command args))
         (response (nnimap-get-response sequence)))
     (if (equal (caar response) "OK")