(iswitchb-visit-buffer): Use `select-frame-set-input-focus'.

[gnu-emacs] / lisp / ediff-merg.el

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 92788ae968fa1c05c305f1adaba13660c06da19c..5242014eb7ee3e13e305cb9e2b4a94118fc9cac4 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -21,6 +21,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (provide 'ediff-merg)
@@ -348,7 +350,8 @@ Combining is done according to the specifications in variable
 
        (reverse delim-regs-list)
        )))
-       
+
+(eval-when-compile (defvar state-of-merge)) ; dynamic var
 
 ;; Check if the non-preferred merge has been modified since originally set.
 ;; This affects only the regions that are marked as default-A/B or combined.
@@ -384,4 +387,4 @@ Combining is done according to the specifications in variable
 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;;; End:
 
-;; ediff-merg.el ends here
+;;; ediff-merg.el ends here