From f9fcf84a9c6e7a4510a60b41c29cadbef817af14 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 24 Nov 2014 16:58:37 +0100 Subject: [PATCH] * net/eww.el (eww-set-character-encoding): Use `read-coding-system'. --- lisp/ChangeLog | 4 ++++ lisp/net/eww.el | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) 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 + + * net/eww.el (eww-set-character-encoding): Use `read-coding-system'. + 2014-11-24 Leo Liu * 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 -- 2.39.5