aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/ediff-util.el4
-rw-r--r--lisp/vc/ediff.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index ec227f44e8f..8f84dfb14ef 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2818,7 +2818,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
2818 (with-output-to-temp-buffer ediff-msg-buffer 2818 (with-output-to-temp-buffer ediff-msg-buffer
2819 (ediff-with-current-buffer standard-output 2819 (ediff-with-current-buffer standard-output
2820 (fundamental-mode)) 2820 (fundamental-mode))
2821 (raise-frame (selected-frame)) 2821 (raise-frame)
2822 (princ (ediff-version)) 2822 (princ (ediff-version))
2823 (princ "\n\n") 2823 (princ "\n\n")
2824 (ediff-with-current-buffer ediff-buffer-A 2824 (ediff-with-current-buffer ediff-buffer-A
@@ -3468,7 +3468,7 @@ Without an argument, it saves customized diff argument, if available
3468 (ediff-with-current-buffer buf 3468 (ediff-with-current-buffer buf
3469 (goto-char (point-min))) 3469 (goto-char (point-min)))
3470 (switch-to-buffer buf) 3470 (switch-to-buffer buf)
3471 (raise-frame (selected-frame))))) 3471 (raise-frame))))
3472 (if (frame-live-p ediff-control-frame) 3472 (if (frame-live-p ediff-control-frame)
3473 (ediff-reset-mouse ediff-control-frame)) 3473 (ediff-reset-mouse ediff-control-frame))
3474 (if (window-live-p ediff-control-window) 3474 (if (window-live-p ediff-control-window)
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index e9a6a97409c..d35c3e53e9a 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1499,7 +1499,7 @@ With optional NODE, goes to that node."
1499 (if node 1499 (if node
1500 (Info-goto-node node) 1500 (Info-goto-node node)
1501 (message "Type `i' to search for a specific topic")) 1501 (message "Type `i' to search for a specific topic"))
1502 (raise-frame (selected-frame))) 1502 (raise-frame))
1503 (error (beep 1) 1503 (error (beep 1)
1504 (with-output-to-temp-buffer ediff-msg-buffer 1504 (with-output-to-temp-buffer ediff-msg-buffer
1505 (ediff-with-current-buffer standard-output 1505 (ediff-with-current-buffer standard-output