mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Change doc-string comments to new style' [w/doc:' keyword].

Browse Source
This commit is contained in:
Miles Bader 2001-10-17 03:16:12 +00:00
parent 015a8883e0
commit 7ee72033eb
11 changed files with 1009 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/abbrev.c
View File

@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <config.h>
#include <stdio.h>
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "commands.h"
#include "buffer.h"
@ -84,15 +84,15 @@ int last_abbrev_point;
Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0,
/* Create a new, empty abbrev table object. */
())
doc: /* Create a new, empty abbrev table object. */)
()
{
return Fmake_vector (make_number (59), make_number (0));
}
DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
/* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */
(table))
doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */)
(table)
Lisp_Object table;
{
int i, size;
@ -106,7 +106,7 @@ DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
}
DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0,
/* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
NAME must be a string.
EXPANSION should usually be a string.
To undefine an abbrev, define it with EXPANSION = nil.
@ -115,8 +115,8 @@ it is called after EXPANSION is inserted.
If EXPANSION is not a string, the abbrev is a special one,
which does not expand in the usual way but only runs HOOK.
COUNT, if specified, initializes the abbrev's usage-count
which is incremented each time the abbrev is used. */
(table, name, expansion, hook, count))
which is incremented each time the abbrev is used. */)
(table, name, expansion, hook, count)
Lisp_Object table, name, expansion, hook, count;
{
Lisp_Object sym, oexp, ohook, tem;
@ -149,8 +149,8 @@ which is incremented each time the abbrev is used. */
DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2,
"sDefine global abbrev: \nsExpansion for %s: ",
/* Define ABBREV as a global abbreviation for EXPANSION. */
(abbrev, expansion))
doc: /* Define ABBREV as a global abbreviation for EXPANSION. */)
(abbrev, expansion)
Lisp_Object abbrev, expansion;
{
Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev),
@ -160,8 +160,8 @@ DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2,
DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2,
"sDefine mode abbrev: \nsExpansion for %s: ",
/* Define ABBREV as a mode-specific abbreviation for EXPANSION. */
(abbrev, expansion))
doc: /* Define ABBREV as a mode-specific abbreviation for EXPANSION. */)
(abbrev, expansion)
Lisp_Object abbrev, expansion;
{
if (NILP (current_buffer->abbrev_table))
@ -173,13 +173,13 @@ DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2,
}
DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0,
/* Return the symbol representing abbrev named ABBREV.
doc: /* Return the symbol representing abbrev named ABBREV.
This symbol's name is ABBREV, but it is not the canonical symbol of that name;
it is interned in an abbrev-table rather than the normal obarray.
The value is nil if that abbrev is not defined.
Optional second arg TABLE is abbrev table to look it up in.
The default is to try buffer's mode-specific abbrev table, then global table. */
(abbrev, table))
The default is to try buffer's mode-specific abbrev table, then global table. */)
(abbrev, table)
Lisp_Object abbrev, table;
{
Lisp_Object sym;
@ -202,10 +202,10 @@ The default is to try buffer's mode-specific abbrev table, then global table. *
}
DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0,
/* Return the string that ABBREV expands into in the current buffer.
doc: /* Return the string that ABBREV expands into in the current buffer.
Optionally specify an abbrev table as second arg;
then ABBREV is looked up in that table only. */
(abbrev, table))
then ABBREV is looked up in that table only. */)
(abbrev, table)
Lisp_Object abbrev, table;
{
Lisp_Object sym;
@ -218,10 +218,10 @@ then ABBREV is looked up in that table only. */
Returns 1 if an expansion is done. */
DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "",
/* Expand the abbrev before point, if there is an abbrev there.
doc: /* Expand the abbrev before point, if there is an abbrev there.
Effective when explicitly called even when `abbrev-mode' is nil.
Returns the abbrev symbol, if expansion took place. */
())
Returns the abbrev symbol, if expansion took place. */)
()
{
register char *buffer, *p;
int wordstart, wordend;
@ -389,10 +389,10 @@ Returns the abbrev symbol, if expansion took place. */
}
DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "",
/* Undo the expansion of the last abbrev that expanded.
doc: /* Undo the expansion of the last abbrev that expanded.
This differs from ordinary undo in that other editing done since then
is not undone. */
())
is not undone. */)
()
{
int opoint = PT;
int adjust = 0;
@ -467,13 +467,13 @@ describe_abbrev (sym, stream)
DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,
Sinsert_abbrev_table_description, 1, 2, 0,
/* Insert before point a full description of abbrev table named NAME.
doc: /* Insert before point a full description of abbrev table named NAME.
NAME is a symbol whose value is an abbrev table.
If optional 2nd arg READABLE is non-nil, a human-readable description
is inserted. Otherwise the description is an expression,
a call to `define-abbrev-table', which would
define the abbrev table NAME exactly as it is currently defined. */
(name, readable))
define the abbrev table NAME exactly as it is currently defined. */)
(name, readable)
Lisp_Object name, readable;
{
Lisp_Object table;
@ -507,10 +507,10 @@ define the abbrev table NAME exactly as it is currently defined. */
DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table,
2, 2, 0,
/* Define TABLENAME (a symbol) as an abbrev table name.
doc: /* Define TABLENAME (a symbol) as an abbrev table name.
Define abbrevs in it according to DEFINITIONS, which is a list of elements
of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */
(tablename, definitions))
of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */)
(tablename, definitions)
Lisp_Object tablename, definitions;
{
Lisp_Object name, exp, hook, count;
@ -541,64 +541,64 @@ of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */
void
syms_of_abbrev ()
{
DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list
/* List of symbols whose values are abbrev tables. */);
DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list,
doc: /* List of symbols whose values are abbrev tables. */);
Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"),
Fcons (intern ("global-abbrev-table"),
Qnil));
DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table
/* The abbrev table whose abbrevs affect all buffers.
DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table,
doc: /* The abbrev table whose abbrevs affect all buffers.
Each buffer may also have a local abbrev table.
If it does, the local table overrides the global one
for any particular abbrev defined in both. */);
Vglobal_abbrev_table = Fmake_abbrev_table ();
DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table
/* The abbrev table of mode-specific abbrevs for Fundamental Mode. */);
DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table,
doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */);
Vfundamental_mode_abbrev_table = Fmake_abbrev_table ();
current_buffer->abbrev_table = Vfundamental_mode_abbrev_table;
buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table;
DEFVAR_LISP ("last-abbrev", &Vlast_abbrev
/* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */);
DEFVAR_LISP ("last-abbrev", &Vlast_abbrev,
doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */);
DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text
/* The exact text of the last abbrev expanded.
DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text,
doc: /* The exact text of the last abbrev expanded.
nil if the abbrev has already been unexpanded. */);
DEFVAR_INT ("last-abbrev-location", &last_abbrev_point
/* The location of the start of the last abbrev expanded. */);
DEFVAR_INT ("last-abbrev-location", &last_abbrev_point,
doc: /* The location of the start of the last abbrev expanded. */);
Vlast_abbrev = Qnil;
Vlast_abbrev_text = Qnil;
last_abbrev_point = 0;
DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location
/* Buffer position for `expand-abbrev' to use as the start of the abbrev.
DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location,
doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
nil means use the word before point as the abbrev.
Calling `expand-abbrev' sets this to nil. */);
Vabbrev_start_location = Qnil;
DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer
/* Buffer that `abbrev-start-location' has been set for.
DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer,
doc: /* Buffer that `abbrev-start-location' has been set for.
Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */);
Vabbrev_start_location_buffer = Qnil;
DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil
/* Local (mode-specific) abbrev table of current buffer. */);
DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil,
doc: /* Local (mode-specific) abbrev table of current buffer. */);
DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed
/* Set non-nil by defining or altering any word abbrevs.
DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed,
doc: /* Set non-nil by defining or altering any word abbrevs.
This causes `save-some-buffers' to offer to save the abbrevs. */);
abbrevs_changed = 0;
DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps
/* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */);
DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps,
doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */);
abbrev_all_caps = 0;
DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook
/* Function or functions to be called before abbrev expansion is done.
DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook,
doc: /* Function or functions to be called before abbrev expansion is done.
This is the first thing that `expand-abbrev' does, and so this may change
the current abbrev table before abbrev lookup happens. */);
Vpre_abbrev_expand_hook = Qnil;

151
src/alloc.c
View File

