Mercurial > emacs
diff lisp/follow.el @ 90951:3619e7770f2e
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--unicode--0--patch-223
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 16 Jun 2007 22:32:13 +0000 |
| parents | 95d0cdf160ea 0a0d00f78651 |
| children | a66921565bcb |
line wrap: on
line diff
--- a/lisp/follow.el Sat Jun 16 21:50:56 2007 +0000 +++ b/lisp/follow.el Sat Jun 16 22:32:13 2007 +0000 @@ -912,7 +912,7 @@ "Return all windows displaying the same buffer as the TESTWIN. The list contains only windows displayed in the same frame as TESTWIN. If TESTWIN is nil the selected window is used." - (or (and testwin (window-live-p testwin)) + (or (window-live-p testwin) (setq testwin (selected-window))) (let* ((top (frame-first-window (window-frame testwin))) (win top) @@ -1968,7 +1968,7 @@ ;; If we're in follow mode, do our stuff. Select a new window and ;; redisplay. (Actually, it is redundant to check `buf', but I ;; feel it's more correct.) - (if (and buf win (window-live-p win)) + (if (and buf (window-live-p win)) (progn (set-buffer buf) (if (and (boundp 'follow-mode) follow-mode)