Mercurial > hg > xemacs-beta
view src/EmacsFrameP.h @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 374186f156d5 |
children | 308d34e9f07d |
line wrap: on
line source
/* Private header for the Emacs frame widget. Copyright (C) 1993-1995 Sun Microsystems, Inc. Copyright (C) 1995 Ben Wing. 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: Not in FSF. */ #ifndef INCLUDED_EmacsFrameP_h_ #define INCLUDED_EmacsFrameP_h_ #include "xintrinsicp.h" #include <X11/CoreP.h> #ifdef LWLIB_USES_MOTIF #include "xmprimitivep.h" #endif #include "EmacsFrame.h" typedef struct { #ifdef LWLIB_USES_MOTIF #if XmVERSION < 2 /* It's easy to erroneously compile with Motif 1 headers, but link with Motif 2 libraries. For example, AIX stupidly provides Motif headers in /usr/dt/include, but fails to provide the corresponding libraries in /usr/dt/lib. We actually try to survive such a version mismatch, since Motif 2 is _almost_ binary compatible with Motif 1. Motif 2's XmPrimitivePart has some trailing data members which overlay the start of this struct. We create dummy members to make space for XmPrimitivePart's added members. These must, of course, be at the beginning of this struct. Delete this kludge when no one has Motif1 on their system anymore, perhaps in 2010. */ XtCallbackList Motif2_dummy_convert_callback; XtCallbackList Motif2_dummy_popup_handler_callback; long Motif2_dummy_layout_direction; #endif #endif struct frame* frame; /* the *emacs* frame object */ /* Resources that can't be done from lisp. */ char* geometry; /* geometry spec of this frame */ Boolean iconic; /* whether this frame is iconic */ /* The rest of this is crap and should be deleted. #### Comments that start with + are fields that actually get referred to somewhere aside from the init function. I guess the "crap" has mostly moved to specifiers? */ Boolean minibuffer; /* 0: normal frames with minibuffers. * 1: frames without minibuffers * 2: minibuffer only. */ Boolean unsplittable; /* frame can only have one window */ int internal_border_width; /* + internal borders */ int scrollbar_width; /* width of frame vertical sb's */ int scrollbar_height; /* height of frame horizontal sb's */ int top_toolbar_height; /* height of top toolbar */ int bottom_toolbar_height; /* height of bottom toolbar */ int left_toolbar_width; /* width of left toolbar */ int right_toolbar_width; /* width of right toolbar */ int top_toolbar_border_width; /* border width */ int bottom_toolbar_border_width; /* ... of bottom toolbar */ int left_toolbar_border_width; /* ... of left toolbar */ int right_toolbar_border_width; /* ... of right toolbar */ Dimension toolbar_shadow_thickness; /* + of shadows */ unsigned char scrollbar_placement; int interline; /* + skips between lines */ XFontStruct* font; /* font */ Pixel foreground_pixel; /* foreground */ Pixel background_pixel; /* background */ Pixel cursor_color; /* text cursor color */ Boolean bar_cursor; /* 1 if bar, 0 if block */ Boolean visual_bell; /* flash instead of beep */ int bell_volume; /* how loud is beep */ Boolean menubar_p; /* initially show a menubar? */ Boolean initially_unmapped; /* + inhibit initial window mapping */ Boolean use_backing_store; /* backing store for menubar & ew? */ Dimension preferred_width; /* if non-zero, preferred size for */ Dimension preferred_height; /* QueryGeometry() */ /* private state */ } EmacsFramePart; typedef struct _EmacsFrameRec { /* full instance record */ CorePart core; #ifdef LWLIB_USES_MOTIF XmPrimitivePart primitive; #endif EmacsFramePart emacs_frame; } EmacsFrameRec; typedef struct { /* new fields for EmacsFrame class */ int dummy; } EmacsFrameClassPart; typedef struct _EmacsFrameClassRec { /* full class record declaration */ CoreClassPart core_class; #ifdef LWLIB_USES_MOTIF XmPrimitiveClassPart primitive_class; #endif EmacsFrameClassPart emacs_frame_class; } EmacsFrameClassRec; extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */ #endif /* INCLUDED_EmacsFrameP_h_ */