aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-08-13 18:16:51 +0300
committerEli Zaretskii2019-08-13 18:16:51 +0300
commitc0e720cdd97b28d532f4deb66861518a70d062ac (patch)
tree33778bcbdbe98cad7bfd3af6a56d666f3811dd03
parentc90975f92fd71be7282293e0ed1098c0fa5d62a0 (diff)
downloademacs-c0e720cdd97b28d532f4deb66861518a70d062ac.tar.gz
emacs-c0e720cdd97b28d532f4deb66861518a70d062ac.zip
Improve documentation of 'diff-font-lock-prettify'
* lisp/vc/diff-mode.el (diff-font-lock-prettify): Doc fix. * etc/NEWS: Minor copyedits.
-rw-r--r--etc/NEWS6
-rw-r--r--lisp/vc/diff-mode.el6
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index e8618152ed9..b9e9e28db4b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -734,6 +734,10 @@ With a prefix argument asks for a command, so for example,
734'C-u M-x vc-log-search RET git log -1 f302475 RET' will display 734'C-u M-x vc-log-search RET git log -1 f302475 RET' will display
735just one log entry found by its revision number. 735just one log entry found by its revision number.
736 736
737*** 'C-x v =' can now mimic Magit's diff format.
738Set the new user option 'diff-font-lock-prettify' to t for that, see
739below under "Diff mode".
740
737** Diff mode 741** Diff mode
738+++ 742+++
739*** Hunks are now automatically refined by font-lock. 743*** Hunks are now automatically refined by font-lock.
@@ -754,6 +758,8 @@ according to the appropriate major mode. Customize the new option
754 758
755*** File headers can be shortened, mimicking Magit's diff format. 759*** File headers can be shortened, mimicking Magit's diff format.
756To enable it, set the new user option 'diff-font-lock-prettify' to t. 760To enable it, set the new user option 'diff-font-lock-prettify' to t.
761On GUI frames, this option also displays the insertion and deletion
762indicators on the left fringe.
757 763
758+++ 764+++
759*** Prefix arg of 'diff-goto-source' means jump to the old revision 765*** Prefix arg of 'diff-goto-source' means jump to the old revision
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c4812e81d40..19f9c802d40 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -109,7 +109,11 @@ You can always manually refine a hunk with `diff-refine-hunk'."
109 (const :tag "Refine hunks during navigation" navigation))) 109 (const :tag "Refine hunks during navigation" navigation)))
110 110
111(defcustom diff-font-lock-prettify nil 111(defcustom diff-font-lock-prettify nil
112 "If non-nil, font-lock will try and make the format prettier." 112 "If non-nil, font-lock will try and make the format prettier.
113
114This mimics the Magit's diff format by making the hunk header
115less cryptic, and on GUI frames also displays insertion and
116deletion indicators on the left fringe (if it's available)."
113 :version "27.1" 117 :version "27.1"
114 :type 'boolean) 118 :type 'boolean)
115 119