[Emacs-diffs] /srv/bzr/emacs/trunk r99808: (vc-hg-push, vc-hg-pull): Use `apply' when calling

[Sam Steingold]

------------------------------------------------------------
revno: 99808
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-02 10:21:57 -0400
message:
  (vc-hg-push, vc-hg-pull): Use `apply' when calling
  `vc-hg-command' with a list of flags.
modified:
  lisp/ChangeLog
  lisp/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-02 09:44:50 +0000
+++ b/lisp/ChangeLog    2010-04-02 14:21:57 +0000
@@ -1,3 +1,8 @@
+2010-04-02  Sam Steingold  <address@hidden>
+
+       * vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling
+       `vc-hg-command' with a list of flags.
+
 2010-04-02  Jan Djärv  <address@hidden>
 
        * tmm.el (tmm-get-keymap): Check with symbolp before passing

=== modified file 'lisp/vc-hg.el'
--- a/lisp/vc-hg.el     2010-03-24 03:34:06 +0000
+++ b/lisp/vc-hg.el     2010-04-02 14:21:57 +0000
@@ -235,10 +235,10 @@
     (with-current-buffer
        buffer
       (apply 'vc-hg-command buffer 0 files "log"
-            (append
+            (nconc
              (when start-revision (list (format "-r%s:" start-revision)))
              (when limit (list "-l" (format "%s" limit)))
-             (when shortlog '("--style" "compact"))
+             (when shortlog (list "--style" "compact"))
              vc-hg-log-switches)))))
 
 (defvar log-view-message-re)
@@ -419,7 +419,8 @@
 (defun vc-hg-checkin (files rev comment &optional extra-args)
   "Hg-specific version of `vc-backend-checkin'.
 REV is ignored."
-  (apply 'vc-hg-command nil 0 files  (append (list "commit" "-m" comment) 
extra-args)))
+  (apply 'vc-hg-command nil 0 files
+         (nconc (list "commit" "-m" comment) extra-args)))
 
 (defun vc-hg-find-revision (file rev buffer)
   (let ((coding-system-for-read 'binary)
@@ -611,22 +612,22 @@
   (interactive)
   (let ((marked-list (log-view-get-marked)))
     (if marked-list
-        (vc-hg-command
-         nil 0 nil
-         (cons "push"
+        (apply #'vc-hg-command
+               nil 0 nil
+               "push"
                (apply 'nconc
-                      (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
-         (error "No log entries selected for push"))))
+                      (mapcar (lambda (arg) (list "-r" arg)) marked-list)))
+      (error "No log entries selected for push"))))
 
 (defun vc-hg-pull ()
   (interactive)
   (let ((marked-list (log-view-get-marked)))
     (if marked-list
-        (vc-hg-command
-         nil 0 nil
-         (cons "pull"
+        (apply #'vc-hg-command
+               nil 0 nil
+               "pull"
                (apply 'nconc
-                      (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
+                      (mapcar (lambda (arg) (list "-r" arg)) marked-list)))
       (error "No log entries selected for pull"))))
 
 ;;; Internal functions