From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Oct 2008 07:19:34 +0000 (+0000)
Subject: (jka-compr-compression-info-list)
X-Git-Tag: emacs-pretest-23.0.90~2671
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f34ccdf9c165571d8c5f4f4be42b1fbc69cff39;p=emacs.git

(jka-compr-compression-info-list)
(jka-compr-mode-alist-additions): Also match `.tbz2'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e46f35d184..fc861509adc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-03  Glenn Morris  <rgm@gnu.org>
 
+	* jka-cmpr-hook.el (jka-compr-compression-info-list)
+	(jka-compr-mode-alist-additions): Also match `.tbz2'.
+
 	* progmodes/idlwave.el (auto-mode-alist): Remove unnecessary autoload.
 	* files.el (auto-mode-alist): Add .PRO as per above autoload.
 
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 3377fed04c9..8ea83f996a9 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -207,7 +207,7 @@ options through Custom does this automatically."
      "bzip2ing"        "bzip2"         nil
      "bunzip2ing"      "bzip2"         ("-d")
      nil t "BZh"]
-    ["\\.tbz\\'"
+    ["\\.tbz2?\\'"
      "bzip2ing"        "bzip2"         nil
      "bunzip2ing"      "bzip2"         ("-d")
      nil nil "BZh"]
@@ -286,7 +286,7 @@ variables.  Setting this through Custom does that automatically."
   :group 'jka-compr)
 
 (defcustom jka-compr-mode-alist-additions
-  (list (cons "\\.tgz\\'" 'tar-mode) (cons "\\.tbz\\'" 'tar-mode))
+  (list (cons "\\.tgz\\'" 'tar-mode) (cons "\\.tbz2?\\'" 'tar-mode))
   "List of pairs added to `auto-mode-alist' when installing jka-compr.
 Uninstalling jka-compr removes all pairs from `auto-mode-alist' that
 installing added.