[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103532: Handle git-style backup name
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103532: Handle git-style backup names in file-name-version-regexp (Bug#8159). |
Date: |
Sat, 05 Mar 2011 15:35:08 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103532
author: Reuben Thomas <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 15:35:08 -0500
message:
Handle git-style backup names in file-name-version-regexp (Bug#8159).
* files.el (file-name-version-regexp): Handle backup files of the
form `foo.js.~HEAD~1~' (Bug#8159).
modified:
lisp/ChangeLog
lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-05 20:07:27 +0000
+++ b/lisp/ChangeLog 2011-03-05 20:35:08 +0000
@@ -1,3 +1,8 @@
+2011-03-05 Reuben Thomas <address@hidden>
+
+ * files.el (file-name-version-regexp): Handle backup files of the
+ form `foo.js.~HEAD~1~' (Bug#8159).
+
2011-03-05 Glenn Morris <address@hidden>
* eshell/esh-var.el: Don't require esh-test when compiling.
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-03-05 19:37:46 +0000
+++ b/lisp/files.el 2011-03-05 20:35:08 +0000
@@ -3869,7 +3869,9 @@
(set-file-selinux-context to-name context)))
(defvar file-name-version-regexp
- "\\(?:~\\|\\.~[-[:alnum:]:address@hidden)"
+ "\\(?:~\\|\\.~[-[:alnum:]:address@hidden(?:~[[:digit:]]+\\)?~\\)"
+ ;; The last ~[[:digit]]+ matches relative versions in git,
+ ;; e.g. `foo.js.~HEAD~1~'.
"Regular expression matching the backup/version part of a file name.
Used by `file-name-sans-versions'.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103532: Handle git-style backup names in file-name-version-regexp (Bug#8159).,
Chong Yidong <=