Mercurial > emacs

comparison lisp/emacs-lisp/edebug.el @ 83635:9c01792a3ce8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 793-802) - Update from CVS - Remove RCS keywords - Merge from emacs--rel--22 * emacs--rel--22 (patch 42-50) - Update from CVS - Merge from gnus--rel--5.10 - Gnus ChangeLog tweaks * gnus--rel--5.10 (patch 229-232) - Merge from emacs--devo--0, emacs--rel--22 - ChangeLog tweak - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
author Miles Bader <miles@gnu.org>
date Sat, 16 Jun 2007 22:33:42 +0000
parents 0842cee3ad33
children b98604865ea0 3619e7770f2e
comparison
equal deleted inserted replaced
83634:391cce03f832 83635:9c01792a3ce8
367 ;; Select WINDOW if it is provided and still exists. Otherwise, 367 ;; Select WINDOW if it is provided and still exists. Otherwise,
368 ;; if buffer is currently shown in several windows, choose one. 368 ;; if buffer is currently shown in several windows, choose one.
369 ;; Otherwise, find a new window, possibly splitting one. 369 ;; Otherwise, find a new window, possibly splitting one.
370 (setq window 370 (setq window
371 (cond 371 (cond
372 ((and (windowp window) (edebug-window-live-p window) 372 ((and (edebug-window-live-p window)
373 (eq (window-buffer window) buffer)) 373 (eq (window-buffer window) buffer))
374 window) 374 window)
375 ((eq (window-buffer (selected-window)) buffer) 375 ((eq (window-buffer (selected-window)) buffer)
376 ;; Selected window already displays BUFFER. 376 ;; Selected window already displays BUFFER.
377 (selected-window)) 377 (selected-window))
2737 (set-window-start edebug-trace-window 2737 (set-window-start edebug-trace-window
2738 edebug-trace-window-start)) 2738 edebug-trace-window-start))
2739 2739
2740 ;; Unrestore edebug-buffer's window-start, if displayed. 2740 ;; Unrestore edebug-buffer's window-start, if displayed.
2741 (let ((window (car edebug-window-data))) 2741 (let ((window (car edebug-window-data)))
2742 (if (and window (edebug-window-live-p window) 2742 (if (and (edebug-window-live-p window)
2743 (eq (window-buffer) edebug-buffer)) 2743 (eq (window-buffer) edebug-buffer))
2744 (progn 2744 (progn
2745 (set-window-start window (cdr edebug-window-data) 2745 (set-window-start window (cdr edebug-window-data)
2746 'no-force) 2746 'no-force)
2747 ;; Unrestore edebug-buffer's window-point. 2747 ;; Unrestore edebug-buffer's window-point.