Index: mule.el =================================================================== RCS file: /sources/emacs/emacs/lisp/international/mule.el,v retrieving revision 1.254 diff -u -c -r1.254 mule.el cvs diff: conflicting specifications of output style *** mule.el 4 Apr 2007 15:34:59 -0000 1.254 --- mule.el 19 Apr 2007 01:29:58 -0000 *************** *** 1582,1587 **** --- 1582,1591 ---- '(("\\.\\(arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion) ("\\.\\(ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion) ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) + ;; .exe and .EXE no-conversion to support archive-mode looking at DOS + ;; self-extracting exe archives from magic-mode-alist; and in any case + ;; an executable is just bytes + ("\\.\\(exe\\|EXE\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) ("/#[^/]+#\\'" . emacs-mule))