mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Fix for jka-compr-compression-info-list not including version extension

Browse source 
* 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
This commit is contained in:
Glenn Morris 2012-11-28 00:37:38 -08:00
parent 8ecba97da2
commit 6247eff516
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2012-11-28 Glenn Morris <rgm@gnu.org>
* jka-cmpr-hook.el (jka-compr-get-compression-info):
Remove any version extension before checking filename. (Bug#13006)
(jka-compr-compression-info-list): Belated :version bump.
2012-11-28 Chong Yidong <cyd@gnu.org> 2012-11-28 Chong Yidong <cyd@gnu.org>
* simple.el (transient-mark-mode): Doc fix (Bug#11523). * simple.el (transient-mark-mode): Doc fix (Bug#11523).

15
lisp/jka-cmpr-hook.el
View file

@ -109,6 +109,7 @@ Otherwise, it is nil.")
"Return information about the compression scheme of FILENAME. "Return information about the compression scheme of FILENAME.
The determination as to which compression scheme, if any, to use is The determination as to which compression scheme, if any, to use is
based on the filename itself and `jka-compr-compression-info-list'." based on the filename itself and `jka-compr-compression-info-list'."
(setq filename (file-name-sans-versions filename))
(catch 'compression-info (catch 'compression-info
(let ((case-fold-search nil)) (let ((case-fold-search nil))
(dolist (x jka-compr-compression-info-list) (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 ;; 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. ;; 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 (defcustom jka-compr-compression-info-list
;;[regexp ;;[regexp
;; compr-message compr-prog compr-args ;; compr-message compr-prog compr-args
@ -310,6 +298,7 @@ variables. Setting this through Custom does that automatically."
(boolean :tag "Strip Extension") (boolean :tag "Strip Extension")
(string :tag "Magic Bytes"))) (string :tag "Magic Bytes")))
:set 'jka-compr-set :set 'jka-compr-set
:version "24.1" ; removed version extension piece
:group 'jka-compr) :group 'jka-compr)
(defcustom jka-compr-mode-alist-additions (defcustom jka-compr-mode-alist-additions