diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-01 19:13:16 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-01 19:13:16 +0000 |
| commit | 3702367bcef4d8987b1c6aa06ab29ec0390d6887 (patch) | |
| tree | 28e5ebf63522f5a5b0930eeccaf573a613b6b0b3 /lisp/vc-cvs.el | |
| parent | a84615c77a3642de1ddc4f488017adfab586a33e (diff) | |
| download | emacs-3702367bcef4d8987b1c6aa06ab29ec0390d6887.tar.gz | |
Change 'needs-patch to 'needs-update.
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index eec813859d2..ba80153a60c 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -838,7 +838,7 @@ state." ((string-match "Locally Modified" status) 'edited) ((string-match "Needs Merge" status) 'needs-merge) ((string-match "Needs \\(Checkout\\|Patch\\)" status) - (if missing 'missing 'needs-patch)) + (if missing 'missing 'needs-update)) ((string-match "Locally Added" status) 'added) ((string-match "Locally Removed" status) 'removed) ((string-match "File had conflicts " status) 'conflict) @@ -903,7 +903,7 @@ state." ((string-match "Locally Modified" status-str) 'edited) ((string-match "Needs Merge" status-str) 'needs-merge) ((string-match "Needs \\(Checkout\\|Patch\\)" status-str) - (if missing 'missing 'needs-patch)) + (if missing 'missing 'needs-update)) ((string-match "Locally Added" status-str) 'added) ((string-match "Locally Removed" status-str) 'removed) ((string-match "File had conflicts " status-str) 'conflict) @@ -922,7 +922,7 @@ state." ;; (?M . edited) ;; (?P . needs-merge) ;; (?R . removed) - ;; (?U . needs-patch)))) + ;; (?U . needs-update)))) ;; (goto-char (point-min)) ;; (while (not (eobp)) ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$") |