diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-01-02 18:54:10 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-01-02 18:54:10 -0800 |
| commit | 220740a35be2a87e7d3fdcf42fe710017d0d067a (patch) | |
| tree | 564772c5db3a08e41bb0d03160100ad05f075d0a | |
| parent | 75e78d1e904bde7eae13b78202f99081543701dc (diff) | |
| download | emacs-220740a35be2a87e7d3fdcf42fe710017d0d067a.tar.gz | |
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.
Fixes: debbugs:13338
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/etags.el | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04ba7f802ca..34c13ad67fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-01-03 Glenn Morris <rgm@gnu.org> + * 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) diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 3799fbc1e2d..dc16a2ce762 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -67,11 +67,8 @@ Use the `etags' program to make a tags table file." ;;;###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 @@ error message." "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 @@ error message." (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)))) |