(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.

[gnu-emacs] / lisp / compare-w.el

diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 495ff12d110e54b4cbf54efcfa981f8151ed8ae9..d3788508cd36737dc0c3997715a3cdb3a00ce20c 100644 (file)
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -81,7 +81,9 @@ If `compare-ignore-case' is non-nil, changes in case are also ignored."
                             'compare-windows-skip-whitespace
                           compare-windows-whitespace))))
     (setq p1 (point) b1 (current-buffer))
-    (setq w2 (next-window (selected-window) nil 'visible))
+    (setq w2 (next-window (selected-window)))
+    (if (eq w2 (selected-window))
+       (setq w2 (next-window (selected-window) nil 'visible)))
     (if (eq w2 (selected-window))
        (error "No other window"))
     (setq p2 (window-point w2)