diff options
| author | Lars Ingebrigtsen | 2015-12-25 08:31:10 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2015-12-25 17:05:39 +0100 |
| commit | e59b2ee8cdfe75785f3e49acd9a03db784114763 (patch) | |
| tree | ca269bdf50ad92f40c244f4115620242ca7f3728 | |
| parent | 6c12691a4becc7cecc208bd95f8e99afe81d9469 (diff) | |
| download | emacs-e59b2ee8cdfe75785f3e49acd9a03db784114763.tar.gz emacs-e59b2ee8cdfe75785f3e49acd9a03db784114763.zip | |
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)
| -rw-r--r-- | lisp/net/eww.el | 4 |
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." | |||
| 1426 | (car (detect-coding-string binary)))))) | 1426 | (car (detect-coding-string binary)))))) |
| 1427 | (encodes (find-coding-systems-string decoded))) | 1427 | (encodes (find-coding-systems-string decoded))) |
| 1428 | (if (or (equal encodes '(undecided)) | 1428 | (if (or (equal encodes '(undecided)) |
| 1429 | (memq (or file-name-coding-system | 1429 | (memq (coding-system-base (or file-name-coding-system |
| 1430 | default-file-name-coding-system) | 1430 | default-file-name-coding-system)) |
| 1431 | encodes)) | 1431 | encodes)) |
| 1432 | decoded | 1432 | decoded |
| 1433 | ;; If we can't encode the decoded file name (due to language | 1433 | ;; If we can't encode the decoded file name (due to language |