aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2005-03-28 01:40:34 +0000
committerJuri Linkov2005-03-28 01:40:34 +0000
commitba40634b4f2bf06fdd8f1ec26073d73b8d58fdb0 (patch)
tree6447388b6763120d0fffefd17f8a6adca6dc42c4
parent853f9bf3015c0e8a8d73b0bf7ba80f36d9da52fb (diff)
downloademacs-ba40634b4f2bf06fdd8f1ec26073d73b8d58fdb0.tar.gz
emacs-ba40634b4f2bf06fdd8f1ec26073d73b8d58fdb0.zip
(auto-coding-alist): Associate non-ascii
image filename extensions with `no-conversion'.
-rw-r--r--lisp/ChangeLog34
-rw-r--r--lisp/international/mule.el1
2 files changed, 35 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59888da5284..62f84d0ce41 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
12005-03-28 Juri Linkov <juri@jurta.org>
2
3 * dired.el (dired-mode-map): Add ellipsis to "Compare directories".
4
5 * menu-bar.el (menu-bar-file-menu): Remove ellipsis from
6 "Recover Crashed Session".
7 (menu-bar-search-menu): Add ellipsis to "Search tagged files".
8 (menu-bar-replace-menu): Add ellipsis to "Replace in tagged files".
9 (menu-bar-goto-menu): Add ellipsis to "Set Tags File Name".
10 (menu-bar-goto-menu): Add ellipsis to "Tags Apropos".
11 (menu-bar-options-menu): Add ellipsis to "Set Font/Fontset".
12 (menu-bar-manuals-menu): Add ellipsis to "Find Command in Manual".
13 (menu-bar-manuals-menu): Add ellipsis to "Find Key in Manual".
14 (menu-bar-help-menu): Remove ellipsis from "Find Emacs Packages".
15
16 * ediff-hook.el (menu-bar-ediff-misc-menu, ediff-misc-menu):
17 Remove ellipsis from "Ediff Manual", "Customize Ediff", "List
18 Ediff Sessions", "Toggle use of separate control buffer frame",
19 "Use separate frame for Ediff control buffer".
20
21 * bookmark.el (menu-bar-bookmark-map): Add ellipsis to "Jump to
22 Bookmark", "Set Bookmark", "Insert Contents", "Insert Location",
23 "Rename Bookmark", "Delete Bookmark".
24
25 * info.el (Info-mode-menu): Remove ellipsis from "Index".
26 Add ellipsis to "Lookup a String", "Lookup a string in all indices".
27 Add `:active Info-index-alternatives' to "Next Matching Item".
28
29 * wdired.el (wdired-change-to-wdired-mode):
30 Mention `wdired-abort-changes' key in the initial message.
31
32 * international/mule.el (auto-coding-alist): Associate non-ascii
33 image filename extensions with `no-conversion'.
34
12005-03-26 Luc Teirlinck <teirllm@auburn.edu> 352005-03-26 Luc Teirlinck <teirllm@auburn.edu>
2 36
3 * textmodes/sgml-mode.el (html-mode): Doc update. 37 * textmodes/sgml-mode.el (html-mode): Doc update.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1ec546e22fd..49635652bb2 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1546,6 +1546,7 @@ text, and convert it in the temporary buffer. Otherwise, convert in-place."
1546 ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion) 1546 ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion)
1547 ("\\.\\(sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion) 1547 ("\\.\\(sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion)
1548 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) 1548 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
1549 ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
1549 ("/#[^/]+#\\'" . emacs-mule)) 1550 ("/#[^/]+#\\'" . emacs-mule))
1550 "Alist of filename patterns vs corresponding coding systems. 1551 "Alist of filename patterns vs corresponding coding systems.
1551Each element looks like (REGEXP . CODING-SYSTEM). 1552Each element looks like (REGEXP . CODING-SYSTEM).