aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-10-31 23:16:48 -0400
committerChong Yidong2010-10-31 23:16:48 -0400
commit4624de78377ea0a3c434b3bac2debe7a8c6a5bb1 (patch)
tree5071b6ce21f412adc6c1790c8f43f8eb991653ab
parentfeb5e60ae796691a61e9a4078a0dff0111fcae31 (diff)
downloademacs-4624de78377ea0a3c434b3bac2debe7a8c6a5bb1.tar.gz
emacs-4624de78377ea0a3c434b3bac2debe7a8c6a5bb1.zip
Remove extra leftover args to vc-*-checkin.
* vc/vc-arch.el (vc-arch-checkin): * vc/vc-cvs.el (vc-cvs-checkin): * vc/vc-mtn.el (vc-mtn-checkin): * vc/vc-rcs.el (vc-rcs-checkin): * vc/vc-sccs.el (vc-sccs-checkin): * vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused since 2010-04-21 commit by Stefan Monnier.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/vc/vc-arch.el2
-rw-r--r--lisp/vc/vc-cvs.el2
-rw-r--r--lisp/vc/vc-mtn.el2
-rw-r--r--lisp/vc/vc-rcs.el2
-rw-r--r--lisp/vc/vc-sccs.el2
6 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a2df683e40..35f4b70736c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12010-10-31 Chong Yidong <cyd@stupidchicken.com>
2
3 * vc/vc-arch.el (vc-arch-checkin):
4 * vc/vc-cvs.el (vc-cvs-checkin):
5 * vc/vc-mtn.el (vc-mtn-checkin):
6 * vc/vc-rcs.el (vc-rcs-checkin):
7 * vc/vc-sccs.el (vc-sccs-checkin):
8 * vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused
9 since 2010-04-21 commit by Stefan Monnier.
10
12010-11-01 Glenn Morris <rgm@gnu.org> 112010-11-01 Glenn Morris <rgm@gnu.org>
2 12
3 * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change. 13 * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change.
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index 3ca9d59e3c1..ba91f7f23c6 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -428,7 +428,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
428 (message "There are unresolved conflicts in %s" 428 (message "There are unresolved conflicts in %s"
429 (file-name-nondirectory rej)))))) 429 (file-name-nondirectory rej))))))
430 430
431(defun vc-arch-checkin (files rev comment &optional extra-args-ignored) 431(defun vc-arch-checkin (files rev comment)
432 (if rev (error "Committing to a specific revision is unsupported")) 432 (if rev (error "Committing to a specific revision is unsupported"))
433 ;; FIXME: This implementation probably only works for singleton filesets 433 ;; FIXME: This implementation probably only works for singleton filesets
434 (let ((summary (file-relative-name (car files) (vc-arch-root (car files))))) 434 (let ((summary (file-relative-name (car files) (vc-arch-root (car files)))))
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 03ff1f555a1..a78b59ffba5 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -314,7 +314,7 @@ its parents."
314 (directory-file-name dir)))) 314 (directory-file-name dir))))
315 (eq dir t))) 315 (eq dir t)))
316 316
317(defun vc-cvs-checkin (files rev comment &optional extra-args-ignored) 317(defun vc-cvs-checkin (files rev comment)
318 "CVS-specific version of `vc-backend-checkin'." 318 "CVS-specific version of `vc-backend-checkin'."
319 (unless (or (not rev) (vc-cvs-valid-revision-number-p rev)) 319 (unless (or (not rev) (vc-cvs-valid-revision-number-p rev))
320 (if (not (vc-cvs-valid-symbolic-tag-name-p rev)) 320 (if (not (vc-cvs-valid-symbolic-tag-name-p rev))
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index cb03853f865..3d76d34f3d8 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -175,7 +175,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
175 175
176(declare-function log-edit-extract-headers "log-edit" (headers string)) 176(declare-function log-edit-extract-headers "log-edit" (headers string))
177 177
178(defun vc-mtn-checkin (files rev comment &optional extra-args-ignored) 178(defun vc-mtn-checkin (files rev comment)
179 (apply 'vc-mtn-command nil 0 files 179 (apply 'vc-mtn-command nil 0 files
180 (nconc (list "commit" "-m") 180 (nconc (list "commit" "-m")
181 (log-edit-extract-headers '(("Author" . "--author") 181 (log-edit-extract-headers '(("Author" . "--author")
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 6537c2b96f3..f8d5214d776 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -349,7 +349,7 @@ whether to remove it."
349 (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) 349 (yes-or-no-p (format "Directory %s is empty; remove it? " dir))
350 (delete-directory dir)))) 350 (delete-directory dir))))
351 351
352(defun vc-rcs-checkin (files rev comment &optional extra-args-ignored) 352(defun vc-rcs-checkin (files rev comment)
353 "RCS-specific version of `vc-backend-checkin'." 353 "RCS-specific version of `vc-backend-checkin'."
354 (let ((switches (vc-switches 'RCS 'checkin))) 354 (let ((switches (vc-switches 'RCS 'checkin)))
355 ;; Now operate on the files 355 ;; Now operate on the files
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index fb9cb3fc3f8..2acd778881a 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -237,7 +237,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
237 (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "") 237 (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "")
238 (file-name-nondirectory file))))) 238 (file-name-nondirectory file)))))
239 239
240(defun vc-sccs-checkin (files rev comment &optional extra-args-ignored) 240(defun vc-sccs-checkin (files rev comment)
241 "SCCS-specific version of `vc-backend-checkin'." 241 "SCCS-specific version of `vc-backend-checkin'."
242 (dolist (file (vc-expand-dirs files)) 242 (dolist (file (vc-expand-dirs files))
243 (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file) 243 (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file)