@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA. */
replaced, this file likely will not be used. */
#undef HIDE_LISP_IMPLEMENTATION
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "process.h"
#include "intervals.h"
@ -1660,9 +1659,9 @@ compact_small_strings ()
DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0,
/* Return a newly created string of length LENGTH, with each element being INIT.
Both LENGTH and INIT must be numbers. */
(length, init))
doc: /* Return a newly created string of length LENGTH, with each element being INIT.
Both LENGTH and INIT must be numbers. */)
(length, init)
Lisp_Object length, init;
{
register Lisp_Object val;
@ -1704,9 +1703,9 @@ Both LENGTH and INIT must be numbers. */
DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
/* Return a new bool-vector of length LENGTH, using INIT for as each element.
LENGTH must be a number. INIT matters only in whether it is t or nil. */
(length, init))
doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element.
LENGTH must be a number. INIT matters only in whether it is t or nil. */)
(length, init)
Lisp_Object length, init;
{
register Lisp_Object val;
@ -2058,8 +2057,8 @@ free_cons (ptr)
DEFUN ("cons", Fcons, Scons, 2, 2, 0,
/* Create a new cons, give it CAR and CDR as components, and return it. */
(car, cdr))
doc: /* Create a new cons, give it CAR and CDR as components, and return it. */)
(car, cdr)
Lisp_Object car, cdr;
{
register Lisp_Object val;
@ -2131,9 +2130,9 @@ list5 (arg1, arg2, arg3, arg4, arg5)
DEFUN ("list", Flist, Slist, 0, MANY, 0,
/* Return a newly created list with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */
(nargs, args))
doc: /* Return a newly created list with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */)
(nargs, args)
int nargs;
register Lisp_Object *args;
{
@ -2150,8 +2149,8 @@ Any number of arguments, even zero arguments, are allowed. */
DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
/* Return a newly created list of length LENGTH, with each element being INIT. */
(length, init))
doc: /* Return a newly created list of length LENGTH, with each element being INIT. */)
(length, init)
register Lisp_Object length, init;
{
register Lisp_Object val;
@ -2337,9 +2336,9 @@ allocate_other_vector (len)
DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0,
/* Return a newly created vector of length LENGTH, with each element being INIT.
See also the function `vector'. */
(length, init))
doc: /* Return a newly created vector of length LENGTH, with each element being INIT.
See also the function `vector'. */)
(length, init)
register Lisp_Object length, init;
{
Lisp_Object vector;
@ -2360,11 +2359,11 @@ See also the function `vector'. */
DEFUN ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0,
/* Return a newly created char-table, with purpose PURPOSE.
doc: /* Return a newly created char-table, with purpose PURPOSE.
Each element is initialized to INIT, which defaults to nil.
PURPOSE should be a symbol which has a `char-table-extra-slots' property.
The property's value should be an integer between 0 and 10. */
(purpose, init))
The property's value should be an integer between 0 and 10. */)
(purpose, init)
register Lisp_Object purpose, init;
{
Lisp_Object vector;
@ -2403,9 +2402,9 @@ make_sub_char_table (defalt)
DEFUN ("vector", Fvector, Svector, 0, MANY, 0,
/* Return a newly created vector with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */
(nargs, args))
doc: /* Return a newly created vector with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */)
(nargs, args)
register int nargs;
Lisp_Object *args;
{
@ -2423,12 +2422,12 @@ Any number of arguments, even zero arguments, are allowed. */
DEFUN ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0,
/* Create a byte-code object with specified arguments as elements.
doc: /* Create a byte-code object with specified arguments as elements.
The arguments should be the arglist, bytecode-string, constant vector,
stack size, (optional) doc string, and (optional) interactive spec.
The first four arguments are required; at most six have any
significance. */
(nargs, args))
significance. */)
(nargs, args)
register int nargs;
Lisp_Object *args;
{
@ -2511,9 +2510,9 @@ init_symbol ()
DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
/* Return a newly allocated uninterned symbol whose name is NAME.
Its value and function definition are void, and its property list is nil. */
(name))
doc: /* Return a newly allocated uninterned symbol whose name is NAME.
Its value and function definition are void, and its property list is nil. */)
(name)
Lisp_Object name;
{
register Lisp_Object val;
@ -2629,8 +2628,8 @@ allocate_misc ()
}
DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
/* Return a newly allocated marker which does not point at any place. */
())
doc: /* Return a newly allocated marker which does not point at any place. */)
()
{
register Lisp_Object val;
register struct Lisp_Marker *p;
@ -3300,8 +3299,8 @@ static int max_live, max_zombies;
static double avg_live;
DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
/* Show information about live and zombie objects. */
())
doc: /* Show information about live and zombie objects. */)
()
{
Lisp_Object args[7];
args[0] = build_string ("%d GCs, avg live/zombies = %.2f/%.2f (%f%%), max %d/%d");
@ -3540,7 +3539,7 @@ mark_memory (start, end)
only a pointer to them remains. Example:
DEFUN ("testme", Ftestme, Stestme, 0, 0, 0, "")
()
()
{
Lisp_Object obj = build_string ("test");
struct Lisp_String *s = XSTRING (obj);
@ -3919,10 +3918,10 @@ make_pure_vector (len)
DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
/* Make a copy of OBJECT in pure storage.
doc: /* Make a copy of OBJECT in pure storage.
Recursively copies contents of vectors and cons cells.
Does not copy symbols. Copies strings without text properties. */
(obj))
Does not copy symbols. Copies strings without text properties. */)
(obj)
register Lisp_Object obj;
{
if (NILP (Vpurify_flag))
@ -4016,15 +4015,15 @@ inhibit_garbage_collection ()
DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "",
/* Reclaim storage for Lisp objects no longer needed.
doc: /* Reclaim storage for Lisp objects no longer needed.
Returns info on amount of space in use:
((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS)
(USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS
(USED-FLOATS . FREE-FLOATS) (USED-INTERVALS . FREE-INTERVALS)
(USED-STRINGS . FREE-STRINGS))
Garbage collection happens automatically if you cons more than
`gc-cons-threshold' bytes of Lisp data since previous garbage collection. */
())
`gc-cons-threshold' bytes of Lisp data since previous garbage collection. */)
()
{
register struct gcpro *tail;
register struct specbinding *bind;
@ -5321,10 +5320,10 @@ gc_sweep ()
/* Debugging aids. */
DEFUN ("memory-limit", Fmemory_limit, Smemory_limit, 0, 0, 0,
/* Return the address of the last byte Emacs has allocated, divided by 1024.
doc: /* Return the address of the last byte Emacs has allocated, divided by 1024.
This may be helpful in debugging Emacs's memory usage.
We divide the value by 1024 to make sure it fits in a Lisp integer. */
())
We divide the value by 1024 to make sure it fits in a Lisp integer. */)
()
{
Lisp_Object end;
@ -5334,7 +5333,7 @@ We divide the value by 1024 to make sure it fits in a Lisp integer. */
}
DEFUN ("memory-use-counts", Fmemory_use_counts, Smemory_use_counts, 0, 0, 0,
/* Return a list of counters that measure how much consing there has been.
doc: /* Return a list of counters that measure how much consing there has been.
Each of these counters increments for a certain kind of object.
The counters wrap around from the largest positive integer to zero.
Garbage collection does not decrease them.
@ -5345,8 +5344,8 @@ except for VECTOR-CELLS and STRING-CHARS, which count the total length of
objects consed.
MISCS include overlays, markers, and some internal types.
Frames, windows, buffers, and subprocesses count as vectors
(but the contents of a buffer's text do not count here). */
())
(but the contents of a buffer's text do not count here). */)
()
{
Lisp_Object consed[8];
@ -5439,8 +5438,8 @@ init_alloc ()
void
syms_of_alloc ()
{
DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold
/* *Number of bytes of consing between garbage collections.
DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold,
doc: /* *Number of bytes of consing between garbage collections.
Garbage collection can happen automatically once this many bytes have been
allocated since the last garbage collection. All data types count.
@ -5449,58 +5448,58 @@ Garbage collection happens automatically only when `eval' is called.
By binding this temporarily to a large number, you can effectively
prevent garbage collection during a part of the program. */);
DEFVAR_INT ("pure-bytes-used", &pure_bytes_used
/* Number of bytes of sharable Lisp data allocated so far. */);
DEFVAR_INT ("pure-bytes-used", &pure_bytes_used,
doc: /* Number of bytes of sharable Lisp data allocated so far. */);
DEFVAR_INT ("cons-cells-consed", &cons_cells_consed
/* Number of cons cells that have been consed so far. */);
DEFVAR_INT ("cons-cells-consed", &cons_cells_consed,
doc: /* Number of cons cells that have been consed so far. */);
DEFVAR_INT ("floats-consed", &floats_consed
/* Number of floats that have been consed so far. */);
DEFVAR_INT ("floats-consed", &floats_consed,
doc: /* Number of floats that have been consed so far. */);
DEFVAR_INT ("vector-cells-consed", &vector_cells_consed
/* Number of vector cells that have been consed so far. */);
DEFVAR_INT ("vector-cells-consed", &vector_cells_consed,
doc: /* Number of vector cells that have been consed so far. */);
DEFVAR_INT ("symbols-consed", &symbols_consed
/* Number of symbols that have been consed so far. */);
DEFVAR_INT ("symbols-consed", &symbols_consed,
doc: /* Number of symbols that have been consed so far. */);
DEFVAR_INT ("string-chars-consed", &string_chars_consed
/* Number of string characters that have been consed so far. */);
DEFVAR_INT ("string-chars-consed", &string_chars_consed,
doc: /* Number of string characters that have been consed so far. */);
DEFVAR_INT ("misc-objects-consed", &misc_objects_consed
/* Number of miscellaneous objects that have been consed so far. */);
DEFVAR_INT ("misc-objects-consed", &misc_objects_consed,
doc: /* Number of miscellaneous objects that have been consed so far. */);
DEFVAR_INT ("intervals-consed", &intervals_consed
/* Number of intervals that have been consed so far. */);
DEFVAR_INT ("intervals-consed", &intervals_consed,
doc: /* Number of intervals that have been consed so far. */);
DEFVAR_INT ("strings-consed", &strings_consed
/* Number of strings that have been consed so far. */);
DEFVAR_INT ("strings-consed", &strings_consed,
doc: /* Number of strings that have been consed so far. */);
DEFVAR_LISP ("purify-flag", &Vpurify_flag
/* Non-nil means loading Lisp code in order to dump an executable.
DEFVAR_LISP ("purify-flag", &Vpurify_flag,
doc: /* Non-nil means loading Lisp code in order to dump an executable.
This means that certain objects should be allocated in shared (pure) space. */);
DEFVAR_INT ("undo-limit", &undo_limit
/* Keep no more undo information once it exceeds this size.
DEFVAR_INT ("undo-limit", &undo_limit,
doc: /* Keep no more undo information once it exceeds this size.
This limit is applied when garbage collection happens.
The size is counted as the number of bytes occupied,
which includes both saved text and other data. */);
undo_limit = 20000;
DEFVAR_INT ("undo-strong-limit", &undo_strong_limit
/* Don't keep more than this much size of undo information.
DEFVAR_INT ("undo-strong-limit", &undo_strong_limit,
doc: /* Don't keep more than this much size of undo information.
A command which pushes past this size is itself forgotten.
This limit is applied when garbage collection happens.
The size is counted as the number of bytes occupied,
which includes both saved text and other data. */);
undo_strong_limit = 30000;
DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages
/* Non-nil means display messages at start and end of garbage collection. */);
DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages,
doc: /* Non-nil means display messages at start and end of garbage collection. */);
garbage_collection_messages = 0;
DEFVAR_LISP ("post-gc-hook", &Vpost_gc_hook
/* Hook run after garbage collection has finished. */);
DEFVAR_LISP ("post-gc-hook", &Vpost_gc_hook,
doc: /* Hook run after garbage collection has finished. */);
Vpost_gc_hook = Qnil;
Qpost_gc_hook = intern ("post-gc-hook");
staticpro (&Qpost_gc_hook);

532
src/buffer.c
View File

File diff suppressed because it is too large Load Diff

102
src/dispnew.c
View File

