aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-04-06 11:48:36 +0300
committerEli Zaretskii2019-04-06 11:48:36 +0300
commit646d33dbbced04b3454fa5f726309dd96cd089c7 (patch)
treed258eb814777d32ede90a60970921462fad8e506
parenta30a6c3019ac09ede1cc47671083b2e9ecdbffdf (diff)
downloademacs-646d33dbbced04b3454fa5f726309dd96cd089c7.tar.gz
emacs-646d33dbbced04b3454fa5f726309dd96cd089c7.zip
Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
* lisp/vc/vc.el (vc-version-diff, vc-version-ediff): Describe arguments in the doc strings. (Bug#35019)
-rw-r--r--lisp/vc/vc.el17
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 326284f4446..353299cbed9 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1814,7 +1814,12 @@ Return t if the buffer had changes, nil otherwise."
1814 1814
1815;;;###autoload 1815;;;###autoload
1816(defun vc-version-diff (_files rev1 rev2) 1816(defun vc-version-diff (_files rev1 rev2)
1817 "Report diffs between revisions of the fileset in the repository history." 1817 "Report diffs between revisions REV1 and REV2 in the repository history.
1818This compares two revisions of the current fileset.
1819If REV1 is nil, it defaults to the current revision, i.e. revision
1820of the last commit.
1821If REV2 is nil, it defaults to the work tree, i.e. the current
1822state of each file in the fileset."
1818 (interactive (vc-diff-build-argument-list-internal)) 1823 (interactive (vc-diff-build-argument-list-internal))
1819 ;; All that was just so we could do argument completion! 1824 ;; All that was just so we could do argument completion!
1820 (when (and (not rev1) rev2) 1825 (when (and (not rev1) rev2)
@@ -1846,8 +1851,14 @@ saving the buffer."
1846 1851
1847;;;###autoload 1852;;;###autoload
1848(defun vc-version-ediff (files rev1 rev2) 1853(defun vc-version-ediff (files rev1 rev2)
1849 "Show differences between revisions of the fileset in the 1854 "Show differences between REV1 and REV2 of FILES using ediff.
1850repository history using ediff." 1855This compares two revisions of the files in FILES. Currently,
1856only a single file's revisions can be compared, i.e. FILES can
1857specify only one file name.
1858If REV1 is nil, it defaults to the current revision, i.e. revision
1859of the last commit.
1860If REV2 is nil, it defaults to the work tree, i.e. the current
1861state of each file in FILES."
1851 (interactive (vc-diff-build-argument-list-internal)) 1862 (interactive (vc-diff-build-argument-list-internal))
1852 ;; All that was just so we could do argument completion! 1863 ;; All that was just so we could do argument completion!
1853 (when (and (not rev1) rev2) 1864 (when (and (not rev1) rev2)