annotate lisp/window-xemacs.el @ 3736:01830ac74073

[xemacs-hg @ 2006-12-11 12:22:47 by aidan] 2006-12-08 Aidan Kehoe <kehoea@parhasard.net> * specifier.c (charset_matches_specifier_tag_set_p): A charset's entry in Vcharset_tag_lists may be nil, if, when that charset was created, no tags with associated charset predicates existed. Accept this possibility, treat it as the tag not matching that charset.
author aidan
date Mon, 11 Dec 2006 12:22:52 +0000
parents b6287dbce5f0
children db22824aa020
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 ;;; window-xemacs.el --- XEmacs window commands aside from those written in C.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 ;; Copyright (C) 1985, 1989, 1993-94, 1997 Free Software Foundation, Inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995, 1996 Ben Wing.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Keywords: frames, extensions, dumped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 ;;; Synched up with: Not synched.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;; This file is dumped with XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;; slb - 5/29/97
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 ;; Split apart from window.el in order to keep that file better in synch
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;; with Emacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 (defgroup windows nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 "Windows within a frame."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 :group 'environment)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 (defun recenter (&optional n window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 "Center point in WINDOW and redisplay frame. With N, put point on line N.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 The desired position of point is always relative to the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 Just C-u as prefix means put point in the center of the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 No N (i.e., it is nil) erases the entire frame and then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 redraws with point in the center of the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 If WINDOW is nil, the selected window is used."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 (interactive "_P")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 (center-to-window-line (if (consp n) nil n) window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 (when (null n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 (redraw-frame (window-frame window) t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
54 (defun backward-other-window (count &optional which-frames which-devices)
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
55 "Select the COUNT'th different window on this frame, going backwards.
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
56 This is just like calling `other-window' with COUNT negated."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 (interactive "p")
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
58 (other-window (- count) which-frames which-devices))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 (defalias 'windows-of-buffer 'get-buffer-window-list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 (defun buffer-in-multiple-windows-p (&optional buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 "Return t if BUFFER is in multiple windows.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 If BUFFER is not specified, the current buffer will be used."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 (setq buffer (or buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 (get-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 (get-file-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 (current-buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 (> (length (windows-of-buffer buffer)) 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 (defun window-list (&optional frame minibuf window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 "Return a list of windows on FRAME, beginning with WINDOW.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 FRAME and WINDOW default to the selected ones.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 Optional second arg MINIBUF t means count the minibuffer window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 even if not active. If MINIBUF is neither t nor nil it means
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 not to count the minibuffer even if it is active."
1261
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 1230
diff changeset
77 (setq frame (or frame (selected-frame))
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 1230
diff changeset
78 window (or window (selected-window frame)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79 (if (not (eq (window-frame window) frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 (error "Window must be on frame."))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 (let ((current-frame (selected-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 (unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 (save-window-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 (select-frame frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 (walk-windows
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 (function (lambda (cur-window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 (if (not (eq window cur-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 (setq list (cons cur-window list)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 (setq list (cons window list)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 (select-frame current-frame))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 ;; We used to have set-window-dedicated-p as an obsolete version
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 ;; of set-window-buffer-dedicated, but it really makes more sense
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 ;; this way.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 (make-obsolete 'set-window-buffer-dedicated 'set-window-dedicated-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 (defun set-window-buffer-dedicated (window buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 "Make WINDOW display BUFFER and be dedicated to that buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 Then Emacs will not automatically change which buffer appears in WINDOW.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 If BUFFER is nil, make WINDOW not be dedicated (but don't change which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 buffer appears in it currently)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 (if (bufferp buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 (set-window-buffer window (get-buffer-create buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 (set-window-dedicated-p window (not (null buffer))))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
107
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
108 ;; Window configurations
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109
3646
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
110 (defcustom window-configuration-includes-position nil
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
111 "*Whether restoring window configurations will restore positions too.
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
112 If nil, only the size of windows will be restored.
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
113
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
114 Note that setting this value to t may have counterintuitive consequences,
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
115 if a window manager employing virtual desktops is in use."
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
116 :type 'boolean
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
117 :group 'windows)
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
118
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
119 (defstruct saved-window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
120 currentp minibufferp minibuffer-scrollp
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
121 buffer mark-marker
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
122 start-marker
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
123 point-marker
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
124 pixel-left pixel-top pixel-right pixel-bottom
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
125 hscroll modeline-hscroll
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
126 dedicatedp
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
127 first-hchild first-vchild next-child)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
128
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
129 (defstruct window-configuration
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
130 frame
2872
5bf18ccb05df [xemacs-hg @ 2005-07-24 17:53:21 by michaels]
michaels
parents: 2590
diff changeset
131 frame-top frame-left
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
132 frame-pixel-width frame-pixel-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
133 current-buffer
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
134 minibuffer-pixel-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
135 min-width min-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
136 saved-root-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
137
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
138 (defun window-configuration-equal (conf-1 conf-2)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
139 "Returns a boolean indicating whether the two given configurations
3646
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
140 are identical.
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
141
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
142 Window configurations containing windows with different window
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
143 positions are not identical iff `window-configuration-includes-position'
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
144 is t."
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
145 (or (eq conf-1 conf-2)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
146 (and (eq (window-configuration-frame conf-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
147 (window-configuration-frame conf-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
148 (= (window-configuration-frame-pixel-width conf-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
149 (window-configuration-frame-pixel-width conf-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
150 (= (window-configuration-frame-pixel-height conf-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
151 (window-configuration-frame-pixel-height conf-2))
3646
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
152 (if window-configuration-includes-position
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
153 (and (equal (window-configuration-frame-top conf-1)
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
154 (window-configuration-frame-top conf-2))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
155 (equal (window-configuration-frame-left conf-1)
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
156 (window-configuration-frame-left conf-2)))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
157 t)
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
158 (eq (window-configuration-current-buffer conf-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
159 (window-configuration-current-buffer conf-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
160 (saved-window-equal (window-configuration-saved-root-window conf-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
161 (window-configuration-saved-root-window conf-2)))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
162
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
163 (defun saved-window-equal (saved-1 saved-2)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
164 "Returns a boolean indicating whether the two given saved windows
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
165 are identical."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
166 (or (eq saved-1 saved-2)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
167 (and (eq (saved-window-currentp saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
168 (saved-window-currentp saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
169 (eq (saved-window-minibuffer-scrollp saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
170 (saved-window-minibuffer-scrollp saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
171 (eq (saved-window-buffer saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
172 (saved-window-buffer saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
173 (equal (saved-window-mark-marker saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
174 (saved-window-mark-marker saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
175 (or (and (saved-window-currentp saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
176 (saved-window-currentp saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
177 (equal (saved-window-start-marker saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
178 (saved-window-start-marker saved-2)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
179 (or (and (saved-window-currentp saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
180 (saved-window-currentp saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
181 (equal (saved-window-point-marker saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
182 (saved-window-point-marker saved-2)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
183 (= (saved-window-pixel-left saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
184 (saved-window-pixel-left saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
185 (= (saved-window-pixel-top saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
186 (saved-window-pixel-top saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
187 (= (saved-window-pixel-right saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
188 (saved-window-pixel-right saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
189 (= (saved-window-pixel-bottom saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
190 (saved-window-pixel-bottom saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
191 (= (saved-window-hscroll saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
192 (saved-window-hscroll saved-2))
1387
e04cd2f562b7 [xemacs-hg @ 2003-03-26 15:09:51 by james]
james
parents: 1261
diff changeset
193 (equal (saved-window-modeline-hscroll saved-1)
e04cd2f562b7 [xemacs-hg @ 2003-03-26 15:09:51 by james]
james
parents: 1261
diff changeset
194 (saved-window-modeline-hscroll saved-2))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
195 (eq (saved-window-dedicatedp saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
196 (saved-window-dedicatedp saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
197 (maybe-saved-window-equal (saved-window-first-hchild saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
198 (saved-window-first-hchild saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
199 (maybe-saved-window-equal (saved-window-first-vchild saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
200 (saved-window-first-vchild saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
201 (maybe-saved-window-equal (saved-window-next-child saved-1)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
202 (saved-window-next-child saved-2)))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
203
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
204 (defun maybe-saved-window-equal (maybe-saved-1 maybe-saved-2)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
205 "Returns a boolean indicating whether the two given saved windows
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
206 or NILs are identical."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
207 (cond
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
208 ((and (not maybe-saved-1) (not maybe-saved-2)) t)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
209 ((not maybe-saved-1) (not maybe-saved-2))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
210 ((not maybe-saved-2) (not maybe-saved-1))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
211 (t (saved-window-equal maybe-saved-1 maybe-saved-2))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
212
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
213 (defun current-window-configuration (&optional frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
214 "Return an object representing the current window configuration of FRAME.
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
215 If FRAME is nil or omitted, use the selected frame.
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
216 This describes the number of windows, their sizes and current buffers,
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
217 and for each window on FRAME the displayed buffer, where display
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
218 starts, and the positions of point and mark.
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
219 An exception is made for point in the current buffer:
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
220 its value is -not- saved."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
221 (let ((frame (or frame (selected-frame))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
222 ;; The original C code used complicated but still incomplete logic
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
223 ;; to decide if and how to restore the size of the minibuffer. It
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
224 ;; goes something like this:
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
225 ; (let ((real-font-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
226 ; (font-height (face-font 'default) frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
227 ; (minibuffer-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
228 ; (if (and (minibuffer-window frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
229 ; (not (frame-minibuffer-only-p frame)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
230 ; (window-pixel-height (minibuffer-window frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
231 ; 0)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
232 ; ...)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
233
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
234 (make-window-configuration
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
235 :frame frame
2885
6caa3d30f19f [xemacs-hg @ 2005-08-04 17:13:18 by michaels]
michaels
parents: 2872
diff changeset
236 :frame-top (frame-property frame 'top)
6caa3d30f19f [xemacs-hg @ 2005-08-04 17:13:18 by michaels]
michaels
parents: 2872
diff changeset
237 :frame-left (frame-property frame 'left)
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
238 :frame-pixel-width (frame-pixel-width frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
239 :frame-pixel-height (frame-pixel-height frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
240 :current-buffer (current-buffer)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
241 :min-width window-min-width :min-height window-min-height
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
242 :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
243 ;; this tries to do what the old code did:
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
244 ; :minibuffer-height (if (zerop (% minibuffer-height real-font-height))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
245 ; (- (/ minibuffer-height real-font-height)) ; lines
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
246 ; minibuffer-height) ; pixels
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
247 :saved-root-window (root-window->saved-window (frame-root-window frame)))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
248
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
249 (defun root-window->saved-window (window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
250 "Converts a root window into a tree of saved-window structures."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
251 (let ((buffer (window-buffer window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
252 (edges (window-pixel-edges window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
253 (let ((left (nth 0 edges))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
254 (top (nth 1 edges))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
255 (right (nth 2 edges))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
256 (bottom (nth 3 edges)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
257 (let ((saved-window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
258 (make-saved-window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
259 :currentp (eq window (selected-window (window-frame window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
260 :minibufferp (eq window (minibuffer-window (window-frame window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
261 :minibuffer-scrollp (eq window minibuffer-scroll-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
262 :buffer buffer
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
263 :pixel-left left :pixel-top top :pixel-right right :pixel-bottom bottom
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
264 :hscroll (window-hscroll window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
265 :modeline-hscroll (modeline-hscroll window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
266 :dedicatedp (window-dedicated-p window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
267 :first-hchild (if (window-first-hchild window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
268 (root-window->saved-window (window-first-hchild window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
269 nil)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
270 :first-vchild (if (window-first-vchild window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
271 (root-window->saved-window (window-first-vchild window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
272 nil)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
273 :next-child (if (window-next-child window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
274 (root-window->saved-window (window-next-child window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
275 nil))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
276 (if buffer
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
277 (progn
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
278 (let ((marker (make-marker)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
279 (set-marker marker (window-start window) buffer)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
280 (setf (saved-window-start-marker saved-window) marker))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
281 (let ((marker (make-marker)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
282 (if (eq window (selected-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
283 (set-marker marker (point buffer) buffer)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
284 (set-marker marker (window-point window) buffer))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
285 (setf (saved-window-point-marker saved-window) marker))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
286 (setf (saved-window-mark-marker saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
287 (copy-marker (mark-marker t buffer)))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
288 saved-window))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
289
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
290 (defun set-window-configuration (configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
291 "Set the configuration of windows and buffers as specified by CONFIGURATION.
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
292 CONFIGURATION must be a value previously returned
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
293 by `current-window-configuration'."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
294 (let ((frame (window-configuration-frame configuration)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
295 (if (and (frame-live-p frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
296 (not (window-configuration-equal configuration
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
297 (current-window-configuration))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
298 (really-set-window-configuration frame configuration))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
299
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
300 (defun really-set-window-configuration (frame configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
301 "Set the window configuration CONFIGURATION on live frame FRAME."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
302 ;; avoid potential temporary problems
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
303 (setq window-min-width 0)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
304 (setq window-min-height 0)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
305 (setq minibuffer-scroll-window nil)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
306
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
307 (frame-reduce-to-one-window frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
308 (set-window-configuration-frame-size configuration)
2888
469ce4fa0ade [xemacs-hg @ 2005-08-06 09:41:58 by michaels]
michaels
parents: 2885
diff changeset
309
469ce4fa0ade [xemacs-hg @ 2005-08-06 09:41:58 by michaels]
michaels
parents: 2885
diff changeset
310 ; avoid setting these if they're already up-to-date
469ce4fa0ade [xemacs-hg @ 2005-08-06 09:41:58 by michaels]
michaels
parents: 2885
diff changeset
311 ; This also avoids potential inaccuracies in these settings --Mike
3646
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
312 (when window-configuration-includes-position
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
313 (let ((left (window-configuration-frame-left configuration))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
314 (top (window-configuration-frame-top configuration)))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
315 (if (not (equal left (frame-property frame 'left)))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
316 (set-frame-property frame 'left left))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
317 (if (not (equal top (frame-property frame 'top)))
b6287dbce5f0 [xemacs-hg @ 2006-10-31 09:16:27 by michaels]
michaels
parents: 2888
diff changeset
318 (set-frame-property frame 'top top))))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
319
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
320 ;; these may have changed because of the delete
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
321 (let ((root-window (frame-root-window frame)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
322 (enlarge-window-pixels
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
323 (- (window-configuration-minibuffer-pixel-height configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
324 (window-pixel-height (minibuffer-window frame)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
325 nil
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
326 (minibuffer-window frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
327
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
328 ;; avoid that `set-window-point' will set the buffer's point for
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
329 ;; the selected window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
330 (select-window (minibuffer-window frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
331
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
332 (let ((window-configuration-current-window nil))
1261
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 1230
diff changeset
333 (declare (special window-configuration-current-window))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
334 (restore-saved-window configuration
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
335 root-window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
336 (window-configuration-saved-root-window configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
337 'vertical)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
338 (if window-configuration-current-window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
339 (select-window window-configuration-current-window))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
340
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
341 (setq window-min-width (window-configuration-min-width configuration))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
342 (setq window-min-height (window-configuration-min-height configuration))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
343
2227
8e7b4a0c1a81 [xemacs-hg @ 2004-08-21 17:05:49 by michaels]
michaels
parents: 1669
diff changeset
344 (let ((buffer (window-configuration-current-buffer configuration)))
8e7b4a0c1a81 [xemacs-hg @ 2004-08-21 17:05:49 by michaels]
michaels
parents: 1669
diff changeset
345 (if (buffer-live-p buffer)
8e7b4a0c1a81 [xemacs-hg @ 2004-08-21 17:05:49 by michaels]
michaels
parents: 1669
diff changeset
346 (set-buffer buffer)
8e7b4a0c1a81 [xemacs-hg @ 2004-08-21 17:05:49 by michaels]
michaels
parents: 1669
diff changeset
347 (set-buffer (car (buffer-list))))))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
348
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
349 (defun set-window-configuration-frame-size (configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
350 "Restore the frame size of a window configuration."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
351 (set-frame-pixel-size
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
352 (window-configuration-frame configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
353 (window-configuration-frame-pixel-width configuration)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
354 (window-configuration-frame-pixel-height configuration)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
355
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
356 (defun frame-reduce-to-one-window (frame)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
357 "Delete all windows except the minibuffer and one other in FRAME."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
358 (let* ((root-window (frame-root-window frame))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
359 (combination-start (or (window-first-hchild root-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
360 (window-first-vchild root-window))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
361 (if combination-start
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
362 (window-reduce-to-one combination-start))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
363
1230
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
364 ;; Note that simply using `delete-other-windows' causes obscure
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
365 ;; breakage. --Mike
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
366
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
367 (defun window-reduce-to-one (window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
368 "Make sure only one subwindow of WINDOW is left."
1230
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
369 (let ((window (window-next-child window)))
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
370 (while window
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
371 (if (window-live-p window)
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
372 (let ((next (window-next-child window)))
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
373 (delete-window window)
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
374 (setq window next)))))
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
375 (cond
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
376 ((window-first-hchild window)
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
377 (window-reduce-to-one (window-first-hchild window)))
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
378 ((window-first-vchild window)
78781398fc4c [xemacs-hg @ 2003-01-23 10:09:41 by michaels]
michaels
parents: 1208
diff changeset
379 (window-reduce-to-one (window-first-vchild window)))))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
380
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
381 (defun restore-saved-window (configuration window saved-window direction)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
382 "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW."
1576
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
383 (and (saved-window-next-child saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
384 (not (saved-window-minibufferp (saved-window-next-child saved-window)))
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
385 (progn
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
386 (cond ((eq direction 'vertical)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
387 (split-window window nil nil))
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
388 ((eq direction 'horizontal)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
389 (split-window window nil t)))
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
390 (restore-saved-window configuration
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
391 (window-next-child window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
392 (saved-window-next-child saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
393 direction)))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
394
1576
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
395 (if (saved-window-first-hchild saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
396 (restore-saved-window configuration
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
397 window
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
398 (saved-window-first-hchild saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
399 'horizontal))
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
400 (if (saved-window-first-vchild saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
401 (restore-saved-window configuration
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
402 window
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
403 (saved-window-first-vchild saved-window)
bd921b813d33 [xemacs-hg @ 2003-07-17 14:41:23 by james]
james
parents: 1387
diff changeset
404 'vertical))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
405
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
406 (if (not (saved-window-minibufferp saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
407 (restore-saved-window-parameters configuration window saved-window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
408
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
409 (defun restore-saved-window-parameters (configuration window saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
410 "Restore the window parameters stored in SAVED-WINDOW on WINDOW."
1261
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 1230
diff changeset
411 (declare (special window-configuration-current-window))
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
412 (let ((buffer (saved-window-buffer saved-window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
413 (if (and buffer (buffer-live-p buffer))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
414 (progn
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
415 (set-window-buffer window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
416 (saved-window-buffer saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
417 (set-window-start window
1161
8e95979f01c6 [xemacs-hg @ 2002-12-16 02:32:47 by ben]
ben
parents: 1149
diff changeset
418 (marker-position (saved-window-start-marker saved-window))
8e95979f01c6 [xemacs-hg @ 2002-12-16 02:32:47 by ben]
ben
parents: 1149
diff changeset
419 t)
1149
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
420 (set-window-point window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
421 (marker-position (saved-window-point-marker saved-window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
422 (set-marker (mark-marker t buffer)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
423 (marker-position (saved-window-mark-marker saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
424 buffer)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
425 (if (not (eq buffer (window-configuration-current-buffer configuration)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
426 (goto-char (window-point window) buffer)))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
427
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
428 (if (and (not (saved-window-first-hchild saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
429 (not (saved-window-first-vchild saved-window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
430 ;; only set size for non-container windows
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
431 (progn
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
432 ;; If this is the root window, it may be the only window.
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
433 ;; Because of mismatches between actual and reported frame
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
434 ;; size, it may not let us actually set the size of the root
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
435 ;; window to what we want. --Mike
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
436 (if (not (eq window (frame-root-window (window-frame window))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
437 (progn
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
438 (enlarge-window-pixels (- (saved-window-pixel-width saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
439 (window-pixel-width window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
440 t
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
441 window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
442 (enlarge-window-pixels (- (saved-window-pixel-height saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
443 (window-pixel-height window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
444 nil
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
445 window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
446 (set-window-hscroll window (saved-window-hscroll saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
447 (set-modeline-hscroll window
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
448 (saved-window-modeline-hscroll saved-window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
449 (set-window-dedicated-p window (saved-window-dedicatedp saved-window))))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
450
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
451 (if (saved-window-currentp saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
452 (setq window-configuration-current-window window))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
453 (if (saved-window-minibuffer-scrollp saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
454 (setq minibuffer-scroll-window window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
455
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
456 (defun saved-window-pixel-width (saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
457 "Compute the pixel width of SAVED-WINDOW."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
458 (- (saved-window-pixel-right saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
459 (saved-window-pixel-left saved-window)))
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
460
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
461 (defun saved-window-pixel-height (saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
462 "Compute the pixel height of SAVED-WINDOW."
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
463 (- (saved-window-pixel-bottom saved-window)
a123f88fa975 [xemacs-hg @ 2002-12-08 10:24:33 by michaels]
michaels
parents: 903
diff changeset
464 (saved-window-pixel-top saved-window)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
466 ;; The window-config stack is stored as a list in frame property
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
467 ;; 'window-config-stack, with the most recent element at the front.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
468 ;; When you pop off an element, the popped off element gets put at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 ;; front of frame property 'window-config-unpop-stack, so you can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 ;; retrieve it using unpop-window-configuration.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472 (defcustom window-config-stack-max 16
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 "*Maximum size of window configuration stack.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 Start discarding off end if it gets this big."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 :type 'integer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478 (defun window-config-stack (&optional frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479 (or frame (setq frame (selected-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480 (let ((stack (frame-property frame 'window-config-stack)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 (if stack
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482 (set-undoable-stack-max stack window-config-stack-max)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 (setq stack (make-undoable-stack window-config-stack-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485 (set-frame-property frame 'window-config-stack stack)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486 stack))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
488 (defun push-window-configuration (&optional config)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 "Push the current window configuration onto the window-config stack.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 If CONFIG is specified, push it instead of the current window configuration.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491 Each frame has its own window-config stack."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
492 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
493 (let ((wc (or config (current-window-configuration)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
494 (stack (window-config-stack)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
495 (if (or (= 0 (undoable-stack-a-length stack))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
496 (not (equal (undoable-stack-a-top stack) wc)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
497 (undoable-stack-push stack wc))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
499 (defun pop-window-configuration ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
500 "Pop the top window configuration off the window-config stack and set it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
501 Before setting the new window configuration, the current window configuration
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
502 is pushed onto the \"unpop\" stack.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
503 `unpop-window-configuration' undoes what this function does.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
504 Each frame has its own window-config and \"unpop\" stack."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
505 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506 (let ((stack (window-config-stack))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
507 (wc (current-window-configuration))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
508 popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
509 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
510 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511 (setq popped (undoable-stack-pop stack))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
512 (while (equal popped wc)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
513 (setq popped (undoable-stack-pop stack)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
514 (undoable-stack-push stack wc)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
515 (undoable-stack-undo stack)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
516 (set-window-configuration popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
517 popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
518 (trunc-stack-bottom
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
519 (error "Bottom of window config stack")))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
520
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
521 (defun unpop-window-configuration ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
522 "Undo the effect of the most recent `pop-window-configuration'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
523 This does exactly the inverse of what `pop-window-configuration' does:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
524 i.e. it pops a window configuration off of the \"unpop\" stack and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
525 pushes the current window configuration onto the window-config stack.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
526 Each frame has its own window-config and \"unpop\" stack."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
527 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
528 (let ((stack (window-config-stack))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
529 (wc (current-window-configuration))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
530 popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
531 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
532 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
533 (setq popped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
534 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
535 (undoable-stack-redo stack)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
536 (undoable-stack-pop stack)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
537 (while (equal popped wc)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
538 (setq popped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
539 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
540 (undoable-stack-redo stack)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
541 (undoable-stack-pop stack))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
542 (undoable-stack-push stack wc)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
543 (set-window-configuration popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
544 popped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
545 (trunc-stack-bottom
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
546 (error "Top of window config stack")))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
547
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
548
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
549 ;;;;;;;;;;;;; display-buffer, moved here from C. Hallelujah.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
550
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
551 (make-variable-buffer-local '__buffer-dedicated-frame)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
552
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
553 (defun buffer-dedicated-frame (&optional buffer)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
554 "Return the frame dedicated to this BUFFER, or nil if there is none.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
555 No argument or nil as argument means use current buffer as BUFFER."
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
556 (let ((buffer (decode-buffer buffer)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
557 (let ((frame (symbol-value-in-buffer '__buffer-dedicated-frame buffer)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
558 ;; XEmacs addition: if the frame is dead, silently make it go away.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
559 (when (and (framep frame) (not (frame-live-p frame)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
560 (with-current-buffer buffer
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
561 (setq __buffer-dedicated-frame nil))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
562 (setq frame nil))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
563 frame)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
564
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
565 (defun set-buffer-dedicated-frame (buffer frame)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
566 "For this BUFFER, set the FRAME dedicated to it.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
567 FRAME must be a frame or nil."
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
568 (let ((buffer (decode-buffer buffer)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
569 (and frame
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
570 (check-argument-type #'frame-live-p frame))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
571 (with-current-buffer buffer
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
572 (setq __buffer-dedicated-frame frame))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
573
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
574 (defvar display-buffer-function nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
575 "If non-nil, function to call to handle `display-buffer'.
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
576 It will receive four args: the same as those to `display-buffer'.")
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
577
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
578 (defvar pre-display-buffer-function nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
579 "If non-nil, function that will be called from `display-buffer'
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
580 as the first action. It will receive four args: the same as those
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
581 to `display-buffer'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
582 This function may be used to select an appropriate frame for the buffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
583 for example. See also the variable `display-buffer-function', which may
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
584 be used to completely replace the `display-buffer' function.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
585 If the return value of this function is non-nil, it should be a frame,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
586 and that frame will be used to display the buffer.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
587
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
588 (defcustom pop-up-frames nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
589 "*Non-nil means `display-buffer' should make a separate frame."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
590 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
591 :group 'frames)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
592
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
593 (defvar pop-up-frame-function nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
594 "Function to call to handle automatic new frame creation.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
595 It is called with no arguments and should return a newly created frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
596
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
597 A typical value might be `(lambda () (new-frame pop-up-frame-alist))'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
598 where `pop-up-frame-alist' would hold the default frame parameters.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
599
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
600 (defcustom special-display-buffer-names nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
601 "*List of buffer names that should have their own special frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
602 Displaying a buffer whose name is in this list makes a special frame for it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
603 using `special-display-function'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
604
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
605 An element of the list can be a cons cell instead of just a string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
606 Then the car should be a buffer name, and the cdr specifies frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
607 parameters for creating the frame for that buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
608 More precisely, the cdr is passed as the second argument to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
609 the function found in `special-display-function', when making that frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
610 See also `special-display-regexps'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
611 :type '(repeat (choice :value ""
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
612 (string :tag "Name")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
613 (cons :menu-tag "Properties"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
614 :value ("" . nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
615 (string :tag "Name")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
616 (repeat :tag "Properties"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
617 (group :inline t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
618 (symbol :tag "Property")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
619 (sexp :tag "Value"))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
620 :group 'frames)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
621
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
622 (defcustom special-display-regexps nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
623 "*List of regexps saying which buffers should have their own special frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
624 If a buffer name matches one of these regexps, it gets its own frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
625 Displaying a buffer whose name is in this list makes a special frame for it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
626 using `special-display-function'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
627
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
628 An element of the list can be a cons cell instead of just a string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
629 Then the car should be the regexp, and the cdr specifies frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
630 parameters for creating the frame for buffers that match.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
631 More precisely, the cdr is passed as the second argument to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 the function found in `special-display-function', when making that frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
633 See also `special-display-buffer-names'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
634 :type '(repeat (choice :value ""
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
635 regexp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 (cons :menu-tag "Properties"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 :value ("" . nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638 regexp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
639 (repeat :tag "Properties"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
640 (group :inline t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 (symbol :tag "Property")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642 (sexp :tag "Value"))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
643 :group 'frames)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 (defvar special-display-function nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 "Function to call to make a new frame for a special buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
647 It is called with two arguments, the buffer and optional buffer specific
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
648 data, and should return a window displaying that buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649 The default value makes a separate frame for the buffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
650 using `special-display-frame-alist' to specify the frame parameters.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
651
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
652 A buffer is special if its is listed in `special-display-buffer-names'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653 or matches a regexp in `special-display-regexps'.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
655 (defcustom same-window-buffer-names nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
656 "*List of buffer names that should appear in the selected window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
657 Displaying one of these buffers using `display-buffer' or `pop-to-buffer'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
658 switches to it in the selected window, rather than making it appear
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
659 in some other window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
660
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
661 An element of the list can be a cons cell instead of just a string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
662 Then the car must be a string, which specifies the buffer name.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
663 This is for compatibility with `special-display-buffer-names';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
664 the cdr of the cons cell is ignored.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
665
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 See also `same-window-regexps'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
667 :type '(repeat (string :tag "Name"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
668 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
670 (defcustom same-window-regexps nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671 "*List of regexps saying which buffers should appear in the selected window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
672 If a buffer name matches one of these regexps, then displaying it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
673 using `display-buffer' or `pop-to-buffer' switches to it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
674 in the selected window, rather than making it appear in some other window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 An element of the list can be a cons cell instead of just a string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677 Then the car must be a string, which specifies the buffer name.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
678 This is for compatibility with `special-display-buffer-names';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
679 the cdr of the cons cell is ignored.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
680
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 See also `same-window-buffer-names'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 :type '(repeat regexp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
685 (defcustom pop-up-windows t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
686 "*Non-nil means display-buffer should make new windows."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
688 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 (defcustom split-height-threshold 500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
691 "*display-buffer would prefer to split the largest window if this large.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
692 If there is only one window, it is split regardless of this value."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
693 :type 'integer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
696 (defcustom split-width-threshold 500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 "*display-buffer would prefer to split the largest window if this large.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698 If there is only one window, it is split regardless of this value."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699 :type 'integer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700 :group 'windows)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
701
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 ;; Deiconify the frame containing the window WINDOW, then return WINDOW.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704 (defun display-buffer-1 (window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
705 (if (frame-iconified-p (window-frame window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
706 (make-frame-visible (window-frame window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
708
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
709 ;; Can you believe that all of this crap was formerly in C?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
710 ;; Praise Jesus that it's not there any more.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
712 (defun display-buffer (buffer &optional not-this-window-p override-frame
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
713 shrink-to-fit)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
714 "Make BUFFER appear in some window on the current frame, but don't select it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
715 BUFFER can be a buffer or a buffer name.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
716 If BUFFER is shown already in some window in the current frame,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 just uses that one, unless the window is the selected window and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
718 NOT-THIS-WINDOW-P is non-nil (interactively, with prefix arg).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
719
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
720 If BUFFER has a dedicated frame, display on that frame instead of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
721 the current frame, unless OVERRIDE-FRAME is non-nil.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
722
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
723 If OVERRIDE-FRAME is non-nil, display on that frame instead of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
724 the current frame (or the dedicated frame).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
725
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
726 If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
727 the new buffer less than half the space if it is small enough to fit.
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
728
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
729 If `pop-up-windows' is non-nil, always use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
730 current frame and create a new window regardless of whether the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
731 buffer has a dedicated frame, and regardless of whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
732 OVERRIDE-FRAME was specified.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
733
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
734 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
735
2590
627e25731054 [xemacs-hg @ 2005-02-16 11:07:29 by aidan]
aidan
parents: 2227
diff changeset
736 If the buffer name is a member of the `same-window-buffer-names' list,
627e25731054 [xemacs-hg @ 2005-02-16 11:07:29 by aidan]
aidan
parents: 2227
diff changeset
737 or matches one of the `same-window-regexps' expressions, display the
627e25731054 [xemacs-hg @ 2005-02-16 11:07:29 by aidan]
aidan
parents: 2227
diff changeset
738 buffer in the currently selected window.
627e25731054 [xemacs-hg @ 2005-02-16 11:07:29 by aidan]
aidan
parents: 2227
diff changeset
739
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
740 Returns the window displaying BUFFER."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
741 (interactive "BDisplay buffer:\nP")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
742
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
743 (let ((wconfig (current-window-configuration))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
744 (result
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745 ;; We just simulate a `return' in C. This function is way ugly
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
746 ;; and does `returns' all over the place and there's no sense
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
747 ;; in trying to rewrite it to be more Lispy.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
748 (catch 'done
1669
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
749 (let (window old-frame target-frame explicit-frame shrink-it)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
750 (setq old-frame (or (last-nonminibuf-frame) (selected-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
751 (setq buffer (get-buffer buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
752 (check-argument-type 'bufferp buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
753
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
754 (setq explicit-frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 (if pre-display-buffer-function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756 (funcall pre-display-buffer-function buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757 not-this-window-p
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
758 override-frame
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
759 shrink-to-fit)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
760
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
761 ;; Give the user the ability to completely reimplement
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762 ;; this function via the `display-buffer-function'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
763 (if display-buffer-function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
764 (throw 'done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 (funcall display-buffer-function buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 not-this-window-p
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
767 override-frame
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
768 shrink-to-fit)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
770 ;; If the buffer has a dedicated frame, that takes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771 ;; precedence over the current frame, and over what the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 ;; pre-display-buffer-function did.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
773 (let ((dedi (buffer-dedicated-frame buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774 (if (frame-live-p dedi) (setq explicit-frame dedi)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
775
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
776 ;; if override-frame is supplied, that takes precedence over
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
777 ;; everything. This is gonna look bad if the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
778 ;; pre-display-buffer-function raised some other frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
779 ;; already.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
780 (if override-frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
781 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
782 (check-argument-type 'frame-live-p override-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
783 (setq explicit-frame override-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
784
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
785 (setq target-frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
786 (or explicit-frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
787 (last-nonminibuf-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
788 (selected-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
790 ;; If we have switched frames, then set not-this-window-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
791 ;; to false. Switching frames means that selected-window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
792 ;; is no longer the same as it was on entry -- it's the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
793 ;; selected-window of target_frame instead of old_frame,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
794 ;; so it's a fine candidate for display.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
795 (if (not (eq old-frame target-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
796 (setq not-this-window-p nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
797
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
798 ;; if it's in the selected window, and that's ok, then we're done.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
799 (if (and (not not-this-window-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
800 (eq buffer (window-buffer (selected-window))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
801 (throw 'done (display-buffer-1 (selected-window))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
802
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
803 ;; See if the user has specified this buffer should appear
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
804 ;; in the selected window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
805
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
806 (if not-this-window-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
807 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
808
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
809 (if (or (member (buffer-name buffer) same-window-buffer-names)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
810 (assoc (buffer-name buffer) same-window-buffer-names))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
811 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
812 (switch-to-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
813 (throw 'done (display-buffer-1 (selected-window)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
814
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
815 (let ((tem same-window-regexps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
816 (while tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
817 (let ((car (car tem)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
818 (if (or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
819 (and (stringp car)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
820 (string-match car (buffer-name buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
821 (and (consp car) (stringp (car car))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
822 (string-match (car car) (buffer-name buffer))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
823 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
824 (switch-to-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
825 (throw 'done (display-buffer-1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
826 (selected-window))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
827 (setq tem (cdr tem)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
828
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
829 ;; If pop-up-frames, look for a window showing BUFFER on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
830 ;; any visible or iconified frame. Otherwise search only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
831 ;; the current frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
832 (if (and (not explicit-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
833 (or pop-up-frames (not (last-nonminibuf-frame))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
834 (setq target-frame 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
835
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
836 ;; Otherwise, find some window that it's already in, and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
837 ;; return that, unless that window is the selected window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
838 ;; and that isn't ok. What a contorted mess!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
839 (setq window (or (if (not explicit-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
840 ;; search the selected frame
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
841 ;; first if the user didn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
842 ;; specify an explicit frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
843 (get-buffer-window buffer nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
844 (get-buffer-window buffer target-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
845 (if (and window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
846 (or (not not-this-window-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
847 (not (eq window (selected-window)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
848 (throw 'done (display-buffer-1 window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
849
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
850 ;; Certain buffer names get special handling.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
851 (if special-display-function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
852 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
853 (if (member (buffer-name buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
854 special-display-buffer-names)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
855 (throw 'done (funcall special-display-function buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
856
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
857 (let ((tem (assoc (buffer-name buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
858 special-display-buffer-names)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
859 (if tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
860 (throw 'done (funcall special-display-function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
861 buffer (cdr tem)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
862
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
863 (let ((tem special-display-regexps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
864 (while tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
865 (let ((car (car tem)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
866 (if (and (stringp car)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
867 (string-match car (buffer-name buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
868 (throw 'done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
869 (funcall special-display-function buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
870 (if (and (consp car)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
871 (stringp (car car))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
872 (string-match (car car)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
873 (buffer-name buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
874 (throw 'done (funcall
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
875 special-display-function buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
876 (cdr car)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
877 (setq tem (cdr tem))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
878
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
879 ;; If there are no frames open that have more than a minibuffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
880 ;; we need to create a new frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
881 (if (or pop-up-frames
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
882 (null (last-nonminibuf-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
883 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
884 (setq window (frame-selected-window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
885 (funcall pop-up-frame-function)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
886 (set-window-buffer window buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
887 (throw 'done (display-buffer-1 window))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
888
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
889 ;; Otherwise, make it be in some window, splitting if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
890 ;; appropriate/possible. Do not split a window if we are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
891 ;; displaying the buffer in a different frame than that which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
892 ;; was current when we were called. (It is already in a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
893 ;; different window by virtue of being in another frame.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
894 (if (or (and pop-up-windows (eq target-frame old-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
895 (eq 'only (frame-property (selected-frame) 'minibuffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
896 ;; If the current frame is a special display frame,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
897 ;; don't try to reuse its windows.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
898 (window-dedicated-p (frame-root-window (selected-frame))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
899 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
900 (if (eq 'only (frame-property (selected-frame) 'minibuffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
901 (setq target-frame (last-nonminibuf-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
902
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
903 ;; Don't try to create a window if would get an error with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
904 ;; height.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
905 (if (< split-height-threshold (* 2 window-min-height))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
906 (setq split-height-threshold (* 2 window-min-height)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
907
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
908 ;; Same with width.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
909 (if (< split-width-threshold (* 2 window-min-width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
910 (setq split-width-threshold (* 2 window-min-width)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
911
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
912 ;; If the frame we would try to split cannot be split,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
913 ;; try other frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
914 (if (frame-property (if (null target-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
915 (selected-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
916 (last-nonminibuf-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
917 'unsplittable)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
918 (setq window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
919 ;; Try visible frames first.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
920 (or (get-largest-window 'visible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
921 ;; If that didn't work, try iconified frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
922 (get-largest-window 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
923 (get-largest-window t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
924 (setq window (get-largest-window target-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
925
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
926 ;; If we got a tall enough full-width window that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
927 ;; can be split, split it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
928 (if (and window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
929 (not (frame-property (window-frame window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
930 'unsplittable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
931 (>= (window-height window) split-height-threshold)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
932 (or (>= (window-width window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
933 split-width-threshold)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
934 (and (window-leftmost-p window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
935 (window-rightmost-p window))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
936 (setq window (split-window window))
1669
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
937 (let (upper other)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
938 (setq window (get-lru-window target-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
939 ;; If the LRU window is selected, and big enough,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
940 ;; and can be split, split it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
941 (if (and window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
942 (not (frame-property (window-frame window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
943 'unsplittable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
944 (or (eq window (selected-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
945 (not (window-parent window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
946 (>= (window-height window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
947 (* 2 window-min-height)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
948 (setq window (split-window window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
949 ;; If get-lru-window returned nil, try other approaches.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
950 ;; Try visible frames first.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
951 (or window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
952 (setq window (or (get-largest-window 'visible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
953 ;; If that didn't work, try
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
954 ;; iconified frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
955 (get-largest-window 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
956 ;; Try invisible frames.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
957 (get-largest-window t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
958 ;; As a last resort, make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
959 ;; a new frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
960 (frame-selected-window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
961 (funcall
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
962 pop-up-frame-function)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
963 ;; If window appears above or below another,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
964 ;; even out their heights.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
965 (if (window-previous-child window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
966 (setq other (window-previous-child window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
967 upper other))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
968 (if (window-next-child window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
969 (setq other (window-next-child window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
970 upper window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
971 ;; Check that OTHER and WINDOW are vertically arrayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
972 (if (and other
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
973 (not (= (nth 1 (window-pixel-edges other))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
974 (nth 1 (window-pixel-edges window))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
975 (> (window-pixel-height other)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
976 (window-pixel-height window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
977 (enlarge-window (- (/ (+ (window-height other)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
978 (window-height window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
979 2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
980 (window-height upper))
903
4a27df428c73 [xemacs-hg @ 2002-07-06 05:48:14 by andyp]
andyp
parents: 444
diff changeset
981 nil upper))
1669
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
982 ;; Klaus Berndl <klaus.berndl@sdm.de>: Only in
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
983 ;; this situation we shrink-to-fit but we can do
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
984 ;; this first after we have displayed buffer in
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
985 ;; window (s.b. (set-window-buffer window buffer))
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
986 (setq shrink-it shrink-to-fit))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
987
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
988 (setq window (get-lru-window target-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
989
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
990 ;; Bring the window's previous buffer to the top of the MRU chain.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
991 (if (window-buffer window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
992 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
993 (save-selected-window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
994 (select-window window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
995 (record-buffer (window-buffer window)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
997 (set-window-buffer window buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
998
1669
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
999 ;; Now window's previous buffer has been brought to the top
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
1000 ;; of the MRU chain and window displays buffer - now we can
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
1001 ;; shrink-to-fit if necessary
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
1002 (if shrink-it
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
1003 (shrink-window-if-larger-than-buffer window))
c5f86842283a [xemacs-hg @ 2003-09-07 19:46:30 by adrian]
adrian
parents: 1576
diff changeset
1004
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1005 (display-buffer-1 window)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1006 (or (equal wconfig (current-window-configuration))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1007 (push-window-configuration wconfig))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1008 result))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1009
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1010 ;;; window-xemacs.el ends here