aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-05-16 18:36:30 +0000
committerEli Zaretskii2006-05-16 18:36:30 +0000
commit9247c2f2c3f47071b9660618549003a4702e3afb (patch)
treebe20a1a2593983caaa3adb9d0b34d1758f35ce0b
parent03210c3ae665e37b61960b5de473ea6582a9b59f (diff)
downloademacs-9247c2f2c3f47071b9660618549003a4702e3afb.tar.gz
emacs-9247c2f2c3f47071b9660618549003a4702e3afb.zip
(auto-coding-alist): Add .lha to files read with no-conversion.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/mule.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f7f52b637b..57158e5e9b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12006-05-16 Eli Zaretskii <eliz@gnu.org> 12006-05-16 Eli Zaretskii <eliz@gnu.org>
2 2
3 * international/mule.el (auto-coding-alist): Add .lha to files
4 read with no-conversion.
5
6 * files.el (auto-mode-alist): Add .lha files to archive file
7 extensions.
8
3 * arc-mode.el (archive-arc-summarize, archive-lzh-summarize): 9 * arc-mode.el (archive-arc-summarize, archive-lzh-summarize):
4 Convert csize to integer when computing offsets within the 10 Convert csize to integer when computing offsets within the
5 compressed archive file. 11 compressed archive file.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 2a88c198a79..350b6347b42 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1567,8 +1567,8 @@ text, and convert it in the temporary buffer. Otherwise, convert in-place."
1567;;; FILE I/O 1567;;; FILE I/O
1568 1568
1569(defcustom auto-coding-alist 1569(defcustom auto-coding-alist
1570 '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion) 1570 '(("\\.\\(arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion)
1571 ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion) 1571 ("\\.\\(ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion)
1572 ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) 1572 ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
1573 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) 1573 ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
1574 ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) 1574 ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)