Mercurial > emacs
diff lisp/emacs-lisp/edebug.el @ 83635:9c01792a3ce8
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 |
line wrap: on
line diff
--- a/lisp/emacs-lisp/edebug.el Tue Jun 12 08:21:39 2007 +0000 +++ b/lisp/emacs-lisp/edebug.el Sat Jun 16 22:33:42 2007 +0000 @@ -369,7 +369,7 @@ ;; Otherwise, find a new window, possibly splitting one. (setq window (cond - ((and (windowp window) (edebug-window-live-p window) + ((and (edebug-window-live-p window) (eq (window-buffer window) buffer)) window) ((eq (window-buffer (selected-window)) buffer) @@ -2739,7 +2739,7 @@ ;; Unrestore edebug-buffer's window-start, if displayed. (let ((window (car edebug-window-data))) - (if (and window (edebug-window-live-p window) + (if (and (edebug-window-live-p window) (eq (window-buffer) edebug-buffer)) (progn (set-window-start window (cdr edebug-window-data)