diff options
| author | Joakim Verona | 2012-02-15 15:12:49 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-02-15 15:12:49 +0100 |
| commit | 02db17e53bf46c91b2cb8ee33b43d8ae252a1681 (patch) | |
| tree | fcafa961e884648e15524130f1dbca55dc7093d0 /lisp/vc/diff-mode.el | |
| parent | 736ab04e2752e7c3c5b5070a0d62279dcfb12b27 (diff) | |
| parent | 1deeb569b1247db4c0b2eea4906a9e53e5ee7e99 (diff) | |
| download | emacs-02db17e53bf46c91b2cb8ee33b43d8ae252a1681.tar.gz emacs-02db17e53bf46c91b2cb8ee33b43d8ae252a1681.zip | |
upstream
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 7de9d17e3f7..ba4a2766526 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -237,7 +237,7 @@ from disabled to enabled, it tries to refine the current hunk, as | |||
| 237 | well." | 237 | well." |
| 238 | :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine" | 238 | :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine" |
| 239 | (when diff-auto-refine-mode | 239 | (when diff-auto-refine-mode |
| 240 | (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) | 240 | (condition-case-unless-debug nil (diff-refine-hunk) (error nil)))) |
| 241 | 241 | ||
| 242 | ;;;; | 242 | ;;;; |
| 243 | ;;;; font-lock support | 243 | ;;;; font-lock support |
| @@ -542,7 +542,7 @@ but in the file header instead, in which case move forward to the first hunk." | |||
| 542 | (easy-mmode-define-navigation | 542 | (easy-mmode-define-navigation |
| 543 | diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view | 543 | diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view |
| 544 | (if diff-auto-refine-mode | 544 | (if diff-auto-refine-mode |
| 545 | (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) | 545 | (condition-case-unless-debug nil (diff-refine-hunk) (error nil)))) |
| 546 | 546 | ||
| 547 | (easy-mmode-define-navigation | 547 | (easy-mmode-define-navigation |
| 548 | diff-file diff-file-header-re "file" diff-end-of-hunk) | 548 | diff-file diff-file-header-re "file" diff-end-of-hunk) |