@ -19,8 +19,6 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#define DOC_STRINGS_IN_COMMENTS
#include <config.h>
#include <signal.h>
#include <stdio.h>
@ -412,8 +410,8 @@ add_frame_display_history (f, paused_p)
DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
Sdump_redisplay_history, 0, 0, "",
/* Dump redisplay history to stderr. */
())
doc: /* Dump redisplay history to stderr. */)
()
{
int i;
@ -3307,8 +3305,8 @@ window_to_frame_hpos (w, hpos)
**********************************************************************/
DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
/* Clear frame FRAME and output again what is supposed to appear on it. */
(frame))
doc: /* Clear frame FRAME and output again what is supposed to appear on it. */)
(frame)
Lisp_Object frame;
{
struct frame *f;
@ -3353,8 +3351,8 @@ redraw_frame (f)
DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
/* Clear and redisplay all visible frames. */
())
doc: /* Clear and redisplay all visible frames. */)
()
{
Lisp_Object tail, frame;
@ -6043,9 +6041,9 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript,
1, 1, "FOpen termscript file: ",
/* Start writing all terminal output to FILE as well as the terminal.
FILE = nil means just close any termscript file currently open. */
(file))
doc: /* Start writing all terminal output to FILE as well as the terminal.
FILE = nil means just close any termscript file currently open. */)
(file)
Lisp_Object file;
{
if (termscript != 0) fclose (termscript);
@ -6064,9 +6062,9 @@ FILE = nil means just close any termscript file currently open. */
DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,
Ssend_string_to_terminal, 1, 1, 0,
/* Send STRING to the terminal without alteration.
Control characters in STRING will have terminal-dependent effects. */
(string))
doc: /* Send STRING to the terminal without alteration.
Control characters in STRING will have terminal-dependent effects. */)
(string)
Lisp_Object string;
{
/* ??? Perhaps we should do something special for multibyte strings here. */
@ -6084,10 +6082,10 @@ Control characters in STRING will have terminal-dependent effects. */
DEFUN ("ding", Fding, Sding, 0, 1, 0,
/* Beep, or flash the screen.
doc: /* Beep, or flash the screen.
Also, unless an argument is given,
terminate any keyboard macro currently executing. */
(arg))
terminate any keyboard macro currently executing. */)
(arg)
Lisp_Object arg;
{
if (!NILP (arg))
@ -6123,13 +6121,13 @@ bitch_at_user ()
***********************************************************************/
DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0,
/* Pause, without updating display, for SECONDS seconds.
doc: /* Pause, without updating display, for SECONDS seconds.
SECONDS may be a floating-point value, meaning that you can wait for a
fraction of a second. Optional second arg MILLISECONDS specifies an
additional wait period, in milliseconds; this may be useful if your
Emacs was built without floating point support.
\(Not all operating systems support waiting for a fraction of a second.) */
(seconds, milliseconds))
\(Not all operating systems support waiting for a fraction of a second.) */)
(seconds, milliseconds)
Lisp_Object seconds, milliseconds;
{
int sec, usec;
@ -6246,7 +6244,7 @@ sit_for (sec, usec, reading, display, initial_display)
DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0,
/* Perform redisplay, then wait for SECONDS seconds or until input is available.
doc: /* Perform redisplay, then wait for SECONDS seconds or until input is available.
SECONDS may be a floating-point value, meaning that you can wait for a
fraction of a second. Optional second arg MILLISECONDS specifies an
additional wait period, in milliseconds; this may be useful if your
@ -6255,8 +6253,8 @@ Emacs was built without floating point support.
Optional third arg NODISP non-nil means don't redisplay, just wait for input.
Redisplay is preempted as always if input arrives, and does not happen
if input is available before it starts.
Value is t if waited the full time with no input arriving. */
(seconds, milliseconds, nodisp))
Value is t if waited the full time with no input arriving. */)
(seconds, milliseconds, nodisp)
Lisp_Object seconds, milliseconds, nodisp;
{
int sec, usec;
@ -6297,14 +6295,14 @@ static Lisp_Object frame_and_buffer_state;
DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p,
Sframe_or_buffer_changed_p, 0, 0, 0,
/* Return non-nil if the frame and buffer state appears to have changed.
doc: /* Return non-nil if the frame and buffer state appears to have changed.
The state variable is an internal vector containing all frames and buffers,
aside from buffers whose names start with space,
along with the buffers' read-only and modified flags, which allows a fast
check to see whether the menu bars might need to be recomputed.
If this function returns non-nil, it updates the internal vector to reflect
the current state. */
())
the current state. */)
()
{
Lisp_Object tail, frame, buf;
Lisp_Object *vecp;
@ -6569,11 +6567,11 @@ For types not defined in VMS, use define emacs_term \"TYPE\".\n\
DEFUN ("internal-show-cursor", Finternal_show_cursor,
Sinternal_show_cursor, 2, 2, 0,
/* Set the cursor-visibility flag of WINDOW to SHOW.
doc: /* Set the cursor-visibility flag of WINDOW to SHOW.
WINDOW nil means use the selected window. SHOW non-nil means
show a cursor in WINDOW in the next redisplay. SHOW nil means
don't show a cursor. */
(window, show))
don't show a cursor. */)
(window, show)
Lisp_Object window, show;
{
/* Don't change cursor state while redisplaying. This could confuse
@ -6594,9 +6592,9 @@ don't show a cursor. */
DEFUN ("internal-show-cursor-p", Finternal_show_cursor_p,
Sinternal_show_cursor_p, 0, 1, 0,
/* Value is non-nil if next redisplay will display a cursor in WINDOW.
WINDOW nil or omitted means report on the selected window. */
(window))
doc: /* Value is non-nil if next redisplay will display a cursor in WINDOW.
WINDOW nil or omitted means report on the selected window. */)
(window)
Lisp_Object window;
{
struct window *w;
@ -6641,37 +6639,37 @@ syms_of_display ()
Qredisplay_dont_pause = intern ("redisplay-dont-pause");
staticpro (&Qredisplay_dont_pause);
DEFVAR_INT ("baud-rate", &baud_rate
/* *The output baud rate of the terminal.
DEFVAR_INT ("baud-rate", &baud_rate,
doc: /* *The output baud rate of the terminal.
On most systems, changing this value will affect the amount of padding
and the other strategic decisions made during redisplay. */);
DEFVAR_BOOL ("inverse-video", &inverse_video
/* *Non-nil means invert the entire frame display.
DEFVAR_BOOL ("inverse-video", &inverse_video,
doc: /* *Non-nil means invert the entire frame display.
This means everything is in inverse video which otherwise would not be. */);
DEFVAR_BOOL ("visible-bell", &visible_bell
/* *Non-nil means try to flash the frame to represent a bell. */);
DEFVAR_BOOL ("visible-bell", &visible_bell,
doc: /* *Non-nil means try to flash the frame to represent a bell. */);
DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter
/* *Non-nil means no need to redraw entire frame after suspending.
DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter,
doc: /* *Non-nil means no need to redraw entire frame after suspending.
A non-nil value is useful if the terminal can automatically preserve
Emacs's frame display when you reenter Emacs.
It is up to you to set this variable if your terminal can do that. */);
DEFVAR_LISP ("window-system", &Vwindow_system
/* A symbol naming the window-system under which Emacs is running
DEFVAR_LISP ("window-system", &Vwindow_system,
doc: /* A symbol naming the window-system under which Emacs is running
\(such as `x'), or nil if emacs is running on an ordinary terminal. */);
DEFVAR_LISP ("window-system-version", &Vwindow_system_version
/* The version number of the window system in use.
DEFVAR_LISP ("window-system-version", &Vwindow_system_version,
doc: /* The version number of the window system in use.
For X windows, this is 10 or 11. */);
DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area
/* Non-nil means put cursor in minibuffer, at end of any message there. */);
DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area,
doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */);
DEFVAR_LISP ("glyph-table", &Vglyph_table
/* Table defining how to output a glyph code to the frame.
DEFVAR_LISP ("glyph-table", &Vglyph_table,
doc: /* Table defining how to output a glyph code to the frame.
If not nil, this is a vector indexed by glyph code to define the glyph.
Each element can be:
integer: a glyph code which this glyph is an alias for.
@ -6681,13 +6679,13 @@ Each element can be:
while outputting it. */);
Vglyph_table = Qnil;
DEFVAR_LISP ("standard-display-table", &Vstandard_display_table
/* Display table to use for buffers that specify none.
DEFVAR_LISP ("standard-display-table", &Vstandard_display_table,
doc: /* Display table to use for buffers that specify none.
See `buffer-display-table' for more information. */);
Vstandard_display_table = Qnil;
DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause
/* *Non-nil means update isn't paused when input is detected. */);
DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause,
doc: /* *Non-nil means update isn't paused when input is detected. */);
redisplay_dont_pause = 0;
/* Initialize `window-system', unless init_display already decided it. */

461
src/editfns.c
View File

File diff suppressed because it is too large Load Diff

14
src/term.c
View File

