]> git.eshelyaron.com Git - emacs.git/commitdiff
More eww file name coding fixes
authorLars Ingebrigtsen <larsi@gnus.org>
Fri, 25 Dec 2015 07:31:10 +0000 (08:31 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Fri, 25 Dec 2015 16:05:39 +0000 (17:05 +0100)
* eww.el (eww-decode-url-file-name): Use the base coding
system to check for encodability.

Backport:

(cherry picked from commit a8627008abe4ab339df19b417776da28b3ce0fc7)

lisp/net/eww.el

index 5da7c4929c0c04f98b0da51cfcb8acb0c3d30a33..29b4b876465ef2246b08d59f08ed72ab182400f7 100644 (file)
@@ -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