From 2de9cc1acd9e3198983c89593297c0e486f96365 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sat, 5 Mar 2011 15:35:08 -0500 Subject: [PATCH] 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). --- lisp/ChangeLog | 5 +++++ lisp/files.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * files.el (file-name-version-regexp): Handle backup files of the + form `foo.js.~HEAD~1~' (Bug#8159). + 2011-03-05 Glenn Morris * 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'.") -- 2.39.5