@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include "termchar.h"
#include "termopts.h"
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "charset.h"
#include "coding.h"
@ -2176,8 +2176,8 @@ turn_off_face (f, face_id)
DEFUN ("tty-display-color-p", Ftty_display_color_p, Stty_display_color_p,
0, 1, 0,
/* Return non-nil if TTY can display colors on FRAME. */
(frame))
doc: /* Return non-nil if TTY can display colors on FRAME. */)
(frame)
Lisp_Object frame;
{
return TN_max_colors > 0 ? Qt : Qnil;
@ -2608,8 +2608,8 @@ fatal (str, arg1, arg2)
void
syms_of_term ()
{
DEFVAR_BOOL ("system-uses-terminfo", &system_uses_terminfo
/* Non-nil means the system uses terminfo rather than termcap.
DEFVAR_BOOL ("system-uses-terminfo", &system_uses_terminfo,
doc: /* Non-nil means the system uses terminfo rather than termcap.
This variable can be used by terminal emulator packages. */);
#ifdef TERMINFO
system_uses_terminfo = 1;
@ -2617,8 +2617,8 @@ This variable can be used by terminal emulator packages. */);
system_uses_terminfo = 0;
#endif
DEFVAR_LISP ("ring-bell-function", &Vring_bell_function
/* Non-nil means call this function to ring the bell.
DEFVAR_LISP ("ring-bell-function", &Vring_bell_function,
doc: /* Non-nil means call this function to ring the bell.
The function should accept no arguments. */);
Vring_bell_function = Qnil;

172
src/xdisp.c
View File

@ -169,7 +169,7 @@ Boston, MA 02111-1307, USA. */
#include <config.h>
#include <stdio.h>
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "keyboard.h"
#include "frame.h"
@ -7792,8 +7792,8 @@ tool_bar_lines_needed (f)
DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
0, 1, 0,
/* Return the number of lines occupied by the tool bar of FRAME. */
(frame))
doc: /* Return the number of lines occupied by the tool bar of FRAME. */)
(frame)
Lisp_Object frame;
{
struct frame *f;
@ -12161,11 +12161,11 @@ dump_glyph_row (row, vpos, glyphs)
DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
Sdump_glyph_matrix, 0, 1, "p",
/* Dump the current matrix of the selected window to stderr.
doc: /* Dump the current matrix of the selected window to stderr.
Shows contents of glyph row structures. With non-nil
parameter GLYPHS, dump glyphs as well. If GLYPHS is 1 show
glyphs in short form, otherwise show glyphs in long form. */
(glyphs))
glyphs in short form, otherwise show glyphs in long form. */)
(glyphs)
Lisp_Object glyphs;
{
struct window *w = XWINDOW (selected_window);
@ -12183,11 +12183,11 @@ glyphs in short form, otherwise show glyphs in long form. */
DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "",
/* Dump glyph row ROW to stderr.
doc: /* Dump glyph row ROW to stderr.
GLYPH 0 means don't dump glyphs.
GLYPH 1 means dump glyphs in short form.
GLYPH > 1 or omitted means dump glyphs in long form. */
(row, glyphs))
GLYPH > 1 or omitted means dump glyphs in long form. */)
(row, glyphs)
Lisp_Object row, glyphs;
{
struct glyph_matrix *matrix;
@ -12205,11 +12205,11 @@ GLYPH > 1 or omitted means dump glyphs in long form. */
DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "",
/* Dump glyph row ROW of the tool-bar of the current frame to stderr.
doc: /* Dump glyph row ROW of the tool-bar of the current frame to stderr.
GLYPH 0 means don't dump glyphs.
GLYPH 1 means dump glyphs in short form.
GLYPH > 1 or omitted means dump glyphs in long form. */
(row, glyphs))
GLYPH > 1 or omitted means dump glyphs in long form. */)
(row, glyphs)
Lisp_Object row, glyphs;
{
struct frame *sf = SELECTED_FRAME ();
@ -12226,9 +12226,9 @@ GLYPH > 1 or omitted means dump glyphs in long form. */
DEFUN ("trace-redisplay", Ftrace_redisplay, Strace_redisplay, 0, 1, "P",
/* Toggle tracing of redisplay.
With ARG, turn tracing on if and only if ARG is positive. */
(arg))
doc: /* Toggle tracing of redisplay.
With ARG, turn tracing on if and only if ARG is positive. */)
(arg)
Lisp_Object arg;
{
if (NILP (arg))
@ -12244,8 +12244,8 @@ With ARG, turn tracing on if and only if ARG is positive. */
DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "",
/* Like `format', but print result to stderr. */
(nargs, args))
doc: /* Like `format', but print result to stderr. */)
(nargs, args)
int nargs;
Lisp_Object *args;
{
@ -14662,97 +14662,97 @@ syms_of_xdisp ()
Vmessages_buffer_name = build_string ("*Messages*");
staticpro (&Vmessages_buffer_name);
DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace
/* Non-nil means highlight trailing whitespace.
DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace,
doc: /* Non-nil means highlight trailing whitespace.
The face used for trailing whitespace is `trailing-whitespace'. */);
Vshow_trailing_whitespace = Qnil;
DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay
/* Non-nil means don't actually do any redisplay.
DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay,
doc: /* Non-nil means don't actually do any redisplay.
This is used for internal purposes. */);
Vinhibit_redisplay = Qnil;
DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string
/* String (or mode line construct) included (normally) in `mode-line-format'. */);
DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
doc: /* String (or mode line construct) included (normally) in `mode-line-format'. */);
Vglobal_mode_string = Qnil;
DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position
/* Marker for where to display an arrow on top of the buffer text.
DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
doc: /* Marker for where to display an arrow on top of the buffer text.
This must be the beginning of a line in order to work.
See also `overlay-arrow-string'. */);
Voverlay_arrow_position = Qnil;
DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string
/* String to display as an arrow. See also `overlay-arrow-position'. */);
DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
doc: /* String to display as an arrow. See also `overlay-arrow-position'. */);
Voverlay_arrow_string = Qnil;
DEFVAR_INT ("scroll-step", &scroll_step
/* *The number of lines to try scrolling a window by when point moves out.
DEFVAR_INT ("scroll-step", &scroll_step,
doc: /* *The number of lines to try scrolling a window by when point moves out.
If that fails to bring point back on frame, point is centered instead.
If this is zero, point is always centered after it moves off frame.
If you want scrolling to always be a line at a time, you should set
`scroll-conservatively' to a large value rather than set this to 1. */);
DEFVAR_INT ("scroll-conservatively", &scroll_conservatively
/* *Scroll up to this many lines, to bring point back on screen.
DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
doc: /* *Scroll up to this many lines, to bring point back on screen.
A value of zero means to scroll the text to center point vertically
in the window. */);
scroll_conservatively = 0;
DEFVAR_INT ("scroll-margin", &scroll_margin
/* *Number of lines of margin at the top and bottom of a window.
DEFVAR_INT ("scroll-margin", &scroll_margin,
doc: /* *Number of lines of margin at the top and bottom of a window.
Recenter the window whenever point gets within this many lines
of the top or bottom of the window. */);
scroll_margin = 0;
#if GLYPH_DEBUG
DEFVAR_INT ("debug-end-pos", &debug_end_pos /* Don't ask. */);
DEFVAR_INT ("debug-end-pos", &debug_end_pos, doc: /* Don't ask. */);
#endif
DEFVAR_BOOL ("truncate-partial-width-windows",
&truncate_partial_width_windows
/* *Non-nil means truncate lines in all windows less than full frame wide. */);
&truncate_partial_width_windows,
doc: /* *Non-nil means truncate lines in all windows less than full frame wide. */);
truncate_partial_width_windows = 1;
DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video
/* nil means display the mode-line/header-line/menu-bar in the default face.
DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
doc: /* nil means display the mode-line/header-line/menu-bar in the default face.
Any other value means to use the appropriate face, `mode-line',
`header-line', or `menu' respectively.
This variable is deprecated; please change the above faces instead. */);
mode_line_inverse_video = 1;
DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit
/* *Maximum buffer size for which line number should be displayed.
DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit,
doc: /* *Maximum buffer size for which line number should be displayed.
If the buffer is bigger than this, the line number does not appear
in the mode line. A value of nil means no limit. */);
Vline_number_display_limit = Qnil;
DEFVAR_INT ("line-number-display-limit-width",
&line_number_display_limit_width
/* *Maximum line width (in characters) for line number display.
&line_number_display_limit_width,
doc: /* *Maximum line width (in characters) for line number display.
If the average length of the lines near point is bigger than this, then the
line number may be omitted from the mode line. */);
line_number_display_limit_width = 200;
DEFVAR_BOOL ("highlight-nonselected-windows", &highlight_nonselected_windows
/* *Non-nil means highlight region even in nonselected windows. */);
DEFVAR_BOOL ("highlight-nonselected-windows", &highlight_nonselected_windows,
doc: /* *Non-nil means highlight region even in nonselected windows. */);
highlight_nonselected_windows = 0;
DEFVAR_BOOL ("multiple-frames", &multiple_frames
/* Non-nil if more than one frame is visible on this display.
DEFVAR_BOOL ("multiple-frames", &multiple_frames,
doc: /* Non-nil if more than one frame is visible on this display.
Minibuffer-only frames don't count, but iconified frames do.
This variable is not guaranteed to be accurate except while processing
`frame-title-format' and `icon-title-format'. */);
DEFVAR_LISP ("frame-title-format", &Vframe_title_format
/* Template for displaying the title bar of visible frames.
DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
doc: /* Template for displaying the title bar of visible frames.
\(Assuming the window manager supports this feature.)
This variable has the same structure as `mode-line-format' (which see),
and is used only on frames for which no explicit name has been set
\(see `modify-frame-parameters'). */);
DEFVAR_LISP ("icon-title-format", &Vicon_title_format
/* Template for displaying the title bar of an iconified frame.
DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
doc: /* Template for displaying the title bar of an iconified frame.
\(Assuming the window manager supports this feature.)
This variable has the same structure as `mode-line-format' (which see),
and is used only on frames for which no explicit name has been set
@ -14768,52 +14768,52 @@ and is used only on frames for which no explicit name has been set
Qnil)))),
Qnil)));
DEFVAR_LISP ("message-log-max", &Vmessage_log_max
/* Maximum number of lines to keep in the message log buffer.
DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
doc: /* Maximum number of lines to keep in the message log buffer.
If nil, disable message logging. If t, log messages but don't truncate
the buffer when it becomes large. */);
Vmessage_log_max = make_number (50);
DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions
/* Functions called before redisplay, if window sizes have changed.
DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions,
doc: /* Functions called before redisplay, if window sizes have changed.
The value should be a list of functions that take one argument.
Just before redisplay, for each frame, if any of its windows have changed
size since the last redisplay, or have been split or deleted,
all the functions in the list are called, with the frame as argument. */);
Vwindow_size_change_functions = Qnil;
DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions
/* List of Functions to call before redisplaying a window with scrolling.
DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
doc: /* List of Functions to call before redisplaying a window with scrolling.
Each function is called with two arguments, the window
and its new display-start position. Note that the value of `window-end'
is not valid when these functions are called. */);
Vwindow_scroll_functions = Qnil;
DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p
/* *Non-nil means automatically resize tool-bars.
DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p,
doc: /* *Non-nil means automatically resize tool-bars.
This increases a tool-bar's height if not all tool-bar items are visible.
It decreases a tool-bar's height when it would display blank lines
otherwise. */);
auto_resize_tool_bars_p = 1;
DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p
/* *Non-nil means raise tool-bar buttons when the mouse moves over them. */);
DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p,
doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them. */);
auto_raise_tool_bar_buttons_p = 1;
DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin
/* *Margin around tool-bar buttons in pixels.
DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin,
doc: /* *Margin around tool-bar buttons in pixels.
If an integer, use that for both horizontal and vertical margins.
Otherwise, value should be a pair of integers `(HORZ : VERT)' with
HORZ specifying the horizontal margin, and VERT specifying the
vertical margin. */);
Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN);
DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief
/* Relief thickness of tool-bar buttons. */);
DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief,
doc: /* Relief thickness of tool-bar buttons. */);
tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF;
DEFVAR_LISP ("fontification-functions", &Vfontification_functions
/* List of functions to call to fontify regions of text.
DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
doc: /* List of functions to call to fontify regions of text.
Each function is called with one argument POS. Functions must
fontify a region starting at POS in the current buffer, and give
fontified regions the property `fontified'. */);
@ -14821,22 +14821,22 @@ fontified regions the property `fontified'. */);
Fmake_variable_buffer_local (Qfontification_functions);
DEFVAR_BOOL ("unibyte-display-via-language-environment",
&unibyte_display_via_language_environment
/* *Non-nil means display unibyte text according to language environment.
&unibyte_display_via_language_environment,
doc: /* *Non-nil means display unibyte text according to language environment.
Specifically this means that unibyte non-ASCII characters
are displayed by converting them to the equivalent multibyte characters
according to the current language environment. As a result, they are
displayed according to the current fontset. */);
unibyte_display_via_language_environment = 0;
DEFVAR_LISP ("max-mini-window-height", &Vmax_mini_window_height
/* *Maximum height for resizing mini-windows.
DEFVAR_LISP ("max-mini-window-height", &Vmax_mini_window_height,
doc: /* *Maximum height for resizing mini-windows.
If a float, it specifies a fraction of the mini-window frame's height.
If an integer, it specifies a number of lines. */);
Vmax_mini_window_height = make_float (0.25);
DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows
/* *How to resize mini-windows.
DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows,
doc: /* *How to resize mini-windows.
A value of nil means don't automatically resize mini-windows.
A value of t means resize them to fit the text displayed in them.
A value of `grow-only', the default, means let mini-windows grow
@ -14845,36 +14845,36 @@ go back to their normal size. */);
Vresize_mini_windows = Qgrow_only;
DEFVAR_BOOL ("cursor-in-non-selected-windows",
&cursor_in_non_selected_windows
/* *Non-nil means display a hollow cursor in non-selected windows.
&cursor_in_non_selected_windows,
doc: /* *Non-nil means display a hollow cursor in non-selected windows.
Nil means don't display a cursor there. */);
cursor_in_non_selected_windows = 1;
DEFVAR_BOOL ("automatic-hscrolling", &automatic_hscrolling_p
/* *Non-nil means scroll the display automatically to make point visible. */);
DEFVAR_BOOL ("automatic-hscrolling", &automatic_hscrolling_p,
doc: /* *Non-nil means scroll the display automatically to make point visible. */);
automatic_hscrolling_p = 1;
DEFVAR_LISP ("image-types", &Vimage_types
/* List of supported image types.
DEFVAR_LISP ("image-types", &Vimage_types,
doc: /* List of supported image types.
Each element of the list is a symbol for a supported image type. */);
Vimage_types = Qnil;
DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines
/* If non-nil, messages are truncated instead of resizing the echo area.
DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines,
doc: /* If non-nil, messages are truncated instead of resizing the echo area.
Bind this around calls to `message' to let it take effect. */);
message_truncate_lines = 0;
DEFVAR_LISP ("menu-bar-update-hook", &Vmenu_bar_update_hook
/* Normal hook run for clicks on menu bar, before displaying a submenu.
DEFVAR_LISP ("menu-bar-update-hook", &Vmenu_bar_update_hook,
doc: /* Normal hook run for clicks on menu bar, before displaying a submenu.
Can be used to update submenus whose contents should vary. */);
Vmenu_bar_update_hook = Qnil;
DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update
/* Non-nil means don't update menu bars. Internal use only. */);
DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update,
doc: /* Non-nil means don't update menu bars. Internal use only. */);
inhibit_menubar_update = 0;
DEFVAR_BOOL ("inhibit-eval-during-redisplay", &inhibit_eval_during_redisplay
/* Non-nil means don't eval Lisp during redisplay. */);
DEFVAR_BOOL ("inhibit-eval-during-redisplay", &inhibit_eval_during_redisplay,
doc: /* Non-nil means don't eval Lisp during redisplay. */);
inhibit_eval_during_redisplay = 0;
}

