[Emacs-diffs] /srv/bzr/emacs/trunk r101793: shr.el: Revert last change.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101793
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-05 01:23:11 +0000
message:
  shr.el: Revert last change.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-05 00:44:05 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-05 01:23:11 +0000
@@ -1,9 +1,3 @@
-2010-10-05  Katsumi Yamaoka  <address@hidden>
-
-       * 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  <address@hidden>
 
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-05 00:44:05 +0000
+++ b/lisp/gnus/shr.el  2010-10-05 01:23:11 +0000
@@ -191,25 +191,6 @@
        (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 @@
        ((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)