Commit 9ed5a258 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

Merge changes made in No Gnus

shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix (bug#10732).
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).
gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary buffer if `gnus-kill-summary-on-exit' is nil.
parent 32dbaef2
2012-02-07 Lars Ingebrigtsen <larsi@gnus.org>
* shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
(bug#10732).
* 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 <larsi@gnus.org>
* 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 <yamaoka@jpl.org>
 
* gnus-sum.el (gnus-summary-show-thread):
......
......@@ -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)
(gnus-deaden-summary)
(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
......
......@@ -267,7 +267,8 @@ Like rgb() or hsl()."
(t
nil))))
(defun set-minimum-interval (val1 val2 min max interval &optional fixed)
(defun shr-color-set-minimum-interval (val1 val2 min max interval
&optional fixed)
"Set minimum interval between VAL1 and VAL2 to INTERVAL.
The values are bound by MIN and MAX.
If FIXED is t, then VAL1 will not be touched."
......@@ -341,9 +342,9 @@ color will be adapted to be visible on BG."
(>= luminance-distance shr-color-visible-luminance-min))
(list bg fg)
;; Not visible, try to change luminance to make them visible
(let ((Ls (set-minimum-interval (car bg-lab) (car fg-lab) 0 100
shr-color-visible-luminance-min
fixed-background)))
(let ((Ls (shr-color-set-minimum-interval
(car bg-lab) (car fg-lab) 0 100
shr-color-visible-luminance-min fixed-background)))
(unless fixed-background
(setcar bg-lab (car Ls)))
(setcar fg-lab (cadr Ls))
......
......@@ -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,12 +140,29 @@ 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)
(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.
......
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