180
src/xfaces.c
View File

@ -194,7 +194,7 @@ Boston, MA 02111-1307, USA. */
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "charset.h"
#include "keyboard.h"
@ -669,8 +669,8 @@ unregister_colors (pixels, n)
DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0,
/* Dump currently allocated colors to stderr. */
())
doc: /* Dump currently allocated colors to stderr. */)
()
{
int i, n;
@ -1017,9 +1017,9 @@ clear_face_cache (clear_fonts_p)
DEFUN ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0,
/* Clear face caches on all frames.
Optional THOROUGHLY non-nil means try to free unused fonts, too. */
(thoroughly))
doc: /* Clear face caches on all frames.
Optional THOROUGHLY non-nil means try to free unused fonts, too. */)
(thoroughly)
Lisp_Object thoroughly;
{
clear_face_cache (!NILP (thoroughly));
@ -1098,13 +1098,13 @@ clear_font_table (dpyinfo)
#ifdef HAVE_WINDOW_SYSTEM
DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0,
/* Value is non-nil if OBJECT is a valid bitmap specification.
doc: /* Value is non-nil if OBJECT is a valid bitmap specification.
A bitmap specification is either a string, a file name, or a list
\(WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap,
HEIGHT is its height, and DATA is a string containing the bits of
the pixmap. Bits are stored row by row, each row occupies
\(WIDTH + 7)/8 bytes. */
(object))
\(WIDTH + 7)/8 bytes. */)
(object)
Lisp_Object object;
{
int pixmap_p = 0;
@ -1482,10 +1482,10 @@ face_color_supported_p (f, color_name, background_p)
DEFUN ("color-gray-p", Fcolor_gray_p, Scolor_gray_p, 1, 2, 0,
/* Return non-nil if COLOR is a shade of gray (or white or black).
doc: /* Return non-nil if COLOR is a shade of gray (or white or black).
FRAME specifies the frame and thus the display for interpreting COLOR.
If FRAME is nil or omitted, use the selected frame. */
(color, frame))
If FRAME is nil or omitted, use the selected frame. */)
(color, frame)
Lisp_Object color, frame;
{
struct frame *f;
@ -1499,11 +1499,11 @@ If FRAME is nil or omitted, use the selected frame. */
DEFUN ("color-supported-p", Fcolor_supported_p,
Scolor_supported_p, 2, 3, 0,
/* Return non-nil if COLOR can be displayed on FRAME.
doc: /* Return non-nil if COLOR can be displayed on FRAME.
BACKGROUND-P non-nil means COLOR is used as a background.
If FRAME is nil or omitted, use the selected frame.
COLOR must be a valid color name. */
(color, frame, background_p))
COLOR must be a valid color name. */)
(color, frame, background_p)
Lisp_Object frame, color, background_p;
{
struct frame *f;
@ -2692,7 +2692,7 @@ remove_duplicates (list)
DEFUN ("x-family-fonts", Fx_family_fonts, Sx_family_fonts, 0, 2, 0,
/* Return a list of available fonts of family FAMILY on FRAME.
doc: /* Return a list of available fonts of family FAMILY on FRAME.
If FAMILY is omitted or nil, list all families.
Otherwise, FAMILY must be a string, possibly containing wildcards
`?' and `*'.
@ -2706,8 +2706,8 @@ face attributes. FIXED-P is non-nil if the font is fixed-pitch.
FULL is the full name of the font, and REGISTRY-AND-ENCODING is a string
giving the registry and encoding of the font.
The result list is sorted according to the current setting of
the face font sort order. */
(family, frame))
the face font sort order. */)
(family, frame)
Lisp_Object family, frame;
{
struct frame *f = check_x_frame (frame);
@ -2752,12 +2752,12 @@ the face font sort order. */
DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list,
0, 1, 0,
/* Return a list of available font families on FRAME.
doc: /* Return a list of available font families on FRAME.
If FRAME is omitted or nil, use the selected frame.
Value is a list of conses (FAMILY . FIXED-P) where FAMILY
is a font family, and FIXED-P is non-nil if fonts of that family
are fixed-pitch. */
(frame))
are fixed-pitch. */)
(frame)
Lisp_Object frame;
{
struct frame *f = check_x_frame (frame);
@ -2799,7 +2799,7 @@ are fixed-pitch. */
DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 5, 0,
/* Return a list of the names of available fonts matching PATTERN.
doc: /* Return a list of the names of available fonts matching PATTERN.
If optional arguments FACE and FRAME are specified, return only fonts
the same size as FACE on FRAME.
PATTERN is a string, perhaps with wildcard characters;
@ -2817,8 +2817,8 @@ The optional fourth argument MAXIMUM sets a limit on how many
fonts to match. The first MAXIMUM fonts are reported.
The optional fifth argument WIDTH, if specified, is a number of columns
occupied by a character of a font. In that case, return only fonts
the WIDTH times as wide as FACE on FRAME. */
(pattern, face, frame, maximum, width))
the WIDTH times as wide as FACE on FRAME. */)
(pattern, face, frame, maximum, width)
Lisp_Object pattern, face, frame, maximum, width;
{
struct frame *f;
@ -3624,12 +3624,12 @@ merge_face_vector_with_property (f, to, prop)
DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face,
Sinternal_make_lisp_face, 1, 2, 0,
/* Make FACE, a symbol, a Lisp face with all attributes nil.
doc: /* Make FACE, a symbol, a Lisp face with all attributes nil.
If FACE was not known as a face before, create a new one.
If optional argument FRAME is specified, make a frame-local face
for that frame. Otherwise operate on the global face definition.
Value is a vector of face attributes. */
(face, frame))
Value is a vector of face attributes. */)
(face, frame)
Lisp_Object face, frame;
{
Lisp_Object global_lface, lface;
@ -3702,11 +3702,11 @@ Value is a vector of face attributes. */
DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p,
Sinternal_lisp_face_p, 1, 2, 0,
/* Return non-nil if FACE names a face.
doc: /* Return non-nil if FACE names a face.
If optional second parameter FRAME is non-nil, check for the
existence of a frame-local face with name FACE on that frame.
Otherwise check for the existence of a global face. */
(face, frame))
Otherwise check for the existence of a global face. */)
(face, frame)
Lisp_Object face, frame;
{
Lisp_Object lface;
@ -3725,14 +3725,14 @@ Otherwise check for the existence of a global face. */
DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face,
Sinternal_copy_lisp_face, 4, 4, 0,
/* Copy face FROM to TO.
doc: /* Copy face FROM to TO.
If FRAME it t, copy the global face definition of FROM to the
global face definition of TO. Otherwise, copy the frame-local
definition of FROM on FRAME to the frame-local definition of TO
on NEW-FRAME, or FRAME if NEW-FRAME is nil.
Value is TO. */
(from, to, frame, new_frame))
Value is TO. */)
(from, to, frame, new_frame)
Lisp_Object from, to, frame, new_frame;
{
Lisp_Object lface, copy;
@ -3767,13 +3767,13 @@ Value is TO. */
DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute,
Sinternal_set_lisp_face_attribute, 3, 4, 0,
/* Set attribute ATTR of FACE to VALUE.
doc: /* Set attribute ATTR of FACE to VALUE.
FRAME being a frame means change the face on that frame.
FRAME nil means change the face of the selected frame.
FRAME t means change the default for new frames.
FRAME 0 means change the face on all frames, and change the default
for new frames. */
(face, attr, value, frame))
for new frames. */)
(face, attr, value, frame)
Lisp_Object face, attr, value, frame;
{
Lisp_Object lface;
@ -4311,9 +4311,8 @@ update_face_from_frame_parameter (f, param, new_value)
doesn't take a frame argument. */
DEFUN ("internal-face-x-get-resource", Finternal_face_x_get_resource,
Sinternal_face_x_get_resource, 3, 3, 0,
/* */
(resource, class, frame))
Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */)
(resource, class, frame)
Lisp_Object resource, class, frame;
{
Lisp_Object value = Qnil;
@ -4364,9 +4363,8 @@ face_boolean_x_resource_value (value, signal_p)
DEFUN ("internal-set-lisp-face-attribute-from-resource",
Finternal_set_lisp_face_attribute_from_resource,
Sinternal_set_lisp_face_attribute_from_resource,
3, 4, 0,
/* */
(face, attr, value, frame))
3, 4, 0, doc: /* */)
(face, attr, value, frame)
Lisp_Object face, attr, value, frame;
{
CHECK_SYMBOL (face, 0);
@ -4495,13 +4493,13 @@ x_update_menu_appearance (f)
DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute,
Sinternal_get_lisp_face_attribute,
2, 3, 0,
/* Return face attribute KEYWORD of face SYMBOL.
doc: /* Return face attribute KEYWORD of face SYMBOL.
If SYMBOL does not name a valid Lisp face or KEYWORD isn't a valid
face attribute name, signal an error.
If the optional argument FRAME is given, report on face FACE in that
frame. If FRAME is t, report on the defaults for face FACE (for new
frames). If FRAME is omitted or nil, use the selected frame. */
(symbol, keyword, frame))
frames). If FRAME is omitted or nil, use the selected frame. */)
(symbol, keyword, frame)
Lisp_Object symbol, keyword, frame;
{
Lisp_Object lface, value = Qnil;
@ -4560,9 +4558,9 @@ frames). If FRAME is omitted or nil, use the selected frame. */
DEFUN ("internal-lisp-face-attribute-values",
Finternal_lisp_face_attribute_values,
Sinternal_lisp_face_attribute_values, 1, 1, 0,
/* Return a list of valid discrete values for face attribute ATTR.
Value is nil if ATTR doesn't have a discrete set of valid values. */
(attr))
doc: /* Return a list of valid discrete values for face attribute ATTR.
Value is nil if ATTR doesn't have a discrete set of valid values. */)
(attr)
Lisp_Object attr;
{
Lisp_Object result = Qnil;
@ -4612,9 +4610,9 @@ Value is nil if ATTR doesn't have a discrete set of valid values. */
DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
Sinternal_merge_in_global_face, 2, 2, 0,
/* Add attributes from frame-default definition of FACE to FACE on FRAME.
Default face attributes override any local face attributes. */
(face, frame))
doc: /* Add attributes from frame-default definition of FACE to FACE on FRAME.
Default face attributes override any local face attributes. */)
(face, frame)
Lisp_Object face, frame;
{
int i;
@ -4647,13 +4645,13 @@ Default face attributes override any local face attributes. */
done in fontset.el. */
DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0,
/* Return the font name of face FACE, or nil if it is unspecified.
doc: /* Return the font name of face FACE, or nil if it is unspecified.
If the optional argument FRAME is given, report on face FACE in that frame.
If FRAME is t, report on the defaults for face FACE (for new frames).
The font default for a face is either nil, or a list
of the form (bold), (italic) or (bold italic).
If FRAME is omitted or nil, use the selected frame. */
(face, frame))
If FRAME is omitted or nil, use the selected frame. */)
(face, frame)
Lisp_Object face, frame;
{
if (EQ (frame, Qt))
@ -4731,11 +4729,11 @@ lface_equal_p (v1, v2)
DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
Sinternal_lisp_face_equal_p, 2, 3, 0,
/* True if FACE1 and FACE2 are equal.
doc: /* True if FACE1 and FACE2 are equal.
If the optional argument FRAME is given, report on face FACE in that frame.
If FRAME is t, report on the defaults for face FACE (for new frames).
If FRAME is omitted or nil, use the selected frame. */
(face1, face2, frame))
If FRAME is omitted or nil, use the selected frame. */)
(face1, face2, frame)
Lisp_Object face1, face2, frame;
{
int equal_p;
@ -4761,11 +4759,11 @@ If FRAME is omitted or nil, use the selected frame. */
DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p,
Sinternal_lisp_face_empty_p, 1, 2, 0,
/* True if FACE has no attribute specified.
doc: /* True if FACE has no attribute specified.
If the optional argument FRAME is given, report on face FACE in that frame.
If FRAME is t, report on the defaults for face FACE (for new frames).
If FRAME is omitted or nil, use the selected frame. */
(face, frame))
If FRAME is omitted or nil, use the selected frame. */)
(face, frame)
Lisp_Object face, frame;
{
struct frame *f;
@ -4792,9 +4790,9 @@ If FRAME is omitted or nil, use the selected frame. */
DEFUN ("frame-face-alist", Fframe_face_alist, Sframe_face_alist,
0, 1, 0,
/* Return an alist of frame-local faces defined on FRAME.
For internal use only. */
(frame))
doc: /* Return an alist of frame-local faces defined on FRAME.
For internal use only. */)
(frame)
Lisp_Object frame;
{
struct frame *f = frame_or_selected_frame (frame, 0);
@ -5471,14 +5469,14 @@ lookup_derived_face (f, symbol, c, face_id)
DEFUN ("internal-set-font-selection-order",
Finternal_set_font_selection_order,
Sinternal_set_font_selection_order, 1, 1, 0,
/* Set font selection order for face font selection to ORDER.
doc: /* Set font selection order for face font selection to ORDER.
ORDER must be a list of length 4 containing the symbols `:width',
`:height', `:weight', and `:slant'. Face attributes appearing
first in ORDER are matched first, e.g. if `:height' appears before
`:weight' in ORDER, font selection first tries to find a font with
a suitable height, and then tries to match the font weight.
Value is ORDER. */
(order))
Value is ORDER. */)
(order)
Lisp_Object order;
{
Lisp_Object list;
@ -5531,11 +5529,11 @@ Value is ORDER. */
DEFUN ("internal-set-alternative-font-family-alist",
Finternal_set_alternative_font_family_alist,
Sinternal_set_alternative_font_family_alist, 1, 1, 0,
/* Define alternative font families to try in face font selection.
doc: /* Define alternative font families to try in face font selection.
ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries.
Each ALTERNATIVE is tried in order if no fonts of font family FAMILY can
be found. Value is ALIST. */
(alist))
be found. Value is ALIST. */)
(alist)
Lisp_Object alist;
{
CHECK_LIST (alist, 0);
@ -5548,11 +5546,11 @@ be found. Value is ALIST. */
DEFUN ("internal-set-alternative-font-registry-alist",
Finternal_set_alternative_font_registry_alist,
Sinternal_set_alternative_font_registry_alist, 1, 1, 0,
/* Define alternative font registries to try in face font selection.
doc: /* Define alternative font registries to try in face font selection.
ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries.
Each ALTERNATIVE is tried in order if no fonts of font registry REGISTRY can
be found. Value is ALIST. */
(alist))
be found. Value is ALIST. */)
(alist)
Lisp_Object alist;
{
CHECK_LIST (alist, 0);
@ -6659,13 +6657,13 @@ realize_tty_face (cache, attrs, c)
DEFUN ("tty-suppress-bold-inverse-default-colors",
Ftty_suppress_bold_inverse_default_colors,
Stty_suppress_bold_inverse_default_colors, 1, 1, 0,
/* Suppress/allow boldness of faces with inverse default colors.
doc: /* Suppress/allow boldness of faces with inverse default colors.
SUPPRESS non-nil means suppress it.
This affects bold faces on TTYs whose foreground is the default background
color of the display and whose background is the default foreground color.
For such faces, the bold face attribute is ignored if this variable
is non-nil. */
(suppress))
is non-nil. */)
(suppress)
Lisp_Object suppress;
{
tty_suppress_bold_inverse_default_colors_p = !NILP (suppress);
@ -6981,8 +6979,8 @@ dump_realized_face (face)
}
DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, /* */
(n))
DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
(n)
Lisp_Object n;
{
if (NILP (n))
@ -7016,8 +7014,8 @@ DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, /* */
DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources,
0, 0, 0, /* */
())
0, 0, 0, doc: /* */)
()
{
fprintf (stderr, "number of colors = %d\n", ncolors_allocated);
fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated);
@ -7209,29 +7207,29 @@ syms_of_xfaces ()
defsubr (&Sdump_colors);
#endif
DEFVAR_LISP ("font-list-limit", &Vfont_list_limit
/* *Limit for font matching.
DEFVAR_LISP ("font-list-limit", &Vfont_list_limit,
doc: /* *Limit for font matching.
If an integer > 0, font matching functions won't load more than
that number of fonts when searching for a matching font. */);
Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT);
DEFVAR_LISP ("face-new-frame-defaults", &Vface_new_frame_defaults
/* List of global face definitions (for internal use only.) */);
DEFVAR_LISP ("face-new-frame-defaults", &Vface_new_frame_defaults,
doc: /* List of global face definitions (for internal use only.) */);
Vface_new_frame_defaults = Qnil;
DEFVAR_LISP ("face-default-stipple", &Vface_default_stipple
/* *Default stipple pattern used on monochrome displays.
DEFVAR_LISP ("face-default-stipple", &Vface_default_stipple,
doc: /* *Default stipple pattern used on monochrome displays.
This stipple pattern is used on monochrome displays
instead of shades of gray for a face background color.
See `set-face-stipple' for possible values for this variable. */);
Vface_default_stipple = build_string ("gray3");
DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist
/* An alist of defined terminal colors and their RGB values. */);
DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist,
doc: /* An alist of defined terminal colors and their RGB values. */);
Vtty_defined_color_alist = Qnil;
DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed
/* Allowed scalable fonts.
DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed,
doc: /* Allowed scalable fonts.
A value of nil means don't allow any scalable fonts.
A value of t means allow any scalable font.
Otherwise, value must be a list of regular expressions. A font may be
@ -7240,8 +7238,8 @@ Note that if value is nil, a scalable font might still be used, if no
other font of the appropriate family and registry is available. */);
Vscalable_fonts_allowed = Qnil;
DEFVAR_LISP ("face-ignored-fonts", &Vface_ignored_fonts
/* List of ignored fonts.
DEFVAR_LISP ("face-ignored-fonts", &Vface_ignored_fonts,
doc: /* List of ignored fonts.
Each element is a regular expression that matches names of fonts to
ignore. */);
Vface_ignored_fonts = Qnil;

