procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shr.el: Revert last change.

Browse source
This commit is contained in:
Katsumi Yamaoka 2010-10-05 01:23:11 +00:00
parent ca1bd56c49
commit 97ab3539e0
2 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/gnus/ChangeLog
View file

@ -1,9 +1,3 @@
2010-10-05 Katsumi Yamaoka <yamaoka@jpl.org>
* shr.el (shr-encode-url-chars): New function, that's an alias to
browse-url-url-encode-chars or a copy of it.
(shr-tag-img): Use it.
2010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.

21
lisp/gnus/shr.el
View file

@ -191,25 +191,6 @@ redirects somewhere else."
(copy-region-as-kill (point-min) (point-max))
(message "Copied %s" url))))))
(eval-and-compile
(defalias 'shr-encode-url-chars
;; Neither Emacs 22 nor XEmacs provides this function.
(if (fboundp 'browse-url-url-encode-chars)
'browse-url-url-encode-chars
(lambda (text chars)
"URL-encode the chars in TEXT that match CHARS.
CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
(let ((encoded-text (copy-sequence text))
(s 0))
(while (setq s (string-match chars encoded-text s))
(setq encoded-text
(replace-match (format "%%%x"
(string-to-char
(match-string 0 encoded-text)))
t t encoded-text)
s (1+ s)))
encoded-text)))))
(defun shr-tag-img (cont)
(when (and (> (current-column) 0)
(not (eq shr-state 'image)))
@ -223,7 +204,7 @@ CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
((and shr-blocked-images
(string-match shr-blocked-images url))
(insert alt))
((url-is-cached (shr-encode-url-chars url "[&)$ ]"))
((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
(shr-put-image (shr-get-image-data url) (point) alt))
(t
(insert alt)