summaryrefslogtreecommitdiff
path: root/lisp/vc-mtn.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc-mtn.el')
-rw-r--r--lisp/vc-mtn.el16
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el
index e293af4e836..6a7f72db44b 100644
--- a/lisp/vc-mtn.el
+++ b/lisp/vc-mtn.el
@@ -81,7 +81,7 @@
'edited
'up-to-date))))
-(defun vc-mtn-workfile-version (file)
+(defun vc-mtn-working-revision (file)
;; If `mtn' fails or returns status>0, or if the search fails, just
;; return nil.
(ignore-errors
@@ -135,7 +135,7 @@
(defun vc-mtn-checkin (files rev comment)
(vc-mtn-command nil 0 files "commit" "-m" comment))
-(defun vc-mtn-find-version (file rev buffer)
+(defun vc-mtn-find-revision (file rev buffer)
(vc-mtn-command buffer 0 file "cat" "-r" rev))
;; (defun vc-mtn-checkout (file &optional editable rev)
@@ -151,6 +151,10 @@
(defun vc-mtn-print-log (files &optional buffer)
(vc-mtn-command buffer 0 files "log"))
+(defvar log-view-message-re)
+(defvar log-view-file-re)
+(defvar log-view-font-lock-keywords)
+
(define-derived-mode vc-mtn-log-view-mode log-view-mode "Mtn-Log-View"
;; TODO: Not sure what to do about file markers for now.
(set (make-local-variable 'log-view-file-re) "\\'\\`")
@@ -164,12 +168,11 @@
'(("^[ |]+Author: \\(.*\\)" (1 'change-log-email))
("^[ |]+Date: \\(.*\\)" (1 'change-log-date-face))))))
-;; (defun vc-mtn-show-log-entry (version)
+;; (defun vc-mtn-show-log-entry (revision)
;; )
(defun vc-mtn-wash-log (file))
-(defalias 'vc-mtn-diff-tree 'vc-mtn-diff)
(defun vc-mtn-diff (files &optional rev1 rev2 buffer)
(apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff"
(append (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2)))))
@@ -240,10 +243,11 @@
(push (match-string 0) ids))
ids)))
-(defun vc-mtn-revision-completion-table (file)
+(defun vc-mtn-revision-completion-table (files)
;; TODO: Implement completion for for selectors
;; TODO: Implement completion for composite selectors.
- (lexical-let ((file file))
+ (lexical-let ((files files))
+ ;; What about using `files'?!? --Stef
(lambda (string pred action)
(cond
;; "Tag" selectors.