276
src/xfns.c
View File

@ -19,8 +19,6 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#define DOC_STRINGS_IN_COMMENTS
#include <config.h>
#include <signal.h>
#include <stdio.h>
@ -2641,7 +2639,7 @@ validate_x_resource_name ()
extern char *x_get_string_resource ();
DEFUN ("x-get-resource", Fx_get_resource, Sx_get_resource, 2, 4, 0,
/* Return the value of ATTRIBUTE, of class CLASS, from the X defaults database.
doc: /* Return the value of ATTRIBUTE, of class CLASS, from the X defaults database.
This uses `INSTANCE.ATTRIBUTE' as the key and `Emacs.CLASS' as the
class, where INSTANCE is the name under which Emacs was invoked, or
the name specified by the `-name' or `-rn' command-line arguments.
@ -2649,8 +2647,8 @@ the name specified by the `-name' or `-rn' command-line arguments.
The optional arguments COMPONENT and SUBCLASS add to the key and the
class, respectively. You must specify both of them or neither.
If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE'
and the class is `Emacs.CLASS.SUBCLASS'. */
(attribute, class, component, subclass))
and the class is `Emacs.CLASS.SUBCLASS'. */)
(attribute, class, component, subclass)
Lisp_Object attribute, class, component, subclass;
{
register char *value;
@ -2999,13 +2997,13 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass,
DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0,
/* Parse an X-style geometry string STRING.
doc: /* Parse an X-style geometry string STRING.
Returns an alist of the form ((top . TOP), (left . LEFT) ... ).
The properties returned may include `top', `left', `height', and `width'.
The value of `left' or `top' may be an integer,
or a list (+ N) meaning N pixels relative to top/left corner,
or a list (- N) meaning -N pixels relative to bottom/right corner. */
(string))
or a list (- N) meaning -N pixels relative to bottom/right corner. */)
(string)
Lisp_Object string;
{
int geometry, x, y;
@ -4092,7 +4090,7 @@ unwind_create_frame (frame)
DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
1, 1, 0,
/* Make a new X window, which is called a "frame" in Emacs terms.
doc: /* Make a new X window, which is called a "frame" in Emacs terms.
Returns an Emacs frame object.
ALIST is an alist of frame parameters.
If the parameters specify that the frame should not have a minibuffer,
@ -4100,8 +4098,8 @@ and do not specify a specific minibuffer window to use,
then `default-minibuffer-frame' must be a frame whose minibuffer can
be shared by the new frame.
This function is an internal primitive--use `make-frame' instead. */
(parms))
This function is an internal primitive--use `make-frame' instead. */)
(parms)
Lisp_Object parms;
{
struct frame *f;
@ -4555,9 +4553,9 @@ x_get_focus_frame (frame)
following a user-command. */
DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
/* Set the input focus to FRAME.
FRAME nil means use the selected frame. */
(frame))
doc: /* Set the input focus to FRAME.
FRAME nil means use the selected frame. */)
(frame)
Lisp_Object frame;
{
struct frame *f = check_x_frame (frame);
@ -4576,8 +4574,8 @@ FRAME nil means use the selected frame. */
DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
/* Internal function called by `color-defined-p', which see. */
(color, frame))
doc: /* Internal function called by `color-defined-p', which see. */)
(color, frame)
Lisp_Object color, frame;
{
XColor foo;
@ -4592,8 +4590,8 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
}
DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
/* Internal function called by `color-values', which see. */
(color, frame))
doc: /* Internal function called by `color-values', which see. */)
(color, frame)
Lisp_Object color, frame;
{
XColor foo;
@ -4615,8 +4613,8 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
}
DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
/* Internal function called by `display-color-p', which see. */
(display))
doc: /* Internal function called by `display-color-p', which see. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4639,12 +4637,12 @@ DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
0, 1, 0,
/* Return t if the X display supports shades of gray.
doc: /* Return t if the X display supports shades of gray.
Note that color displays do support shades of gray.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4669,11 +4667,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width,
0, 1, 0,
/* Returns the width in pixels of the X display DISPLAY.
doc: /* Returns the width in pixels of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4683,11 +4681,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-pixel-height", Fx_display_pixel_height,
Sx_display_pixel_height, 0, 1, 0,
/* Returns the height in pixels of the X display DISPLAY.
doc: /* Returns the height in pixels of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4697,11 +4695,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes,
0, 1, 0,
/* Returns the number of bitplanes of the X display DISPLAY.
doc: /* Returns the number of bitplanes of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4711,11 +4709,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells,
0, 1, 0,
/* Returns the number of color cells of the X display DISPLAY.
doc: /* Returns the number of color cells of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4727,11 +4725,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-server-max-request-size", Fx_server_max_request_size,
Sx_server_max_request_size,
0, 1, 0,
/* Returns the maximum request size of the X server of display DISPLAY.
doc: /* Returns the maximum request size of the X server of display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4740,11 +4738,11 @@ If omitted or nil, that stands for the selected frame's display. */
}
DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
/* Returns the vendor ID string of the X server of display DISPLAY.
doc: /* Returns the vendor ID string of the X server of display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4755,15 +4753,15 @@ If omitted or nil, that stands for the selected frame's display. */
}
DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
/* Returns the version numbers of the X server of display DISPLAY.
doc: /* Returns the version numbers of the X server of display DISPLAY.
The value is a list of three integers: the major and minor
version numbers of the X Protocol in use, and the vendor-specific release
number. See also the function `x-server-vendor'.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4775,11 +4773,11 @@ If omitted or nil, that stands for the selected frame's display. */
}
DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,
/* Return the number of screens on the X server of display DISPLAY.
doc: /* Return the number of screens on the X server of display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4788,11 +4786,11 @@ If omitted or nil, that stands for the selected frame's display. */
}
DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0,
/* Return the height in millimeters of the X display DISPLAY.
doc: /* Return the height in millimeters of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4801,11 +4799,11 @@ If omitted or nil, that stands for the selected frame's display. */
}
DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0,
/* Return the width in millimeters of the X display DISPLAY.
doc: /* Return the width in millimeters of the X display DISPLAY.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4815,12 +4813,12 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-backing-store", Fx_display_backing_store,
Sx_display_backing_store, 0, 1, 0,
/* Returns an indication of whether X display DISPLAY does backing store.
doc: /* Returns an indication of whether X display DISPLAY does backing store.
The value may be `always', `when-mapped', or `not-useful'.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4850,14 +4848,14 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-visual-class", Fx_display_visual_class,
Sx_display_visual_class, 0, 1, 0,
/* Return the visual class of the X display DISPLAY.
doc: /* Return the visual class of the X display DISPLAY.
The value is one of the symbols `static-gray', `gray-scale',
`static-color', `pseudo-color', `true-color', or `direct-color'.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -4893,11 +4891,11 @@ If omitted or nil, that stands for the selected frame's display. */
DEFUN ("x-display-save-under", Fx_display_save_under,
Sx_display_save_under, 0, 1, 0,
/* Returns t if the X display DISPLAY supports the save-under feature.
doc: /* Returns t if the X display DISPLAY supports the save-under feature.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */
(display))
If omitted or nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -5114,12 +5112,12 @@ x_display_info_for_name (name)
DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection,
1, 3, 0,
/* Open a connection to an X server.
doc: /* Open a connection to an X server.
DISPLAY is the name of the display to connect to.
Optional second arg XRM-STRING is a string of resources in xrdb format.
If the optional third arg MUST-SUCCEED is non-nil,
terminate Emacs if we can't open the connection. */
(display, xrm_string, must_succeed))
terminate Emacs if we can't open the connection. */)
(display, xrm_string, must_succeed)
Lisp_Object display, xrm_string, must_succeed;
{
unsigned char *xrm_option;
@ -5164,10 +5162,10 @@ connections from your machine.\n",
DEFUN ("x-close-connection", Fx_close_connection,
Sx_close_connection, 1, 1, 0,
/* Close the connection to DISPLAY's X server.
doc: /* Close the connection to DISPLAY's X server.
For DISPLAY, specify either a frame or a display name (a string).
If DISPLAY is nil, that stands for the selected frame's display. */
(display))
If DISPLAY is nil, that stands for the selected frame's display. */)
(display)
Lisp_Object display;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -5203,8 +5201,8 @@ If DISPLAY is nil, that stands for the selected frame's display. */
}
DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
/* Return the list of display names that Emacs has connections to. */
())
doc: /* Return the list of display names that Emacs has connections to. */)
()
{
Lisp_Object tail, result;
@ -5216,15 +5214,15 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
}
DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0,
/* If ON is non-nil, report X errors as soon as the erring request is made.
doc: /* If ON is non-nil, report X errors as soon as the erring request is made.
If ON is nil, allow buffering of requests.
Turning on synchronization prohibits the Xlib routines from buffering
requests and seriously degrades performance, but makes debugging much
easier.
The optional second argument DISPLAY specifies which display to act on.
DISPLAY should be either a frame or a display name (a string).
If DISPLAY is omitted or nil, that stands for the selected frame's display. */
(on, display))
If DISPLAY is omitted or nil, that stands for the selected frame's display. */)
(on, display)
Lisp_Object display, on;
{
struct x_display_info *dpyinfo = check_x_display_info (display);
@ -5603,12 +5601,12 @@ image_spec_value (spec, key, found)
DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0,
/* Return the size of image SPEC as pair (WIDTH . HEIGHT).
doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT).
PIXELS non-nil means return the size in pixels, otherwise return the
size in canonical character units.
FRAME is the frame on which the image will be displayed. FRAME nil
or omitted means use the selected frame. */
(spec, pixels, frame))
or omitted means use the selected frame. */)
(spec, pixels, frame)
Lisp_Object spec, pixels, frame;
{
Lisp_Object size;
@ -5636,10 +5634,10 @@ or omitted means use the selected frame. */
DEFUN ("image-mask-p", Fimage_mask_p, Simage_mask_p, 1, 2, 0,
/* Return t if image SPEC has a mask bitmap.
doc: /* Return t if image SPEC has a mask bitmap.
FRAME is the frame on which the image will be displayed. FRAME nil
or omitted means use the selected frame. */
(spec, frame))
or omitted means use the selected frame. */)
(spec, frame)
Lisp_Object spec, frame;
{
Lisp_Object mask;
@ -5982,10 +5980,10 @@ clear_image_cache (f, force_p)
DEFUN ("clear-image-cache", Fclear_image_cache, Sclear_image_cache,
0, 1, 0,
/* Clear the image cache of FRAME.
doc: /* Clear the image cache of FRAME.
FRAME nil or omitted means use the selected frame.
FRAME t means clear the image caches of all frames. */
(frame))
FRAME t means clear the image caches of all frames. */)
(frame)
Lisp_Object frame;
{
if (EQ (frame, Qt))
@ -10247,10 +10245,10 @@ x_kill_gs_process (pixmap, f)
DEFUN ("x-change-window-property", Fx_change_window_property,
Sx_change_window_property, 2, 3, 0,
/* Change window property PROP to VALUE on the X window of FRAME.
doc: /* Change window property PROP to VALUE on the X window of FRAME.
PROP and VALUE must be strings. FRAME nil or omitted means use the
selected frame. Value is VALUE. */
(prop, value, frame))
selected frame. Value is VALUE. */)
(prop, value, frame)
Lisp_Object frame, prop, value;
{
struct frame *f = check_x_frame (frame);
@ -10275,9 +10273,9 @@ selected frame. Value is VALUE. */
DEFUN ("x-delete-window-property", Fx_delete_window_property,
Sx_delete_window_property, 1, 2, 0,
/* Remove window property PROP from X window of FRAME.
FRAME nil or omitted means use the selected frame. Value is PROP. */
(prop, frame))
doc: /* Remove window property PROP from X window of FRAME.
FRAME nil or omitted means use the selected frame. Value is PROP. */)
(prop, frame)
Lisp_Object prop, frame;
{
struct frame *f = check_x_frame (frame);
@ -10298,11 +10296,11 @@ FRAME nil or omitted means use the selected frame. Value is PROP. */
DEFUN ("x-window-property", Fx_window_property, Sx_window_property,
1, 2, 0,
/* Value is the value of window property PROP on FRAME.
doc: /* Value is the value of window property PROP on FRAME.
If FRAME is nil or omitted, use the selected frame. Value is nil
if FRAME hasn't a property with name PROP or if PROP has no string
value. */
(prop, frame))
value. */)
(prop, frame)
Lisp_Object prop, frame;
{
struct frame *f = check_x_frame (frame);
@ -10941,7 +10939,7 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
/* Show STRING in a "tooltip" window on frame FRAME.
doc: /* Show STRING in a "tooltip" window on frame FRAME.
A tooltip window is a small X window displaying a string.
FRAME nil or omitted means use the selected frame.
@ -10961,8 +10959,8 @@ window, otherwise it is displayed at the mouse position, with offset
DY added (default is -10).
A tooltip's maximum size is specified by `x-max-tooltip-size'.
Text larger than the specified size is clipped. */
(string, frame, parms, timeout, dx, dy))
Text larger than the specified size is clipped. */)
(string, frame, parms, timeout, dx, dy)
Lisp_Object string, frame, parms, timeout, dx, dy;
{
struct frame *f;
@ -11150,9 +11148,9 @@ Text larger than the specified size is clipped. */
DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
/* Hide the current tooltip window, if there is any.
Value is t if tooltip was open, nil otherwise. */
())
doc: /* Hide the current tooltip window, if there is any.
Value is t if tooltip was open, nil otherwise. */)
()
{
int count;
Lisp_Object deleted, frame, timer;
@ -11240,12 +11238,12 @@ file_dialog_unmap_cb (widget, client_data, call_data)
DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
/* Read file name, prompting with PROMPT in directory DIR.
doc: /* Read file name, prompting with PROMPT in directory DIR.
Use a file selection dialog.
Select DEFAULT-FILENAME in the dialog's file selection box, if
specified. Don't let the user enter a file name in the file
selection dialog's entry field, if MUSTMATCH is non-nil. */
(prompt, dir, default_filename, mustmatch))
selection dialog's entry field, if MUSTMATCH is non-nil. */)
(prompt, dir, default_filename, mustmatch)
Lisp_Object prompt, dir, default_filename, mustmatch;
{
int result;
@ -11398,11 +11396,11 @@ selection dialog's entry field, if MUSTMATCH is non-nil. */
DEFUN ("x-backspace-delete-keys-p", Fx_backspace_delete_keys_p,
Sx_backspace_delete_keys_p, 0, 1, 0,
/* Check if both Backspace and Delete keys are on the keyboard of FRAME.
doc: /* Check if both Backspace and Delete keys are on the keyboard of FRAME.
FRAME nil means use the selected frame.
Value is t if we know that both keys are present, and are mapped to the
usual X keysyms. */
(frame))
usual X keysyms. */)
(frame)
Lisp_Object frame;
{
#ifdef HAVE_XKBGETKEYBOARD
@ -11595,24 +11593,24 @@ syms_of_xfns ()
init_x_parm_symbols ();
DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images
/* Non-nil means always draw a cross over disabled images.
DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
doc: /* Non-nil means always draw a cross over disabled images.
Disabled images are those having an `:conversion disabled' property.
A cross is always drawn on black & white displays. */);
cross_disabled_images = 0;
DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path
/* List of directories to search for bitmap files for X. */);
DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
doc: /* List of directories to search for bitmap files for X. */);
Vx_bitmap_file_path = decode_env_path ((char *) 0, PATH_BITMAPS);
DEFVAR_LISP ("x-pointer-shape", &Vx_pointer_shape
/* The shape of the pointer when over text.
DEFVAR_LISP ("x-pointer-shape", &Vx_pointer_shape,
doc: /* The shape of the pointer when over text.
Changing the value does not affect existing frames
unless you set the mouse color. */);
Vx_pointer_shape = Qnil;
DEFVAR_LISP ("x-resource-name", &Vx_resource_name
/* The name Emacs uses to look up X resources.
DEFVAR_LISP ("x-resource-name", &Vx_resource_name,
doc: /* The name Emacs uses to look up X resources.
`x-get-resource' uses this as the first component of the instance name
when requesting resource values.
Emacs initially sets `x-resource-name' to the name under which Emacs
@ -11623,8 +11621,8 @@ It may be useful to bind this variable locally around a call
to `x-get-resource'. See also the variable `x-resource-class'. */);
Vx_resource_name = Qnil;
DEFVAR_LISP ("x-resource-class", &Vx_resource_class
/* The class Emacs uses to look up X resources.
DEFVAR_LISP ("x-resource-class", &Vx_resource_class,
doc: /* The class Emacs uses to look up X resources.
`x-get-resource' uses this as the first component of the instance class
when requesting resource values.
@ -11636,61 +11634,61 @@ is a reasonable practice. See also the variable `x-resource-name'. */);
Vx_resource_class = build_string (EMACS_CLASS);
#if 0 /* This doesn't really do anything. */
DEFVAR_LISP ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape
/* The shape of the pointer when not over text.
DEFVAR_LISP ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape,
doc: /* The shape of the pointer when not over text.
This variable takes effect when you create a new frame
or when you set the mouse color. */);
#endif
Vx_nontext_pointer_shape = Qnil;
DEFVAR_LISP ("x-hourglass-pointer-shape", &Vx_hourglass_pointer_shape
/* The shape of the pointer when Emacs is busy.
DEFVAR_LISP ("x-hourglass-pointer-shape", &Vx_hourglass_pointer_shape,
doc: /* The shape of the pointer when Emacs is busy.
This variable takes effect when you create a new frame
or when you set the mouse color. */);
Vx_hourglass_pointer_shape = Qnil;
DEFVAR_BOOL ("display-hourglass", &display_hourglass_p
/* Non-zero means Emacs displays an hourglass pointer on window systems. */);
DEFVAR_BOOL ("display-hourglass", &display_hourglass_p,
doc: /* Non-zero means Emacs displays an hourglass pointer on window systems. */);
display_hourglass_p = 1;
DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay
/* *Seconds to wait before displaying an hourglass pointer.
DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,
doc: /* *Seconds to wait before displaying an hourglass pointer.
Value must be an integer or float. */);
Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
#if 0 /* This doesn't really do anything. */
DEFVAR_LISP ("x-mode-pointer-shape", &Vx_mode_pointer_shape
/* The shape of the pointer when over the mode line.
DEFVAR_LISP ("x-mode-pointer-shape", &Vx_mode_pointer_shape,
doc: /* The shape of the pointer when over the mode line.
This variable takes effect when you create a new frame
or when you set the mouse color. */);
#endif
Vx_mode_pointer_shape = Qnil;
DEFVAR_LISP ("x-sensitive-text-pointer-shape",
&Vx_sensitive_text_pointer_shape
/* The shape of the pointer when over mouse-sensitive text.
&Vx_sensitive_text_pointer_shape,
doc: /* The shape of the pointer when over mouse-sensitive text.
This variable takes effect when you create a new frame
or when you set the mouse color. */);
Vx_sensitive_text_pointer_shape = Qnil;
DEFVAR_LISP ("x-window-horizontal-drag-cursor",
&Vx_window_horizontal_drag_shape
/* Pointer shape to use for indicating a window can be dragged horizontally.
&Vx_window_horizontal_drag_shape,
doc: /* Pointer shape to use for indicating a window can be dragged horizontally.
This variable takes effect when you create a new frame
or when you set the mouse color. */);
Vx_window_horizontal_drag_shape = Qnil;
DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel
/* A string indicating the foreground color of the cursor box. */);
DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel,
doc: /* A string indicating the foreground color of the cursor box. */);
Vx_cursor_fore_pixel = Qnil;
DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size
/* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS).
DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
doc: /* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS).
Text larger than this is clipped. */);
Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager
/* Non-nil if no X window manager is in use.
DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,
doc: /* Non-nil if no X window manager is in use.
Emacs doesn't try to figure this out; this is always nil
unless you set it to something else. */);
/* We don't have any way to find this out, so set it to nil
@ -11698,8 +11696,8 @@ unless you set it to something else. */);
Vx_no_window_manager = Qnil;
DEFVAR_LISP ("x-pixel-size-width-font-regexp",
&Vx_pixel_size_width_font_regexp
/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.
&Vx_pixel_size_width_font_regexp,
doc: /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.
Since Emacs gets width of a font matching with this regexp from
PIXEL_SIZE field of the name, font finding mechanism gets faster for
@ -11707,8 +11705,8 @@ such a font. This is especially effective for such large fonts as
Chinese, Japanese, and Korean. */);
Vx_pixel_size_width_font_regexp = Qnil;
DEFVAR_LISP ("image-cache-eviction-delay", &Vimage_cache_eviction_delay
/* Time after which cached images are removed from the cache.
DEFVAR_LISP ("image-cache-eviction-delay", &Vimage_cache_eviction_delay,
doc: /* Time after which cached images are removed from the cache.
When an image has not been displayed this many seconds, remove it
from the image cache. Value must be an integer or nil with nil
meaning don't clear the cache. */);
@ -11719,8 +11717,8 @@ meaning don't clear the cache. */);
#ifdef USE_MOTIF
Fprovide (intern ("motif"), Qnil);
DEFVAR_LISP ("motif-version-string", &Vmotif_version_string
/* Version info for LessTif/Motif. */);
DEFVAR_LISP ("motif-version-string", &Vmotif_version_string,
doc: /* Version info for LessTif/Motif. */);
Vmotif_version_string = build_string (XmVERSION_STRING);
#endif /* USE_MOTIF */
#endif /* USE_X_TOOLKIT */

