[gnus git] branch no-gnus updated: m0-1-31-g2242095 =5= Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus ; Clean up trailing whitespace after rendering HTML in shr ; Add a couple of shr doc strings ; Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus ; Fix `Q' exit if gnus-kill-summary-on-exit is nil
Lars Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 224209579a4bbad483f41f7af6840fe1a81d8130 (commit)
via 67fc712d14c42ac2054b5832e0cc9ab75719c012 (commit)
via 16a0858372cf8354e99a8cd8573fcdde6d590967 (commit)
via 487eaccc11897a46d4cff958e806a1b81f83f232 (commit)
via f28b4a98c178b664ade7a6218db5b3ba61d81593 (commit)
from 388955e8f64041c33046fa14411fbef36d890eb8 (commit)
- Log -----------------------------------------------------------------
commit 224209579a4bbad483f41f7af6840fe1a81d8130
Merge: 67fc712 388955e
Author: Lars Ingebrigtsen <[email protected]>
Date: Tue Feb 7 01:22:03 2012 +0100
Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus
diff --cc lisp/ChangeLog
index cc5ac49,9e92a53..2306e82
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,16 -1,8 +1,21 @@@
+2012-02-07 Lars Ingebrigtsen <[email protected]>
+
+ * shr.el (shr-insert-document): Add doc string.
+ (shr-visit-file): Ditto.
+ (shr-remove-trailing-whitespace): New function.
+ (shr-insert-document): Use it to clean up trailing whitespace as the
+ final step (bug#10714).
+
+2012-02-06 Lars Ingebrigtsen <[email protected]>
+
+ * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
+ buffer if `gnus-kill-summary-on-exit' is nil.
+
+ 2012-02-06 Katsumi Yamaoka <[email protected]>
+
+ * gnus-sum.el (gnus-summary-show-thread):
+ next-single-char-property-change may return nil in XEmacs.
+
2012-02-06 Lars Ingebrigtsen <[email protected]>
* gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus
commit 67fc712d14c42ac2054b5832e0cc9ab75719c012
Author: Lars Ingebrigtsen <[email protected]>
Date: Tue Feb 7 01:14:40 2012 +0100
Clean up trailing whitespace after rendering HTML in shr
(shr-remove-trailing-whitespace): New function.
(shr-insert-document): Use it to clean up trailing whitespace as the
final step (bug#10714).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7283576..cc5ac49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
* shr.el (shr-insert-document): Add doc string.
(shr-visit-file): Ditto.
+ (shr-remove-trailing-whitespace): New function.
+ (shr-insert-document): Use it to clean up trailing whitespace as the
+ final step (bug#10714).
2012-02-06 Lars Ingebrigtsen <[email protected]>
diff --git a/lisp/shr.el b/lisp/shr.el
index 26755f8..deaef1d 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -144,11 +144,25 @@ cid: URL as the argument.")
DOM should be a parse tree as generated by
`libxml-parse-html-region' or similar."
(setq shr-content-cache nil)
- (let ((shr-state nil)
+ (let ((start (point))
+ (shr-state nil)
(shr-start nil)
(shr-base nil)
(shr-width (or shr-width (window-width))))
- (shr-descend (shr-transform-dom dom))))
+ (shr-descend (shr-transform-dom dom))
+ (shr-remove-trailing-whitespace start (point))))
+
+(defun shr-remove-trailing-whitespace (start end)
+ (save-restriction
+ (narrow-to-region start end)
+ (delete-trailing-whitespace)
+ (goto-char start)
+ (while (not (eobp))
+ (end-of-line)
+ (dolist (overlay (overlays-at (point)))
+ (when (overlay-get overlay 'before-string)
+ (overlay-put overlay 'before-string nil)))
+ (forward-line 1))))
(defun shr-copy-url ()
"Copy the URL under point to the kill ring.
commit 16a0858372cf8354e99a8cd8573fcdde6d590967
Author: Lars Ingebrigtsen <[email protected]>
Date: Tue Feb 7 01:05:56 2012 +0100
Add a couple of shr doc strings
* shr.el (shr-insert-document): Add doc string.
(shr-visit-file): Ditto.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7004ae6..7283576 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07 Lars Ingebrigtsen <[email protected]>
+
+ * shr.el (shr-insert-document): Add doc string.
+ (shr-visit-file): Ditto.
+
2012-02-06 Lars Ingebrigtsen <[email protected]>
* gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
diff --git a/lisp/shr.el b/lisp/shr.el
index acce766..26755f8 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -128,6 +128,7 @@ cid: URL as the argument.")
;; Public functions and commands.
(defun shr-visit-file (file)
+ "Parse FILE as an HTML document, and render it in a new buffer."
(interactive "fHTML file name: ")
(pop-to-buffer "*html*")
(erase-buffer)
@@ -139,6 +140,9 @@ cid: URL as the argument.")
;;;###autoload
(defun shr-insert-document (dom)
+ "Render the parsed document DOM into the current buffer.
+DOM should be a parse tree as generated by
+`libxml-parse-html-region' or similar."
(setq shr-content-cache nil)
(let ((shr-state nil)
(shr-start nil)
commit 487eaccc11897a46d4cff958e806a1b81f83f232
Merge: f28b4a9 3bba4fb
Author: Lars Ingebrigtsen <[email protected]>
Date: Mon Feb 6 23:46:19 2012 +0100
Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus
diff --cc lisp/ChangeLog
index 1a5929d,051d0ae..7004ae6
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
2012-02-06 Lars Ingebrigtsen <[email protected]>
+ * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
+ buffer if `gnus-kill-summary-on-exit' is nil.
+
++2012-02-06 Lars Ingebrigtsen <[email protected]>
++
+ * gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus
+ when just reading a single group from "without" Gnus.
+
+ 2012-02-06 Chong Yidong <[email protected]>
+
+ * gnus-sum.el (gnus-summary-show-thread):
+ next-single-char-property-change never returns nil (Bug#8657).
+
2012-02-05 Lars Ingebrigtsen <[email protected]>
* nnimap.el (nnimap-open-server): Allow switching the nnoo server
commit f28b4a98c178b664ade7a6218db5b3ba61d81593
Author: Lars Ingebrigtsen <[email protected]>
Date: Mon Feb 6 23:20:52 2012 +0100
Fix `Q' exit if gnus-kill-summary-on-exit is nil
* gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
buffer if `gnus-kill-summary-on-exit' is nil.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c48f08c..1a5929d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06 Lars Ingebrigtsen <[email protected]>
+
+ * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
+ buffer if `gnus-kill-summary-on-exit' is nil.
+
2012-02-05 Lars Ingebrigtsen <[email protected]>
* nnimap.el (nnimap-open-server): Allow switching the nnoo server
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d0a582e..d4fdfeb 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7328,9 +7328,11 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(gnus-kill-buffer gnus-original-article-buffer)
(setq gnus-article-current nil))
;; Return to the group buffer.
- (gnus-configure-windows 'group 'force)
(if (not gnus-kill-summary-on-exit)
+ (progn
(gnus-deaden-summary)
+ (gnus-configure-windows 'group 'force))
+ (gnus-configure-windows 'group 'force)
(gnus-close-group group)
(gnus-kill-buffer gnus-summary-buffer))
(unless gnus-single-article-buffer
-----------------------------------------------------------------------
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 | 13 +++++++++++++
lisp/gnus-sum.el | 6 ++++--
lisp/shr.el | 22 ++++++++++++++++++++--
3 files changed, 37 insertions(+), 4 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, no-gnus has been updated
hooks/post-receive
--
Gnus Project