aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-01-20 16:42:09 -0800
committerGlenn Morris2012-01-20 16:42:09 -0800
commit117a9ea130c92a79b9b6f2a0bdc5fb297256d19c (patch)
treeaacbcbf7ade9c4e48daceec8183d4c5c236e803c
parent7b447e9bda80e5de478922771a62c2b3a8f9b2aa (diff)
downloademacs-117a9ea130c92a79b9b6f2a0bdc5fb297256d19c.tar.gz
emacs-117a9ea130c92a79b9b6f2a0bdc5fb297256d19c.zip
* lisp/international/mule.el (auto-coding-alist): Add .tbz.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/international/mule.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 248de3429fa..58579e18727 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-01-21 Glenn Morris <rgm@gnu.org> 12012-01-21 Glenn Morris <rgm@gnu.org>
2 2
3 * international/mule.el (auto-coding-alist): Add .tbz.
4
3 * files.el (local-enable-local-variables): Doc fix. 5 * files.el (local-enable-local-variables): Doc fix.
4 (inhibit-local-variables-regexps): Rename from 6 (inhibit-local-variables-regexps): Rename from
5 inhibit-first-line-modes-regexps. Keep old name as obsolete alias. 7 inhibit-first-line-modes-regexps. Keep old name as obsolete alias.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 17163071d3f..d4dd4e4cf24 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1668,6 +1668,7 @@ in-place."
1668 1668
1669;;; FILE I/O 1669;;; FILE I/O
1670 1670
1671;; TODO many elements of this list are also in inhibit-local-variables-regexps.
1671(defcustom auto-coding-alist 1672(defcustom auto-coding-alist
1672 ;; .exe and .EXE are added to support archive-mode looking at DOS 1673 ;; .exe and .EXE are added to support archive-mode looking at DOS
1673 ;; self-extracting exe archives. 1674 ;; self-extracting exe archives.
@@ -1677,7 +1678,7 @@ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\
1677ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" 1678ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'"
1678 . no-conversion-multibyte) 1679 . no-conversion-multibyte)
1679 ("\\.\\(exe\\|EXE\\)\\'" . no-conversion) 1680 ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
1680 ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) 1681 ("\\.\\(sx[dmicw]\\|odt\\|tar\\|t[bg]z\\)\\'" . no-conversion)
1681 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) 1682 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion)
1682 ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) 1683 ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
1683 ("\\.pdf\\'" . no-conversion) 1684 ("\\.pdf\\'" . no-conversion)