12:57 a.m.
Hi,
I'm playing with the CVS version of XEmacs 21.2. A problem I'm
experiencing is that shrink-window-if-larger-than buffer never works. If I
plug the CVS version of that defun into 21.1.10, it functions correctly.
One of the functions that shrink-window-if-larger-than-buffer calls must
have changed since 21.1.10, breaking shrink-window-if-larger-than-buffer.
Or am I doing something wrong? All I'm going on is that "C-x -" works in
XEmacs 21.1.10, even with the CVS version of
shrink-window-if-larger-than-buffer, but in XEmacs 21.2 it doesn't work,
even with the old version of the code.
Thanks,
Aaron Lehmann
10:44 a.m.
Aaron Lehmann <aaronl(a)vitelus.com> writes:
Or am I doing something wrong? All I'm going on is that "C-x
-" works in
XEmacs 21.1.10, even with the CVS version of
shrink-window-if-larger-than-buffer, but in XEmacs 21.2 it doesn't work,
even with the old version of the code.
The former patch fixes the bug. It is bogus to check
window-pixel-ediges just after window-left-most-p.
The latter patch is to fix window-pixel-edges. Right now,
left top corner is not (0 0). According to the ChangeLog,
Andy made the change but I don't know why. Andy, could you
review this patch?
2000-07-31 Yoshiki Hayashi <yoshiki(a)xemacs.org>
* window.el (shrink-window-if-larger-than-buffer): Remove
edge checking code.
2000-07-31 Yoshiki Hayashi <yoshiki(a)xemacs.org>
* window.c (Fwindow_pixel_edges): Subtract frame border and
gutter size.
Index: window.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/window.el,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 window.el
--- window.el 2000/03/13 07:27:44 1.4.2.3
+++ window.el 2000/07/31 09:43:12
＠＠ -286,8 +286,7 ＠＠
(if (and (not (eobp))
(eq ?\n (char-after (1- (point-max)))))
1 0)))
- (mini (frame-property (window-frame window) 'minibuffer))
- (edges (window-pixel-edges (selected-window))))
+ (mini (frame-property (window-frame window) 'minibuffer)))
(if (and (< 1 (let ((frame (selected-frame)))
(select-frame (window-frame window))
(unwind-protect
＠＠ -297,7 +296,6 ＠＠
;; of the frame
(window-leftmost-p window)
(window-rightmost-p window)
- (zerop (nth 0 edges))
;; The whole buffer must be visible.
(pos-visible-in-window-p (point-min) window)
;; The frame must not be minibuffer-only.
Index: window.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/window.c,v
retrieving revision 1.41.2.54
diff -u -r1.41.2.54 window.c
--- window.c 2000/07/22 19:33:30 1.41.2.54
+++ window.c 2000/07/31 09:43:00
＠＠ -1603,9 +1603,12 ＠＠
(window))
{
struct window *w = decode_window (window);
+ struct frame *f = XFRAME (w->frame);
- int left = w->pixel_left;
- int top = w->pixel_top;
+ int left =
+ w->pixel_left - FRAME_LEFT_BORDER_END (f) - FRAME_LEFT_GUTTER_BOUNDS (f);
+ int top =
+ w->pixel_top - FRAME_TOP_BORDER_END (f) - FRAME_TOP_GUTTER_BOUNDS (f);
return list4 (make_int (left),
make_int (top),
--
Yoshiki Hayashi
11 a.m.
thank you yoshiki for dealing with errors like this!
Yoshiki Hayashi wrote:
Aaron Lehmann <aaronl(a)vitelus.com> writes:
> Or am I doing something wrong? All I'm going on is that "C-x -" works
in
> XEmacs 21.1.10, even with the CVS version of
> shrink-window-if-larger-than-buffer, but in XEmacs 21.2 it doesn't work,
> even with the old version of the code.
The former patch fixes the bug. It is bogus to check
window-pixel-ediges just after window-left-most-p.
The latter patch is to fix window-pixel-edges. Right now,
left top corner is not (0 0). According to the ChangeLog,
Andy made the change but I don't know why. Andy, could you
review this patch?
at one point andy introduced gutter calculations into windows and took them out
of frames. later, he realized that this was wrong and undid it; it looks like
he forgot to put some code back.
2000-07-31 Yoshiki Hayashi <yoshiki(a)xemacs.org>
* window.el (shrink-window-if-larger-than-buffer): Remove
edge checking code.
2000-07-31 Yoshiki Hayashi <yoshiki(a)xemacs.org>
* window.c (Fwindow_pixel_edges): Subtract frame border and
gutter size.
--------------------------------------------------------------------------------
Index: window.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/window.el,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 window.el
--- window.el 2000/03/13 07:27:44 1.4.2.3
+++ window.el 2000/07/31 09:43:12
＠＠ -286,8 +286,7 ＠＠
(if (and (not (eobp))
(eq ?\n (char-after (1- (point-max)))))
1 0)))
- (mini (frame-property (window-frame window) 'minibuffer))
- (edges (window-pixel-edges (selected-window))))
+ (mini (frame-property (window-frame window) 'minibuffer)))
(if (and (< 1 (let ((frame (selected-frame)))
(select-frame (window-frame window))
(unwind-protect
＠＠ -297,7 +296,6 ＠＠
;; of the frame
(window-leftmost-p window)
(window-rightmost-p window)
- (zerop (nth 0 edges))
;; The whole buffer must be visible.
(pos-visible-in-window-p (point-min) window)
;; The frame must not be minibuffer-only.
--------------------------------------------------------------------------------
Index: window.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/window.c,v
retrieving revision 1.41.2.54
diff -u -r1.41.2.54 window.c
--- window.c 2000/07/22 19:33:30 1.41.2.54
+++ window.c 2000/07/31 09:43:00
＠＠ -1603,9 +1603,12 ＠＠
(window))
{
struct window *w = decode_window (window);
+ struct frame *f = XFRAME (w->frame);
- int left = w->pixel_left;
- int top = w->pixel_top;
+ int left =
+ w->pixel_left - FRAME_LEFT_BORDER_END (f) - FRAME_LEFT_GUTTER_BOUNDS (f);
+ int top =
+ w->pixel_top - FRAME_TOP_BORDER_END (f) - FRAME_TOP_GUTTER_BOUNDS (f);
return list4 (make_int (left),
make_int (top),
--------------------------------------------------------------------------------
--
Yoshiki Hayashi
--
Ben
In order to save my hands, I am cutting back on my mail. I also write
as succinctly as possible -- please don't be offended. If you send me
mail, you _will_ get a response, but please be patient, especially for
XEmacs-related mail. If you need an immediate response and it is not
apparent in your message, please say so. Thanks for your understanding.
See also http://www.666.com/ben/chronic-pain/
3:06 p.m.
At 06:44 PM 7/31/00 +0900, Yoshiki Hayashi wrote:
The latter patch is to fix window-pixel-edges. Right now,
left top corner is not (0 0). According to the ChangeLog,
Andy made the change but I don't know why. Andy, could you
review this patch?
Well the patch looks ok. But you may want to check that anything using the
gutter still works ok.
Thanks
andy
--------------------------------------------------------------
Dr Andy Piper
Principal Consultant, BEA Systems Ltd
6:14 a.m.
Andy Piper <andy(a)xemacs.org> writes:
At 06:44 PM 7/31/00 +0900, Yoshiki Hayashi wrote:
>The latter patch is to fix window-pixel-edges. Right now,
>left top corner is not (0 0). According to the ChangeLog,
>Andy made the change but I don't know why. Andy, could you
>review this patch?
Well the patch looks ok. But you may want to check that anything using the
gutter still works ok.
No C and Lisp gutter codes use window-pixel-edges so it won't be a
problem. I found that a problem with C-x + is gone, too. It used to
shrink upper window until it disappears.
--
Yoshiki Hayashi
7:33 p.m.
This works for me in b40
andy
At 00:57 23/07/00 +0000, Aaron Lehmann wrote:
Hi,
I'm playing with the CVS version of XEmacs 21.2. A problem I'm
experiencing is that shrink-window-if-larger-than buffer never works. If I
plug the CVS version of that defun into 21.1.10, it functions correctly.
One of the functions that shrink-window-if-larger-than-buffer calls must
have changed since 21.1.10, breaking shrink-window-if-larger-than-buffer.
Or am I doing something wrong? All I'm going on is that "C-x -" works in
XEmacs 21.1.10, even with the CVS version of
shrink-window-if-larger-than-buffer, but in XEmacs 21.2 it doesn't work,
even with the old version of the code.
Thanks,
Aaron Lehmann
--------------------------------------------------------------
Dr Andy Piper
Principal Consultant, BEA Systems Ltd
8717
days inactive
8889
days old
5 comments
4 participants
participants (4)
-
Aaron Lehmann -
Andy Piper -
Ben Wing -
Yoshiki Hayashi