diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-28 00:37:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-28 00:37:38 -0800 |
| commit | 6247eff516ed92bf207867a32980cbba02854fa1 (patch) | |
| tree | e87c89a034ad9088919f0f1b58ce3c87e8f2ff1e /lisp/jka-cmpr-hook.el | |
| parent | 8ecba97da2e4bbc8b0ca319de44689ce63dac967 (diff) | |
| download | emacs-6247eff516ed92bf207867a32980cbba02854fa1.tar.gz emacs-6247eff516ed92bf207867a32980cbba02854fa1.tar.bz2 emacs-6247eff516ed92bf207867a32980cbba02854fa1.zip | |
Fix for jka-compr-compression-info-list not including version extension
* lisp/jka-cmpr-hook.el (jka-compr-get-compression-info):
Remove any version extension before checking filename.
(jka-compr-compression-info-list): Belated :version bump.
Fixes: debbugs:13006
Diffstat (limited to 'lisp/jka-cmpr-hook.el')
| -rw-r--r-- | lisp/jka-cmpr-hook.el | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index e4743ada045..75d1bbbad6b 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -109,6 +109,7 @@ Otherwise, it is nil.") "Return information about the compression scheme of FILENAME. The determination as to which compression scheme, if any, to use is based on the filename itself and `jka-compr-compression-info-list'." + (setq filename (file-name-sans-versions filename)) (catch 'compression-info (let ((case-fold-search nil)) (dolist (x jka-compr-compression-info-list) @@ -191,19 +192,6 @@ options through Custom does this automatically." ;; I have this defined so that .Z files are assumed to be in unix ;; compress format; and .gz files, in gzip format, and .bz2 files in bzip fmt. - -;; FIXME? It seems ugly that one has to add "\\(~\\|\\.~[0-9]+~\\)?" to -;; all the regexps here, in order to match backup files etc. -;; It's trivial to modify jka-compr-get-compression-info to match -;; regexps against file-name-sans-versions, but this regexp is also -;; used to build a file-name-handler-alist entry. -;; find-file-name-handler does not use file-name-sans-versions. -;; Perhaps it should, -;; http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00812.html, -;; but it's used all over the place and there are probably other ramifications. -;; One could modify jka-compr-build-file-regexp to add the backup regexp, -;; but jka-compr-compression-info-list is a defcustom to which -;; anything could be added, so it's easiest to leave things as they are. (defcustom jka-compr-compression-info-list ;;[regexp ;; compr-message compr-prog compr-args @@ -310,6 +298,7 @@ variables. Setting this through Custom does that automatically." (boolean :tag "Strip Extension") (string :tag "Magic Bytes"))) :set 'jka-compr-set + :version "24.1" ; removed version extension piece :group 'jka-compr) (defcustom jka-compr-mode-alist-additions |