Omit unnecessary \ before paren in C docstrings
Although \( is needed in docstrings in Elisp code, it is not needed in docstrings in C code, since C function definitiions do not start with a parenthesis. The backslashes made the docstrings a bit harder to read and to format in columns. Also, some C docstrings had ( in column 1 and this did not appear to be causing any problems. So, simplify C docstrings by replacing \( with ( and \) with ).
This commit is contained in:
parent
309d39b832
commit
032ce1c7d1
37 changed files with 130 additions and 130 deletions
16
src/buffer.c
16
src/buffer.c
|
@ -1042,7 +1042,7 @@ DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name,
|
|||
doc: /* Return a string that is the name of no existing buffer based on NAME.
|
||||
If there is no live buffer named NAME, then return NAME.
|
||||
Otherwise modify name by appending `<NUMBER>', incrementing NUMBER
|
||||
\(starting at 2) until an unused name is found, and then return that name.
|
||||
(starting at 2) until an unused name is found, and then return that name.
|
||||
Optional second argument IGNORE specifies a name that is okay to use (if
|
||||
it is in the sequence to be tried) even if a buffer with that name exists.
|
||||
|
||||
|
@ -1385,7 +1385,7 @@ DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick,
|
|||
Sbuffer_chars_modified_tick, 0, 1, 0,
|
||||
doc: /* Return BUFFER's character-change tick counter.
|
||||
Each buffer has a character-change tick counter, which is set to the
|
||||
value of the buffer's tick counter \(see `buffer-modified-tick'), each
|
||||
value of the buffer's tick counter (see `buffer-modified-tick'), each
|
||||
time text in that buffer is inserted or deleted. By comparing the
|
||||
values returned by two individual calls of `buffer-chars-modified-tick',
|
||||
you can tell whether a character change occurred in that buffer in
|
||||
|
@ -3791,10 +3791,10 @@ If omitted, BUFFER defaults to the current buffer.
|
|||
BEG and END may be integers or markers.
|
||||
The fourth arg FRONT-ADVANCE, if non-nil, makes the marker
|
||||
for the front of the overlay advance when text is inserted there
|
||||
\(which means the text *is not* included in the overlay).
|
||||
(which means the text *is not* included in the overlay).
|
||||
The fifth arg REAR-ADVANCE, if non-nil, makes the marker
|
||||
for the rear of the overlay advance when text is inserted there
|
||||
\(which means the text *is* included in the overlay). */)
|
||||
(which means the text *is* included in the overlay). */)
|
||||
(Lisp_Object beg, Lisp_Object end, Lisp_Object buffer,
|
||||
Lisp_Object front_advance, Lisp_Object rear_advance)
|
||||
{
|
||||
|
@ -6014,7 +6014,7 @@ between 0.0 and 1.0, inclusive. */);
|
|||
doc: /* List of functions to call before each text change.
|
||||
Two arguments are passed to each function: the positions of
|
||||
the beginning and end of the range of old text to be changed.
|
||||
\(For an insertion, the beginning and end are at the same place.)
|
||||
(For an insertion, the beginning and end are at the same place.)
|
||||
No information is given about the length of the text after the change.
|
||||
|
||||
Buffer changes made while executing the `before-change-functions'
|
||||
|
@ -6031,7 +6031,7 @@ from happening repeatedly and making Emacs nonfunctional. */);
|
|||
Three arguments are passed to each function: the positions of
|
||||
the beginning and end of the range of changed text,
|
||||
and the length in chars of the pre-change text replaced by that range.
|
||||
\(For an insertion, the pre-change length is zero;
|
||||
(For an insertion, the pre-change length is zero;
|
||||
for a deletion, that length is the number of chars deleted,
|
||||
and the post-change beginning and end are at the same place.)
|
||||
|
||||
|
@ -6076,7 +6076,7 @@ was modified between BEG and END. PROPERTY is the property name,
|
|||
and VALUE is the old value.
|
||||
|
||||
An entry (apply FUN-NAME . ARGS) means undo the change with
|
||||
\(apply FUN-NAME ARGS).
|
||||
(apply FUN-NAME ARGS).
|
||||
|
||||
An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo
|
||||
in the active region. BEG and END is the range affected by this entry
|
||||
|
@ -6236,7 +6236,7 @@ to the default frame line height. A value of nil means add no extra space. */)
|
|||
doc: /* Non-nil means show a cursor in non-selected windows.
|
||||
If nil, only shows a cursor in the selected window.
|
||||
If t, displays a cursor related to the usual cursor type
|
||||
\(a solid box becomes hollow, a bar becomes a narrower bar).
|
||||
(a solid box becomes hollow, a bar becomes a narrower bar).
|
||||
You can also specify the cursor type as in the `cursor-type' variable.
|
||||
Use Custom to set this variable and update the display." */);
|
||||
|
||||
|
|
|
@ -2000,9 +2000,9 @@ syms_of_bytecode (void)
|
|||
|
||||
DEFVAR_LISP ("byte-code-meter", Vbyte_code_meter,
|
||||
doc: /* A vector of vectors which holds a histogram of byte-code usage.
|
||||
\(aref (aref byte-code-meter 0) CODE) indicates how many times the byte
|
||||
(aref (aref byte-code-meter 0) CODE) indicates how many times the byte
|
||||
opcode CODE has been executed.
|
||||
\(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0,
|
||||
(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0,
|
||||
indicates how many times the byte opcodes CODE1 and CODE2 have been
|
||||
executed in succession. */);
|
||||
|
||||
|
|
|
@ -226,7 +226,7 @@ The program's input comes from file INFILE (nil means `/dev/null').
|
|||
Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION
|
||||
means discard it; 0 means discard and don't wait; and `(:file FILE)', where
|
||||
FILE is a file name string, means that it should be written to that file
|
||||
\(if the file already exists it is overwritten).
|
||||
(if the file already exists it is overwritten).
|
||||
DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case,
|
||||
REAL-BUFFER says what to do with standard output, as above,
|
||||
while STDERR-FILE says what to do with standard error in the child.
|
||||
|
@ -1462,7 +1462,7 @@ This function searches `process-environment' for VARIABLE.
|
|||
|
||||
If optional parameter ENV is a list, then search this list instead of
|
||||
`process-environment', and return t when encountering a negative entry
|
||||
\(an entry for a variable with no value). */)
|
||||
(an entry for a variable with no value). */)
|
||||
(Lisp_Object variable, Lisp_Object env)
|
||||
{
|
||||
char *value;
|
||||
|
|
|
@ -464,7 +464,7 @@ Emacs treats a sequence of word constituent characters as a single
|
|||
word (i.e. finds no word boundary between them) only if they belong to
|
||||
the same script. But, exceptions are allowed in the following cases.
|
||||
|
||||
\(1) The case that characters are in different scripts is controlled
|
||||
(1) The case that characters are in different scripts is controlled
|
||||
by the variable `word-combining-categories'.
|
||||
|
||||
Emacs finds no word boundary between characters of different scripts
|
||||
|
@ -478,7 +478,7 @@ For instance, to tell that Han characters followed by Hiragana
|
|||
characters can form a single word, the element `(?C . ?H)' should be
|
||||
in this list.
|
||||
|
||||
\(2) The case that character are in the same script is controlled by
|
||||
(2) The case that character are in the same script is controlled by
|
||||
the variable `word-separating-categories'.
|
||||
|
||||
Emacs finds a word boundary between characters of the same script
|
||||
|
|
|
@ -534,7 +534,7 @@ DEFUN ("char-table-parent", Fchar_table_parent, Schar_table_parent,
|
|||
The value is either nil or another char-table.
|
||||
If CHAR-TABLE holds nil for a given character,
|
||||
then the actual applicable value is inherited from the parent char-table
|
||||
\(or from its parents, if necessary). */)
|
||||
(or from its parents, if necessary). */)
|
||||
(Lisp_Object char_table)
|
||||
{
|
||||
CHECK_CHAR_TABLE (char_table);
|
||||
|
|
|
@ -108,7 +108,7 @@ right or to the left on the screen. This is in contrast with
|
|||
DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p",
|
||||
doc: /* Move N lines forward (backward if N is negative).
|
||||
Precisely, if point is on line I, move to the start of line I + N
|
||||
\("start of line" in the logical order).
|
||||
("start of line" in the logical order).
|
||||
If there isn't room, go as far as possible (no error).
|
||||
|
||||
Returns the count of lines left to move. If moving forward,
|
||||
|
|
|
@ -9800,7 +9800,7 @@ DEFUN ("find-operation-coding-system", Ffind_operation_coding_system,
|
|||
doc: /* Choose a coding system for an operation based on the target name.
|
||||
The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM).
|
||||
DECODING-SYSTEM is the coding system to use for decoding
|
||||
\(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system
|
||||
(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system
|
||||
for encoding (in case OPERATION does encoding).
|
||||
|
||||
The first argument OPERATION specifies an I/O primitive:
|
||||
|
@ -11175,7 +11175,7 @@ the cdr part is used for encoding a text to be sent to a process. */);
|
|||
Table of extra Latin codes in the range 128..159 (inclusive).
|
||||
This is a vector of length 256.
|
||||
If Nth element is non-nil, the existence of code N in a file
|
||||
\(or output of subprocess) doesn't prevent it to be detected as
|
||||
(or output of subprocess) doesn't prevent it to be detected as
|
||||
a coding system of ISO 2022 variant which has a flag
|
||||
`accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file
|
||||
or reading output of a subprocess.
|
||||
|
|
|
@ -791,7 +791,7 @@ SUBR must be a built-in function. */)
|
|||
DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0,
|
||||
doc: /* Return the interactive form of CMD or nil if none.
|
||||
If CMD is not a command, the return value is nil.
|
||||
Value, if non-nil, is a list \(interactive SPEC). */)
|
||||
Value, if non-nil, is a list (interactive SPEC). */)
|
||||
(Lisp_Object cmd)
|
||||
{
|
||||
Lisp_Object fun = indirect_function (cmd); /* Check cycles. */
|
||||
|
@ -1660,8 +1660,8 @@ DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable,
|
|||
1, 1, "vMake Local Variable: ",
|
||||
doc: /* Make VARIABLE have a separate value in the current buffer.
|
||||
Other buffers will continue to share a common default value.
|
||||
\(The buffer-local value of VARIABLE starts out as the same value
|
||||
VARIABLE previously had. If VARIABLE was void, it remains void.\)
|
||||
(The buffer-local value of VARIABLE starts out as the same value
|
||||
VARIABLE previously had. If VARIABLE was void, it remains void.)
|
||||
Return VARIABLE.
|
||||
|
||||
If the variable is already arranged to become local when set,
|
||||
|
|
|
@ -1233,20 +1233,20 @@ This is an internal function, it shall not be used outside dbus.el.
|
|||
The following usages are expected:
|
||||
|
||||
`dbus-call-method', `dbus-call-method-asynchronously':
|
||||
\(dbus-message-internal
|
||||
(dbus-message-internal
|
||||
dbus-message-type-method-call BUS SERVICE PATH INTERFACE METHOD HANDLER
|
||||
&optional :timeout TIMEOUT &rest ARGS)
|
||||
|
||||
`dbus-send-signal':
|
||||
\(dbus-message-internal
|
||||
(dbus-message-internal
|
||||
dbus-message-type-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)
|
||||
|
||||
`dbus-method-return-internal':
|
||||
\(dbus-message-internal
|
||||
(dbus-message-internal
|
||||
dbus-message-type-method-return BUS SERVICE SERIAL &rest ARGS)
|
||||
|
||||
`dbus-method-error-internal':
|
||||
\(dbus-message-internal
|
||||
(dbus-message-internal
|
||||
dbus-message-type-error BUS SERVICE SERIAL &rest ARGS)
|
||||
|
||||
usage: (dbus-message-internal &rest REST) */)
|
||||
|
@ -1796,7 +1796,7 @@ string which denotes a D-Bus interface, and MEMBER, also a string, is
|
|||
either a method, a signal or a property INTERFACE is offering. All
|
||||
arguments but BUS must not be nil.
|
||||
|
||||
The value in the hash table is a list of quadruple lists \((UNAME
|
||||
The value in the hash table is a list of quadruple lists ((UNAME
|
||||
SERVICE PATH OBJECT [RULE]) ...). SERVICE is the service name as
|
||||
registered, UNAME is the corresponding unique name. In case of
|
||||
registered methods and properties, UNAME is nil. PATH is the object
|
||||
|
|
|
@ -5665,7 +5665,7 @@ DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0,
|
|||
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 is for backwards compatibility.
|
||||
\(Not all operating systems support waiting for a fraction of a second.) */)
|
||||
(Not all operating systems support waiting for a fraction of a second.) */)
|
||||
(Lisp_Object seconds, Lisp_Object milliseconds)
|
||||
{
|
||||
double duration = extract_float (seconds);
|
||||
|
|
|
@ -716,7 +716,7 @@ is not on any keys.
|
|||
Each substring of the form \\=\\{MAPVAR} is replaced by a summary of
|
||||
the value of MAPVAR as a keymap. This summary is similar to the one
|
||||
produced by `describe-bindings'. The summary ends in two newlines
|
||||
\(used by the helper function `help-make-xrefs' to find the end of the
|
||||
(used by the helper function `help-make-xrefs' to find the end of the
|
||||
summary).
|
||||
|
||||
Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR
|
||||
|
|
|
@ -3627,7 +3627,7 @@ save_restriction_restore (Lisp_Object data)
|
|||
DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0,
|
||||
doc: /* Execute BODY, saving and restoring current buffer's restrictions.
|
||||
The buffer's restrictions make parts of the beginning and end invisible.
|
||||
\(They are set up with `narrow-to-region' and eliminated with `widen'.)
|
||||
(They are set up with `narrow-to-region' and eliminated with `widen'.)
|
||||
This special form, `save-restriction', saves the current buffer's restrictions
|
||||
when it is entered, and restores them when it is exited.
|
||||
So any `narrow-to-region' within BODY lasts only until the end of the form.
|
||||
|
|
|
@ -705,7 +705,7 @@ If SYMBOL has a local binding, then this form affects the local
|
|||
binding. This is usually not what you want. Thus, if you need to
|
||||
load a file defining variables, with this form or with `defconst' or
|
||||
`defcustom', you should always load that file _outside_ any bindings
|
||||
for these variables. \(`defconst' and `defcustom' behave similarly in
|
||||
for these variables. (`defconst' and `defcustom' behave similarly in
|
||||
this respect.)
|
||||
|
||||
The optional argument DOCSTRING is a documentation string for the
|
||||
|
@ -1188,7 +1188,7 @@ suppresses the debugger).
|
|||
When a handler handles an error, control returns to the `condition-case'
|
||||
and it executes the handler's BODY...
|
||||
with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error.
|
||||
\(If VAR is nil, the handler can't access that information.)
|
||||
(If VAR is nil, the handler can't access that information.)
|
||||
Then the value of the last BODY form is returned from the `condition-case'
|
||||
expression.
|
||||
|
||||
|
@ -2366,7 +2366,7 @@ may be nil, a function, or a list of functions. Call each
|
|||
function in order with arguments ARGS, stopping at the first
|
||||
one that returns nil, and return nil. Otherwise (if all functions
|
||||
return non-nil, or if there are no functions to call), return non-nil
|
||||
\(do not rely on the precise return value in this case).
|
||||
(do not rely on the precise return value in this case).
|
||||
|
||||
Do not use `make-local-variable' to make a hook variable buffer-local.
|
||||
Instead, use `add-hook' and specify t for the LOCAL argument.
|
||||
|
|
18
src/fileio.c
18
src/fileio.c
|
@ -451,7 +451,7 @@ DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory,
|
|||
A `directly usable' directory name is one that may be used without the
|
||||
intervention of any file handler.
|
||||
If FILENAME is a directly usable file itself, return
|
||||
\(file-name-directory FILENAME).
|
||||
(file-name-directory FILENAME).
|
||||
If FILENAME refers to a file which is not accessible from a local process,
|
||||
then this should return nil.
|
||||
The `call-process' and `start-process' functions use this function to
|
||||
|
@ -742,7 +742,7 @@ DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0,
|
|||
doc: /* Generate temporary file name (string) starting with PREFIX (a string).
|
||||
The Emacs process number forms part of the result, so there is no
|
||||
danger of generating a name being used by another Emacs process
|
||||
\(so long as only a single host can access the containing directory...).
|
||||
(so long as only a single host can access the containing directory...).
|
||||
|
||||
This function tries to choose a name that has no existing file.
|
||||
For this to work, PREFIX should be an absolute file name.
|
||||
|
@ -758,7 +758,7 @@ normally use `make-temp-file' instead. */)
|
|||
DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
|
||||
doc: /* Convert filename NAME to absolute, and canonicalize it.
|
||||
Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
|
||||
\(does not start with slash or tilde); both the directory name and
|
||||
(does not start with slash or tilde); both the directory name and
|
||||
a directory's file name are accepted. If DEFAULT-DIRECTORY is nil or
|
||||
missing, the current buffer's value of `default-directory' is used.
|
||||
NAME should be a string that is a valid file name for the underlying
|
||||
|
@ -776,8 +776,8 @@ See also the function `substitute-in-file-name'.
|
|||
|
||||
For technical reasons, this function can return correct but
|
||||
non-intuitive results for the root directory; for instance,
|
||||
\(expand-file-name ".." "/") returns "/..". For this reason, use
|
||||
\(directory-file-name (file-name-directory dirname)) to traverse a
|
||||
(expand-file-name ".." "/") returns "/..". For this reason, use
|
||||
(directory-file-name (file-name-directory dirname)) to traverse a
|
||||
filesystem tree, not (expand-file-name ".." dirname). */)
|
||||
(Lisp_Object name, Lisp_Object default_directory)
|
||||
{
|
||||
|
@ -1460,7 +1460,7 @@ filesystem tree, not (expand-file-name ".." dirname). */)
|
|||
DEAFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
|
||||
"Convert FILENAME to absolute, and canonicalize it.\n\
|
||||
Second arg DEFAULT is directory to start with if FILENAME is relative\n\
|
||||
\(does not start with slash); if DEFAULT is nil or missing,\n\
|
||||
(does not start with slash); if DEFAULT is nil or missing,\n\
|
||||
the current buffer's value of default-directory is used.\n\
|
||||
Filenames containing `.' or `..' as components are simplified;\n\
|
||||
initial `~/' expands to your home directory.\n\
|
||||
|
@ -2469,7 +2469,7 @@ Use `file-symlink-p' to test for such links. */)
|
|||
DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0,
|
||||
doc: /* Return t if FILENAME can be executed by you.
|
||||
For a directory, this means you can access files in that directory.
|
||||
\(It is generally better to use `file-accessible-directory-p' for that
|
||||
(It is generally better to use `file-accessible-directory-p' for that
|
||||
purpose, though.) */)
|
||||
(Lisp_Object filename)
|
||||
{
|
||||
|
@ -5306,8 +5306,8 @@ DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime,
|
|||
Useful if the buffer was not read from the file normally
|
||||
or if the file itself has been changed for some known benign reason.
|
||||
An argument specifies the modification time value to use
|
||||
\(instead of that of the visited file), in the form of a list
|
||||
\(HIGH LOW USEC PSEC) or an integer flag as returned by
|
||||
(instead of that of the visited file), in the form of a list
|
||||
(HIGH LOW USEC PSEC) or an integer flag as returned by
|
||||
`visited-file-modtime'. */)
|
||||
(Lisp_Object time_flag)
|
||||
{
|
||||
|
|
|
@ -170,7 +170,7 @@ Cause an error if X1 or X2 is not a float. */)
|
|||
DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0,
|
||||
doc: /* Get significand and exponent of a floating point number.
|
||||
Breaks the floating point number X into its binary significand SGNFCAND
|
||||
\(a floating point value between 0.5 (included) and 1.0 (excluded))
|
||||
(a floating point value between 0.5 (included) and 1.0 (excluded))
|
||||
and an integral exponent EXP for 2, such that:
|
||||
|
||||
X = SGNFCAND * 2^EXP
|
||||
|
@ -454,7 +454,7 @@ With optional DIVISOR, return the nearest integer to ARG/DIVISOR.
|
|||
|
||||
Rounding a value equidistant between two integers may choose the
|
||||
integer closer to zero, or it may prefer an even integer, depending on
|
||||
your machine. For example, \(round 2.5\) can return 3 on some
|
||||
your machine. For example, (round 2.5) can return 3 on some
|
||||
systems, but 2 on others. */)
|
||||
(Lisp_Object arg, Lisp_Object divisor)
|
||||
{
|
||||
|
@ -491,7 +491,7 @@ fmod_float (Lisp_Object x, Lisp_Object y)
|
|||
|
||||
DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0,
|
||||
doc: /* Return the smallest integer no less than ARG, as a float.
|
||||
\(Round toward +inf.\) */)
|
||||
(Round toward +inf.) */)
|
||||
(Lisp_Object arg)
|
||||
{
|
||||
double d = extract_float (arg);
|
||||
|
@ -501,7 +501,7 @@ DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0,
|
|||
|
||||
DEFUN ("ffloor", Fffloor, Sffloor, 1, 1, 0,
|
||||
doc: /* Return the largest integer no greater than ARG, as a float.
|
||||
\(Round towards -inf.\) */)
|
||||
(Round towards -inf.) */)
|
||||
(Lisp_Object arg)
|
||||
{
|
||||
double d = extract_float (arg);
|
||||
|
|
24
src/fns.c
24
src/fns.c
|
@ -224,7 +224,7 @@ DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
|
|||
The arguments START1, END1, START2, and END2, if non-nil, are
|
||||
positions specifying which parts of STR1 or STR2 to compare. In
|
||||
string STR1, compare the part between START1 (inclusive) and END1
|
||||
\(exclusive). If START1 is nil, it defaults to 0, the beginning of
|
||||
(exclusive). If START1 is nil, it defaults to 0, the beginning of
|
||||
the string; if END1 is nil, it defaults to the length of the string.
|
||||
Likewise, in string STR2, compare the part between START2 and END2.
|
||||
Like in `substring', negative values are counted from the end.
|
||||
|
@ -347,8 +347,8 @@ This function obeys the conventions for collation order in your
|
|||
locale settings. For example, punctuation and whitespace characters
|
||||
might be considered less significant for sorting:
|
||||
|
||||
\(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp)
|
||||
=> \("11" "1 1" "1.1" "12" "1 2" "1.2")
|
||||
(sort '("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp)
|
||||
=> ("11" "1 1" "1.1" "12" "1 2" "1.2")
|
||||
|
||||
The optional argument LOCALE, a string, overrides the setting of your
|
||||
current locale identifier for collation. The value is system
|
||||
|
@ -393,7 +393,7 @@ settings. For example, characters with different coding points but
|
|||
the same meaning might be considered as equal, like different grave
|
||||
accent Unicode characters:
|
||||
|
||||
\(string-collate-equalp \(string ?\\uFF40) \(string ?\\u1FEF))
|
||||
(string-collate-equalp (string ?\\uFF40) (string ?\\u1FEF))
|
||||
=> t
|
||||
|
||||
The optional argument LOCALE, a string, overrides the setting of your
|
||||
|
@ -1026,7 +1026,7 @@ to a multibyte character. In this case, the returned string is a
|
|||
newly created string with no text properties. If STRING is multibyte
|
||||
or entirely ASCII, it is returned unchanged. In particular, when
|
||||
STRING is unibyte and entirely ASCII, the returned string is unibyte.
|
||||
\(When the characters are all ASCII, Emacs primitives will treat the
|
||||
(When the characters are all ASCII, Emacs primitives will treat the
|
||||
string the same way whether it is unibyte or multibyte.) */)
|
||||
(Lisp_Object string)
|
||||
{
|
||||
|
@ -1225,14 +1225,14 @@ validate_subarray (Lisp_Object array, Lisp_Object from, Lisp_Object to,
|
|||
DEFUN ("substring", Fsubstring, Ssubstring, 1, 3, 0,
|
||||
doc: /* Return a new string whose contents are a substring of STRING.
|
||||
The returned string consists of the characters between index FROM
|
||||
\(inclusive) and index TO (exclusive) of STRING. FROM and TO are
|
||||
(inclusive) and index TO (exclusive) of STRING. FROM and TO are
|
||||
zero-indexed: 0 means the first character of STRING. Negative values
|
||||
are counted from the end of STRING. If TO is nil, the substring runs
|
||||
to the end of STRING.
|
||||
|
||||
The STRING argument may also be a vector. In that case, the return
|
||||
value is a new vector that contains the elements between index FROM
|
||||
\(inclusive) and index TO (exclusive) of that vector argument.
|
||||
(inclusive) and index TO (exclusive) of that vector argument.
|
||||
|
||||
With one argument, just copy STRING (with properties, if any). */)
|
||||
(Lisp_Object string, Lisp_Object from, Lisp_Object to)
|
||||
|
@ -2051,7 +2051,7 @@ merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred)
|
|||
DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
|
||||
doc: /* Extract a value from a property list.
|
||||
PLIST is a property list, which is a list of the form
|
||||
\(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
|
||||
(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
|
||||
corresponding to the given PROP, or nil if PROP is not one of the
|
||||
properties on the list. This function never signals an error. */)
|
||||
(Lisp_Object plist, Lisp_Object prop)
|
||||
|
@ -2086,7 +2086,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */)
|
|||
DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
|
||||
doc: /* Change value in PLIST of PROP to VAL.
|
||||
PLIST is a property list, which is a list of the form
|
||||
\(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object.
|
||||
(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object.
|
||||
If PROP is already a property on the list, its value is set to VAL,
|
||||
otherwise the new PROP VAL pair is added. The new plist is returned;
|
||||
use `(setq x (plist-put x prop val))' to be sure to use the new value.
|
||||
|
@ -2130,7 +2130,7 @@ It can be retrieved with `(get SYMBOL PROPNAME)'. */)
|
|||
DEFUN ("lax-plist-get", Flax_plist_get, Slax_plist_get, 2, 2, 0,
|
||||
doc: /* Extract a value from a property list, comparing with `equal'.
|
||||
PLIST is a property list, which is a list of the form
|
||||
\(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
|
||||
(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
|
||||
corresponding to the given PROP, or nil if PROP is not
|
||||
one of the properties on the list. */)
|
||||
(Lisp_Object plist, Lisp_Object prop)
|
||||
|
@ -2155,7 +2155,7 @@ one of the properties on the list. */)
|
|||
DEFUN ("lax-plist-put", Flax_plist_put, Slax_plist_put, 3, 3, 0,
|
||||
doc: /* Change value in PLIST of PROP to VAL, comparing with `equal'.
|
||||
PLIST is a property list, which is a list of the form
|
||||
\(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects.
|
||||
(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects.
|
||||
If PROP is already a property on the list, its value is set to VAL,
|
||||
otherwise the new PROP VAL pair is added. The new plist is returned;
|
||||
use `(setq x (lax-plist-put x prop val))' to be sure to use the new value.
|
||||
|
@ -2867,7 +2867,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */)
|
|||
DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0,
|
||||
doc: /* Return non-nil if PLIST has the property PROP.
|
||||
PLIST is a property list, which is a list of the form
|
||||
\(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol.
|
||||
(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol.
|
||||
Unlike `plist-get', this allows you to distinguish between a missing
|
||||
property and a property with the value nil.
|
||||
The value is actually the tail of PLIST whose car is PROP. */)
|
||||
|
|
14
src/font.c
14
src/font.c
|
@ -4068,7 +4068,7 @@ DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1,
|
|||
FONT is a font name, a font-spec, a font-entity, or a font-object.
|
||||
The return value is a list of the form
|
||||
|
||||
\(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH)
|
||||
(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH)
|
||||
|
||||
where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values
|
||||
compatible with `set-face-attribute'. Some of these key-attribute pairs
|
||||
|
@ -4749,15 +4749,15 @@ ASCENT, DESCENT, SPACE-WIDTH, AVERAGE-WIDTH are metrics of the font in
|
|||
pixels.
|
||||
|
||||
CAPABILITY is a list whose first element is a symbol representing the
|
||||
font format \(x, opentype, truetype, type1, pcf, or bdf) and the
|
||||
font format (x, opentype, truetype, type1, pcf, or bdf) and the
|
||||
remaining elements describe the details of the font capability.
|
||||
|
||||
If the font is OpenType font, the form of the list is
|
||||
\(opentype GSUB GPOS)
|
||||
(opentype GSUB GPOS)
|
||||
where GSUB shows which "GSUB" features the font supports, and GPOS
|
||||
shows which "GPOS" features the font supports. Both GSUB and GPOS are
|
||||
lists of the format:
|
||||
\((SCRIPT (LANGSYS FEATURE ...) ...) ...)
|
||||
((SCRIPT (LANGSYS FEATURE ...) ...) ...)
|
||||
|
||||
If the font is not OpenType font, currently the length of the form is
|
||||
one.
|
||||
|
@ -5043,11 +5043,11 @@ where
|
|||
as follows:
|
||||
|
||||
If the font is OpenType font, the form of the list is
|
||||
\(opentype GSUB GPOS)
|
||||
(opentype GSUB GPOS)
|
||||
where GSUB shows which "GSUB" features the font supports, and GPOS
|
||||
shows which "GPOS" features the font supports. Both GSUB and GPOS are
|
||||
lists of the form:
|
||||
\((SCRIPT (LANGSYS FEATURE ...) ...) ...)
|
||||
((SCRIPT (LANGSYS FEATURE ...) ...) ...)
|
||||
|
||||
where
|
||||
SCRIPT is a symbol representing OpenType script tag.
|
||||
|
@ -5359,7 +5359,7 @@ where ENCODING is a charset or a char-table,
|
|||
and REPERTORY is a charset, a char-table, or nil.
|
||||
|
||||
If ENCODING and REPERTORY are the same, the element can have the form
|
||||
\(REGEXP . ENCODING).
|
||||
(REGEXP . ENCODING).
|
||||
|
||||
ENCODING is for converting a character to a glyph code of the font.
|
||||
If ENCODING is a charset, encoding a character by the charset gives
|
||||
|
|
|
@ -5175,7 +5175,7 @@ keep it unchanged if this option is either t or a list containing
|
|||
`vertical-scroll-bars'.
|
||||
|
||||
The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows
|
||||
\(which means that adding/removing a tool bar does not change the frame
|
||||
(which means that adding/removing a tool bar does not change the frame
|
||||
height), nil on all other window systems including GTK+ (which means
|
||||
that changing any of the parameters listed above may change the size of
|
||||
the frame), and t otherwise (which means the frame size never changes
|
||||
|
|
|
@ -11332,7 +11332,7 @@ See Info node `(elisp)Multiple Terminals'. */);
|
|||
|
||||
DEFVAR_BOOL ("cannot-suspend", cannot_suspend,
|
||||
doc: /* Non-nil means to always spawn a subshell instead of suspending.
|
||||
\(Even if the operating system has support for stopping a process.\) */);
|
||||
(Even if the operating system has support for stopping a process.) */);
|
||||
cannot_suspend = false;
|
||||
|
||||
DEFVAR_BOOL ("menu-prompting", menu_prompting,
|
||||
|
@ -11538,7 +11538,7 @@ immediately after running `post-command-hook'. */);
|
|||
DEFVAR_LISP ("input-method-function", Vinput_method_function,
|
||||
doc: /* If non-nil, the function that implements the current input method.
|
||||
It's called with one argument, a printing character that was just read.
|
||||
\(That means a character with code 040...0176.)
|
||||
(That means a character with code 040...0176.)
|
||||
Typically this function uses `read-event' to read additional events.
|
||||
When it does so, it should first bind `input-method-function' to nil
|
||||
so it will not be called recursively.
|
||||
|
|
|
@ -1687,7 +1687,7 @@ DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0,
|
|||
KEYS is a string or vector, a sequence of keystrokes.
|
||||
The binding is probably a symbol with a function definition.
|
||||
This function's return values are the same as those of `lookup-key'
|
||||
\(which see).
|
||||
(which see).
|
||||
|
||||
If optional argument ACCEPT-DEFAULT is non-nil, recognize default
|
||||
bindings; see the description of `lookup-key' for more details about this. */)
|
||||
|
@ -2492,7 +2492,7 @@ If FIRSTONLY is the symbol `non-ascii', return the first binding found,
|
|||
no matter what it is.
|
||||
If FIRSTONLY has another non-nil value, prefer bindings
|
||||
that use the modifier key specified in `where-is-preferred-modifier'
|
||||
\(or their meta variants) and entirely reject menu bindings.
|
||||
(or their meta variants) and entirely reject menu bindings.
|
||||
|
||||
If optional 4th arg NOINDIRECT is non-nil, don't extract the commands inside
|
||||
menu-items. This makes it possible to search for a menu-item itself.
|
||||
|
@ -2723,7 +2723,7 @@ looked up in BUFFER.
|
|||
The optional argument PREFIX, if non-nil, should be a key sequence;
|
||||
then we display only bindings that start with that prefix.
|
||||
The optional argument MENUS, if non-nil, says to mention menu bindings.
|
||||
\(Ordinarily these are omitted from the output.) */)
|
||||
(Ordinarily these are omitted from the output.) */)
|
||||
(Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus)
|
||||
{
|
||||
Lisp_Object outbuf, shadow;
|
||||
|
|
|
@ -4512,7 +4512,7 @@ customize `jka-compr-load-suffixes' rather than the present variable. */);
|
|||
Each element looks like (REGEXP-OR-FEATURE FUNCS...).
|
||||
|
||||
REGEXP-OR-FEATURE is either a regular expression to match file names, or
|
||||
a symbol \(a feature name).
|
||||
a symbol (a feature name).
|
||||
|
||||
When `load' is run and the file-name argument matches an element's
|
||||
REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol
|
||||
|
|
|
@ -1129,7 +1129,7 @@ If POSITION is t, it means to use the current mouse position.
|
|||
MENU is a specifier for a menu. For the simplest case, MENU is a keymap.
|
||||
The menu items come from key bindings that have a menu string as well as
|
||||
a definition; actually, the "definition" in such a key binding looks like
|
||||
\(STRING . REAL-DEFINITION). To give the menu a title, put a string into
|
||||
(STRING . REAL-DEFINITION). To give the menu a title, put a string into
|
||||
the keymap as a top-level element.
|
||||
|
||||
If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
|
||||
|
@ -1491,7 +1491,7 @@ 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.)
|
||||
(By default, approximately half appear on each side.)
|
||||
|
||||
If HEADER is non-nil, the frame title for the box is "Information",
|
||||
otherwise it is "Question".
|
||||
|
|
|
@ -916,7 +916,7 @@ INITIAL-CONTENTS argument in more detail. It is only relevant when
|
|||
studying existing code, or when HIST is a cons. If non-nil,
|
||||
INITIAL-CONTENTS is a string to be inserted into the minibuffer before
|
||||
reading input. Normally, point is put at the end of that string.
|
||||
However, if INITIAL-CONTENTS is \(STRING . POSITION), the initial
|
||||
However, if INITIAL-CONTENTS is (STRING . POSITION), the initial
|
||||
input is STRING, but point is placed at _one-indexed_ position
|
||||
POSITION in the minibuffer. Any integer value less than or equal to
|
||||
one puts point at the beginning of the string. *Note* that this
|
||||
|
@ -996,7 +996,7 @@ DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1,
|
|||
Prompt with PROMPT. Whitespace terminates the input. If INITIAL is
|
||||
non-nil, it should be a string, which is used as initial input, with
|
||||
point positioned at the end, so that SPACE will accept the input.
|
||||
\(Actually, INITIAL can also be a cons of a string and an integer.
|
||||
(Actually, INITIAL can also be a cons of a string and an integer.
|
||||
Such values are treated as in `read-from-minibuffer', but are normally
|
||||
not useful in this function.)
|
||||
Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
|
||||
|
|
|
@ -1639,7 +1639,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
|
|||
|
||||
DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
|
||||
doc: /* Return the "vendor ID" string of Nextstep display server TERMINAL.
|
||||
\(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
that operating systems cannot be developed and distributed noncommercially.)
|
||||
The optional argument TERMINAL specifies which display to ask about.
|
||||
TERMINAL should be a terminal object, a frame or a display name (a string).
|
||||
|
@ -1816,7 +1816,7 @@ and GNUstep implementations ("distributor-specific release
|
|||
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.
|
||||
\(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(Lisp_Object display, Lisp_Object resource_string, Lisp_Object must_succeed)
|
||||
{
|
||||
struct ns_display_info *dpyinfo;
|
||||
|
@ -2289,7 +2289,7 @@ and GNUstep implementations ("distributor-specific release
|
|||
|
||||
DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
|
||||
doc: /* Internal function called by `color-defined-p', which see.
|
||||
\(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
(Lisp_Object color, Lisp_Object frame)
|
||||
{
|
||||
NSColor * col;
|
||||
|
|
|
@ -316,7 +316,7 @@ Updated by Christian Limpach (chris@nice.ch)
|
|||
Sns_own_selection_internal, 2, 2, 0,
|
||||
doc: /* Assert an X selection of type SELECTION and value VALUE.
|
||||
SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
VALUE is typically a string, or a cons of two markers, but may be
|
||||
anything that the functions on `selection-converter-alist' know about. */)
|
||||
(Lisp_Object selection, Lisp_Object value)
|
||||
|
@ -414,7 +414,7 @@ Updated by Christian Limpach (chris@nice.ch)
|
|||
doc: /* Whether the current Emacs process owns the given X Selection.
|
||||
The arg should be the name of the selection in question, typically one of
|
||||
the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
For convenience, the symbol nil is the same as `PRIMARY',
|
||||
and t is the same as `SECONDARY'. */)
|
||||
(Lisp_Object selection)
|
||||
|
@ -433,7 +433,7 @@ Updated by Christian Limpach (chris@nice.ch)
|
|||
Sns_get_selection, 2, 2, 0,
|
||||
doc: /* Return text selected from some X window.
|
||||
SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
TARGET-TYPE is the type of data desired, typically `STRING'. */)
|
||||
(Lisp_Object selection_name, Lisp_Object target_type)
|
||||
{
|
||||
|
|
|
@ -2198,7 +2198,7 @@ Also print formfeeds as `\\f'. */);
|
|||
|
||||
DEFVAR_BOOL ("print-escape-nonascii", print_escape_nonascii,
|
||||
doc: /* Non-nil means print unibyte non-ASCII chars in strings as \\OOO.
|
||||
\(OOO is the octal representation of the character code.)
|
||||
(OOO is the octal representation of the character code.)
|
||||
Only single-byte characters are affected, and only in `prin1'.
|
||||
When the output goes in a multibyte buffer, this feature is
|
||||
enabled regardless of the value of the variable. */);
|
||||
|
@ -2206,7 +2206,7 @@ enabled regardless of the value of the variable. */);
|
|||
|
||||
DEFVAR_BOOL ("print-escape-multibyte", print_escape_multibyte,
|
||||
doc: /* Non-nil means print multibyte characters in strings as \\xXXXX.
|
||||
\(XXXX is the hex representation of the character code.)
|
||||
(XXXX is the hex representation of the character code.)
|
||||
This affects only `prin1'. */);
|
||||
print_escape_multibyte = 0;
|
||||
|
||||
|
|
|
@ -957,7 +957,7 @@ DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0,
|
|||
This is a list of strings, the first string being the program executed
|
||||
and the rest of the strings being the arguments given to it.
|
||||
For a network or serial process, this is nil (process is running) or t
|
||||
\(process is stopped). */)
|
||||
(process is stopped). */)
|
||||
(register Lisp_Object process)
|
||||
{
|
||||
CHECK_PROCESS (process);
|
||||
|
@ -2674,7 +2674,7 @@ is not given or nil, 1 stopbit is used.
|
|||
:flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of
|
||||
flowcontrol to be used, which is either nil (don't use flowcontrol),
|
||||
the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw'
|
||||
\(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no
|
||||
(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no
|
||||
flowcontrol is used.
|
||||
|
||||
`serial-process-configure' is called by `make-serial-process' for the
|
||||
|
@ -2682,12 +2682,12 @@ initial configuration of the serial port.
|
|||
|
||||
Examples:
|
||||
|
||||
\(serial-process-configure :process "/dev/ttyS0" :speed 1200)
|
||||
(serial-process-configure :process "/dev/ttyS0" :speed 1200)
|
||||
|
||||
\(serial-process-configure
|
||||
(serial-process-configure
|
||||
:buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw)
|
||||
|
||||
\(serial-process-configure :port "\\\\.\\COM13" :bytesize 7)
|
||||
(serial-process-configure :port "\\\\.\\COM13" :bytesize 7)
|
||||
|
||||
usage: (serial-process-configure &rest ARGS) */)
|
||||
(ptrdiff_t nargs, Lisp_Object *args)
|
||||
|
@ -2781,13 +2781,13 @@ is available via the function `process-contact'.
|
|||
|
||||
Examples:
|
||||
|
||||
\(make-serial-process :port "/dev/ttyS0" :speed 9600)
|
||||
(make-serial-process :port "/dev/ttyS0" :speed 9600)
|
||||
|
||||
\(make-serial-process :port "COM1" :speed 115200 :stopbits 2)
|
||||
(make-serial-process :port "COM1" :speed 115200 :stopbits 2)
|
||||
|
||||
\(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd)
|
||||
(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd)
|
||||
|
||||
\(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil)
|
||||
(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil)
|
||||
|
||||
usage: (make-serial-process &rest ARGS) */)
|
||||
(ptrdiff_t nargs, Lisp_Object *args)
|
||||
|
@ -7296,7 +7296,7 @@ DEFUN ("process-attributes", Fprocess_attributes,
|
|||
|
||||
Value is an alist where each element is a cons cell of the form
|
||||
|
||||
\(KEY . VALUE)
|
||||
(KEY . VALUE)
|
||||
|
||||
If this functionality is unsupported, the value is nil.
|
||||
|
||||
|
|
|
@ -2784,7 +2784,7 @@ if the last match was on a buffer; integers or nil if a string was matched.
|
|||
Use `set-match-data' to reinstate the data in this list.
|
||||
|
||||
If INTEGERS (the optional first argument) is non-nil, always use
|
||||
integers \(rather than markers) to represent buffer positions. In
|
||||
integers (rather than markers) to represent buffer positions. In
|
||||
this case, and if the last match was in a buffer, the buffer will get
|
||||
stored as one additional element at the end of the list.
|
||||
|
||||
|
|
|
@ -1098,7 +1098,7 @@ DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0,
|
|||
doc: /* Convert a syntax descriptor STRING into a raw syntax descriptor.
|
||||
STRING should be a string of the form allowed as argument of
|
||||
`modify-syntax-entry'. The return value is a raw syntax descriptor: a
|
||||
cons cell \(CODE . MATCHING-CHAR) which can be used, for example, as
|
||||
cons cell (CODE . MATCHING-CHAR) which can be used, for example, as
|
||||
the value of a `syntax-table' text property. */)
|
||||
(Lisp_Object string)
|
||||
{
|
||||
|
|
|
@ -1494,7 +1494,7 @@ DEFUN ("remove-text-properties", Fremove_text_properties,
|
|||
doc: /* Remove some properties from text from START to END.
|
||||
The third argument PROPERTIES is a property list
|
||||
whose property names specify the properties to remove.
|
||||
\(The values stored in PROPERTIES are ignored.)
|
||||
(The values stored in PROPERTIES are ignored.)
|
||||
If the optional fourth argument OBJECT is a buffer (or nil, which means
|
||||
the current buffer), START and END are buffer positions (integers or
|
||||
markers). If OBJECT is a string, START and END are 0-based indices into it.
|
||||
|
|
|
@ -686,7 +686,7 @@ For MS-Windows and MS-DOS:
|
|||
When sending or receiving text via selection and clipboard, the text
|
||||
is encoded or decoded by this coding system. The default value is
|
||||
the current system default encoding on 9x/Me, `utf-16le-dos'
|
||||
\(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS.
|
||||
(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS.
|
||||
|
||||
For X Windows:
|
||||
When sending text via selection and clipboard, if the target
|
||||
|
|
|
@ -5305,7 +5305,7 @@ x_get_focus_frame (struct frame *frame)
|
|||
|
||||
DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
|
||||
doc: /* Internal function called by `color-defined-p', which see.
|
||||
\(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
(Lisp_Object color, Lisp_Object frame)
|
||||
{
|
||||
XColor foo;
|
||||
|
@ -5447,7 +5447,7 @@ 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,
|
||||
doc: /* Return the "vendor ID" string of the GUI software on TERMINAL.
|
||||
|
||||
\(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
that operating systems cannot be developed and distributed noncommercially.)
|
||||
|
||||
For GNU and Unix systems, this queries the X server software; for
|
||||
|
@ -5850,7 +5850,7 @@ 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.
|
||||
\(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed)
|
||||
{
|
||||
unsigned char *xrm_option;
|
||||
|
|
|
@ -641,7 +641,7 @@ DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combinatio
|
|||
WINDOW must be a valid window used in horizontal or vertical combination.
|
||||
If the return value is nil, child windows of WINDOW can be recombined with
|
||||
WINDOW's siblings. A return value of t means that child windows of
|
||||
WINDOW are never \(re-)combined with WINDOW's siblings. */)
|
||||
WINDOW are never (re-)combined with WINDOW's siblings. */)
|
||||
(Lisp_Object window)
|
||||
{
|
||||
struct window *w;
|
||||
|
@ -658,7 +658,7 @@ DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_windo
|
|||
WINDOW must be a valid window used in horizontal or vertical combination.
|
||||
If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's
|
||||
siblings. LIMIT t means that child windows of WINDOW are never
|
||||
\(re-)combined with WINDOW's siblings. Other values are reserved for
|
||||
(re-)combined with WINDOW's siblings. Other values are reserved for
|
||||
future use. */)
|
||||
(Lisp_Object window, Lisp_Object limit)
|
||||
{
|
||||
|
@ -1312,7 +1312,7 @@ DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
|
|||
WINDOW must be a live window and defaults to the selected one.
|
||||
COORDINATES is a cons of the form (X . Y), X and Y being distances
|
||||
measured in characters from the upper-left corner of the frame.
|
||||
\(0 . 0) denotes the character in the upper left corner of the
|
||||
(0 . 0) denotes the character in the upper left corner of the
|
||||
frame.
|
||||
If COORDINATES are in the text portion of WINDOW,
|
||||
the coordinates relative to the window are returned.
|
||||
|
@ -1696,7 +1696,7 @@ of the window. The remaining elements are omitted if the character after
|
|||
POS is fully visible; otherwise, RTOP and RBOT are the number of pixels
|
||||
off-window at the top and bottom of the screen line ("row") containing
|
||||
POS, ROWH is the visible height of that row, and VPOS is the row number
|
||||
\(zero-based). */)
|
||||
(zero-based). */)
|
||||
(Lisp_Object pos, Lisp_Object window, Lisp_Object partially)
|
||||
{
|
||||
struct window *w;
|
||||
|
|
14
src/xdisp.c
14
src/xdisp.c
|
@ -21038,7 +21038,7 @@ window-specific overlays, which can affect the results.
|
|||
|
||||
Strong directional characters `L', `R', and `AL' can have their
|
||||
intrinsic directionality overridden by directional override
|
||||
control characters RLO \(u+202e) and LRO \(u+202d). See the
|
||||
control characters RLO (u+202e) and LRO (u+202d). See the
|
||||
function `get-char-code-property' for a way to inquire about
|
||||
the `bidi-class' property of a character. */)
|
||||
(Lisp_Object from, Lisp_Object to, Lisp_Object object)
|
||||
|
@ -30994,18 +30994,18 @@ This variable is not guaranteed to be accurate except while processing
|
|||
|
||||
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.)
|
||||
(Assuming the window manager supports this feature.)
|
||||
|
||||
This variable has the same structure as `mode-line-format', except that
|
||||
the %c and %l constructs are ignored. It is used only on frames for
|
||||
which no explicit name has been set \(see `modify-frame-parameters'). */);
|
||||
which no explicit name has been set (see `modify-frame-parameters'). */);
|
||||
|
||||
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.)
|
||||
(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'). */);
|
||||
(see `modify-frame-parameters'). */);
|
||||
Vicon_title_format
|
||||
= Vframe_title_format
|
||||
= listn (CONSTYPE_PURE, 3,
|
||||
|
@ -31064,9 +31064,9 @@ A positive number means delay autoselection by that many seconds: a
|
|||
window is autoselected only after the mouse has remained in that
|
||||
window for the duration of the delay.
|
||||
A negative number has a similar effect, but causes windows to be
|
||||
autoselected only after the mouse has stopped moving. \(Because of
|
||||
autoselected only after the mouse has stopped moving. (Because of
|
||||
the way Emacs compares mouse events, you will occasionally wait twice
|
||||
that time before the window gets selected.\)
|
||||
that time before the window gets selected.)
|
||||
Any other value means to autoselect window instantaneously when the
|
||||
mouse pointer enters it.
|
||||
|
||||
|
|
18
src/xfaces.c
18
src/xfaces.c
|
@ -709,10 +709,10 @@ Optional THOROUGHLY non-nil means try to free unused fonts, too. */)
|
|||
DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0,
|
||||
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,
|
||||
(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. */)
|
||||
(WIDTH + 7)/8 bytes. */)
|
||||
(Lisp_Object object)
|
||||
{
|
||||
bool pixmap_p = false;
|
||||
|
@ -4631,8 +4631,8 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector,
|
|||
that a face containing all the attributes in ATTRS, when merged with the
|
||||
default face for display, can be represented in a way that's
|
||||
|
||||
\(1) different in appearance than the default face, and
|
||||
\(2) `close in spirit' to what the attributes specify, if not exact. */
|
||||
(1) different in appearance than the default face, and
|
||||
(2) `close in spirit' to what the attributes specify, if not exact. */
|
||||
|
||||
static bool
|
||||
x_supports_face_attributes_p (struct frame *f,
|
||||
|
@ -4731,8 +4731,8 @@ x_supports_face_attributes_p (struct frame *f,
|
|||
that a face containing all the attributes in ATTRS, when merged
|
||||
with the default face for display, can be represented in a way that's
|
||||
|
||||
\(1) different in appearance than the default face, and
|
||||
\(2) `close in spirit' to what the attributes specify, if not exact.
|
||||
(1) different in appearance than the default face, and
|
||||
(2) `close in spirit' to what the attributes specify, if not exact.
|
||||
|
||||
Point (2) implies that a `:weight black' attribute will be satisfied
|
||||
by any terminal that can display bold, and a `:foreground "yellow"' as
|
||||
|
@ -4914,8 +4914,8 @@ The definition of `supported' is somewhat heuristic, but basically means
|
|||
that a face containing all the attributes in ATTRIBUTES, when merged
|
||||
with the default face for display, can be represented in a way that's
|
||||
|
||||
\(1) different in appearance than the default face, and
|
||||
\(2) `close in spirit' to what the attributes specify, if not exact.
|
||||
(1) different in appearance than the default face, and
|
||||
(2) `close in spirit' to what the attributes specify, if not exact.
|
||||
|
||||
Point (2) implies that a `:weight black' attribute will be satisfied by
|
||||
any display that can display bold, and a `:foreground \"yellow\"' as long
|
||||
|
@ -6521,7 +6521,7 @@ changing this variable for it to take effect. */);
|
|||
Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where
|
||||
FONT-PATTERN is a font-spec or a regular expression matching a font name, and
|
||||
RESCALE-RATIO is a floating point number to specify how much larger
|
||||
\(or smaller) font we should use. For instance, if a face requests
|
||||
(or smaller) font we should use. For instance, if a face requests
|
||||
a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */);
|
||||
Vface_font_rescale_alist = Qnil;
|
||||
|
||||
|
|
|
@ -3444,8 +3444,8 @@ x_focus_frame (struct frame *f)
|
|||
|
||||
|
||||
DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
|
||||
doc: /* Internal function called by `color-defined-p', which see
|
||||
.\(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
doc: /* Internal function called by `color-defined-p', which see.
|
||||
(Note that the Nextstep version of this function ignores FRAME.) */)
|
||||
(Lisp_Object color, Lisp_Object frame)
|
||||
{
|
||||
XColor foo;
|
||||
|
@ -3612,7 +3612,7 @@ 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,
|
||||
doc: /* Return the "vendor ID" string of the GUI software on TERMINAL.
|
||||
|
||||
\(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
(Labeling every distributor as a "vendor" embodies the false assumption
|
||||
that operating systems cannot be developed and distributed noncommercially.)
|
||||
The optional argument TERMINAL specifies which display to ask about.
|
||||
|
||||
|
@ -4710,7 +4710,7 @@ 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.
|
||||
\(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(In the Nextstep version, the last two arguments are currently ignored.) */)
|
||||
(Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed)
|
||||
{
|
||||
char *xrm_option;
|
||||
|
|
|
@ -1915,7 +1915,7 @@ DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
|
|||
Sx_own_selection_internal, 2, 3, 0,
|
||||
doc: /* Assert an X selection of type SELECTION and value VALUE.
|
||||
SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
VALUE is typically a string, or a cons of two markers, but may be
|
||||
anything that the functions on `selection-converter-alist' know about.
|
||||
|
||||
|
@ -1944,7 +1944,7 @@ DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
|
|||
Sx_get_selection_internal, 2, 4, 0,
|
||||
doc: /* Return text selected from some X window.
|
||||
SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
TARGET-TYPE is the type of data desired, typically `STRING'.
|
||||
|
||||
TIME-STAMP is the time to use in the XConvertSelection call for foreign
|
||||
|
@ -2048,7 +2048,7 @@ DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
|
|||
doc: /* Whether the current Emacs process owns the given X Selection.
|
||||
The arg should be the name of the selection in question, typically one of
|
||||
the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
|
||||
\(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
(Those are literal upper-case symbol names, since that's what X expects.)
|
||||
For convenience, the symbol nil is the same as `PRIMARY',
|
||||
and t is the same as `SECONDARY'.
|
||||
|
||||
|
@ -2623,7 +2623,7 @@ and the local selection value (whatever was given to
|
|||
`x-own-selection-internal').
|
||||
|
||||
The function should return the value to send to the X server
|
||||
\(typically a string). A return value of nil
|
||||
(typically a string). A return value of nil
|
||||
means that the conversion could not be done.
|
||||
A return value which is the symbol `NULL'
|
||||
means that a side-effect was executed,
|
||||
|
@ -2632,10 +2632,10 @@ and there is no meaningful selection value. */);
|
|||
|
||||
DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions,
|
||||
doc: /* A list of functions to be called when Emacs loses an X selection.
|
||||
\(This happens when some other X client makes its own selection
|
||||
(This happens when some other X client makes its own selection
|
||||
or when a Lisp program explicitly clears the selection.)
|
||||
The functions are called with one argument, the selection type
|
||||
\(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */);
|
||||
(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */);
|
||||
Vx_lost_selection_functions = Qnil;
|
||||
|
||||
DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions,
|
||||
|
|
Loading…
Add table
Reference in a new issue