diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-03-09 10:03:47 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-03-09 10:03:47 +0100 |
| commit | 43b0df62cd5922df5495b3f4aee5b7beca14384f (patch) | |
| tree | 3c0bfa9526d08c9c85e646cd355467e3dfb439ac /lisp/vc/vc-src.el | |
| parent | 380ba045c48bfbb160da288b1bd50f82d3f999f0 (diff) | |
| parent | 9cbdf20316e1cec835a7dfe28877142e437976f4 (diff) | |
| download | emacs-43b0df62cd5922df5495b3f4aee5b7beca14384f.tar.gz emacs-43b0df62cd5922df5495b3f4aee5b7beca14384f.tar.bz2 emacs-43b0df62cd5922df5495b3f4aee5b7beca14384f.zip | |
Merge commit '9cbdf20316' into native-comp
Diffstat (limited to 'lisp/vc/vc-src.el')
| -rw-r--r-- | lisp/vc/vc-src.el | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 201d69d79a1..faba5bce2b7 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -97,13 +97,11 @@ If nil, VC itself computes this value when it is first needed." :type '(choice (const :tag "Auto" nil) (string :tag "Specified") - (const :tag "Unknown" unknown)) - :group 'vc-src) + (const :tag "Unknown" unknown))) (defcustom vc-src-program "src" "Name of the SRC executable (excluding any arguments)." - :type 'string - :group 'vc-src) + :type 'string) (defcustom vc-src-diff-switches nil "String or list of strings specifying switches for SRC diff under VC. @@ -111,8 +109,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :type '(choice (const :tag "Unspecified" nil) (const :tag "None" t) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-src) + (repeat :tag "Argument List" :value ("") string))) ;; This needs to be autoloaded because vc-src-registered uses it (via ;; vc-default-registered), and vc-hooks needs to be able to check @@ -126,8 +123,7 @@ For a description of possible values, see `vc-check-master-templates'." '("%s.src/%s,v")) (repeat :tag "User-specified" (choice string - function))) - :group 'vc-src) + function)))) ;;; Properties of the backend @@ -221,7 +217,7 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." (setq file-list (list "--" file-or-list))) (file-or-list (setq file-list (cons "--" file-or-list)))) - (apply 'vc-do-command (or buffer "*vc*") 0 vc-src-program file-list flags))) + (apply #'vc-do-command (or buffer "*vc*") 0 vc-src-program file-list flags))) (defun vc-src-working-revision (file) "SRC-specific version of `vc-working-revision'." @@ -275,7 +271,7 @@ REV is the revision to check out into WORKFILE." "Revert FILE to the version it was based on. If FILE is a directory, revert all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-src-revert (vc-expand-dirs (list file) 'SRC)) + (mapc #'vc-src-revert (vc-expand-dirs (list file) 'SRC)) (vc-src-command nil file "co"))) (defun vc-src-modify-change-comment (files rev comment) @@ -290,8 +286,7 @@ directory the operation is applied to all registered files beneath it." "String or list of strings specifying switches for src log under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") - (repeat :tag "Argument List" :value ("") string)) - :group 'vc-src) + (repeat :tag "Argument List" :value ("") string))) (defun vc-src-print-log (files buffer &optional shortlog _start-revision limit) "Print commit log associated with FILES into specified BUFFER. @@ -307,7 +302,7 @@ If LIMIT is non-nil, show no more than this many entries." (let ((inhibit-read-only t)) (with-current-buffer buffer - (apply 'vc-src-command buffer files (if shortlog "list" "log") + (apply #'vc-src-command buffer files (if shortlog "list" "log") (nconc ;;(when start-revision (list (format "%s-1" start-revision))) (when limit (list "-l" (format "%s" limit))) |