Make Edebug work with Follow Mode.

* emacs-lisp/edebug.el (edebug--display-1): Remove call to
edebug-adjust-window.
(edebug--recursive-edit): Don't bind pre/post-command-hooks to nil
over the recursive edit.
(edebug-adjust-window): Remove.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 747a1d6c6509fdf631795b4ec3ed8e545f1895b4..c6fab7fba3d708a82c45542640b4f90e7163d2c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-16  Alan Mackenzie  <acm@muc.de>
+
+       Make Edebug work with Follow Mode.
+
+       * emacs-lisp/edebug.el (edebug--display-1): Remove call to
+       edebug-adjust-window.
+       (edebug--recursive-edit): Don't bind pre/post-command-hooks to nil
+       over the recursive edit.
+       (edebug-adjust-window): Remove.
+
 2015-03-15  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-adb.el:

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 10918775f49671f48d078602fc58e9ddd8f34adc..333f02842f7895ef47d2a9dc1f8388f44f731719 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2446,9 +2446,6 @@ MSG is printed after `::::} '."
                               edebug-function)
                 ))
 
-         (setcdr edebug-window-data
-                 (edebug-adjust-window (cdr edebug-window-data)))
-
          ;; Test if there is input, not including keyboard macros.
          (if (input-pending-p)
              (progn
@@ -2677,12 +2674,6 @@ MSG is printed after `::::} '."
              (defining-kbd-macro
                (if edebug-continue-kbd-macro defining-kbd-macro))
 
-             ;; Disable command hooks.  This is essential when
-             ;; a hook function is instrumented - to avoid infinite loop.
-             ;; This may be more than we need, however.
-             (pre-command-hook nil)
-             (post-command-hook nil)
-
              ;; others??
              )
 
@@ -2722,31 +2713,6 @@ MSG is printed after `::::} '."
 
 ;;; Display related functions
 
-(defun edebug-adjust-window (old-start)
-  ;; If pos is not visible, adjust current window to fit following context.
-  ;; (message "window: %s old-start: %s window-start: %s pos: %s"
-  ;;          (selected-window) old-start (window-start) (point)) (sit-for 5)
-  (if (not (pos-visible-in-window-p))
-      (progn
-       ;; First try old-start
-       (if old-start
-           (set-window-start (selected-window) old-start))
-       (if (not (pos-visible-in-window-p))
-           (progn
-       ;; (message "resetting window start") (sit-for 2)
-       (set-window-start
-        (selected-window)
-        (save-excursion
-          (forward-line
-           (if (< (point) (window-start)) -1   ; one line before if in back
-             (- (/ (window-height) 2)) ; center the line moving forward
-             ))
-          (beginning-of-line)
-          (point)))))))
-  (window-start))
-
-
-
 (defconst edebug-arrow-alist
   '((Continue-fast . "=")
     (Trace-fast . "-")