diff options
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 392973e08fe..9f0fa584b0d 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -225,9 +225,16 @@ when editing big diffs)." | |||
| 225 | "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.") | 225 | "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.") |
| 226 | 226 | ||
| 227 | (define-minor-mode diff-auto-refine-mode | 227 | (define-minor-mode diff-auto-refine-mode |
| 228 | "Automatically highlight changes in detail as the user visits hunks. | 228 | "Toggle automatic diff hunk highlighting (Diff Auto Refine mode). |
| 229 | When transitioning from disabled to enabled, | 229 | With a prefix argument ARG, enable Diff Auto Refine mode if ARG |
| 230 | try to refine the current hunk, as well." | 230 | is positive, and disable it otherwise. If called from Lisp, |
| 231 | enable the mode if ARG is omitted or nil. | ||
| 232 | |||
| 233 | Diff Auto Refine mode is a buffer-local minor mode used with | ||
| 234 | `diff-mode'. When enabled, Emacs automatically highlights | ||
| 235 | changes in detail as the user visits hunks. When transitioning | ||
| 236 | from disabled to enabled, it tries to refine the current hunk, as | ||
| 237 | well." | ||
| 231 | :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine" | 238 | :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine" |
| 232 | (when diff-auto-refine-mode | 239 | (when diff-auto-refine-mode |
| 233 | (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) | 240 | (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) |
| @@ -1306,7 +1313,11 @@ a diff with \\[diff-reverse-direction]. | |||
| 1306 | 1313 | ||
| 1307 | ;;;###autoload | 1314 | ;;;###autoload |
| 1308 | (define-minor-mode diff-minor-mode | 1315 | (define-minor-mode diff-minor-mode |
| 1309 | "Minor mode for viewing/editing context diffs. | 1316 | "Toggle Diff minor mode. |
| 1317 | With a prefix argument ARG, enable Diff minor mode if ARG is | ||
| 1318 | positive, and disable it otherwise. If called from Lisp, enable | ||
| 1319 | the mode if ARG is omitted or nil. | ||
| 1320 | |||
| 1310 | \\{diff-minor-mode-map}" | 1321 | \\{diff-minor-mode-map}" |
| 1311 | :group 'diff-mode :lighter " Diff" | 1322 | :group 'diff-mode :lighter " Diff" |
| 1312 | ;; FIXME: setup font-lock | 1323 | ;; FIXME: setup font-lock |