aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-01-24 00:22:50 -0800
committerGlenn Morris2012-01-24 00:22:50 -0800
commit70df4bbe298651a3980d56795bcfd04611efa37e (patch)
treee8cda1f21e0bc146fa835b37b710fbfe7e8fb8c4
parentb13f806e12df7f9a500f671bbf3177f7a2c1bfde (diff)
downloademacs-70df4bbe298651a3980d56795bcfd04611efa37e.tar.gz
emacs-70df4bbe298651a3980d56795bcfd04611efa37e.zip
Fix rcs and sccs create-tag commands.
* lisp/vc/vc-rcs.el (vc-rcs-create-tag): * lisp/vc/vc-sccs.el (vc-sccs-create-tag): Fix argument spec to be what vc-create-tag expects. Fixes: debbugs:10515
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc-rcs.el4
-rw-r--r--lisp/vc/vc-sccs.el4
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97281db4c7c..e35ed8b87cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-01-24 Glenn Morris <rgm@gnu.org>
2
3 * vc/vc-rcs.el (vc-rcs-create-tag):
4 * vc/vc-sccs.el (vc-sccs-create-tag):
5 Fix argument spec to be what vc-create-tag expects. (Bug#10515)
6
12012-01-23 Mike Lamb <mrlamb@gmail.com> (tiny change) 72012-01-23 Mike Lamb <mrlamb@gmail.com> (tiny change)
2 8
3 * eshell/esh-util.el (eshell-read-hosts-file): 9 * eshell/esh-util.el (eshell-read-hosts-file):
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index f9248d5a954..f2122b60ce1 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -809,9 +809,9 @@ systime, or nil if there is none. Also, reposition point."
809;;; Tag system 809;;; Tag system
810;;; 810;;;
811 811
812(defun vc-rcs-create-tag (backend dir name branchp) 812(defun vc-rcs-create-tag (dir name branchp)
813 (when branchp 813 (when branchp
814 (error "RCS backend %s does not support module branches" backend)) 814 (error "RCS backend does not support module branches"))
815 (let ((result (vc-tag-precondition dir))) 815 (let ((result (vc-tag-precondition dir)))
816 (if (stringp result) 816 (if (stringp result)
817 (error "File %s is not up-to-date" result) 817 (error "File %s is not up-to-date" result)
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 26e7b020b46..31637f5490e 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -359,9 +359,9 @@ revert all subfiles."
359;;; our own set of name-to-revision mappings. 359;;; our own set of name-to-revision mappings.
360;;; 360;;;
361 361
362(defun vc-sccs-create-tag (backend dir name branchp) 362(defun vc-sccs-create-tag (dir name branchp)
363 (when branchp 363 (when branchp
364 (error "SCCS backend %s does not support module branches" backend)) 364 (error "SCCS backend does not support module branches"))
365 (let ((result (vc-tag-precondition dir))) 365 (let ((result (vc-tag-precondition dir)))
366 (if (stringp result) 366 (if (stringp result)
367 (error "File %s is not up-to-date" result) 367 (error "File %s is not up-to-date" result)