summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2006-05-16 Eli Zaretskii <eliz@gnu.org>
+ * international/mule.el (auto-coding-alist): Add .lha to files
+ read with no-conversion.
+
+ * files.el (auto-mode-alist): Add .lha files to archive file
+ extensions.
+
* arc-mode.el (archive-arc-summarize, archive-lzh-summarize):
Convert csize to integer when computing offsets within the
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."
;;; FILE I/O
(defcustom auto-coding-alist
- '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion)
- ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion)
+ '(("\\.\\(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)
("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)