From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 25 Dec 2015 07:31:10 +0000 (+0100)
Subject: More eww file name coding fixes
X-Git-Tag: emacs-25.0.90~386
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e59b2ee8cdfe75785f3e49acd9a03db784114763;p=emacs.git

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)
---

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