summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-02-07 01:38:41 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2022-02-07 04:58:49 +0100
commit130cd70d9bea68099e9748af59fe812c248ca1f5 (patch)
tree9157f3349d6fccd44bf6d41df4f7d49174b3eb65 /lisp
parentab5b2e63fa0b966570cc505fa4a77d16cf3f45d6 (diff)
downloademacs-130cd70d9bea68099e9748af59fe812c248ca1f5.tar.gz
emacs-130cd70d9bea68099e9748af59fe812c248ca1f5.tar.bz2
emacs-130cd70d9bea68099e9748af59fe812c248ca1f5.zip
Improve the ediff-diff-options documentation
* lisp/vc/ediff-diff.el (ediff-diff-options): * doc/misc/ediff.texi (Patch and Diff Programs): Note that setting this variable directly is probably the wrong thing to do (bug#6512).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc/ediff-diff.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index ca56a2851db..07b853817d1 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -85,7 +85,10 @@ options after the default ones.
This variable is not for customizing the look of the differences produced by
the command \\[ediff-show-diff-output]. Use the variable
-`ediff-custom-diff-options' for that."
+`ediff-custom-diff-options' for that.
+
+Setting this variable directly may not yield the expected
+results. It should be set via the Customize interface instead."
:set #'ediff-set-diff-options
:type 'string)