18
src/xmenu.c
View File

@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA. */
#include <signal.h>
#include <stdio.h>
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "termhooks.h"
#include "keyboard.h"
@ -656,7 +656,7 @@ list_of_items (pane)
}
DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
/* Pop up a deck-of-cards menu and return user's selection.
doc: /* Pop up a deck-of-cards menu and return user's selection.
POSITION is a position specification. This is either a mouse button event
or a list ((XOFFSET YOFFSET) WINDOW)
where XOFFSET and YOFFSET are positions in pixels from the top left
@ -688,8 +688,8 @@ in the menu.
With this form of menu, the return value is VALUE from the chosen item.
If POSITION is nil, don't display the menu at all, just precalculate the
cached information about equivalent key sequences. */
(position, menu))
cached information about equivalent key sequences. */)
(position, menu)
Lisp_Object position, menu;
{
Lisp_Object keymap, tem;
@ -881,7 +881,7 @@ cached information about equivalent key sequences. */
#ifdef HAVE_MENUS
DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
/* Pop up a dialog box and return user's selection.
doc: /* Pop up a dialog box and return user's selection.
POSITION specifies which frame to use.
This is normally a mouse button event or a window or frame.
If POSITION is t, it means to use the frame the mouse is on.
@ -895,8 +895,8 @@ The return value is VALUE from the chosen item.
An ITEM may also be just a string--that makes a nonselectable item.
An ITEM may also be nil--that means to put all preceding items
on the left of the dialog box and all following items on the right.
\(By default, approximately half appear on each side.) */
(position, contents))
\(By default, approximately half appear on each side.) */)
(position, contents)
Lisp_Object position, contents;
{
struct frame * f = NULL;
@ -2849,8 +2849,8 @@ syms_of_xmenu ()
Qdebug_on_next_call = intern ("debug-on-next-call");
staticpro (&Qdebug_on_next_call);
DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame
/* Frame for which we are updating a menu.
DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,
doc: /* Frame for which we are updating a menu.
The enable predicate for a menu command should check this variable. */);
Vmenu_updating_frame = Qnil;

13
src/xterm.c
View File

@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA. */
#ifdef HAVE_X_WINDOWS
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h"
#include "blockinput.h"
@ -14799,22 +14798,22 @@ syms_of_xterm ()
staticpro (&previous_help_echo);
help_echo_pos = -1;
DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p
/* *Non-nil means draw block cursor as wide as the glyph under it.
DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
doc: /* *Non-nil means draw block cursor as wide as the glyph under it.
For example, if a block cursor is over a tab, it will be drawn as
wide as that tab on the display. */);
x_stretch_cursor_p = 0;
DEFVAR_BOOL ("x-use-underline-position-properties",
&x_use_underline_position_properties
/* *Non-nil means make use of UNDERLINE_POSITION font properties.
&x_use_underline_position_properties,
doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
Nil means ignore them. If you encounter fonts with bogus
UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
to 4.1, set this to nil. */);
x_use_underline_position_properties = 1;
DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars
/* What X toolkit scroll bars Emacs uses.
DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
doc: /* What X toolkit scroll bars Emacs uses.
A value of nil means Emacs doesn't use X toolkit scroll bars.
Otherwise, value is a symbol describing the X toolkit. */);
#ifdef USE_TOOLKIT_SCROLL_BARS