diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33aa29ea41b..ce07d351d7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-05 Reuben Thomas <rrt@sc3d.org> + + * files.el (file-name-version-regexp): Handle backup files of the + form `foo.js.~HEAD~1~' (Bug#8159). + 2011-03-05 Glenn Morris <rgm@gnu.org> * eshell/esh-var.el: Don't require esh-test when compiling. diff --git a/lisp/files.el b/lisp/files.el index a236b337b35..39021ac1b2d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3869,7 +3869,9 @@ BACKUPNAME is the backup file name, which is the old file renamed." (set-file-selinux-context to-name context))) (defvar file-name-version-regexp - "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+~\\)" + "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(?:~[[: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'.") |