(file-name-sans-versions): Use [:alnum:] and also allow

#, @, : and ^.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d01bcd68c5be1b25acebc413b904f69a10b3780a..28d9f4eb9ec2ca86066f99428e7012b6e00b904a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * files.el (file-name-sans-versions): Use [:alnum:] and also allow
+       #, @, : and ^.
+
 2007-09-23  Glenn Morris  <rgm@gnu.org>
 
        * ses.el (ses-calculate-cell): Don't evaluate unsafe formulae.

diff --git a/lisp/files.el b/lisp/files.el
index 19762c189458204336d48fea2ef6ecf077ba1ab5..054f0e7d3a0412bd847f75aba90a6ce3bca6d554 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3188,7 +3188,7 @@ we do not remove backup version numbers, only true file version numbers."
                         (length name))
                   (if keep-backup-version
                       (length name)
-                    (or (string-match "\\.~[-0-9a-zA-Z._]+~\\'" name)
+                    (or (string-match "\\.~[-[:alnum:]:#@^._]+~\\'" name)
                         (string-match "~\\'" name)
                         (length name))))))))