From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 24 Nov 2014 15:58:37 +0000 (+0100)
Subject: * net/eww.el (eww-set-character-encoding): Use `read-coding-system'.
X-Git-Tag: emacs-25.0.90~2635^2~348
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9fcf84a9c6e7a4510a60b41c29cadbef817af14;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27cde869693..58f2a58a1c6 100644
--- 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 077a00401cc..a607e444fa3 100644
--- 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