* net/eww.el (eww-set-character-encoding): Use `read-coding-system'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27cde869693812632ae9039078132c4b799c4265..58f2a58a1c6bfe695ad81ddb654209de72011aa0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-set-character-encoding): Use `read-coding-system'.
+
 2014-11-24  Leo Liu  <sdl.web@gmail.com>
 
        * emacs-lisp/macroexp.el (macroexp-let2*): New macro.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 077a00401cc126c12fe053a16ac095edf6c86536..a607e444fa3035c958fc09b542ffcd791b8f9d10 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1385,15 +1385,12 @@ Differences in #targets are ignored."
        (setq count (1+ count)))
       (expand-file-name file directory)))
 
-(defun eww-set-character-encoding (encode)
+(defun eww-set-character-encoding (charset)
   "Set character encoding."
-  (interactive "sSet Character Encoding (default utf-8): ")
-  (cond ((zerop (length encode))
-       (eww-reload 'utf-8))
-       (t
-       (if (not (coding-system-p (intern encode)))
-           (user-error "Invalid encodeing type.")
-         (eww-reload (intern encode))))))
+  (interactive "zUse character set (default utf-8): ")
+  (if (null charset)
+      (eww-reload 'utf-8)
+    (eww-reload charset)))
 
 ;;; Bookmarks code