diff options
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index f224246f40b..a16c7871ff9 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -255,10 +255,6 @@ Can be nil if the style is undecided, or else: - `diff3-E' - `diff3-A'") -;; Compiler pacifiers -(defvar font-lock-mode) -(defvar font-lock-keywords) - ;;;; ;;;; Actual code ;;;; @@ -1243,7 +1239,11 @@ spacing of the \"Lower\" chunk." (write-region beg1 end1 file1 nil 'nomessage) (write-region beg2 end2 file2 nil 'nomessage) (unwind-protect - (with-current-buffer (get-buffer-create smerge-diff-buffer-name) + (save-current-buffer + (if-let (buffer (get-buffer smerge-diff-buffer-name)) + (set-buffer buffer) + (set-buffer (get-buffer-create smerge-diff-buffer-name)) + (setq buffer-read-only t)) (setq default-directory dir) (let ((inhibit-read-only t)) (erase-buffer) |