[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111124: etags.el fix for compress
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111124: etags.el fix for compressed files |
Date: |
Wed, 02 Jan 2013 18:54:10 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111124
fixes bug: http://debbugs.gnu.org/13338
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-01-02 18:54:10 -0800
message:
etags.el fix for compressed files
* lisp/progmodes/etags.el (tags-compression-info-list): Doc fix.
(tag-find-file-of-tag-noselect):
Check auto-compression-mode rather than 'jka-compr being loaded.
modified:
lisp/ChangeLog
lisp/progmodes/etags.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-03 00:50:35 +0000
+++ b/lisp/ChangeLog 2013-01-03 02:54:10 +0000
@@ -1,5 +1,9 @@
2013-01-03 Glenn Morris <address@hidden>
+ * progmodes/etags.el (tags-compression-info-list): Doc fix.
+ (tag-find-file-of-tag-noselect): Check auto-compression-mode
+ rather than 'jka-compr being loaded. (Bug#13338)
+
* subr.el (eval-after-load): Don't purecopy the form, so that it
can be nconc'd later on; reverts 2009-11-11 change. (Bug#13331)
=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/etags.el 2013-01-03 02:54:10 +0000
@@ -67,11 +67,8 @@
;;;###autoload
(defcustom tags-compression-info-list
(purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
- "List of extensions tried by etags when jka-compr is used.
-An empty string means search the non-compressed file.
-These extensions will be tried only if jka-compr was activated
-\(i.e. via customize of `auto-compression-mode' or by calling the function
-`auto-compression-mode')."
+ "List of extensions tried by etags when `auto-compression-mode' is on.
+An empty string means search the non-compressed file."
:version "24.1" ; added xz
:type '(repeat string)
:group 'etags)
@@ -1180,7 +1177,7 @@
"Find the right line in the specified FILE."
;; If interested in compressed-files, search files with extensions.
;; Otherwise, search only the real file.
- (let* ((buffer-search-extensions (if (featurep 'jka-compr)
+ (let* ((buffer-search-extensions (if auto-compression-mode
tags-compression-info-list
'("")))
the-buffer
@@ -1204,7 +1201,7 @@
(setq file-search-extensions (cdr file-search-extensions))
(setq the-buffer (find-file-noselect (concat file (car
file-search-extensions))))))
(if (not the-buffer)
- (if (featurep 'jka-compr)
+ (if auto-compression-mode
(error "File %s (with or without extensions %s) not found" file
tags-compression-info-list)
(error "File %s not found" file))
(set-buffer the-buffer))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111124: etags.el fix for compressed files,
Glenn Morris <=