Mercurial > hg > xemacs-beta
view lwlib/xlwtabsP.h @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 382b11fa8866 |
children | a6c778975d7d |
line wrap: on
line source
/* Tabs Widget for XEmacs. Copyright (C) 1999 Edward A. Falk This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: TabsP.h 1.8 */ /* * TabsP.h - Private definitions for Index Tabs widget */ #ifndef _TabsP_h #define _TabsP_h /*********************************************************************** * * Tabs Widget Private Data * ***********************************************************************/ #include <X11/IntrinsicP.h> #ifdef NEED_MOTIF #include <Xm/XmP.h> #include <Xm/ManagerP.h> #endif #include "xlwtabs.h" #ifdef USE_XFT_TABS #include <X11/Xft/Xft.h> #endif /* New fields for the Tabs widget class record */ typedef struct {XtPointer extension;} TabsClassPart; /* Full class record declaration */ typedef struct _TabsClassRec { CoreClassPart core_class; CompositeClassPart composite_class; ConstraintClassPart constraint_class; #ifdef NEED_MOTIF XmManagerClassPart manager_class; #endif TabsClassPart tabs_class; } TabsClassRec; extern TabsClassRec tabsClassRec; /**************************************************************** * * instance record declaration * ****************************************************************/ /* New fields for the Tabs widget record */ typedef struct { /* resources */ XFontStruct *font ; #ifdef USE_XFT_TABS XftFont *renderFont; String fcFontName; String xftFontName; #endif Dimension internalHeight, internalWidth ; Widget topWidget ; XtCallbackList callbacks ; XtCallbackList popdownCallbacks ; Boolean selectInsensitive ; Boolean be_nice_to_cmap ; int top_shadow_contrast ; int bot_shadow_contrast ; int insensitive_contrast ; /* private state */ Widget hilight ; GC foregroundGC ; GC backgroundGC ; GC greyGC ; GC topGC ; GC botGC ; Dimension tab_height ; /* height of tabs (all the same) */ /* Note: includes top shadow only */ Dimension tab_total ; /* total height of all tabs */ Dimension child_width, child_height; /* child size, including borders */ Dimension max_cw, max_ch ; /* max child preferred size */ Cardinal numRows ; Cardinal realRows; /* XEmacs addition */ XtGeometryMask last_query_mode; Boolean needs_layout ; Pixmap grey50 ; /* TODO: cache this elsewhere */ } TabsPart; typedef struct _TabsRec { CorePart core; CompositePart composite; ConstraintPart constraint; #ifdef NEED_MOTIF XmManagerPart manager; #endif TabsPart tabs; } TabsRec; /**************************************************************** * * Constraint record declaration * ****************************************************************/ typedef struct _TabsConstraintsPart { /* resources */ String label ; Pixmap left_bitmap ; Pixel foreground ; Boolean resizable ; /* private state */ Pixel grey ; Boolean greyAlloc ; Boolean visible; /* XEmacs change */ Dimension width ; /* tab width */ Position x,y ; /* tab base position */ short row ; /* tab row */ Position l_x, l_y ; /* label position */ Position lbm_x, lbm_y ; /* bitmap position */ unsigned int lbm_width, lbm_height, lbm_depth ; } TabsConstraintsPart ; typedef struct _TabsConstraintsRec { #ifdef NEED_MOTIF XmManagerConstraintPart manager; #endif TabsConstraintsPart tabs ; } TabsConstraintsRec, *TabsConstraints ; #endif /* _TabsP_h */