From: Reuben Thomas <rrt@sc3d.org>
Date: Sat, 5 Mar 2011 20:35:08 +0000 (-0500)
Subject: Handle git-style backup names in file-name-version-regexp (Bug#8159).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2de9cc1acd9e3198983c89593297c0e486f96365;p=emacs.git

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).
---

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'.")