summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2015-12-25 08:31:10 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2015-12-25 17:05:39 +0100
commite59b2ee8cdfe75785f3e49acd9a03db784114763 (patch)
treeca269bdf50ad92f40c244f4115620242ca7f3728 /lisp/net
parent6c12691a4becc7cecc208bd95f8e99afe81d9469 (diff)
downloademacs-e59b2ee8cdfe75785f3e49acd9a03db784114763.tar.gz
More eww file name coding fixes
* eww.el (eww-decode-url-file-name): Use the base coding system to check for encodability. Backport: (cherry picked from commit a8627008abe4ab339df19b417776da28b3ce0fc7)
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/eww.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 5da7c4929c0..29b4b876465 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1426,8 +1426,8 @@ Differences in #targets are ignored."
(car (detect-coding-string binary))))))
(encodes (find-coding-systems-string decoded)))
(if (or (equal encodes '(undecided))
- (memq (or file-name-coding-system
- default-file-name-coding-system)
+ (memq (coding-system-base (or file-name-coding-system
+ default-file-name-coding-system))
encodes))
decoded
;; If we can't encode the decoded file name (due to language