emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103383: Merge changes made in Gnus t


From: Katsumi Yamaoka
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103383: Merge changes made in Gnus trunk.
Date: Tue, 22 Feb 2011 13:31:15 +0000
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103383
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-22 13:31:15 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus.texi (Article Date): Clarify gnus-article-update-date-headers.
  gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name after 
exit.
  gnus-sum.el (gnus-summary-show-article): When called with t as the value, 
show the raw article.
  nnimap.el (nnimap-open-connection-1): Revert last change, since auth-source 
now accepts numbers.
  auth-source.el (auth-source-netrc-parse): Accept a number as the port spec, 
too.
   (auth-source-ensure-strings): New function.
  gnus-art.el (gnus-article-update-date-headers): Doc fix.
   (gnus-article-setup-buffer): Always restart the date timer so that user 
changes to the frequency is respected.
  nnimap.el (nnimap-open-connection-1): auth-source expects strings as port 
numbers, so make sure it gets that if nnimap-server-port is explicit.
  nnimap.el (nnimap-inbox): Doc fix.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-msg.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnimap.el
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-21 13:29:15 +0000
+++ b/doc/misc/ChangeLog        2011-02-22 13:31:15 +0000
@@ -1,3 +1,7 @@
+2011-02-21  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Article Date): Clarify gnus-article-update-date-headers.
+
 2011-02-20  Lars Ingebrigtsen  <address@hidden>
 
        * gnus.texi (Window Layout): Document layout names.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-02-21 13:29:15 +0000
+++ b/doc/misc/gnus.texi        2011-02-22 13:31:15 +0000
@@ -9502,8 +9502,11 @@
 Date: 6 weeks, 4 days, 1 hour, 3 minutes, 8 seconds ago
 @end example
 
-This line is updated continually by default.  If you wish to switch
-that off, say:
+This line is updated continually by default.  The frequency (in
+seconds) is controlled by the @code{gnus-article-update-date-headers}
+variable.
+
+If you wish to switch updating off, say:
 
 @vindex gnus-article-update-date-headers
 @lisp

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-21 13:29:15 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-22 13:31:15 +0000
@@ -1,3 +1,32 @@
+2011-02-22  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name
+       after exit.
+
+       * gnus-sum.el (gnus-summary-show-article): When called with t as the
+       value, show the raw article.
+
+2011-02-21  Lars Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-open-connection-1): Revert last change, since
+       auth-source now accepts numbers.
+
+       * auth-source.el (auth-source-netrc-parse): Accept a number as the port
+       spec, too.
+       (auth-source-ensure-strings): New function.
+
+       * gnus-art.el (gnus-article-update-date-headers): Doc fix.
+       (gnus-article-setup-buffer): Always restart the date timer so that user
+       changes to the frequency is respected.
+
+       * nnimap.el (nnimap-open-connection-1): auth-source expects strings as
+       port numbers, so make sure it gets that if nnimap-server-port is
+       explicit.
+
+2011-02-21  Simon Josefsson  <address@hidden>
+
+       * nnimap.el (nnimap-inbox): Doc fix.
+
 2011-02-20  Chong Yidong  <address@hidden>
 
        * shr-color.el (shr-color->hexadecimal): Use renamed function names

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-02-21 13:29:15 +0000
+++ b/lisp/gnus/auth-source.el  2011-02-22 13:31:15 +0000
@@ -680,6 +680,15 @@
 
 ;;; Backend specific parsing: netrc/authinfo backend
 
+(defun auth-source-ensure-strings (values)
+  (unless (listp values)
+    (setq values (list values)))
+  (mapcar (lambda (value)
+           (if (numberp value)
+               (format "%s" value)
+             value))
+         values))
+
 (defvar auth-source-netrc-cache nil)
 
 ;;; (auth-source-netrc-parse "~/.authinfo.gpg")
@@ -693,6 +702,7 @@
       ;; We got already parsed contents; just return it.
       file
     (when (file-exists-p file)
+      (setq port (auth-source-ensure-strings port))
       (with-temp-buffer
         (let ((tokens '("machine" "host" "default" "login" "user"
                         "password" "account" "macdef" "force"

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2011-02-20 04:08:04 +0000
+++ b/lisp/gnus/gnus-art.el     2011-02-22 13:31:15 +0000
@@ -1040,7 +1040,7 @@
          (item :tag "User-defined" :value 'user-defined)))
 
 (defcustom gnus-article-update-date-headers 1
-  "How often to update the date header.
+  "A number that says how often to update the date header (in seconds).
 If nil, don't update it at all."
   :version "24.1"
   :group 'gnus-article-headers
@@ -4505,13 +4505,10 @@
        (setq gnus-summary-buffer
              (gnus-summary-buffer-name gnus-newsgroup-name))
        (gnus-summary-set-local-parameters gnus-newsgroup-name)
-       (cond
-        ((and gnus-article-update-date-headers
-              (not article-lapsed-timer))
+       (when article-lapsed-timer
+         (gnus-stop-date-timer))
+       (when gnus-article-update-date-headers
          (gnus-start-date-timer gnus-article-update-date-headers))
-        ((and (not gnus-article-update-date-headers)
-              article-lapsed-timer)
-         (gnus-stop-date-timer)))
        (current-buffer)))))
 
 ;; Set article window start at LINE, where LINE is the number of lines

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2011-02-15 11:24:37 +0000
+++ b/lisp/gnus/gnus-msg.el     2011-02-22 13:31:15 +0000
@@ -388,6 +388,7 @@
        (yanked (make-symbol "gnus-setup-yanked-articles"))
        (group (make-symbol "gnus-setup-message-group")))
     `(let ((,winconf (current-window-configuration))
+          (,winconf-name gnus-current-window-configuration)
           (,buffer (buffer-name (current-buffer)))
           (,article gnus-article-reply)
           (,yanked gnus-article-yanked-articles)
@@ -432,7 +433,7 @@
           (progn
             ,@forms)
         (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config
-                                     ,yanked)
+                                     ,yanked ,winconf-name)
         (setq gnus-message-buffer (current-buffer))
         (set (make-local-variable 'gnus-message-group-art)
              (cons ,group ,article))
@@ -527,7 +528,8 @@
            (throw 'found (cons (cadr elem) (caddr elem)))))))))
 
 (defun gnus-inews-add-send-actions (winconf buffer article
-                                           &optional config yanked)
+                                           &optional config yanked
+                                           winconf-name)
   (gnus-make-local-hook 'message-sent-hook)
   (add-hook 'message-sent-hook (if gnus-agent 'gnus-agent-possibly-do-gcc
                                 'gnus-inews-do-gcc) nil t)
@@ -538,8 +540,10 @@
        `(lambda (&optional arg)
           (gnus-post-method arg ,gnus-newsgroup-name)))
   (message-add-action
-   `(when (gnus-buffer-exists-p ,buffer)
-      (set-window-configuration ,winconf))
+   `(progn
+      (setq gnus-current-window-configuration ,winconf-name)
+      (when (gnus-buffer-exists-p ,buffer)
+       (set-window-configuration ,winconf)))
    'exit 'postpone 'kill)
   (let ((to-be-marked (cond
                       (yanked

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-02-21 13:29:15 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-02-22 13:31:15 +0000
@@ -9525,8 +9525,7 @@
    ((not arg)
     ;; Select the article the normal way.
     (gnus-summary-select-article nil 'force))
-   ((or (equal arg '(16))
-       (eq arg t))
+   ((equal arg '(16))
     ;; C-u C-u g
     (let ((gnus-inhibit-article-treatments t))
       (gnus-summary-select-article nil 'force)))

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-02-20 04:08:04 +0000
+++ b/lisp/gnus/nnimap.el       2011-02-22 13:31:15 +0000
@@ -72,14 +72,15 @@
                               "ssh %s imapd"))
 
 (defvoo nnimap-inbox nil
-  "The mail box where incoming mail arrives and should be split out of.")
+  "The mail box where incoming mail arrives and should be split out of.
+For example, \"INBOX\".")
 
 (defvoo nnimap-split-methods nil
   "How mail is split.
-Uses the same syntax as nnmail-split-methods")
+Uses the same syntax as `nnmail-split-methods'.")
 
 (defvoo nnimap-split-fancy nil
-  "Uses the same syntax as nnmail-split-fancy.")
+  "Uses the same syntax as `nnmail-split-fancy'.")
 
 (defvoo nnimap-unsplittable-articles '(%Deleted %Seen)
   "Articles with the flags in the list will not be considered when splitting.")


reply via email to

[Prev in Thread] Current Thread [Next in Thread]