[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110973: Fix for jka-compr-compres
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110973: Fix for jka-compr-compression-info-list not including version extension |
Date: |
Wed, 28 Nov 2012 00:37:38 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110973
fixes bug: http://debbugs.gnu.org/13006
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-11-28 00:37:38 -0800
message:
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.
modified:
lisp/ChangeLog
lisp/jka-cmpr-hook.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-11-28 07:16:45 +0000
+++ b/lisp/ChangeLog 2012-11-28 08:37:38 +0000
@@ -1,3 +1,9 @@
+2012-11-28 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* simple.el (transient-mark-mode): Doc fix (Bug#11523).
=== modified file 'lisp/jka-cmpr-hook.el'
--- a/lisp/jka-cmpr-hook.el 2012-01-29 17:41:43 +0000
+++ b/lisp/jka-cmpr-hook.el 2012-11-28 08:37:38 +0000
@@ -109,6 +109,7 @@
"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 @@
;; 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 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r110973: Fix for jka-compr-compression-info-list not including version extension,
Glenn Morris <=