aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-09-07 19:00:30 +0000
committerStefan Monnier2007-09-07 19:00:30 +0000
commit98a6dc9f68be9d66b3c23caf00529e16c38d356d (patch)
tree274ee1f5a5dad532860489702279da99e7a1c2b3
parente141eb2e9717cdfd112389bd90e0d0616e249e2c (diff)
downloademacs-98a6dc9f68be9d66b3c23caf00529e16c38d356d.tar.gz
emacs-98a6dc9f68be9d66b3c23caf00529e16c38d356d.zip
(vc-arch-checkin): Fix typo.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-arch.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1e2ba0f8ed..8b757a8db92 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-09-07 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc-arch.el (vc-arch-checkin): Fix typo.
4
12007-09-07 Johan Bockg,Ae(Brd <bojohan@gnu.org> 52007-09-07 Johan Bockg,Ae(Brd <bojohan@gnu.org>
2 6
3 * cus-face.el (custom-theme-set-faces): Set face attributes 7 * cus-face.el (custom-theme-set-faces): Set face attributes
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 19c5c0ac9a0..840a19a0f66 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -370,7 +370,7 @@ Return non-nil if FILE is unchanged."
370(defun vc-arch-checkin (files rev comment) 370(defun vc-arch-checkin (files rev comment)
371 (if rev (error "Committing to a specific revision is unsupported")) 371 (if rev (error "Committing to a specific revision is unsupported"))
372 ;; FIXME: This implementation probably only works for singleton filesets 372 ;; FIXME: This implementation probably only works for singleton filesets
373 (let ((summary (file-relative-name (car file) (vc-arch-root (car files))))) 373 (let ((summary (file-relative-name (car files) (vc-arch-root (car files)))))
374 ;; Extract a summary from the comment. 374 ;; Extract a summary from the comment.
375 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment) 375 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment)
376 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment)) 376 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment))