diff options
| author | Juri Linkov <juri@jurta.org> | 2005-03-19 20:00:36 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2005-03-19 20:00:36 +0000 |
| commit | 0ee6e7b7c2478b2967e448069f429618e1f779b2 (patch) | |
| tree | 328406e8f35ab53e32d32a70f6c35ba3fbad17f7 /lisp | |
| parent | e3668698dcf8a475c5ed2605cc286d42e275aa33 (diff) | |
| download | emacs-0ee6e7b7c2478b2967e448069f429618e1f779b2.tar.gz | |
(auto-mode-alist): Add comment. Optimize jar/ear/war.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/files.el | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 06c7aa39734..a756e8cf475 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-03-19 Juri Linkov <juri@jurta.org> + + * files.el (auto-mode-alist): Add comment. Optimize jar/ear/war. + + * international/mule.el (auto-coding-alist): Sync with + `auto-mode-alist' by adding upper case archive file extensions + and adding ear/war to jar extension. + 2005-03-19 David Casperson <casper@unbc.ca> (tiny change) * textmodes/tex-mode.el (tex-view): If tex-shell process is not diff --git a/lisp/files.el b/lisp/files.el index 8099c7f1b40..1921c959bf9 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1775,8 +1775,10 @@ in that case, this function acts as if `enable-local-variables' were t." ("\\.pro\\'" . idlwave-mode) ("\\.prolog\\'" . prolog-mode) ("\\.tar\\'" . tar-mode) - ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|ear\\|jar\\|war\\)\\'" . archive-mode) - ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|EAR\\|JAR\\|WAR\\)\\'" . archive-mode) + ;; The list of archive file extensions should be in sync with + ;; `auto-coding-alist' with `no-conversion' coding system. + ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\)\\'" . archive-mode) + ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\)\\'" . archive-mode) ("\\.sx[dmicw]\\'" . archive-mode) ; OpenOffice.org ;; Mailer puts message to be edited in ;; /tmp/Re.... or Message |