Mercurial > hg > xemacs-beta
view src/conslots.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 | e22b0213b713 |
| children | 308d34e9f07d |
line wrap: on
line source
/* Definitions of marked slots in consoles Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2002 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: Mule 2.0, FSF 19.30. (see FSF keyboard.h.) */ /* We define the Lisp_Objects in the console structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. No need to undefine; that happens automatically. */ #ifndef CONSOLE_SLOTS_FIRST_NAME #define CONSOLE_SLOTS_FIRST_NAME name #endif /* Name of this console, for resourcing and printing purposes. If not explicitly given, it's initialized in a console-specific manner. */ MARKED_SLOT (name) /* What this console is connected to */ MARKED_SLOT (connection) /* A canonical name for the connection that is used to determine whether create_console() is being called on an existing console. */ MARKED_SLOT (canon_connection) /* List of devices on this console. */ MARKED_SLOT (device_list) /* Currently selected device. */ MARKED_SLOT (selected_device) /* Most-recently-selected non-minibuffer-only frame. Always the same as the selected frame, unless that's a minibuffer-only frame. */ MARKED_SLOT (last_nonminibuf_frame) /* If non-nil, a keymap that overrides all others but applies only to this console. Lisp code that uses this instead of calling next-event can effectively wait for input in the any-console state, and hence avoid blocking out the other consoles. See universal-argument in lisp/simple.el for an example. #### This comes from FSF Emacs; but there's probably a better solution that involves making next-event itself work over all consoles. */ MARKED_SLOT (overriding_terminal_local_map) /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ MARKED_SLOT (last_command) /* The prefix argument for the next command, in raw form. */ MARKED_SLOT (prefix_arg) /* Where information about a partially completed key sequence is kept. */ MARKED_SLOT (command_builder) /* Non-nil while a kbd macro is being defined. */ MARKED_SLOT (defining_kbd_macro) /* This is a lisp vector, which contains the events of the keyboard macro currently being read. It is reallocated when the macro gets too large. */ MARKED_SLOT (kbd_macro_builder) /* Last anonymous kbd macro defined. */ MARKED_SLOT (last_kbd_macro) #ifdef HAVE_TTY /* ERASE character from stty settings. */ MARKED_SLOT (tty_erase_char) #endif /* Key that invokes QUIT. */ MARKED_SLOT (quit_char) /* Event version of quit-char. */ MARKED_SLOT (quit_event) /* Event version of critical QUIT (upshifted quit-char). */ MARKED_SLOT (critical_quit_event) /* Minibufferless frames on this console use this frame's minibuffer. */ MARKED_SLOT (default_minibuffer_frame) /* Keymap mapping ASCII function key sequences onto their preferred forms. Initialized by the terminal-specific lisp files. */ MARKED_SLOT (function_key_map) #ifndef CONSOLE_SLOTS_LAST_NAME #define CONSOLE_SLOTS_LAST_NAME function_key_map #endif #undef MARKED_SLOT