aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-03-22 17:09:33 +0000
committerDan Nicolaescu2008-03-22 17:09:33 +0000
commit3281a821f771b2c74fe880f24cc38ce0d25e4d58 (patch)
tree0f97b0e38c1c9d06549679d0d28fcf5dae1dfc74
parentb07103dc2b17933e30e1500bce6f9a1471752cc7 (diff)
downloademacs-3281a821f771b2c74fe880f24cc38ce0d25e4d58.tar.gz
emacs-3281a821f771b2c74fe880f24cc38ce0d25e4d58.zip
(vc-mtn-state): Support the added state.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-mtn.el9
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c9f6b2cfee..dbdf5ab03ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-03-22 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-mtn.el (vc-mtn-state): Support the added state.
4
12008-03-22 Carsten Dominik <dominik@science.uva.nl> 52008-03-22 Carsten Dominik <dominik@science.uva.nl>
2 6
3 * org: New directory for Org-mode. 7 * org: New directory for Org-mode.
diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el
index 6a7f72db44b..fd3f48f9105 100644
--- a/lisp/vc-mtn.el
+++ b/lisp/vc-mtn.el
@@ -76,10 +76,11 @@
76 (with-temp-buffer 76 (with-temp-buffer
77 (vc-mtn-command t 0 file "status") 77 (vc-mtn-command t 0 file "status")
78 (goto-char (point-min)) 78 (goto-char (point-min))
79 (re-search-forward "^ \\(?:patched \\(.*\\)\\|no changes$\\)") 79 (re-search-forward
80 (if (match-end 1) 80 "^ \\(?:\\(patched\\)\\|\\(added\\) \\(?:.*\\)\\)\\|no changes$")
81 'edited 81 (cond ((match-end 1) 'edited)
82 'up-to-date)))) 82 ((match-end 2) 'added)
83 (t 'up-to-date)))))
83 84
84(defun vc-mtn-working-revision (file) 85(defun vc-mtn-working-revision (file)
85 ;; If `mtn' fails or returns status>0, or if the search fails, just 86 ;; If `mtn' fails or returns status>0, or if the search fails, just