aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Merrill2011-03-30 17:56:04 -0400
committerStefan Monnier2011-03-30 17:56:04 -0400
commitf3e4086c9ddb2df447907aaf8fc403426b724408 (patch)
tree995956765615b869b3071626b9760b1f35f0e787
parent44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
downloademacs-f3e4086c9ddb2df447907aaf8fc403426b724408.tar.gz
emacs-f3e4086c9ddb2df447907aaf8fc403426b724408.zip
* lisp/vc/add-log.el (add-change-log-entry): Don't use whitespace
syntax class to search for whitespace on a single line (Message-ID: <4D938140.4030905@redhat.com>).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/add-log.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ce8b62b333..3c9e81f0b8a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-03-30 Jason Merrill <jason@redhat.com> (tiny change)
2
3 * vc/add-log.el (add-change-log-entry): Don't use whitespace
4 syntax class to search for whitespace on a single line
5 (Message-ID: <4D938140.4030905@redhat.com>).
6
12011-03-30 Leo Liu <sdl.web@gmail.com> 72011-03-30 Leo Liu <sdl.web@gmail.com>
2 8
3 * abbrev.el (abbrev-edit-save-to-file, abbrev-edit-save-buffer): 9 * abbrev.el (abbrev-edit-save-to-file, abbrev-edit-save-buffer):
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index d75fcb5f4f1..e9fbdb91e97 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -886,7 +886,7 @@ non-nil, otherwise in local time."
886 (point)))) 886 (point))))
887 887
888 ;; Now insert the new line for this item. 888 ;; Now insert the new line for this item.
889 (cond ((re-search-forward "^\\s *\\*\\s *$" bound t) 889 (cond ((re-search-forward "^\\s *\\* *$" bound t)
890 ;; Put this file name into the existing empty item. 890 ;; Put this file name into the existing empty item.
891 (if item 891 (if item
892 (insert item))) 892 (insert item)))
@@ -928,7 +928,7 @@ non-nil, otherwise in local time."
928 ;; No function name, so put in a colon unless we have just a star. 928 ;; No function name, so put in a colon unless we have just a star.
929 (unless (save-excursion 929 (unless (save-excursion
930 (beginning-of-line 1) 930 (beginning-of-line 1)
931 (looking-at "\\s *\\(\\*\\s *\\)?$")) 931 (looking-at "\\s *\\(\\* *\\)?$"))
932 (insert ": ") 932 (insert ": ")
933 (if version (insert version ?\s))) 933 (if version (insert version ?\s)))
934 ;; Make it easy to get rid of the function name. 934 ;; Make it easy to get rid of the function name.