Commit a5057546 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka

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.
parent b511b994
2011-03-07 Antoine Levitt <antoine.levitt@gmail.com>
* message.texi (Message Buffers): Update default value of
message-generate-new-buffers.
2011-03-06 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
......
......@@ -2298,8 +2298,7 @@ created.
@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 @@ type, the To address and the group name (any of these may be
@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
......
2011-03-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-table-horizontal-line): Change the defaults for the table
lines to be spaces instead.
2011-03-07 Julien Danjou <julien@danjou.info>
* 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 <antoine.levitt@gmail.com>
* gnus.el (gnus-interactive): Use read-directory-name.
......@@ -12,6 +23,13 @@
2011-03-05 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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
......
......@@ -1306,16 +1306,13 @@ for new groups, and subscribe the new groups as zombies."
((>= 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
......
......@@ -1545,10 +1545,11 @@ textual parts.")
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))
......
......@@ -53,17 +53,17 @@ fit these criteria."
: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)
......
......@@ -275,9 +275,10 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
(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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment