diff lisp/vc-mtn.el @ 108948:c3f02c0c5924

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 09 Jun 2010 22:49:43 +0000
parents 05ef9c0de767
children
line wrap: on
line diff
--- a/lisp/vc-mtn.el	Tue Jun 08 22:52:50 2010 +0000
+++ b/lisp/vc-mtn.el	Wed Jun 09 22:49:43 2010 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: 
+;; Keywords:
 
 ;; This file is part of GNU Emacs.
 
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 
-;; 
+;;
 
 ;;; TODO:
 
@@ -172,8 +172,14 @@
 (defun vc-mtn-responsible-p (file) (vc-mtn-root file))
 (defun vc-mtn-could-register (file) (vc-mtn-root file))
 
+(declare-function log-edit-extract-headers "log-edit" (headers string))
+
 (defun vc-mtn-checkin (files rev comment  &optional extra-args-ignored)
-  (vc-mtn-command nil 0 files "commit" "-m" comment))
+  (apply 'vc-mtn-command nil 0 files
+	 (nconc (list "commit" "-m")
+		(log-edit-extract-headers '(("Author" . "--author")
+					    ("Date" . "--date"))
+					  comment))))
 
 (defun vc-mtn-find-revision (file rev buffer)
   (vc-mtn-command buffer 0 file "cat" "-r" rev))