Commit 3eb4d23a authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

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.
parent 85993609
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> 2015-03-15 Michael Albinus <michael.albinus@gmx.de>
   
* net/tramp-adb.el: * net/tramp-adb.el:
......
...@@ -2446,9 +2446,6 @@ MSG is printed after `::::} '." ...@@ -2446,9 +2446,6 @@ MSG is printed after `::::} '."
edebug-function) edebug-function)
)) ))
(setcdr edebug-window-data
(edebug-adjust-window (cdr edebug-window-data)))
;; Test if there is input, not including keyboard macros. ;; Test if there is input, not including keyboard macros.
(if (input-pending-p) (if (input-pending-p)
(progn (progn
...@@ -2677,12 +2674,6 @@ MSG is printed after `::::} '." ...@@ -2677,12 +2674,6 @@ MSG is printed after `::::} '."
(defining-kbd-macro (defining-kbd-macro
(if edebug-continue-kbd-macro 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?? ;; others??
) )
...@@ -2722,31 +2713,6 @@ MSG is printed after `::::} '." ...@@ -2722,31 +2713,6 @@ MSG is printed after `::::} '."
;;; Display related functions ;;; 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 (defconst edebug-arrow-alist
'((Continue-fast . "=") '((Continue-fast . "=")
(Trace-fast . "-") (Trace-fast . "-")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment