diff options
| author | Sean Whitton | 2024-10-24 21:15:28 +0800 |
|---|---|---|
| committer | Sean Whitton | 2024-10-24 21:36:58 +0800 |
| commit | fefc3005d46f4ac41af624d4591b052df92e4bd0 (patch) | |
| tree | 4bd3005cfa12c2faef3fbfde3fd852d289029cb5 | |
| parent | be29879850028d316592ba82cd859d31a67c1ffe (diff) | |
| download | emacs-fefc3005d46f4ac41af624d4591b052df92e4bd0.tar.gz emacs-fefc3005d46f4ac41af624d4591b052df92e4bd0.zip | |
; Touch up & fix documentation changes from last commit
| -rw-r--r-- | etc/NEWS | 10 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package-vc.el | 4 | ||||
| -rw-r--r-- | lisp/ldefs-boot.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 12 |
4 files changed, 15 insertions, 13 deletions
| @@ -614,15 +614,17 @@ even though Emacs thinks it is dangerous. | |||
| 614 | 614 | ||
| 615 | So far, this applies only to using 'e' from Log View mode for Git. | 615 | So far, this applies only to using 'e' from Log View mode for Git. |
| 616 | 616 | ||
| 617 | --- | ||
| 617 | *** 'vc-clone' is now an interactive command. | 618 | *** 'vc-clone' is now an interactive command. |
| 618 | When called interactively, 'vc-clone' now prompts for the remote | 619 | When called interactively, 'vc-clone' now prompts for the remote |
| 619 | repository address, the backend for cloning, if it has not been | 620 | repository address, and the directory into which to clone the |
| 620 | determined automatically according to the URL, and the directory to | 621 | repository. It tries to automatically determine the VC backend for |
| 621 | clone the repository into. | 622 | cloning, or prompts for that, too. |
| 622 | 623 | ||
| 624 | --- | ||
| 623 | *** 'vc-clone' now accepts an optional argument OPEN-DIR. | 625 | *** 'vc-clone' now accepts an optional argument OPEN-DIR. |
| 624 | When the argument is non-nil, the function switches to a buffer visiting | 626 | When the argument is non-nil, the function switches to a buffer visiting |
| 625 | directory to which the repository was cloned. | 627 | the directory into which the repository was cloned. |
| 626 | 628 | ||
| 627 | 629 | ||
| 628 | * New Modes and Packages in Emacs 31.1 | 630 | * New Modes and Packages in Emacs 31.1 |
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index ae183cc9f72..d30f616f6ea 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | "Default VC backend to use for cloning package repositories. | 71 | "Default VC backend to use for cloning package repositories. |
| 72 | `package-vc-install' uses this backend when you specify neither | 72 | `package-vc-install' uses this backend when you specify neither |
| 73 | the backend nor a repository URL that's recognized via | 73 | the backend nor a repository URL that's recognized via |
| 74 | `package-vc-heuristic-alist'. | 74 | `vc-clone-heuristic-alist'. |
| 75 | 75 | ||
| 76 | The value must be a member of `vc-handled-backends' that supports | 76 | The value must be a member of `vc-handled-backends' that supports |
| 77 | the `clone' VC function." | 77 | the `clone' VC function." |
| @@ -809,7 +809,7 @@ If PACKAGE is a string, it specifies the URL of the package | |||
| 809 | repository. In this case, optional argument BACKEND specifies | 809 | repository. In this case, optional argument BACKEND specifies |
| 810 | the VC backend to use for cloning the repository; if it's nil, | 810 | the VC backend to use for cloning the repository; if it's nil, |
| 811 | this function tries to infer which backend to use according to | 811 | this function tries to infer which backend to use according to |
| 812 | the value of `package-vc-heuristic-alist' and if that fails it | 812 | the value of `vc-clone-heuristic-alist' and if that fails it |
| 813 | uses `package-vc-default-backend'. Optional argument NAME | 813 | uses `package-vc-default-backend'. Optional argument NAME |
| 814 | specifies the package name in this case; if it's nil, this | 814 | specifies the package name in this case; if it's nil, this |
| 815 | package uses `file-name-base' on the URL to obtain the package | 815 | package uses `file-name-base' on the URL to obtain the package |
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 6320af1e79f..38df2a23cac 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -24112,7 +24112,7 @@ If PACKAGE is a string, it specifies the URL of the package | |||
| 24112 | repository. In this case, optional argument BACKEND specifies | 24112 | repository. In this case, optional argument BACKEND specifies |
| 24113 | the VC backend to use for cloning the repository; if it's nil, | 24113 | the VC backend to use for cloning the repository; if it's nil, |
| 24114 | this function tries to infer which backend to use according to | 24114 | this function tries to infer which backend to use according to |
| 24115 | the value of `package-vc-heuristic-alist' and if that fails it | 24115 | the value of `vc-clone-heuristic-alist' and if that fails it |
| 24116 | uses `package-vc-default-backend'. Optional argument NAME | 24116 | uses `package-vc-default-backend'. Optional argument NAME |
| 24117 | specifies the package name in this case; if it's nil, this | 24117 | specifies the package name in this case; if it's nil, this |
| 24118 | package uses `file-name-base' on the URL to obtain the package | 24118 | package uses `file-name-base' on the URL to obtain the package |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 9c85dee9129..ebe3de5c6c4 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -3884,17 +3884,17 @@ If successful, return the string with the directory of the checkout; | |||
| 3884 | otherwise return nil. | 3884 | otherwise return nil. |
| 3885 | REMOTE should be a string, the URL of the remote repository or the name | 3885 | REMOTE should be a string, the URL of the remote repository or the name |
| 3886 | of a directory (if the repository is local). | 3886 | of a directory (if the repository is local). |
| 3887 | |||
| 3888 | When called interactively, prompt for REMOTE, BACKEND and DIRECTORY, | ||
| 3889 | except attempt to determine BACKEND automatically based on REMOTE. | ||
| 3890 | |||
| 3887 | If DIRECTORY is nil or omitted, it defaults to `default-directory'. | 3891 | If DIRECTORY is nil or omitted, it defaults to `default-directory'. |
| 3888 | If BACKEND is nil or omitted, the function iterates through every known | 3892 | If BACKEND is nil or omitted, the function iterates through every known |
| 3889 | backend in `vc-handled-backends' until one succeeds to clone REMOTE. | 3893 | backend in `vc-handled-backends' until one succeeds to clone REMOTE. |
| 3890 | If REV is non-nil, it indicates a specific revision to check out after | 3894 | If REV is non-nil, it indicates a specific revision to check out after |
| 3891 | cloning; the syntax of REV depends on what BACKEND accepts. | 3895 | cloning; the syntax of REV depends on what BACKEND accepts. |
| 3892 | If OPEN-DIR is non-nil, switches to a buffer visiting DIRECTORY to | 3896 | If OPEN-DIR is non-nil, as it is interactively, also switches to a |
| 3893 | which the repository was cloned. It would be useful in scripts, but not | 3897 | buffer visiting DIRECTORY." |
| 3894 | in regular code. | ||
| 3895 | If called interactively, prompt for REMOTE, DIRECTORY and BACKEND, | ||
| 3896 | if BACKEND has not been automatically determined according to the REMOTE | ||
| 3897 | URL, in the minibuffer." | ||
| 3898 | (interactive | 3898 | (interactive |
| 3899 | (let* ((url (read-string "Remote: " nil 'vc--remotes-history)) | 3899 | (let* ((url (read-string "Remote: " nil 'vc--remotes-history)) |
| 3900 | (backend (or (vc-guess-url-backend url) | 3900 | (backend (or (vc-guess-url-backend url) |