diff options
| author | Sean Whitton | 2025-08-17 11:06:55 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-08-17 11:36:30 +0100 |
| commit | 6f7e795ce1e5cf4e62c6260c4bde3545fc6d0f0d (patch) | |
| tree | 1eb0dde78da399a98165698f0986ccc5545c839a | |
| parent | 6979bce0b284d62db564647a7be941f8d4828e95 (diff) | |
| download | emacs-6f7e795ce1e5cf4e62c6260c4bde3545fc6d0f0d.tar.gz emacs-6f7e795ce1e5cf4e62c6260c4bde3545fc6d0f0d.zip | |
vc--maybe-read-remote-location: Don't return a list
* lisp/vc/vc.el (vc--maybe-read-remote-location): Return an atom.
(vc-root-diff-incoming, vc-root-diff-outgoing, vc-log-incoming)
(vc-log-outgoing): Wrap call to 'vc--maybe-read-remote-location'
in a call to 'list'.
| -rw-r--r-- | lisp/vc/vc.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 5d8c3f1eeb8..8543b14c2a2 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2546,7 +2546,7 @@ In some version control systems REMOTE-LOCATION can be a remote branch name. | |||
| 2546 | 2546 | ||
| 2547 | See `vc-use-incoming-outgoing-prefixes' regarding giving this command a | 2547 | See `vc-use-incoming-outgoing-prefixes' regarding giving this command a |
| 2548 | global binding." | 2548 | global binding." |
| 2549 | (interactive (vc--maybe-read-remote-location)) | 2549 | (interactive (list (vc--maybe-read-remote-location))) |
| 2550 | (vc--with-backend-in-rootdir "VC root-diff" | 2550 | (vc--with-backend-in-rootdir "VC root-diff" |
| 2551 | (let ((default-directory rootdir) | 2551 | (let ((default-directory rootdir) |
| 2552 | (incoming (vc--incoming-revision backend | 2552 | (incoming (vc--incoming-revision backend |
| @@ -2570,7 +2570,7 @@ global binding." | |||
| 2570 | ;; for those VCS is to make a comparison between locally committed | 2570 | ;; for those VCS is to make a comparison between locally committed |
| 2571 | ;; changes and remote committed changes. | 2571 | ;; changes and remote committed changes. |
| 2572 | ;; (Hence why we don't call `vc-buffer-sync-fileset'.) | 2572 | ;; (Hence why we don't call `vc-buffer-sync-fileset'.) |
| 2573 | (interactive (vc--maybe-read-remote-location)) | 2573 | (interactive (list (vc--maybe-read-remote-location))) |
| 2574 | (vc--with-backend-in-rootdir "VC root-diff" | 2574 | (vc--with-backend-in-rootdir "VC root-diff" |
| 2575 | (let ((default-directory rootdir) | 2575 | (let ((default-directory rootdir) |
| 2576 | (incoming (vc--incoming-revision backend | 2576 | (incoming (vc--incoming-revision backend |
| @@ -3449,8 +3449,8 @@ The command prompts for the branch whose change log to show." | |||
| 3449 | 3449 | ||
| 3450 | (defun vc--maybe-read-remote-location () | 3450 | (defun vc--maybe-read-remote-location () |
| 3451 | (and current-prefix-arg | 3451 | (and current-prefix-arg |
| 3452 | (list (read-string "Remote location/branch (empty for default): " | 3452 | (read-string "Remote location/branch (empty for default): " |
| 3453 | 'vc-remote-location-history)))) | 3453 | 'vc-remote-location-history))) |
| 3454 | 3454 | ||
| 3455 | (defun vc--incoming-revision (backend remote-location) | 3455 | (defun vc--incoming-revision (backend remote-location) |
| 3456 | (or (vc-call-backend backend 'incoming-revision remote-location) | 3456 | (or (vc-call-backend backend 'incoming-revision remote-location) |
| @@ -3462,7 +3462,7 @@ The command prompts for the branch whose change log to show." | |||
| 3462 | When unspecified REMOTE-LOCATION is the place \\[vc-update] would pull from. | 3462 | When unspecified REMOTE-LOCATION is the place \\[vc-update] would pull from. |
| 3463 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION. | 3463 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION. |
| 3464 | In some version control systems REMOTE-LOCATION can be a remote branch name." | 3464 | In some version control systems REMOTE-LOCATION can be a remote branch name." |
| 3465 | (interactive (vc--maybe-read-remote-location)) | 3465 | (interactive (list (vc--maybe-read-remote-location))) |
| 3466 | (vc--with-backend-in-rootdir "VC root-log" | 3466 | (vc--with-backend-in-rootdir "VC root-log" |
| 3467 | (vc-incoming-outgoing-internal backend (or remote-location "") | 3467 | (vc-incoming-outgoing-internal backend (or remote-location "") |
| 3468 | "*vc-incoming*" 'log-incoming))) | 3468 | "*vc-incoming*" 'log-incoming))) |
| @@ -3480,7 +3480,7 @@ In some version control systems REMOTE-LOCATION can be a remote branch name." | |||
| 3480 | When unspecified REMOTE-LOCATION is the place \\[vc-push] would push to. | 3480 | When unspecified REMOTE-LOCATION is the place \\[vc-push] would push to. |
| 3481 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION. | 3481 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION. |
| 3482 | In some version control systems REMOTE-LOCATION can be a remote branch name." | 3482 | In some version control systems REMOTE-LOCATION can be a remote branch name." |
| 3483 | (interactive (vc--maybe-read-remote-location)) | 3483 | (interactive (list (vc--maybe-read-remote-location))) |
| 3484 | (vc--with-backend-in-rootdir "VC root-log" | 3484 | (vc--with-backend-in-rootdir "VC root-log" |
| 3485 | (vc-incoming-outgoing-internal backend (or remote-location "") | 3485 | (vc-incoming-outgoing-internal backend (or remote-location "") |
| 3486 | "*vc-outgoing*" 'log-outgoing))) | 3486 | "*vc-outgoing*" 'log-outgoing))) |