aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2011-02-14 04:23:59 +0000
committerKatsumi Yamaoka2011-02-14 04:23:59 +0000
commitd5e9a4e9a76d5cd3aa03a7cc8a6c2ab405bb9ca5 (patch)
tree731ca405290c9019907b047a6fff20fcaaf7b93a
parenta241b7c067132a073c29dc924846952fd7a7391b (diff)
downloademacs-d5e9a4e9a76d5cd3aa03a7cc8a6c2ab405bb9ca5.tar.gz
emacs-d5e9a4e9a76d5cd3aa03a7cc8a6c2ab405bb9ca5.zip
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'.
-rw-r--r--lisp/gnus/ChangeLog14
-rw-r--r--lisp/gnus/auth-source.el4
-rw-r--r--lisp/gnus/gnus-art.el4
-rw-r--r--lisp/gnus/nnimap.el14
4 files changed, 30 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f156198a8e0..9dd336a1f09 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
12011-02-14 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * nnimap.el (nnimap-inhibit-logging): New variable.
4 (nnimap-log-command): Don't log login commands.
5
6 * auth-source.el (auth-source-netrc-search): The asserts seem to want
7 to have more parameters.
8
9 * nnimap.el (nnimap-send-command): Mark the command time for each
10 command, so that we don't get NOOPs stepping on our toes.
11
12 * gnus-art.el (article-date-ut): Get the date from the Date header on
13 `t'.
14
12011-02-14 Katsumi Yamaoka <yamaoka@jpl.org> 152011-02-14 Katsumi Yamaoka <yamaoka@jpl.org>
2 16
3 * auth-source.el (auth-source-search): Use copy-sequence instead of 17 * auth-source.el (auth-source-search): Use copy-sequence instead of
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index de6926248ab..8f4a6ddc7b4 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -483,7 +483,7 @@ must call it to obtain the actual value."
483 483
484 (assert 484 (assert
485 (or (eq t create) (listp create)) t 485 (or (eq t create) (listp create)) t
486 "Invalid auth-source :create parameter (must be nil, t, or a list)") 486 "Invalid auth-source :create parameter (must be nil, t, or a list): %s %s")
487 487
488 (setq filtered-backends (copy-sequence backends)) 488 (setq filtered-backends (copy-sequence backends))
489 (dolist (backend backends) 489 (dolist (backend backends)
@@ -779,7 +779,7 @@ Note that the MAX parameter is used so we can exit the parse early."
779See `auth-source-search' for details on SPEC." 779See `auth-source-search' for details on SPEC."
780 ;; just in case, check that the type is correct (null or same as the backend) 780 ;; just in case, check that the type is correct (null or same as the backend)
781 (assert (or (null type) (eq type (oref backend type))) 781 (assert (or (null type) (eq type (oref backend type)))
782 t "Invalid netrc search") 782 t "Invalid netrc search: %s %s")
783 783
784 (let ((results (auth-source-netrc-normalize 784 (let ((results (auth-source-netrc-normalize
785 (auth-source-netrc-parse 785 (auth-source-netrc-parse
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index d7c0d7a7250..3e1630804f7 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3404,6 +3404,7 @@ possible values."
3404 (inhibit-read-only t) 3404 (inhibit-read-only t)
3405 (inhibit-point-motion-hooks t) 3405 (inhibit-point-motion-hooks t)
3406 (first t) 3406 (first t)
3407 (visible-date (mail-fetch-field "Date"))
3407 pos date bface eface) 3408 pos date bface eface)
3408 (save-excursion 3409 (save-excursion
3409 (save-restriction 3410 (save-restriction
@@ -3427,6 +3428,9 @@ possible values."
3427 (delete-region (point-at-bol) (progn 3428 (delete-region (point-at-bol) (progn
3428 (gnus-article-forward-header) 3429 (gnus-article-forward-header)
3429 (point)))) 3430 (point))))
3431 (when (and (not date)
3432 visible-date)
3433 (setq date visible-date))
3430 (when date 3434 (when date
3431 (article-transform-date date type bface eface))))))) 3435 (article-transform-date date type bface eface)))))))
3432 3436
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index be3f8125192..a5a001f7e11 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -142,6 +142,8 @@ textual parts.")
142(defvar nnimap-quirks 142(defvar nnimap-quirks
143 '(("QRESYNC" "Zimbra" "QRESYNC "))) 143 '(("QRESYNC" "Zimbra" "QRESYNC ")))
144 144
145(defvar nnimap-inhibit-logging nil)
146
145(defun nnimap-buffer () 147(defun nnimap-buffer ()
146 (nnimap-find-process-buffer nntp-server-buffer)) 148 (nnimap-find-process-buffer nntp-server-buffer))
147 149
@@ -389,8 +391,9 @@ textual parts.")
389 nnimap-address) 391 nnimap-address)
390 ports t)))) 392 ports t))))
391 (setq nnimap-object nil) 393 (setq nnimap-object nil)
392 (setq login-result 394 (let ((nnimap-inhibit-logging t))
393 (nnimap-login (car credentials) (cadr credentials))) 395 (setq login-result
396 (nnimap-login (car credentials) (cadr credentials))))
394 (unless (car login-result) 397 (unless (car login-result)
395 ;; If the login failed, then forget the credentials 398 ;; If the login failed, then forget the credentials
396 ;; that are now possibly cached. 399 ;; that are now possibly cached.
@@ -1565,6 +1568,7 @@ textual parts.")
1565(defvar nnimap-sequence 0) 1568(defvar nnimap-sequence 0)
1566 1569
1567(defun nnimap-send-command (&rest args) 1570(defun nnimap-send-command (&rest args)
1571 (setf (nnimap-last-command-time nnimap-object) (current-time))
1568 (process-send-string 1572 (process-send-string
1569 (get-buffer-process (current-buffer)) 1573 (get-buffer-process (current-buffer))
1570 (nnimap-log-command 1574 (nnimap-log-command
@@ -1583,12 +1587,14 @@ textual parts.")
1583(defun nnimap-log-command (command) 1587(defun nnimap-log-command (command)
1584 (with-current-buffer (get-buffer-create "*imap log*") 1588 (with-current-buffer (get-buffer-create "*imap log*")
1585 (goto-char (point-max)) 1589 (goto-char (point-max))
1586 (insert (format-time-string "%H:%M:%S") " " command)) 1590 (insert (format-time-string "%H:%M:%S") " "
1591 (if nnimap-inhibit-logging
1592 "(inhibited)"
1593 command)))
1587 command) 1594 command)
1588 1595
1589(defun nnimap-command (&rest args) 1596(defun nnimap-command (&rest args)
1590 (erase-buffer) 1597 (erase-buffer)
1591 (setf (nnimap-last-command-time nnimap-object) (current-time))
1592 (let* ((sequence (apply #'nnimap-send-command args)) 1598 (let* ((sequence (apply #'nnimap-send-command args))
1593 (response (nnimap-get-response sequence))) 1599 (response (nnimap-get-response sequence)))
1594 (if (equal (caar response) "OK") 1600 (if (equal (caar response) "OK")