[gnus git] branch master updated: n0-13-83-g1a2936c =4= Change the defaults for the table lines to be spaces instead. ; Resolve conflicts. ; Allow putting foreign groups onto the list of killed groups, too. ; (nnimap-request-thread): Don't bug out when we can't find the parent.

       via  1a2936cbc8b4b584becd8426ac4959957e0595fd (commit)
       via  b3978870c8ca17817da4b31c04f93504997a6822 (commit)
       via  f94ce3ddf1d8752e29f0c67c4bb8c6a5a69fc452 (commit)
       via  6fd1d2d46eb91ff219b0d410adecc4c4352c5120 (commit)
      from  b94e6917956f748007b46c54f2bed607fd71f6c7 (commit)


- Log -----------------------------------------------------------------
commit 1a2936cbc8b4b584becd8426ac4959957e0595fd
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Mar 7 17:35:46 2011 +0100

    Change the defaults for the table lines to be spaces instead.

diff --git a/lisp/shr.el b/lisp/shr.el
index bb9695e..c9c5bd5 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -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)

commit b3978870c8ca17817da4b31c04f93504997a6822
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Mar 7 17:36:22 2011 +0100

    Resolve conflicts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ee96a6..e3afe7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* shr.el (shr-table-horizontal-line): Change the defaults for the table
+	lines to be spaces instead.
+
 2011-03-07  Julien Danjou  <[email protected]>
 
 	* sieve-manage.el (sieve-sasl-auth): Create auth-info if not found.

commit f94ce3ddf1d8752e29f0c67c4bb8c6a5a69fc452
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sat Mar 5 13:20:20 2011 +0100

    Allow putting foreign groups onto the list of killed groups, too.
    
    This makes killed nnimap groups, for instance, more reliably not
    reappear.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e899424..6ee96a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -18,6 +18,10 @@
 
 2011-03-05  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* 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.
 
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index ebfa53f..c6ff604 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -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)))))
+	    (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

commit 6fd1d2d46eb91ff219b0d410adecc4c4352c5120
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sat Mar 5 12:24:08 2011 +0100

    (nnimap-request-thread): Don't bug out when we can't find the parent.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3922baf..e899424 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -18,6 +18,9 @@
 
 2011-03-05  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* 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
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index aa4ecbc..638097a 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1545,10 +1545,11 @@ textual parts.")
 			       refid refid value)))))
 	 (result (with-current-buffer (nnimap-buffer)
 		   (nnimap-command  "UID SEARCH %s" cmd))))
+    (when result
     (gnus-fetch-headers
      (and (car result) (delete 0 (mapcar #'string-to-number
 					 (cdr (assoc "SEARCH" (cdr result))))))
-     nil t)))
+       nil t))))
 
 (defun nnimap-possibly-change-group (group server)
   (let ((open-result t))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog     |   12 ++++++++++++
 lisp/gnus-start.el |   17 +++++++----------
 lisp/nnimap.el     |    9 +++++----
 lisp/shr.el        |    6 +++---
 4 files changed, 27 insertions(+), 17 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project