aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-10-26 12:57:09 +0300
committerEli Zaretskii2019-10-26 12:57:09 +0300
commitc3b0950639f847264d3d6558d065993fb743376c (patch)
tree31982909884b2fdec025f65a5fe83d1d6da71b84
parent626e0a6aad6b0f3c7348f37c9b2c9854b06b449b (diff)
downloademacs-c3b0950639f847264d3d6558d065993fb743376c.tar.gz
emacs-c3b0950639f847264d3d6558d065993fb743376c.zip
Improve the documentation of 'vc-tor'
* lisp/vc/vc-dispatcher.el (vc-tor): Add :version. Enhance the doc string. * etc/NEWS: Announce the new option.
-rw-r--r--etc/NEWS6
-rw-r--r--lisp/vc/vc-dispatcher.el5
2 files changed, 10 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 56127ba6018..137d476c926 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -823,6 +823,12 @@ The default value is 'find-dired-sort-by-filename'.
823 823
824** Change Logs and VC 824** Change Logs and VC
825 825
826---
827*** New user option 'vc-tor'.
828When non-nil, this option causes the VC commands to communicate with
829the repository via Tor's proxy, using the 'torsocks' wrapper script.
830The default is nil.
831
826+++ 832+++
827*** New command 'log-edit-generate-changelog-from-diff', bound to 'C-c C-w'. 833*** New command 'log-edit-generate-changelog-from-diff', bound to 'C-c C-w'.
828This generates ChangeLog entries from the VC fileset diff. 834This generates ChangeLog entries from the VC fileset diff.
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index bf238dedbb8..40055091ef7 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -268,8 +268,11 @@ and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.")
268 (if (not filelist) "." (mapconcat 'identity filelist " "))) 268 (if (not filelist) "." (mapconcat 'identity filelist " ")))
269 269
270(defcustom vc-tor nil 270(defcustom vc-tor nil
271 "If non-nil, communicate with the repository site via Tor." 271 "If non-nil, communicate with the repository site via Tor.
272See https://2019.www.torproject.org/about/overview.html.en and
273the man pages for \"torsocks\" for more details about Tor."
272 :type 'boolean 274 :type 'boolean
275 :version "27.1"
273 :group 'vc) 276 :group 'vc)
274 277
275;;;###autoload 278;;;###autoload