Mercurial > emacs

diff lisp/international/mule.el @ 83490:0cdee8b991e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-144 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-145 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-146 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-147 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-148 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-149 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-150 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-151 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-152 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-56 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-57 Copy/update icons from Gnus trunk git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-530
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 12 Mar 2006 04:51:49 +0000
parents 9b150bc96d33 f4bef16905cb
children b901f4f12f33
line wrap: on
line diff
--- a/lisp/international/mule.el	Sun Mar 12 04:16:48 2006 +0000
+++ b/lisp/international/mule.el	Sun Mar 12 04:51:49 2006 +0000
@@ -1576,7 +1576,7 @@
 (defcustom auto-coding-alist
   '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion)
     ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion)
-    ("\\.\\(sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion)
+    ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
     ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
     ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
     ("/#[^/]+#\\'" . emacs-mule))