Mercurial > emacs
comparison lisp/vc-hg.el @ 108439:c3622fa53abe
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 26 Mar 2010 15:03:20 +0000 |
parents | 79c0352f271f |
children | 94a453a3e40a |
comparison
equal
deleted
inserted
replaced
108438:2485b1fb98d3 | 108439:c3622fa53abe |
---|---|
277 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" | 277 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" |
278 (1 'change-log-email)) | 278 (1 'change-log-email)) |
279 ("^date: \\(.+\\)" (1 'change-log-date)) | 279 ("^date: \\(.+\\)" (1 'change-log-date)) |
280 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) | 280 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |
281 | 281 |
282 (declare-function log-edit-mode "log-edit" ()) | |
282 (defvar log-edit-extra-flags) | 283 (defvar log-edit-extra-flags) |
283 (defvar log-edit-before-checkin-process) | 284 (defvar log-edit-before-checkin-process) |
284 | 285 |
285 (define-derived-mode vc-hg-log-edit-mode log-edit-mode "Hg-log-edit" | 286 (define-derived-mode vc-hg-log-edit-mode log-edit-mode "Hg-log-edit" |
286 "Mode for editing Hg commit logs. | 287 "Mode for editing Hg commit logs. |
287 If a line like: | 288 If a line like: |
288 Author: NAME | 289 Author: NAME |
289 is present in the log, it is removed, and | 290 is present in the log, it is removed, and |
290 --author NAME | 291 --author NAME |
291 is passed to the hg commit command." | 292 is passed to the hg commit command." |
292 (set (make-local-variable 'log-edit-extra-flags) nil) | 293 (set (make-local-variable 'log-edit-extra-flags) nil) |
293 (set (make-local-variable 'log-edit-before-checkin-process) | 294 (set (make-local-variable 'log-edit-before-checkin-process) |
294 '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--user" (match-string 1)))))) | 295 '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--user" (match-string 1)))))) |