[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103592: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103592: Merge changes made in Gnus trunk. |
Date: |
Tue, 08 Mar 2011 14:26:05 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103592
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-08 14:26:05 +0000
message:
Merge changes made in Gnus trunk.
message.texi (Message Buffers): Update default value of
message-generate-new-buffers.
shr.el (shr-table-horizontal-line): Change the defaults for the table lines
to be spaces instead.
sieve-manage.el (sieve-sasl-auth): Create auth-info if not found.
(sieve-sasl-auth): Check that auth-source-search did return something, or
just return an empty string.
gnus-start.el (gnus-group-change-level): Allow putting foreign groups onto
the list of killed groups, too. This makes killed nnimap groups, for instance,
more reliably not reappear.
nnimap.el (nnimap-request-thread): Don't bug out when we can't find the
parent.
modified:
doc/misc/ChangeLog
doc/misc/message.texi
lisp/gnus/ChangeLog
lisp/gnus/gnus-start.el
lisp/gnus/nnimap.el
lisp/gnus/shr.el
lisp/gnus/sieve-manage.el
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2011-03-06 04:28:39 +0000
+++ b/doc/misc/ChangeLog 2011-03-08 14:26:05 +0000
@@ -1,3 +1,8 @@
+2011-03-07 Antoine Levitt <address@hidden>
+
+ * message.texi (Message Buffers): Update default value of
+ message-generate-new-buffers.
+
2011-03-06 Jay Belanger <address@hidden>
* calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi 2011-02-19 19:40:59 +0000
+++ b/doc/misc/message.texi 2011-03-08 14:26:05 +0000
@@ -2298,8 +2298,7 @@
@item unique
@item t
-Create the new buffer with the name generated in the Message way. This
-is the default.
+Create the new buffer with the name generated in the Message way.
@item unsent
Similar to @code{unique} but the buffer name begins with "*unsent ".
@@ -2315,7 +2314,7 @@
@code{nil}). The function should return the new buffer name.
@end table
-The default value is @code{unique}.
+The default value is @code{unsent}.
@item message-max-buffers
@vindex message-max-buffers
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-03-06 02:43:19 +0000
+++ b/lisp/gnus/ChangeLog 2011-03-08 14:26:05 +0000
@@ -1,3 +1,14 @@
+2011-03-07 Lars Magne Ingebrigtsen <address@hidden>
+
+ * shr.el (shr-table-horizontal-line): Change the defaults for the table
+ lines to be spaces instead.
+
+2011-03-07 Julien Danjou <address@hidden>
+
+ * sieve-manage.el (sieve-sasl-auth): Create auth-info if not found.
+ (sieve-sasl-auth): Check that auth-source-search did return something,
+ or just return an empty string.
+
2011-03-05 Antoine Levitt <address@hidden>
* gnus.el (gnus-interactive): Use read-directory-name.
@@ -12,6 +23,13 @@
2011-03-05 Lars Magne Ingebrigtsen <address@hidden>
+ * gnus-start.el (gnus-group-change-level): Allow putting foreign groups
+ onto the list of killed groups, too. This makes killed nnimap groups,
+ for instance, more reliably not reappear.
+
+ * nnimap.el (nnimap-request-thread): Don't bug out when we can't find
+ the parent.
+
* gnus-sum.el (gnus-update-read-articles): Fix typo.
* gnus.el (gnus-valid-select-methods): Mark nnimap as a backend that
=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el 2011-02-28 01:07:29 +0000
+++ b/lisp/gnus/gnus-start.el 2011-03-08 14:26:05 +0000
@@ -1306,16 +1306,13 @@
((>= level gnus-level-zombie)
;; Remove from the hash table.
(gnus-sethash group nil gnus-newsrc-hashtb)
- ;; We do not enter foreign groups into the list of dead
- ;; groups.
- (unless (gnus-group-foreign-p group)
- (if (= level gnus-level-zombie)
- (push group gnus-zombie-list)
- (if (= oldlevel gnus-level-killed)
- ;; Remove from active hashtb.
- (unintern group gnus-active-hashtb)
- ;; Don't add it into killed-list if it was killed.
- (push group gnus-killed-list)))))
+ (if (= level gnus-level-zombie)
+ (push group gnus-zombie-list)
+ (if (= oldlevel gnus-level-killed)
+ ;; Remove from active hashtb.
+ (unintern group gnus-active-hashtb)
+ ;; Don't add it into killed-list if it was killed.
+ (push group gnus-killed-list))))
(t
;; If the list is to be entered into the newsrc assoc, and
;; it was killed, we have to create an entry in the newsrc
=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el 2011-03-03 13:21:50 +0000
+++ b/lisp/gnus/nnimap.el 2011-03-08 14:26:05 +0000
@@ -1545,10 +1545,11 @@
refid refid value)))))
(result (with-current-buffer (nnimap-buffer)
(nnimap-command "UID SEARCH %s" cmd))))
- (gnus-fetch-headers
- (and (car result) (delete 0 (mapcar #'string-to-number
- (cdr (assoc "SEARCH" (cdr result))))))
- nil t)))
+ (when result
+ (gnus-fetch-headers
+ (and (car result) (delete 0 (mapcar #'string-to-number
+ (cdr (assoc "SEARCH" (cdr
result))))))
+ nil t))))
(defun nnimap-possibly-change-group (group server)
(let ((open-result t))
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2011-02-09 22:16:29 +0000
+++ b/lisp/gnus/shr.el 2011-03-08 14:26:05 +0000
@@ -53,17 +53,17 @@
:group 'shr
:type 'regexp)
-(defcustom shr-table-horizontal-line ?-
+(defcustom shr-table-horizontal-line ?
"Character used to draw horizontal table lines."
:group 'shr
:type 'character)
-(defcustom shr-table-vertical-line ?|
+(defcustom shr-table-vertical-line ?
"Character used to draw vertical table lines."
:group 'shr
:type 'character)
-(defcustom shr-table-corner ?+
+(defcustom shr-table-corner ?
"Character used to draw table corners."
:group 'shr
:type 'character)
=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2011-02-13 00:25:29 +0000
+++ b/lisp/gnus/sieve-manage.el 2011-03-08 14:26:05 +0000
@@ -275,9 +275,10 @@
(with-current-buffer buffer
(let* ((auth-info (auth-source-search :host sieve-manage-server
:port "sieve"
- :max 1))
- (user-name (plist-get (nth 0 auth-info) :user))
- (user-password (plist-get (nth 0 auth-info) :secret))
+ :max 1
+ :create t))
+ (user-name (or (plist-get (nth 0 auth-info) :user) ""))
+ (user-password (or (plist-get (nth 0 auth-info) :secret) ""))
(user-password (if (functionp user-password)
(funcall user-password)
user-password))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103592: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=