aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2007-09-22 08:51:58 +0000
committerAndreas Schwab2007-09-22 08:51:58 +0000
commitd2f95fcaf907bcf7c494af208429e061de821eed (patch)
treeb96cdb9eaf7d11994438f89b65b32386acc6f19a
parent257c97151c744740af63b5098b914803d4d9384a (diff)
downloademacs-d2f95fcaf907bcf7c494af208429e061de821eed.tar.gz
emacs-d2f95fcaf907bcf7c494af208429e061de821eed.zip
(file-name-sans-versions): Also allow `_'.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 768a3a83a3c..457a25efbaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-09-22 Andreas Schwab <schwab@suse.de>
2
3 * files.el (file-name-sans-versions): Also allow `_'.
4
12007-09-22 Glenn Morris <rgm@gnu.org> 52007-09-22 Glenn Morris <rgm@gnu.org>
2 6
3 * eshell/esh-mode.el (eshell-output-filter-functions): Add 7 * eshell/esh-mode.el (eshell-output-filter-functions): Add
diff --git a/lisp/files.el b/lisp/files.el
index 17b4a6504db..bf7d34e2227 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3188,7 +3188,7 @@ we do not remove backup version numbers, only true file version numbers."
3188 (length name)) 3188 (length name))
3189 (if keep-backup-version 3189 (if keep-backup-version
3190 (length name) 3190 (length name)
3191 (or (string-match "\\.~[-0-9a-z.]+~\\'" name) 3191 (or (string-match "\\.~[-0-9a-z._]+~\\'" name)
3192 (string-match "~\\'" name) 3192 (string-match "~\\'" name)
3193 (length name)))))))) 3193 (length name))))))))
3194 3194