[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 e59b2ee 12/12: More eww file name coding fixes
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 e59b2ee 12/12: More eww file name coding fixes |
Date: |
Fri, 25 Dec 2015 16:06:03 +0000 |
branch: emacs-25
commit e59b2ee8cdfe75785f3e49acd9a03db784114763
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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)
---
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 5da7c49..29b4b87 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
- [Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images, (continued)
- [Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 90f82ff 03/12: Decode hex-encoded URLs before using them as file names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 ec2a509 06/12: Use cl-reduce, not reduce., Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 96ac314 05/12: Allow several <tbody> tags in shr, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 eeff251 08/12: Don't store cookies with empty names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 5b2401d 07/12: Stop rendering HTML before specdlr exhaustion, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 6c12691 11/12: Always save eww history, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 a7143fa 04/12: Make prettier unique file names in eww, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 2d33a9c 09/12: Make toggling checkboxes work again, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 1a99bd6 10/12: Default web pages to right-to-left, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 e59b2ee 12/12: More eww file name coding fixes,
Lars Ingebrigtsen <=