diff options
| author | Paul Eggert | 2015-09-16 16:23:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-09-16 16:26:07 -0700 |
| commit | 032ce1c7d1afb23e6b1265d91c5a97e45de071ce (patch) | |
| tree | dab9ca1e540c23aeb15ee9ef8fdc6b78e1929b6d /src | |
| parent | 309d39b832ccd72f99cc726090ff03f7e146948d (diff) | |
| download | emacs-032ce1c7d1afb23e6b1265d91c5a97e45de071ce.tar.gz emacs-032ce1c7d1afb23e6b1265d91c5a97e45de071ce.zip | |
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 ).
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 16 | ||||
| -rw-r--r-- | src/bytecode.c | 4 | ||||
| -rw-r--r-- | src/callproc.c | 4 | ||||
| -rw-r--r-- | src/category.c | 4 | ||||
| -rw-r--r-- | src/chartab.c | 2 | ||||
| -rw-r--r-- | src/cmds.c | 2 | ||||
| -rw-r--r-- | src/coding.c | 4 | ||||
| -rw-r--r-- | src/data.c | 6 | ||||
| -rw-r--r-- | src/dbusbind.c | 10 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/doc.c | 2 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/fileio.c | 18 | ||||
| -rw-r--r-- | src/floatfns.c | 8 | ||||
| -rw-r--r-- | src/fns.c | 24 | ||||
| -rw-r--r-- | src/font.c | 14 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 4 | ||||
| -rw-r--r-- | src/keymap.c | 6 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/menu.c | 4 | ||||
| -rw-r--r-- | src/minibuf.c | 4 | ||||
| -rw-r--r-- | src/nsfns.m | 6 | ||||
| -rw-r--r-- | src/nsselect.m | 6 | ||||
| -rw-r--r-- | src/print.c | 4 | ||||
| -rw-r--r-- | src/process.c | 20 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/syntax.c | 2 | ||||
| -rw-r--r-- | src/textprop.c | 2 | ||||
| -rw-r--r-- | src/w16select.c | 2 | ||||
| -rw-r--r-- | src/w32fns.c | 6 | ||||
| -rw-r--r-- | src/window.c | 8 | ||||
| -rw-r--r-- | src/xdisp.c | 14 | ||||
| -rw-r--r-- | src/xfaces.c | 18 | ||||
| -rw-r--r-- | src/xfns.c | 8 | ||||
| -rw-r--r-- | src/xselect.c | 12 |
37 files changed, 130 insertions, 130 deletions
diff --git a/src/buffer.c b/src/buffer.c index 33f7996a8c1..530fe114cc8 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1042,7 +1042,7 @@ DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, | |||
| 1042 | doc: /* Return a string that is the name of no existing buffer based on NAME. | 1042 | doc: /* Return a string that is the name of no existing buffer based on NAME. |
| 1043 | If there is no live buffer named NAME, then return NAME. | 1043 | If there is no live buffer named NAME, then return NAME. |
| 1044 | Otherwise modify name by appending `<NUMBER>', incrementing NUMBER | 1044 | Otherwise modify name by appending `<NUMBER>', incrementing NUMBER |
| 1045 | \(starting at 2) until an unused name is found, and then return that name. | 1045 | (starting at 2) until an unused name is found, and then return that name. |
| 1046 | Optional second argument IGNORE specifies a name that is okay to use (if | 1046 | Optional second argument IGNORE specifies a name that is okay to use (if |
| 1047 | it is in the sequence to be tried) even if a buffer with that name exists. | 1047 | it is in the sequence to be tried) even if a buffer with that name exists. |
| 1048 | 1048 | ||
| @@ -1385,7 +1385,7 @@ DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick, | |||
| 1385 | Sbuffer_chars_modified_tick, 0, 1, 0, | 1385 | Sbuffer_chars_modified_tick, 0, 1, 0, |
| 1386 | doc: /* Return BUFFER's character-change tick counter. | 1386 | doc: /* Return BUFFER's character-change tick counter. |
| 1387 | Each buffer has a character-change tick counter, which is set to the | 1387 | Each buffer has a character-change tick counter, which is set to the |
| 1388 | value of the buffer's tick counter \(see `buffer-modified-tick'), each | 1388 | value of the buffer's tick counter (see `buffer-modified-tick'), each |
| 1389 | time text in that buffer is inserted or deleted. By comparing the | 1389 | time text in that buffer is inserted or deleted. By comparing the |
| 1390 | values returned by two individual calls of `buffer-chars-modified-tick', | 1390 | values returned by two individual calls of `buffer-chars-modified-tick', |
| 1391 | you can tell whether a character change occurred in that buffer in | 1391 | you can tell whether a character change occurred in that buffer in |
| @@ -3791,10 +3791,10 @@ If omitted, BUFFER defaults to the current buffer. | |||
| 3791 | BEG and END may be integers or markers. | 3791 | BEG and END may be integers or markers. |
| 3792 | The fourth arg FRONT-ADVANCE, if non-nil, makes the marker | 3792 | The fourth arg FRONT-ADVANCE, if non-nil, makes the marker |
| 3793 | for the front of the overlay advance when text is inserted there | 3793 | for the front of the overlay advance when text is inserted there |
| 3794 | \(which means the text *is not* included in the overlay). | 3794 | (which means the text *is not* included in the overlay). |
| 3795 | The fifth arg REAR-ADVANCE, if non-nil, makes the marker | 3795 | The fifth arg REAR-ADVANCE, if non-nil, makes the marker |
| 3796 | for the rear of the overlay advance when text is inserted there | 3796 | for the rear of the overlay advance when text is inserted there |
| 3797 | \(which means the text *is* included in the overlay). */) | 3797 | (which means the text *is* included in the overlay). */) |
| 3798 | (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, | 3798 | (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, |
| 3799 | Lisp_Object front_advance, Lisp_Object rear_advance) | 3799 | Lisp_Object front_advance, Lisp_Object rear_advance) |
| 3800 | { | 3800 | { |
| @@ -6014,7 +6014,7 @@ between 0.0 and 1.0, inclusive. */); | |||
| 6014 | doc: /* List of functions to call before each text change. | 6014 | doc: /* List of functions to call before each text change. |
| 6015 | Two arguments are passed to each function: the positions of | 6015 | Two arguments are passed to each function: the positions of |
| 6016 | the beginning and end of the range of old text to be changed. | 6016 | the beginning and end of the range of old text to be changed. |
| 6017 | \(For an insertion, the beginning and end are at the same place.) | 6017 | (For an insertion, the beginning and end are at the same place.) |
| 6018 | No information is given about the length of the text after the change. | 6018 | No information is given about the length of the text after the change. |
| 6019 | 6019 | ||
| 6020 | Buffer changes made while executing the `before-change-functions' | 6020 | Buffer changes made while executing the `before-change-functions' |
| @@ -6031,7 +6031,7 @@ from happening repeatedly and making Emacs nonfunctional. */); | |||
| 6031 | Three arguments are passed to each function: the positions of | 6031 | Three arguments are passed to each function: the positions of |
| 6032 | the beginning and end of the range of changed text, | 6032 | the beginning and end of the range of changed text, |
| 6033 | and the length in chars of the pre-change text replaced by that range. | 6033 | and the length in chars of the pre-change text replaced by that range. |
| 6034 | \(For an insertion, the pre-change length is zero; | 6034 | (For an insertion, the pre-change length is zero; |
| 6035 | for a deletion, that length is the number of chars deleted, | 6035 | for a deletion, that length is the number of chars deleted, |
| 6036 | and the post-change beginning and end are at the same place.) | 6036 | and the post-change beginning and end are at the same place.) |
| 6037 | 6037 | ||
| @@ -6076,7 +6076,7 @@ was modified between BEG and END. PROPERTY is the property name, | |||
| 6076 | and VALUE is the old value. | 6076 | and VALUE is the old value. |
| 6077 | 6077 | ||
| 6078 | An entry (apply FUN-NAME . ARGS) means undo the change with | 6078 | An entry (apply FUN-NAME . ARGS) means undo the change with |
| 6079 | \(apply FUN-NAME ARGS). | 6079 | (apply FUN-NAME ARGS). |
| 6080 | 6080 | ||
| 6081 | An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo | 6081 | An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo |
| 6082 | in the active region. BEG and END is the range affected by this entry | 6082 | 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. */) | |||
| 6236 | doc: /* Non-nil means show a cursor in non-selected windows. | 6236 | doc: /* Non-nil means show a cursor in non-selected windows. |
| 6237 | If nil, only shows a cursor in the selected window. | 6237 | If nil, only shows a cursor in the selected window. |
| 6238 | If t, displays a cursor related to the usual cursor type | 6238 | If t, displays a cursor related to the usual cursor type |
| 6239 | \(a solid box becomes hollow, a bar becomes a narrower bar). | 6239 | (a solid box becomes hollow, a bar becomes a narrower bar). |
| 6240 | You can also specify the cursor type as in the `cursor-type' variable. | 6240 | You can also specify the cursor type as in the `cursor-type' variable. |
| 6241 | Use Custom to set this variable and update the display." */); | 6241 | Use Custom to set this variable and update the display." */); |
| 6242 | 6242 | ||
diff --git a/src/bytecode.c b/src/bytecode.c index 86d44aba46b..864db1a0bed 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -2000,9 +2000,9 @@ syms_of_bytecode (void) | |||
| 2000 | 2000 | ||
| 2001 | DEFVAR_LISP ("byte-code-meter", Vbyte_code_meter, | 2001 | DEFVAR_LISP ("byte-code-meter", Vbyte_code_meter, |
| 2002 | doc: /* A vector of vectors which holds a histogram of byte-code usage. | 2002 | doc: /* A vector of vectors which holds a histogram of byte-code usage. |
| 2003 | \(aref (aref byte-code-meter 0) CODE) indicates how many times the byte | 2003 | (aref (aref byte-code-meter 0) CODE) indicates how many times the byte |
| 2004 | opcode CODE has been executed. | 2004 | opcode CODE has been executed. |
| 2005 | \(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0, | 2005 | (aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0, |
| 2006 | indicates how many times the byte opcodes CODE1 and CODE2 have been | 2006 | indicates how many times the byte opcodes CODE1 and CODE2 have been |
| 2007 | executed in succession. */); | 2007 | executed in succession. */); |
| 2008 | 2008 | ||
diff --git a/src/callproc.c b/src/callproc.c index 39f0eb6265e..e38844e2da6 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -226,7 +226,7 @@ The program's input comes from file INFILE (nil means `/dev/null'). | |||
| 226 | Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION | 226 | Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION |
| 227 | means discard it; 0 means discard and don't wait; and `(:file FILE)', where | 227 | means discard it; 0 means discard and don't wait; and `(:file FILE)', where |
| 228 | FILE is a file name string, means that it should be written to that file | 228 | FILE is a file name string, means that it should be written to that file |
| 229 | \(if the file already exists it is overwritten). | 229 | (if the file already exists it is overwritten). |
| 230 | DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, | 230 | DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
| 231 | REAL-BUFFER says what to do with standard output, as above, | 231 | REAL-BUFFER says what to do with standard output, as above, |
| 232 | while STDERR-FILE says what to do with standard error in the child. | 232 | while STDERR-FILE says what to do with standard error in the child. |
| @@ -1462,7 +1462,7 @@ This function searches `process-environment' for VARIABLE. | |||
| 1462 | 1462 | ||
| 1463 | If optional parameter ENV is a list, then search this list instead of | 1463 | If optional parameter ENV is a list, then search this list instead of |
| 1464 | `process-environment', and return t when encountering a negative entry | 1464 | `process-environment', and return t when encountering a negative entry |
| 1465 | \(an entry for a variable with no value). */) | 1465 | (an entry for a variable with no value). */) |
| 1466 | (Lisp_Object variable, Lisp_Object env) | 1466 | (Lisp_Object variable, Lisp_Object env) |
| 1467 | { | 1467 | { |
| 1468 | char *value; | 1468 | char *value; |
diff --git a/src/category.c b/src/category.c index bb4a75d3a4d..400116f6e03 100644 --- a/src/category.c +++ b/src/category.c | |||
| @@ -464,7 +464,7 @@ Emacs treats a sequence of word constituent characters as a single | |||
| 464 | word (i.e. finds no word boundary between them) only if they belong to | 464 | word (i.e. finds no word boundary between them) only if they belong to |
| 465 | the same script. But, exceptions are allowed in the following cases. | 465 | the same script. But, exceptions are allowed in the following cases. |
| 466 | 466 | ||
| 467 | \(1) The case that characters are in different scripts is controlled | 467 | (1) The case that characters are in different scripts is controlled |
| 468 | by the variable `word-combining-categories'. | 468 | by the variable `word-combining-categories'. |
| 469 | 469 | ||
| 470 | Emacs finds no word boundary between characters of different scripts | 470 | Emacs finds no word boundary between characters of different scripts |
| @@ -478,7 +478,7 @@ For instance, to tell that Han characters followed by Hiragana | |||
| 478 | characters can form a single word, the element `(?C . ?H)' should be | 478 | characters can form a single word, the element `(?C . ?H)' should be |
| 479 | in this list. | 479 | in this list. |
| 480 | 480 | ||
| 481 | \(2) The case that character are in the same script is controlled by | 481 | (2) The case that character are in the same script is controlled by |
| 482 | the variable `word-separating-categories'. | 482 | the variable `word-separating-categories'. |
| 483 | 483 | ||
| 484 | Emacs finds a word boundary between characters of the same script | 484 | Emacs finds a word boundary between characters of the same script |
diff --git a/src/chartab.c b/src/chartab.c index bd14c4d172b..274bb60727c 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -534,7 +534,7 @@ DEFUN ("char-table-parent", Fchar_table_parent, Schar_table_parent, | |||
| 534 | The value is either nil or another char-table. | 534 | The value is either nil or another char-table. |
| 535 | If CHAR-TABLE holds nil for a given character, | 535 | If CHAR-TABLE holds nil for a given character, |
| 536 | then the actual applicable value is inherited from the parent char-table | 536 | then the actual applicable value is inherited from the parent char-table |
| 537 | \(or from its parents, if necessary). */) | 537 | (or from its parents, if necessary). */) |
| 538 | (Lisp_Object char_table) | 538 | (Lisp_Object char_table) |
| 539 | { | 539 | { |
| 540 | CHECK_CHAR_TABLE (char_table); | 540 | CHECK_CHAR_TABLE (char_table); |
diff --git a/src/cmds.c b/src/cmds.c index a975a8ed4e0..7a575ae7348 100644 --- a/src/cmds.c +++ b/src/cmds.c | |||
| @@ -108,7 +108,7 @@ right or to the left on the screen. This is in contrast with | |||
| 108 | DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", | 108 | DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", |
| 109 | doc: /* Move N lines forward (backward if N is negative). | 109 | doc: /* Move N lines forward (backward if N is negative). |
| 110 | Precisely, if point is on line I, move to the start of line I + N | 110 | Precisely, if point is on line I, move to the start of line I + N |
| 111 | \("start of line" in the logical order). | 111 | ("start of line" in the logical order). |
| 112 | If there isn't room, go as far as possible (no error). | 112 | If there isn't room, go as far as possible (no error). |
| 113 | 113 | ||
| 114 | Returns the count of lines left to move. If moving forward, | 114 | Returns the count of lines left to move. If moving forward, |
diff --git a/src/coding.c b/src/coding.c index d14e562ce9a..3fc6fb684c6 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9800,7 +9800,7 @@ DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, | |||
| 9800 | doc: /* Choose a coding system for an operation based on the target name. | 9800 | doc: /* Choose a coding system for an operation based on the target name. |
| 9801 | The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). | 9801 | The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). |
| 9802 | DECODING-SYSTEM is the coding system to use for decoding | 9802 | DECODING-SYSTEM is the coding system to use for decoding |
| 9803 | \(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system | 9803 | (in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system |
| 9804 | for encoding (in case OPERATION does encoding). | 9804 | for encoding (in case OPERATION does encoding). |
| 9805 | 9805 | ||
| 9806 | The first argument OPERATION specifies an I/O primitive: | 9806 | 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. */); | |||
| 11175 | Table of extra Latin codes in the range 128..159 (inclusive). | 11175 | Table of extra Latin codes in the range 128..159 (inclusive). |
| 11176 | This is a vector of length 256. | 11176 | This is a vector of length 256. |
| 11177 | If Nth element is non-nil, the existence of code N in a file | 11177 | If Nth element is non-nil, the existence of code N in a file |
| 11178 | \(or output of subprocess) doesn't prevent it to be detected as | 11178 | (or output of subprocess) doesn't prevent it to be detected as |
| 11179 | a coding system of ISO 2022 variant which has a flag | 11179 | a coding system of ISO 2022 variant which has a flag |
| 11180 | `accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file | 11180 | `accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file |
| 11181 | or reading output of a subprocess. | 11181 | or reading output of a subprocess. |
diff --git a/src/data.c b/src/data.c index 34265b7ecdc..eda611055d8 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -791,7 +791,7 @@ SUBR must be a built-in function. */) | |||
| 791 | DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, | 791 | DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, |
| 792 | doc: /* Return the interactive form of CMD or nil if none. | 792 | doc: /* Return the interactive form of CMD or nil if none. |
| 793 | If CMD is not a command, the return value is nil. | 793 | If CMD is not a command, the return value is nil. |
| 794 | Value, if non-nil, is a list \(interactive SPEC). */) | 794 | Value, if non-nil, is a list (interactive SPEC). */) |
| 795 | (Lisp_Object cmd) | 795 | (Lisp_Object cmd) |
| 796 | { | 796 | { |
| 797 | Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ | 797 | Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ |
| @@ -1660,8 +1660,8 @@ DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, | |||
| 1660 | 1, 1, "vMake Local Variable: ", | 1660 | 1, 1, "vMake Local Variable: ", |
| 1661 | doc: /* Make VARIABLE have a separate value in the current buffer. | 1661 | doc: /* Make VARIABLE have a separate value in the current buffer. |
| 1662 | Other buffers will continue to share a common default value. | 1662 | Other buffers will continue to share a common default value. |
| 1663 | \(The buffer-local value of VARIABLE starts out as the same value | 1663 | (The buffer-local value of VARIABLE starts out as the same value |
| 1664 | VARIABLE previously had. If VARIABLE was void, it remains void.\) | 1664 | VARIABLE previously had. If VARIABLE was void, it remains void.) |
| 1665 | Return VARIABLE. | 1665 | Return VARIABLE. |
| 1666 | 1666 | ||
| 1667 | If the variable is already arranged to become local when set, | 1667 | If the variable is already arranged to become local when set, |
diff --git a/src/dbusbind.c b/src/dbusbind.c index e5318fd51a1..fcb6ab8b618 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -1233,20 +1233,20 @@ This is an internal function, it shall not be used outside dbus.el. | |||
| 1233 | The following usages are expected: | 1233 | The following usages are expected: |
| 1234 | 1234 | ||
| 1235 | `dbus-call-method', `dbus-call-method-asynchronously': | 1235 | `dbus-call-method', `dbus-call-method-asynchronously': |
| 1236 | \(dbus-message-internal | 1236 | (dbus-message-internal |
| 1237 | dbus-message-type-method-call BUS SERVICE PATH INTERFACE METHOD HANDLER | 1237 | dbus-message-type-method-call BUS SERVICE PATH INTERFACE METHOD HANDLER |
| 1238 | &optional :timeout TIMEOUT &rest ARGS) | 1238 | &optional :timeout TIMEOUT &rest ARGS) |
| 1239 | 1239 | ||
| 1240 | `dbus-send-signal': | 1240 | `dbus-send-signal': |
| 1241 | \(dbus-message-internal | 1241 | (dbus-message-internal |
| 1242 | dbus-message-type-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) | 1242 | dbus-message-type-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) |
| 1243 | 1243 | ||
| 1244 | `dbus-method-return-internal': | 1244 | `dbus-method-return-internal': |
| 1245 | \(dbus-message-internal | 1245 | (dbus-message-internal |
| 1246 | dbus-message-type-method-return BUS SERVICE SERIAL &rest ARGS) | 1246 | dbus-message-type-method-return BUS SERVICE SERIAL &rest ARGS) |
| 1247 | 1247 | ||
| 1248 | `dbus-method-error-internal': | 1248 | `dbus-method-error-internal': |
| 1249 | \(dbus-message-internal | 1249 | (dbus-message-internal |
| 1250 | dbus-message-type-error BUS SERVICE SERIAL &rest ARGS) | 1250 | dbus-message-type-error BUS SERVICE SERIAL &rest ARGS) |
| 1251 | 1251 | ||
| 1252 | usage: (dbus-message-internal &rest REST) */) | 1252 | usage: (dbus-message-internal &rest REST) */) |
| @@ -1796,7 +1796,7 @@ string which denotes a D-Bus interface, and MEMBER, also a string, is | |||
| 1796 | either a method, a signal or a property INTERFACE is offering. All | 1796 | either a method, a signal or a property INTERFACE is offering. All |
| 1797 | arguments but BUS must not be nil. | 1797 | arguments but BUS must not be nil. |
| 1798 | 1798 | ||
| 1799 | The value in the hash table is a list of quadruple lists \((UNAME | 1799 | The value in the hash table is a list of quadruple lists ((UNAME |
| 1800 | SERVICE PATH OBJECT [RULE]) ...). SERVICE is the service name as | 1800 | SERVICE PATH OBJECT [RULE]) ...). SERVICE is the service name as |
| 1801 | registered, UNAME is the corresponding unique name. In case of | 1801 | registered, UNAME is the corresponding unique name. In case of |
| 1802 | registered methods and properties, UNAME is nil. PATH is the object | 1802 | registered methods and properties, UNAME is nil. PATH is the object |
diff --git a/src/dispnew.c b/src/dispnew.c index 645d4106e9e..00d086e4161 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -5665,7 +5665,7 @@ DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, | |||
| 5665 | SECONDS may be a floating-point value, meaning that you can wait for a | 5665 | SECONDS may be a floating-point value, meaning that you can wait for a |
| 5666 | fraction of a second. Optional second arg MILLISECONDS specifies an | 5666 | fraction of a second. Optional second arg MILLISECONDS specifies an |
| 5667 | additional wait period, in milliseconds; this is for backwards compatibility. | 5667 | additional wait period, in milliseconds; this is for backwards compatibility. |
| 5668 | \(Not all operating systems support waiting for a fraction of a second.) */) | 5668 | (Not all operating systems support waiting for a fraction of a second.) */) |
| 5669 | (Lisp_Object seconds, Lisp_Object milliseconds) | 5669 | (Lisp_Object seconds, Lisp_Object milliseconds) |
| 5670 | { | 5670 | { |
| 5671 | double duration = extract_float (seconds); | 5671 | double duration = extract_float (seconds); |
| @@ -716,7 +716,7 @@ is not on any keys. | |||
| 716 | Each substring of the form \\=\\{MAPVAR} is replaced by a summary of | 716 | Each substring of the form \\=\\{MAPVAR} is replaced by a summary of |
| 717 | the value of MAPVAR as a keymap. This summary is similar to the one | 717 | the value of MAPVAR as a keymap. This summary is similar to the one |
| 718 | produced by `describe-bindings'. The summary ends in two newlines | 718 | produced by `describe-bindings'. The summary ends in two newlines |
| 719 | \(used by the helper function `help-make-xrefs' to find the end of the | 719 | (used by the helper function `help-make-xrefs' to find the end of the |
| 720 | summary). | 720 | summary). |
| 721 | 721 | ||
| 722 | Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR | 722 | Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR |
diff --git a/src/editfns.c b/src/editfns.c index 2080b53421e..e6f144e7b30 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3627,7 +3627,7 @@ save_restriction_restore (Lisp_Object data) | |||
| 3627 | DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0, | 3627 | DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0, |
| 3628 | doc: /* Execute BODY, saving and restoring current buffer's restrictions. | 3628 | doc: /* Execute BODY, saving and restoring current buffer's restrictions. |
| 3629 | The buffer's restrictions make parts of the beginning and end invisible. | 3629 | The buffer's restrictions make parts of the beginning and end invisible. |
| 3630 | \(They are set up with `narrow-to-region' and eliminated with `widen'.) | 3630 | (They are set up with `narrow-to-region' and eliminated with `widen'.) |
| 3631 | This special form, `save-restriction', saves the current buffer's restrictions | 3631 | This special form, `save-restriction', saves the current buffer's restrictions |
| 3632 | when it is entered, and restores them when it is exited. | 3632 | when it is entered, and restores them when it is exited. |
| 3633 | So any `narrow-to-region' within BODY lasts only until the end of the form. | 3633 | So any `narrow-to-region' within BODY lasts only until the end of the form. |
diff --git a/src/eval.c b/src/eval.c index b42f9047257..ac98ca11bd4 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -705,7 +705,7 @@ If SYMBOL has a local binding, then this form affects the local | |||
| 705 | binding. This is usually not what you want. Thus, if you need to | 705 | binding. This is usually not what you want. Thus, if you need to |
| 706 | load a file defining variables, with this form or with `defconst' or | 706 | load a file defining variables, with this form or with `defconst' or |
| 707 | `defcustom', you should always load that file _outside_ any bindings | 707 | `defcustom', you should always load that file _outside_ any bindings |
| 708 | for these variables. \(`defconst' and `defcustom' behave similarly in | 708 | for these variables. (`defconst' and `defcustom' behave similarly in |
| 709 | this respect.) | 709 | this respect.) |
| 710 | 710 | ||
| 711 | The optional argument DOCSTRING is a documentation string for the | 711 | The optional argument DOCSTRING is a documentation string for the |
| @@ -1188,7 +1188,7 @@ suppresses the debugger). | |||
| 1188 | When a handler handles an error, control returns to the `condition-case' | 1188 | When a handler handles an error, control returns to the `condition-case' |
| 1189 | and it executes the handler's BODY... | 1189 | and it executes the handler's BODY... |
| 1190 | with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error. | 1190 | with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error. |
| 1191 | \(If VAR is nil, the handler can't access that information.) | 1191 | (If VAR is nil, the handler can't access that information.) |
| 1192 | Then the value of the last BODY form is returned from the `condition-case' | 1192 | Then the value of the last BODY form is returned from the `condition-case' |
| 1193 | expression. | 1193 | expression. |
| 1194 | 1194 | ||
| @@ -2366,7 +2366,7 @@ may be nil, a function, or a list of functions. Call each | |||
| 2366 | function in order with arguments ARGS, stopping at the first | 2366 | function in order with arguments ARGS, stopping at the first |
| 2367 | one that returns nil, and return nil. Otherwise (if all functions | 2367 | one that returns nil, and return nil. Otherwise (if all functions |
| 2368 | return non-nil, or if there are no functions to call), return non-nil | 2368 | return non-nil, or if there are no functions to call), return non-nil |
| 2369 | \(do not rely on the precise return value in this case). | 2369 | (do not rely on the precise return value in this case). |
| 2370 | 2370 | ||
| 2371 | Do not use `make-local-variable' to make a hook variable buffer-local. | 2371 | Do not use `make-local-variable' to make a hook variable buffer-local. |
| 2372 | Instead, use `add-hook' and specify t for the LOCAL argument. | 2372 | Instead, use `add-hook' and specify t for the LOCAL argument. |
diff --git a/src/fileio.c b/src/fileio.c index 69933ccd40b..e4b255a53ac 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -451,7 +451,7 @@ DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory, | |||
| 451 | A `directly usable' directory name is one that may be used without the | 451 | A `directly usable' directory name is one that may be used without the |
| 452 | intervention of any file handler. | 452 | intervention of any file handler. |
| 453 | If FILENAME is a directly usable file itself, return | 453 | If FILENAME is a directly usable file itself, return |
| 454 | \(file-name-directory FILENAME). | 454 | (file-name-directory FILENAME). |
| 455 | If FILENAME refers to a file which is not accessible from a local process, | 455 | If FILENAME refers to a file which is not accessible from a local process, |
| 456 | then this should return nil. | 456 | then this should return nil. |
| 457 | The `call-process' and `start-process' functions use this function to | 457 | 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, | |||
| 742 | doc: /* Generate temporary file name (string) starting with PREFIX (a string). | 742 | doc: /* Generate temporary file name (string) starting with PREFIX (a string). |
| 743 | The Emacs process number forms part of the result, so there is no | 743 | The Emacs process number forms part of the result, so there is no |
| 744 | danger of generating a name being used by another Emacs process | 744 | danger of generating a name being used by another Emacs process |
| 745 | \(so long as only a single host can access the containing directory...). | 745 | (so long as only a single host can access the containing directory...). |
| 746 | 746 | ||
| 747 | This function tries to choose a name that has no existing file. | 747 | This function tries to choose a name that has no existing file. |
| 748 | For this to work, PREFIX should be an absolute file name. | 748 | For this to work, PREFIX should be an absolute file name. |
| @@ -758,7 +758,7 @@ normally use `make-temp-file' instead. */) | |||
| 758 | DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, | 758 | DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, |
| 759 | doc: /* Convert filename NAME to absolute, and canonicalize it. | 759 | doc: /* Convert filename NAME to absolute, and canonicalize it. |
| 760 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative | 760 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative |
| 761 | \(does not start with slash or tilde); both the directory name and | 761 | (does not start with slash or tilde); both the directory name and |
| 762 | a directory's file name are accepted. If DEFAULT-DIRECTORY is nil or | 762 | a directory's file name are accepted. If DEFAULT-DIRECTORY is nil or |
| 763 | missing, the current buffer's value of `default-directory' is used. | 763 | missing, the current buffer's value of `default-directory' is used. |
| 764 | NAME should be a string that is a valid file name for the underlying | 764 | 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'. | |||
| 776 | 776 | ||
| 777 | For technical reasons, this function can return correct but | 777 | For technical reasons, this function can return correct but |
| 778 | non-intuitive results for the root directory; for instance, | 778 | non-intuitive results for the root directory; for instance, |
| 779 | \(expand-file-name ".." "/") returns "/..". For this reason, use | 779 | (expand-file-name ".." "/") returns "/..". For this reason, use |
| 780 | \(directory-file-name (file-name-directory dirname)) to traverse a | 780 | (directory-file-name (file-name-directory dirname)) to traverse a |
| 781 | filesystem tree, not (expand-file-name ".." dirname). */) | 781 | filesystem tree, not (expand-file-name ".." dirname). */) |
| 782 | (Lisp_Object name, Lisp_Object default_directory) | 782 | (Lisp_Object name, Lisp_Object default_directory) |
| 783 | { | 783 | { |
| @@ -1460,7 +1460,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) | |||
| 1460 | DEAFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, | 1460 | DEAFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, |
| 1461 | "Convert FILENAME to absolute, and canonicalize it.\n\ | 1461 | "Convert FILENAME to absolute, and canonicalize it.\n\ |
| 1462 | Second arg DEFAULT is directory to start with if FILENAME is relative\n\ | 1462 | Second arg DEFAULT is directory to start with if FILENAME is relative\n\ |
| 1463 | \(does not start with slash); if DEFAULT is nil or missing,\n\ | 1463 | (does not start with slash); if DEFAULT is nil or missing,\n\ |
| 1464 | the current buffer's value of default-directory is used.\n\ | 1464 | the current buffer's value of default-directory is used.\n\ |
| 1465 | Filenames containing `.' or `..' as components are simplified;\n\ | 1465 | Filenames containing `.' or `..' as components are simplified;\n\ |
| 1466 | initial `~/' expands to your home directory.\n\ | 1466 | initial `~/' expands to your home directory.\n\ |
| @@ -2469,7 +2469,7 @@ Use `file-symlink-p' to test for such links. */) | |||
| 2469 | DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0, | 2469 | DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0, |
| 2470 | doc: /* Return t if FILENAME can be executed by you. | 2470 | doc: /* Return t if FILENAME can be executed by you. |
| 2471 | For a directory, this means you can access files in that directory. | 2471 | For a directory, this means you can access files in that directory. |
| 2472 | \(It is generally better to use `file-accessible-directory-p' for that | 2472 | (It is generally better to use `file-accessible-directory-p' for that |
| 2473 | purpose, though.) */) | 2473 | purpose, though.) */) |
| 2474 | (Lisp_Object filename) | 2474 | (Lisp_Object filename) |
| 2475 | { | 2475 | { |
| @@ -5306,8 +5306,8 @@ DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime, | |||
| 5306 | Useful if the buffer was not read from the file normally | 5306 | Useful if the buffer was not read from the file normally |
| 5307 | or if the file itself has been changed for some known benign reason. | 5307 | or if the file itself has been changed for some known benign reason. |
| 5308 | An argument specifies the modification time value to use | 5308 | An argument specifies the modification time value to use |
| 5309 | \(instead of that of the visited file), in the form of a list | 5309 | (instead of that of the visited file), in the form of a list |
| 5310 | \(HIGH LOW USEC PSEC) or an integer flag as returned by | 5310 | (HIGH LOW USEC PSEC) or an integer flag as returned by |
| 5311 | `visited-file-modtime'. */) | 5311 | `visited-file-modtime'. */) |
| 5312 | (Lisp_Object time_flag) | 5312 | (Lisp_Object time_flag) |
| 5313 | { | 5313 | { |
diff --git a/src/floatfns.c b/src/floatfns.c index 63d35b8ad6b..46eb85ff8ca 100644 --- a/src/floatfns.c +++ b/src/floatfns.c | |||
| @@ -170,7 +170,7 @@ Cause an error if X1 or X2 is not a float. */) | |||
| 170 | DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0, | 170 | DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0, |
| 171 | doc: /* Get significand and exponent of a floating point number. | 171 | doc: /* Get significand and exponent of a floating point number. |
| 172 | Breaks the floating point number X into its binary significand SGNFCAND | 172 | Breaks the floating point number X into its binary significand SGNFCAND |
| 173 | \(a floating point value between 0.5 (included) and 1.0 (excluded)) | 173 | (a floating point value between 0.5 (included) and 1.0 (excluded)) |
| 174 | and an integral exponent EXP for 2, such that: | 174 | and an integral exponent EXP for 2, such that: |
| 175 | 175 | ||
| 176 | X = SGNFCAND * 2^EXP | 176 | X = SGNFCAND * 2^EXP |
| @@ -454,7 +454,7 @@ With optional DIVISOR, return the nearest integer to ARG/DIVISOR. | |||
| 454 | 454 | ||
| 455 | Rounding a value equidistant between two integers may choose the | 455 | Rounding a value equidistant between two integers may choose the |
| 456 | integer closer to zero, or it may prefer an even integer, depending on | 456 | integer closer to zero, or it may prefer an even integer, depending on |
| 457 | your machine. For example, \(round 2.5\) can return 3 on some | 457 | your machine. For example, (round 2.5) can return 3 on some |
| 458 | systems, but 2 on others. */) | 458 | systems, but 2 on others. */) |
| 459 | (Lisp_Object arg, Lisp_Object divisor) | 459 | (Lisp_Object arg, Lisp_Object divisor) |
| 460 | { | 460 | { |
| @@ -491,7 +491,7 @@ fmod_float (Lisp_Object x, Lisp_Object y) | |||
| 491 | 491 | ||
| 492 | DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0, | 492 | DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0, |
| 493 | doc: /* Return the smallest integer no less than ARG, as a float. | 493 | doc: /* Return the smallest integer no less than ARG, as a float. |
| 494 | \(Round toward +inf.\) */) | 494 | (Round toward +inf.) */) |
| 495 | (Lisp_Object arg) | 495 | (Lisp_Object arg) |
| 496 | { | 496 | { |
| 497 | double d = extract_float (arg); | 497 | double d = extract_float (arg); |
| @@ -501,7 +501,7 @@ DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0, | |||
| 501 | 501 | ||
| 502 | DEFUN ("ffloor", Fffloor, Sffloor, 1, 1, 0, | 502 | DEFUN ("ffloor", Fffloor, Sffloor, 1, 1, 0, |
| 503 | doc: /* Return the largest integer no greater than ARG, as a float. | 503 | doc: /* Return the largest integer no greater than ARG, as a float. |
| 504 | \(Round towards -inf.\) */) | 504 | (Round towards -inf.) */) |
| 505 | (Lisp_Object arg) | 505 | (Lisp_Object arg) |
| 506 | { | 506 | { |
| 507 | double d = extract_float (arg); | 507 | double d = extract_float (arg); |
| @@ -224,7 +224,7 @@ DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0, | |||
| 224 | The arguments START1, END1, START2, and END2, if non-nil, are | 224 | The arguments START1, END1, START2, and END2, if non-nil, are |
| 225 | positions specifying which parts of STR1 or STR2 to compare. In | 225 | positions specifying which parts of STR1 or STR2 to compare. In |
| 226 | string STR1, compare the part between START1 (inclusive) and END1 | 226 | string STR1, compare the part between START1 (inclusive) and END1 |
| 227 | \(exclusive). If START1 is nil, it defaults to 0, the beginning of | 227 | (exclusive). If START1 is nil, it defaults to 0, the beginning of |
| 228 | the string; if END1 is nil, it defaults to the length of the string. | 228 | the string; if END1 is nil, it defaults to the length of the string. |
| 229 | Likewise, in string STR2, compare the part between START2 and END2. | 229 | Likewise, in string STR2, compare the part between START2 and END2. |
| 230 | Like in `substring', negative values are counted from the end. | 230 | Like in `substring', negative values are counted from the end. |
| @@ -347,8 +347,8 @@ This function obeys the conventions for collation order in your | |||
| 347 | locale settings. For example, punctuation and whitespace characters | 347 | locale settings. For example, punctuation and whitespace characters |
| 348 | might be considered less significant for sorting: | 348 | might be considered less significant for sorting: |
| 349 | 349 | ||
| 350 | \(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) | 350 | (sort '("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) |
| 351 | => \("11" "1 1" "1.1" "12" "1 2" "1.2") | 351 | => ("11" "1 1" "1.1" "12" "1 2" "1.2") |
| 352 | 352 | ||
| 353 | The optional argument LOCALE, a string, overrides the setting of your | 353 | The optional argument LOCALE, a string, overrides the setting of your |
| 354 | current locale identifier for collation. The value is system | 354 | current locale identifier for collation. The value is system |
| @@ -393,7 +393,7 @@ settings. For example, characters with different coding points but | |||
| 393 | the same meaning might be considered as equal, like different grave | 393 | the same meaning might be considered as equal, like different grave |
| 394 | accent Unicode characters: | 394 | accent Unicode characters: |
| 395 | 395 | ||
| 396 | \(string-collate-equalp \(string ?\\uFF40) \(string ?\\u1FEF)) | 396 | (string-collate-equalp (string ?\\uFF40) (string ?\\u1FEF)) |
| 397 | => t | 397 | => t |
| 398 | 398 | ||
| 399 | The optional argument LOCALE, a string, overrides the setting of your | 399 | 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 | |||
| 1026 | newly created string with no text properties. If STRING is multibyte | 1026 | newly created string with no text properties. If STRING is multibyte |
| 1027 | or entirely ASCII, it is returned unchanged. In particular, when | 1027 | or entirely ASCII, it is returned unchanged. In particular, when |
| 1028 | STRING is unibyte and entirely ASCII, the returned string is unibyte. | 1028 | STRING is unibyte and entirely ASCII, the returned string is unibyte. |
| 1029 | \(When the characters are all ASCII, Emacs primitives will treat the | 1029 | (When the characters are all ASCII, Emacs primitives will treat the |
| 1030 | string the same way whether it is unibyte or multibyte.) */) | 1030 | string the same way whether it is unibyte or multibyte.) */) |
| 1031 | (Lisp_Object string) | 1031 | (Lisp_Object string) |
| 1032 | { | 1032 | { |
| @@ -1225,14 +1225,14 @@ validate_subarray (Lisp_Object array, Lisp_Object from, Lisp_Object to, | |||
| 1225 | DEFUN ("substring", Fsubstring, Ssubstring, 1, 3, 0, | 1225 | DEFUN ("substring", Fsubstring, Ssubstring, 1, 3, 0, |
| 1226 | doc: /* Return a new string whose contents are a substring of STRING. | 1226 | doc: /* Return a new string whose contents are a substring of STRING. |
| 1227 | The returned string consists of the characters between index FROM | 1227 | The returned string consists of the characters between index FROM |
| 1228 | \(inclusive) and index TO (exclusive) of STRING. FROM and TO are | 1228 | (inclusive) and index TO (exclusive) of STRING. FROM and TO are |
| 1229 | zero-indexed: 0 means the first character of STRING. Negative values | 1229 | zero-indexed: 0 means the first character of STRING. Negative values |
| 1230 | are counted from the end of STRING. If TO is nil, the substring runs | 1230 | are counted from the end of STRING. If TO is nil, the substring runs |
| 1231 | to the end of STRING. | 1231 | to the end of STRING. |
| 1232 | 1232 | ||
| 1233 | The STRING argument may also be a vector. In that case, the return | 1233 | The STRING argument may also be a vector. In that case, the return |
| 1234 | value is a new vector that contains the elements between index FROM | 1234 | value is a new vector that contains the elements between index FROM |
| 1235 | \(inclusive) and index TO (exclusive) of that vector argument. | 1235 | (inclusive) and index TO (exclusive) of that vector argument. |
| 1236 | 1236 | ||
| 1237 | With one argument, just copy STRING (with properties, if any). */) | 1237 | With one argument, just copy STRING (with properties, if any). */) |
| 1238 | (Lisp_Object string, Lisp_Object from, Lisp_Object to) | 1238 | (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) | |||
| 2051 | DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0, | 2051 | DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0, |
| 2052 | doc: /* Extract a value from a property list. | 2052 | doc: /* Extract a value from a property list. |
| 2053 | PLIST is a property list, which is a list of the form | 2053 | PLIST is a property list, which is a list of the form |
| 2054 | \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value | 2054 | (PROP1 VALUE1 PROP2 VALUE2...). This function returns the value |
| 2055 | corresponding to the given PROP, or nil if PROP is not one of the | 2055 | corresponding to the given PROP, or nil if PROP is not one of the |
| 2056 | properties on the list. This function never signals an error. */) | 2056 | properties on the list. This function never signals an error. */) |
| 2057 | (Lisp_Object plist, Lisp_Object prop) | 2057 | (Lisp_Object plist, Lisp_Object prop) |
| @@ -2086,7 +2086,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */) | |||
| 2086 | DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0, | 2086 | DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0, |
| 2087 | doc: /* Change value in PLIST of PROP to VAL. | 2087 | doc: /* Change value in PLIST of PROP to VAL. |
| 2088 | PLIST is a property list, which is a list of the form | 2088 | PLIST is a property list, which is a list of the form |
| 2089 | \(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object. | 2089 | (PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object. |
| 2090 | If PROP is already a property on the list, its value is set to VAL, | 2090 | If PROP is already a property on the list, its value is set to VAL, |
| 2091 | otherwise the new PROP VAL pair is added. The new plist is returned; | 2091 | otherwise the new PROP VAL pair is added. The new plist is returned; |
| 2092 | use `(setq x (plist-put x prop val))' to be sure to use the new value. | 2092 | 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)'. */) | |||
| 2130 | DEFUN ("lax-plist-get", Flax_plist_get, Slax_plist_get, 2, 2, 0, | 2130 | DEFUN ("lax-plist-get", Flax_plist_get, Slax_plist_get, 2, 2, 0, |
| 2131 | doc: /* Extract a value from a property list, comparing with `equal'. | 2131 | doc: /* Extract a value from a property list, comparing with `equal'. |
| 2132 | PLIST is a property list, which is a list of the form | 2132 | PLIST is a property list, which is a list of the form |
| 2133 | \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value | 2133 | (PROP1 VALUE1 PROP2 VALUE2...). This function returns the value |
| 2134 | corresponding to the given PROP, or nil if PROP is not | 2134 | corresponding to the given PROP, or nil if PROP is not |
| 2135 | one of the properties on the list. */) | 2135 | one of the properties on the list. */) |
| 2136 | (Lisp_Object plist, Lisp_Object prop) | 2136 | (Lisp_Object plist, Lisp_Object prop) |
| @@ -2155,7 +2155,7 @@ one of the properties on the list. */) | |||
| 2155 | DEFUN ("lax-plist-put", Flax_plist_put, Slax_plist_put, 3, 3, 0, | 2155 | DEFUN ("lax-plist-put", Flax_plist_put, Slax_plist_put, 3, 3, 0, |
| 2156 | doc: /* Change value in PLIST of PROP to VAL, comparing with `equal'. | 2156 | doc: /* Change value in PLIST of PROP to VAL, comparing with `equal'. |
| 2157 | PLIST is a property list, which is a list of the form | 2157 | PLIST is a property list, which is a list of the form |
| 2158 | \(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects. | 2158 | (PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects. |
| 2159 | If PROP is already a property on the list, its value is set to VAL, | 2159 | If PROP is already a property on the list, its value is set to VAL, |
| 2160 | otherwise the new PROP VAL pair is added. The new plist is returned; | 2160 | otherwise the new PROP VAL pair is added. The new plist is returned; |
| 2161 | use `(setq x (lax-plist-put x prop val))' to be sure to use the new value. | 2161 | 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. */) | |||
| 2867 | DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0, | 2867 | DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0, |
| 2868 | doc: /* Return non-nil if PLIST has the property PROP. | 2868 | doc: /* Return non-nil if PLIST has the property PROP. |
| 2869 | PLIST is a property list, which is a list of the form | 2869 | PLIST is a property list, which is a list of the form |
| 2870 | \(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol. | 2870 | (PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol. |
| 2871 | Unlike `plist-get', this allows you to distinguish between a missing | 2871 | Unlike `plist-get', this allows you to distinguish between a missing |
| 2872 | property and a property with the value nil. | 2872 | property and a property with the value nil. |
| 2873 | The value is actually the tail of PLIST whose car is PROP. */) | 2873 | The value is actually the tail of PLIST whose car is PROP. */) |
diff --git a/src/font.c b/src/font.c index 8e06532ac0a..ce144e78a08 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -4068,7 +4068,7 @@ DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, | |||
| 4068 | FONT is a font name, a font-spec, a font-entity, or a font-object. | 4068 | FONT is a font name, a font-spec, a font-entity, or a font-object. |
| 4069 | The return value is a list of the form | 4069 | The return value is a list of the form |
| 4070 | 4070 | ||
| 4071 | \(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) | 4071 | (:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) |
| 4072 | 4072 | ||
| 4073 | where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values | 4073 | where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values |
| 4074 | compatible with `set-face-attribute'. Some of these key-attribute pairs | 4074 | 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 | |||
| 4749 | pixels. | 4749 | pixels. |
| 4750 | 4750 | ||
| 4751 | CAPABILITY is a list whose first element is a symbol representing the | 4751 | CAPABILITY is a list whose first element is a symbol representing the |
| 4752 | font format \(x, opentype, truetype, type1, pcf, or bdf) and the | 4752 | font format (x, opentype, truetype, type1, pcf, or bdf) and the |
| 4753 | remaining elements describe the details of the font capability. | 4753 | remaining elements describe the details of the font capability. |
| 4754 | 4754 | ||
| 4755 | If the font is OpenType font, the form of the list is | 4755 | If the font is OpenType font, the form of the list is |
| 4756 | \(opentype GSUB GPOS) | 4756 | (opentype GSUB GPOS) |
| 4757 | where GSUB shows which "GSUB" features the font supports, and GPOS | 4757 | where GSUB shows which "GSUB" features the font supports, and GPOS |
| 4758 | shows which "GPOS" features the font supports. Both GSUB and GPOS are | 4758 | shows which "GPOS" features the font supports. Both GSUB and GPOS are |
| 4759 | lists of the format: | 4759 | lists of the format: |
| 4760 | \((SCRIPT (LANGSYS FEATURE ...) ...) ...) | 4760 | ((SCRIPT (LANGSYS FEATURE ...) ...) ...) |
| 4761 | 4761 | ||
| 4762 | If the font is not OpenType font, currently the length of the form is | 4762 | If the font is not OpenType font, currently the length of the form is |
| 4763 | one. | 4763 | one. |
| @@ -5043,11 +5043,11 @@ where | |||
| 5043 | as follows: | 5043 | as follows: |
| 5044 | 5044 | ||
| 5045 | If the font is OpenType font, the form of the list is | 5045 | If the font is OpenType font, the form of the list is |
| 5046 | \(opentype GSUB GPOS) | 5046 | (opentype GSUB GPOS) |
| 5047 | where GSUB shows which "GSUB" features the font supports, and GPOS | 5047 | where GSUB shows which "GSUB" features the font supports, and GPOS |
| 5048 | shows which "GPOS" features the font supports. Both GSUB and GPOS are | 5048 | shows which "GPOS" features the font supports. Both GSUB and GPOS are |
| 5049 | lists of the form: | 5049 | lists of the form: |
| 5050 | \((SCRIPT (LANGSYS FEATURE ...) ...) ...) | 5050 | ((SCRIPT (LANGSYS FEATURE ...) ...) ...) |
| 5051 | 5051 | ||
| 5052 | where | 5052 | where |
| 5053 | SCRIPT is a symbol representing OpenType script tag. | 5053 | SCRIPT is a symbol representing OpenType script tag. |
| @@ -5359,7 +5359,7 @@ where ENCODING is a charset or a char-table, | |||
| 5359 | and REPERTORY is a charset, a char-table, or nil. | 5359 | and REPERTORY is a charset, a char-table, or nil. |
| 5360 | 5360 | ||
| 5361 | If ENCODING and REPERTORY are the same, the element can have the form | 5361 | If ENCODING and REPERTORY are the same, the element can have the form |
| 5362 | \(REGEXP . ENCODING). | 5362 | (REGEXP . ENCODING). |
| 5363 | 5363 | ||
| 5364 | ENCODING is for converting a character to a glyph code of the font. | 5364 | ENCODING is for converting a character to a glyph code of the font. |
| 5365 | If ENCODING is a charset, encoding a character by the charset gives | 5365 | If ENCODING is a charset, encoding a character by the charset gives |
diff --git a/src/frame.c b/src/frame.c index b782b094c22..0e95749a055 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -5175,7 +5175,7 @@ keep it unchanged if this option is either t or a list containing | |||
| 5175 | `vertical-scroll-bars'. | 5175 | `vertical-scroll-bars'. |
| 5176 | 5176 | ||
| 5177 | The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows | 5177 | The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows |
| 5178 | \(which means that adding/removing a tool bar does not change the frame | 5178 | (which means that adding/removing a tool bar does not change the frame |
| 5179 | height), nil on all other window systems including GTK+ (which means | 5179 | height), nil on all other window systems including GTK+ (which means |
| 5180 | that changing any of the parameters listed above may change the size of | 5180 | that changing any of the parameters listed above may change the size of |
| 5181 | the frame), and t otherwise (which means the frame size never changes | 5181 | the frame), and t otherwise (which means the frame size never changes |
diff --git a/src/keyboard.c b/src/keyboard.c index ccd340557dd..966af69c97b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11332,7 +11332,7 @@ See Info node `(elisp)Multiple Terminals'. */); | |||
| 11332 | 11332 | ||
| 11333 | DEFVAR_BOOL ("cannot-suspend", cannot_suspend, | 11333 | DEFVAR_BOOL ("cannot-suspend", cannot_suspend, |
| 11334 | doc: /* Non-nil means to always spawn a subshell instead of suspending. | 11334 | doc: /* Non-nil means to always spawn a subshell instead of suspending. |
| 11335 | \(Even if the operating system has support for stopping a process.\) */); | 11335 | (Even if the operating system has support for stopping a process.) */); |
| 11336 | cannot_suspend = false; | 11336 | cannot_suspend = false; |
| 11337 | 11337 | ||
| 11338 | DEFVAR_BOOL ("menu-prompting", menu_prompting, | 11338 | DEFVAR_BOOL ("menu-prompting", menu_prompting, |
| @@ -11538,7 +11538,7 @@ immediately after running `post-command-hook'. */); | |||
| 11538 | DEFVAR_LISP ("input-method-function", Vinput_method_function, | 11538 | DEFVAR_LISP ("input-method-function", Vinput_method_function, |
| 11539 | doc: /* If non-nil, the function that implements the current input method. | 11539 | doc: /* If non-nil, the function that implements the current input method. |
| 11540 | It's called with one argument, a printing character that was just read. | 11540 | It's called with one argument, a printing character that was just read. |
| 11541 | \(That means a character with code 040...0176.) | 11541 | (That means a character with code 040...0176.) |
| 11542 | Typically this function uses `read-event' to read additional events. | 11542 | Typically this function uses `read-event' to read additional events. |
| 11543 | When it does so, it should first bind `input-method-function' to nil | 11543 | When it does so, it should first bind `input-method-function' to nil |
| 11544 | so it will not be called recursively. | 11544 | so it will not be called recursively. |
diff --git a/src/keymap.c b/src/keymap.c index 3668d4b24e2..6a8d129ce2b 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1687,7 +1687,7 @@ DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, | |||
| 1687 | KEYS is a string or vector, a sequence of keystrokes. | 1687 | KEYS is a string or vector, a sequence of keystrokes. |
| 1688 | The binding is probably a symbol with a function definition. | 1688 | The binding is probably a symbol with a function definition. |
| 1689 | This function's return values are the same as those of `lookup-key' | 1689 | This function's return values are the same as those of `lookup-key' |
| 1690 | \(which see). | 1690 | (which see). |
| 1691 | 1691 | ||
| 1692 | If optional argument ACCEPT-DEFAULT is non-nil, recognize default | 1692 | If optional argument ACCEPT-DEFAULT is non-nil, recognize default |
| 1693 | bindings; see the description of `lookup-key' for more details about this. */) | 1693 | 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, | |||
| 2492 | no matter what it is. | 2492 | no matter what it is. |
| 2493 | If FIRSTONLY has another non-nil value, prefer bindings | 2493 | If FIRSTONLY has another non-nil value, prefer bindings |
| 2494 | that use the modifier key specified in `where-is-preferred-modifier' | 2494 | that use the modifier key specified in `where-is-preferred-modifier' |
| 2495 | \(or their meta variants) and entirely reject menu bindings. | 2495 | (or their meta variants) and entirely reject menu bindings. |
| 2496 | 2496 | ||
| 2497 | If optional 4th arg NOINDIRECT is non-nil, don't extract the commands inside | 2497 | If optional 4th arg NOINDIRECT is non-nil, don't extract the commands inside |
| 2498 | menu-items. This makes it possible to search for a menu-item itself. | 2498 | menu-items. This makes it possible to search for a menu-item itself. |
| @@ -2723,7 +2723,7 @@ looked up in BUFFER. | |||
| 2723 | The optional argument PREFIX, if non-nil, should be a key sequence; | 2723 | The optional argument PREFIX, if non-nil, should be a key sequence; |
| 2724 | then we display only bindings that start with that prefix. | 2724 | then we display only bindings that start with that prefix. |
| 2725 | The optional argument MENUS, if non-nil, says to mention menu bindings. | 2725 | The optional argument MENUS, if non-nil, says to mention menu bindings. |
| 2726 | \(Ordinarily these are omitted from the output.) */) | 2726 | (Ordinarily these are omitted from the output.) */) |
| 2727 | (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus) | 2727 | (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus) |
| 2728 | { | 2728 | { |
| 2729 | Lisp_Object outbuf, shadow; | 2729 | Lisp_Object outbuf, shadow; |
diff --git a/src/lread.c b/src/lread.c index 6099545a808..bceec4bb644 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4512,7 +4512,7 @@ customize `jka-compr-load-suffixes' rather than the present variable. */); | |||
| 4512 | Each element looks like (REGEXP-OR-FEATURE FUNCS...). | 4512 | Each element looks like (REGEXP-OR-FEATURE FUNCS...). |
| 4513 | 4513 | ||
| 4514 | REGEXP-OR-FEATURE is either a regular expression to match file names, or | 4514 | REGEXP-OR-FEATURE is either a regular expression to match file names, or |
| 4515 | a symbol \(a feature name). | 4515 | a symbol (a feature name). |
| 4516 | 4516 | ||
| 4517 | When `load' is run and the file-name argument matches an element's | 4517 | When `load' is run and the file-name argument matches an element's |
| 4518 | REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol | 4518 | REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol |
diff --git a/src/menu.c b/src/menu.c index e36fe260f24..dc82809629a 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -1129,7 +1129,7 @@ If POSITION is t, it means to use the current mouse position. | |||
| 1129 | MENU is a specifier for a menu. For the simplest case, MENU is a keymap. | 1129 | MENU is a specifier for a menu. For the simplest case, MENU is a keymap. |
| 1130 | The menu items come from key bindings that have a menu string as well as | 1130 | The menu items come from key bindings that have a menu string as well as |
| 1131 | a definition; actually, the "definition" in such a key binding looks like | 1131 | a definition; actually, the "definition" in such a key binding looks like |
| 1132 | \(STRING . REAL-DEFINITION). To give the menu a title, put a string into | 1132 | (STRING . REAL-DEFINITION). To give the menu a title, put a string into |
| 1133 | the keymap as a top-level element. | 1133 | the keymap as a top-level element. |
| 1134 | 1134 | ||
| 1135 | If REAL-DEFINITION is nil, that puts a nonselectable string in the menu. | 1135 | 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. | |||
| 1491 | An ITEM may also be just a string--that makes a nonselectable item. | 1491 | An ITEM may also be just a string--that makes a nonselectable item. |
| 1492 | An ITEM may also be nil--that means to put all preceding items | 1492 | An ITEM may also be nil--that means to put all preceding items |
| 1493 | on the left of the dialog box and all following items on the right. | 1493 | on the left of the dialog box and all following items on the right. |
| 1494 | \(By default, approximately half appear on each side.) | 1494 | (By default, approximately half appear on each side.) |
| 1495 | 1495 | ||
| 1496 | If HEADER is non-nil, the frame title for the box is "Information", | 1496 | If HEADER is non-nil, the frame title for the box is "Information", |
| 1497 | otherwise it is "Question". | 1497 | otherwise it is "Question". |
diff --git a/src/minibuf.c b/src/minibuf.c index cf0cbca77c1..4e5c17d074c 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -916,7 +916,7 @@ INITIAL-CONTENTS argument in more detail. It is only relevant when | |||
| 916 | studying existing code, or when HIST is a cons. If non-nil, | 916 | studying existing code, or when HIST is a cons. If non-nil, |
| 917 | INITIAL-CONTENTS is a string to be inserted into the minibuffer before | 917 | INITIAL-CONTENTS is a string to be inserted into the minibuffer before |
| 918 | reading input. Normally, point is put at the end of that string. | 918 | reading input. Normally, point is put at the end of that string. |
| 919 | However, if INITIAL-CONTENTS is \(STRING . POSITION), the initial | 919 | However, if INITIAL-CONTENTS is (STRING . POSITION), the initial |
| 920 | input is STRING, but point is placed at _one-indexed_ position | 920 | input is STRING, but point is placed at _one-indexed_ position |
| 921 | POSITION in the minibuffer. Any integer value less than or equal to | 921 | POSITION in the minibuffer. Any integer value less than or equal to |
| 922 | one puts point at the beginning of the string. *Note* that this | 922 | 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, | |||
| 996 | Prompt with PROMPT. Whitespace terminates the input. If INITIAL is | 996 | Prompt with PROMPT. Whitespace terminates the input. If INITIAL is |
| 997 | non-nil, it should be a string, which is used as initial input, with | 997 | non-nil, it should be a string, which is used as initial input, with |
| 998 | point positioned at the end, so that SPACE will accept the input. | 998 | point positioned at the end, so that SPACE will accept the input. |
| 999 | \(Actually, INITIAL can also be a cons of a string and an integer. | 999 | (Actually, INITIAL can also be a cons of a string and an integer. |
| 1000 | Such values are treated as in `read-from-minibuffer', but are normally | 1000 | Such values are treated as in `read-from-minibuffer', but are normally |
| 1001 | not useful in this function.) | 1001 | not useful in this function.) |
| 1002 | Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits | 1002 | Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
diff --git a/src/nsfns.m b/src/nsfns.m index 9c805ac20d1..ad71a508248 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1639,7 +1639,7 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, | |||
| 1639 | 1639 | ||
| 1640 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, | 1640 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, |
| 1641 | doc: /* Return the "vendor ID" string of Nextstep display server TERMINAL. | 1641 | doc: /* Return the "vendor ID" string of Nextstep display server TERMINAL. |
| 1642 | \(Labeling every distributor as a "vendor" embodies the false assumption | 1642 | (Labeling every distributor as a "vendor" embodies the false assumption |
| 1643 | that operating systems cannot be developed and distributed noncommercially.) | 1643 | that operating systems cannot be developed and distributed noncommercially.) |
| 1644 | The optional argument TERMINAL specifies which display to ask about. | 1644 | The optional argument TERMINAL specifies which display to ask about. |
| 1645 | TERMINAL should be a terminal object, a frame or a display name (a string). | 1645 | TERMINAL should be a terminal object, a frame or a display name (a string). |
| @@ -1816,7 +1816,7 @@ DISPLAY is the name of the display to connect to. | |||
| 1816 | Optional second arg XRM-STRING is a string of resources in xrdb format. | 1816 | Optional second arg XRM-STRING is a string of resources in xrdb format. |
| 1817 | If the optional third arg MUST-SUCCEED is non-nil, | 1817 | If the optional third arg MUST-SUCCEED is non-nil, |
| 1818 | terminate Emacs if we can't open the connection. | 1818 | terminate Emacs if we can't open the connection. |
| 1819 | \(In the Nextstep version, the last two arguments are currently ignored.) */) | 1819 | (In the Nextstep version, the last two arguments are currently ignored.) */) |
| 1820 | (Lisp_Object display, Lisp_Object resource_string, Lisp_Object must_succeed) | 1820 | (Lisp_Object display, Lisp_Object resource_string, Lisp_Object must_succeed) |
| 1821 | { | 1821 | { |
| 1822 | struct ns_display_info *dpyinfo; | 1822 | struct ns_display_info *dpyinfo; |
| @@ -2289,7 +2289,7 @@ x_get_focus_frame (struct frame *frame) | |||
| 2289 | 2289 | ||
| 2290 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, | 2290 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, |
| 2291 | doc: /* Internal function called by `color-defined-p', which see. | 2291 | doc: /* Internal function called by `color-defined-p', which see. |
| 2292 | \(Note that the Nextstep version of this function ignores FRAME.) */) | 2292 | (Note that the Nextstep version of this function ignores FRAME.) */) |
| 2293 | (Lisp_Object color, Lisp_Object frame) | 2293 | (Lisp_Object color, Lisp_Object frame) |
| 2294 | { | 2294 | { |
| 2295 | NSColor * col; | 2295 | NSColor * col; |
diff --git a/src/nsselect.m b/src/nsselect.m index 918fb55fb22..5579cc5a767 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -316,7 +316,7 @@ DEFUN ("ns-own-selection-internal", Fns_own_selection_internal, | |||
| 316 | Sns_own_selection_internal, 2, 2, 0, | 316 | Sns_own_selection_internal, 2, 2, 0, |
| 317 | doc: /* Assert an X selection of type SELECTION and value VALUE. | 317 | doc: /* Assert an X selection of type SELECTION and value VALUE. |
| 318 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 318 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 319 | \(Those are literal upper-case symbol names, since that's what X expects.) | 319 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 320 | VALUE is typically a string, or a cons of two markers, but may be | 320 | VALUE is typically a string, or a cons of two markers, but may be |
| 321 | anything that the functions on `selection-converter-alist' know about. */) | 321 | anything that the functions on `selection-converter-alist' know about. */) |
| 322 | (Lisp_Object selection, Lisp_Object value) | 322 | (Lisp_Object selection, Lisp_Object value) |
| @@ -414,7 +414,7 @@ DEFUN ("ns-selection-owner-p", Fns_selection_owner_p, Sns_selection_owner_p, | |||
| 414 | doc: /* Whether the current Emacs process owns the given X Selection. | 414 | doc: /* Whether the current Emacs process owns the given X Selection. |
| 415 | The arg should be the name of the selection in question, typically one of | 415 | The arg should be the name of the selection in question, typically one of |
| 416 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 416 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 417 | \(Those are literal upper-case symbol names, since that's what X expects.) | 417 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 418 | For convenience, the symbol nil is the same as `PRIMARY', | 418 | For convenience, the symbol nil is the same as `PRIMARY', |
| 419 | and t is the same as `SECONDARY'. */) | 419 | and t is the same as `SECONDARY'. */) |
| 420 | (Lisp_Object selection) | 420 | (Lisp_Object selection) |
| @@ -433,7 +433,7 @@ DEFUN ("ns-get-selection", Fns_get_selection, | |||
| 433 | Sns_get_selection, 2, 2, 0, | 433 | Sns_get_selection, 2, 2, 0, |
| 434 | doc: /* Return text selected from some X window. | 434 | doc: /* Return text selected from some X window. |
| 435 | SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 435 | SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 436 | \(Those are literal upper-case symbol names, since that's what X expects.) | 436 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 437 | TARGET-TYPE is the type of data desired, typically `STRING'. */) | 437 | TARGET-TYPE is the type of data desired, typically `STRING'. */) |
| 438 | (Lisp_Object selection_name, Lisp_Object target_type) | 438 | (Lisp_Object selection_name, Lisp_Object target_type) |
| 439 | { | 439 | { |
diff --git a/src/print.c b/src/print.c index 94f3fcd7db1..3c3dca77000 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -2198,7 +2198,7 @@ Also print formfeeds as `\\f'. */); | |||
| 2198 | 2198 | ||
| 2199 | DEFVAR_BOOL ("print-escape-nonascii", print_escape_nonascii, | 2199 | DEFVAR_BOOL ("print-escape-nonascii", print_escape_nonascii, |
| 2200 | doc: /* Non-nil means print unibyte non-ASCII chars in strings as \\OOO. | 2200 | doc: /* Non-nil means print unibyte non-ASCII chars in strings as \\OOO. |
| 2201 | \(OOO is the octal representation of the character code.) | 2201 | (OOO is the octal representation of the character code.) |
| 2202 | Only single-byte characters are affected, and only in `prin1'. | 2202 | Only single-byte characters are affected, and only in `prin1'. |
| 2203 | When the output goes in a multibyte buffer, this feature is | 2203 | When the output goes in a multibyte buffer, this feature is |
| 2204 | enabled regardless of the value of the variable. */); | 2204 | enabled regardless of the value of the variable. */); |
| @@ -2206,7 +2206,7 @@ enabled regardless of the value of the variable. */); | |||
| 2206 | 2206 | ||
| 2207 | DEFVAR_BOOL ("print-escape-multibyte", print_escape_multibyte, | 2207 | DEFVAR_BOOL ("print-escape-multibyte", print_escape_multibyte, |
| 2208 | doc: /* Non-nil means print multibyte characters in strings as \\xXXXX. | 2208 | doc: /* Non-nil means print multibyte characters in strings as \\xXXXX. |
| 2209 | \(XXXX is the hex representation of the character code.) | 2209 | (XXXX is the hex representation of the character code.) |
| 2210 | This affects only `prin1'. */); | 2210 | This affects only `prin1'. */); |
| 2211 | print_escape_multibyte = 0; | 2211 | print_escape_multibyte = 0; |
| 2212 | 2212 | ||
diff --git a/src/process.c b/src/process.c index ed5f4c0f07d..55f31a02673 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -957,7 +957,7 @@ DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0, | |||
| 957 | This is a list of strings, the first string being the program executed | 957 | This is a list of strings, the first string being the program executed |
| 958 | and the rest of the strings being the arguments given to it. | 958 | and the rest of the strings being the arguments given to it. |
| 959 | For a network or serial process, this is nil (process is running) or t | 959 | For a network or serial process, this is nil (process is running) or t |
| 960 | \(process is stopped). */) | 960 | (process is stopped). */) |
| 961 | (register Lisp_Object process) | 961 | (register Lisp_Object process) |
| 962 | { | 962 | { |
| 963 | CHECK_PROCESS (process); | 963 | CHECK_PROCESS (process); |
| @@ -2674,7 +2674,7 @@ is not given or nil, 1 stopbit is used. | |||
| 2674 | :flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of | 2674 | :flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of |
| 2675 | flowcontrol to be used, which is either nil (don't use flowcontrol), | 2675 | flowcontrol to be used, which is either nil (don't use flowcontrol), |
| 2676 | the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw' | 2676 | the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw' |
| 2677 | \(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no | 2677 | (use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no |
| 2678 | flowcontrol is used. | 2678 | flowcontrol is used. |
| 2679 | 2679 | ||
| 2680 | `serial-process-configure' is called by `make-serial-process' for the | 2680 | `serial-process-configure' is called by `make-serial-process' for the |
| @@ -2682,12 +2682,12 @@ initial configuration of the serial port. | |||
| 2682 | 2682 | ||
| 2683 | Examples: | 2683 | Examples: |
| 2684 | 2684 | ||
| 2685 | \(serial-process-configure :process "/dev/ttyS0" :speed 1200) | 2685 | (serial-process-configure :process "/dev/ttyS0" :speed 1200) |
| 2686 | 2686 | ||
| 2687 | \(serial-process-configure | 2687 | (serial-process-configure |
| 2688 | :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw) | 2688 | :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw) |
| 2689 | 2689 | ||
| 2690 | \(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) | 2690 | (serial-process-configure :port "\\\\.\\COM13" :bytesize 7) |
| 2691 | 2691 | ||
| 2692 | usage: (serial-process-configure &rest ARGS) */) | 2692 | usage: (serial-process-configure &rest ARGS) */) |
| 2693 | (ptrdiff_t nargs, Lisp_Object *args) | 2693 | (ptrdiff_t nargs, Lisp_Object *args) |
| @@ -2781,13 +2781,13 @@ is available via the function `process-contact'. | |||
| 2781 | 2781 | ||
| 2782 | Examples: | 2782 | Examples: |
| 2783 | 2783 | ||
| 2784 | \(make-serial-process :port "/dev/ttyS0" :speed 9600) | 2784 | (make-serial-process :port "/dev/ttyS0" :speed 9600) |
| 2785 | 2785 | ||
| 2786 | \(make-serial-process :port "COM1" :speed 115200 :stopbits 2) | 2786 | (make-serial-process :port "COM1" :speed 115200 :stopbits 2) |
| 2787 | 2787 | ||
| 2788 | \(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) | 2788 | (make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) |
| 2789 | 2789 | ||
| 2790 | \(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) | 2790 | (make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) |
| 2791 | 2791 | ||
| 2792 | usage: (make-serial-process &rest ARGS) */) | 2792 | usage: (make-serial-process &rest ARGS) */) |
| 2793 | (ptrdiff_t nargs, Lisp_Object *args) | 2793 | (ptrdiff_t nargs, Lisp_Object *args) |
| @@ -7296,7 +7296,7 @@ DEFUN ("process-attributes", Fprocess_attributes, | |||
| 7296 | 7296 | ||
| 7297 | Value is an alist where each element is a cons cell of the form | 7297 | Value is an alist where each element is a cons cell of the form |
| 7298 | 7298 | ||
| 7299 | \(KEY . VALUE) | 7299 | (KEY . VALUE) |
| 7300 | 7300 | ||
| 7301 | If this functionality is unsupported, the value is nil. | 7301 | If this functionality is unsupported, the value is nil. |
| 7302 | 7302 | ||
diff --git a/src/search.c b/src/search.c index 106a462f804..8c9714eb6fa 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -2784,7 +2784,7 @@ if the last match was on a buffer; integers or nil if a string was matched. | |||
| 2784 | Use `set-match-data' to reinstate the data in this list. | 2784 | Use `set-match-data' to reinstate the data in this list. |
| 2785 | 2785 | ||
| 2786 | If INTEGERS (the optional first argument) is non-nil, always use | 2786 | If INTEGERS (the optional first argument) is non-nil, always use |
| 2787 | integers \(rather than markers) to represent buffer positions. In | 2787 | integers (rather than markers) to represent buffer positions. In |
| 2788 | this case, and if the last match was in a buffer, the buffer will get | 2788 | this case, and if the last match was in a buffer, the buffer will get |
| 2789 | stored as one additional element at the end of the list. | 2789 | stored as one additional element at the end of the list. |
| 2790 | 2790 | ||
diff --git a/src/syntax.c b/src/syntax.c index 55a4ba0abd4..3bd301f0e38 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -1098,7 +1098,7 @@ DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0, | |||
| 1098 | doc: /* Convert a syntax descriptor STRING into a raw syntax descriptor. | 1098 | doc: /* Convert a syntax descriptor STRING into a raw syntax descriptor. |
| 1099 | STRING should be a string of the form allowed as argument of | 1099 | STRING should be a string of the form allowed as argument of |
| 1100 | `modify-syntax-entry'. The return value is a raw syntax descriptor: a | 1100 | `modify-syntax-entry'. The return value is a raw syntax descriptor: a |
| 1101 | cons cell \(CODE . MATCHING-CHAR) which can be used, for example, as | 1101 | cons cell (CODE . MATCHING-CHAR) which can be used, for example, as |
| 1102 | the value of a `syntax-table' text property. */) | 1102 | the value of a `syntax-table' text property. */) |
| 1103 | (Lisp_Object string) | 1103 | (Lisp_Object string) |
| 1104 | { | 1104 | { |
diff --git a/src/textprop.c b/src/textprop.c index 3f7c8d10639..6758d4dfee2 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1494,7 +1494,7 @@ DEFUN ("remove-text-properties", Fremove_text_properties, | |||
| 1494 | doc: /* Remove some properties from text from START to END. | 1494 | doc: /* Remove some properties from text from START to END. |
| 1495 | The third argument PROPERTIES is a property list | 1495 | The third argument PROPERTIES is a property list |
| 1496 | whose property names specify the properties to remove. | 1496 | whose property names specify the properties to remove. |
| 1497 | \(The values stored in PROPERTIES are ignored.) | 1497 | (The values stored in PROPERTIES are ignored.) |
| 1498 | If the optional fourth argument OBJECT is a buffer (or nil, which means | 1498 | If the optional fourth argument OBJECT is a buffer (or nil, which means |
| 1499 | the current buffer), START and END are buffer positions (integers or | 1499 | the current buffer), START and END are buffer positions (integers or |
| 1500 | markers). If OBJECT is a string, START and END are 0-based indices into it. | 1500 | markers). If OBJECT is a string, START and END are 0-based indices into it. |
diff --git a/src/w16select.c b/src/w16select.c index 96f8437b4b1..70b9dd01f09 100644 --- a/src/w16select.c +++ b/src/w16select.c | |||
| @@ -686,7 +686,7 @@ For MS-Windows and MS-DOS: | |||
| 686 | When sending or receiving text via selection and clipboard, the text | 686 | When sending or receiving text via selection and clipboard, the text |
| 687 | is encoded or decoded by this coding system. The default value is | 687 | is encoded or decoded by this coding system. The default value is |
| 688 | the current system default encoding on 9x/Me, `utf-16le-dos' | 688 | the current system default encoding on 9x/Me, `utf-16le-dos' |
| 689 | \(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS. | 689 | (Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS. |
| 690 | 690 | ||
| 691 | For X Windows: | 691 | For X Windows: |
| 692 | When sending text via selection and clipboard, if the target | 692 | When sending text via selection and clipboard, if the target |
diff --git a/src/w32fns.c b/src/w32fns.c index 48218e3bfd2..99fd3ba33fd 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -5305,7 +5305,7 @@ x_get_focus_frame (struct frame *frame) | |||
| 5305 | 5305 | ||
| 5306 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, | 5306 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, |
| 5307 | doc: /* Internal function called by `color-defined-p', which see. | 5307 | doc: /* Internal function called by `color-defined-p', which see. |
| 5308 | \(Note that the Nextstep version of this function ignores FRAME.) */) | 5308 | (Note that the Nextstep version of this function ignores FRAME.) */) |
| 5309 | (Lisp_Object color, Lisp_Object frame) | 5309 | (Lisp_Object color, Lisp_Object frame) |
| 5310 | { | 5310 | { |
| 5311 | XColor foo; | 5311 | XColor foo; |
| @@ -5447,7 +5447,7 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 5447 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, | 5447 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, |
| 5448 | doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. | 5448 | doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. |
| 5449 | 5449 | ||
| 5450 | \(Labeling every distributor as a "vendor" embodies the false assumption | 5450 | (Labeling every distributor as a "vendor" embodies the false assumption |
| 5451 | that operating systems cannot be developed and distributed noncommercially.) | 5451 | that operating systems cannot be developed and distributed noncommercially.) |
| 5452 | 5452 | ||
| 5453 | For GNU and Unix systems, this queries the X server software; for | 5453 | 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. | |||
| 5850 | Optional second arg XRM-STRING is a string of resources in xrdb format. | 5850 | Optional second arg XRM-STRING is a string of resources in xrdb format. |
| 5851 | If the optional third arg MUST-SUCCEED is non-nil, | 5851 | If the optional third arg MUST-SUCCEED is non-nil, |
| 5852 | terminate Emacs if we can't open the connection. | 5852 | terminate Emacs if we can't open the connection. |
| 5853 | \(In the Nextstep version, the last two arguments are currently ignored.) */) | 5853 | (In the Nextstep version, the last two arguments are currently ignored.) */) |
| 5854 | (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) | 5854 | (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) |
| 5855 | { | 5855 | { |
| 5856 | unsigned char *xrm_option; | 5856 | unsigned char *xrm_option; |
diff --git a/src/window.c b/src/window.c index f1af68eff18..42a2ca68f14 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -641,7 +641,7 @@ DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combinatio | |||
| 641 | WINDOW must be a valid window used in horizontal or vertical combination. | 641 | WINDOW must be a valid window used in horizontal or vertical combination. |
| 642 | If the return value is nil, child windows of WINDOW can be recombined with | 642 | If the return value is nil, child windows of WINDOW can be recombined with |
| 643 | WINDOW's siblings. A return value of t means that child windows of | 643 | WINDOW's siblings. A return value of t means that child windows of |
| 644 | WINDOW are never \(re-)combined with WINDOW's siblings. */) | 644 | WINDOW are never (re-)combined with WINDOW's siblings. */) |
| 645 | (Lisp_Object window) | 645 | (Lisp_Object window) |
| 646 | { | 646 | { |
| 647 | struct window *w; | 647 | struct window *w; |
| @@ -658,7 +658,7 @@ DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_windo | |||
| 658 | WINDOW must be a valid window used in horizontal or vertical combination. | 658 | WINDOW must be a valid window used in horizontal or vertical combination. |
| 659 | If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's | 659 | If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's |
| 660 | siblings. LIMIT t means that child windows of WINDOW are never | 660 | siblings. LIMIT t means that child windows of WINDOW are never |
| 661 | \(re-)combined with WINDOW's siblings. Other values are reserved for | 661 | (re-)combined with WINDOW's siblings. Other values are reserved for |
| 662 | future use. */) | 662 | future use. */) |
| 663 | (Lisp_Object window, Lisp_Object limit) | 663 | (Lisp_Object window, Lisp_Object limit) |
| 664 | { | 664 | { |
| @@ -1312,7 +1312,7 @@ DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p, | |||
| 1312 | WINDOW must be a live window and defaults to the selected one. | 1312 | WINDOW must be a live window and defaults to the selected one. |
| 1313 | COORDINATES is a cons of the form (X . Y), X and Y being distances | 1313 | COORDINATES is a cons of the form (X . Y), X and Y being distances |
| 1314 | measured in characters from the upper-left corner of the frame. | 1314 | measured in characters from the upper-left corner of the frame. |
| 1315 | \(0 . 0) denotes the character in the upper left corner of the | 1315 | (0 . 0) denotes the character in the upper left corner of the |
| 1316 | frame. | 1316 | frame. |
| 1317 | If COORDINATES are in the text portion of WINDOW, | 1317 | If COORDINATES are in the text portion of WINDOW, |
| 1318 | the coordinates relative to the window are returned. | 1318 | the coordinates relative to the window are returned. |
| @@ -1696,7 +1696,7 @@ of the window. The remaining elements are omitted if the character after | |||
| 1696 | POS is fully visible; otherwise, RTOP and RBOT are the number of pixels | 1696 | POS is fully visible; otherwise, RTOP and RBOT are the number of pixels |
| 1697 | off-window at the top and bottom of the screen line ("row") containing | 1697 | off-window at the top and bottom of the screen line ("row") containing |
| 1698 | POS, ROWH is the visible height of that row, and VPOS is the row number | 1698 | POS, ROWH is the visible height of that row, and VPOS is the row number |
| 1699 | \(zero-based). */) | 1699 | (zero-based). */) |
| 1700 | (Lisp_Object pos, Lisp_Object window, Lisp_Object partially) | 1700 | (Lisp_Object pos, Lisp_Object window, Lisp_Object partially) |
| 1701 | { | 1701 | { |
| 1702 | struct window *w; | 1702 | struct window *w; |
diff --git a/src/xdisp.c b/src/xdisp.c index a3224e2510f..3eff61f3716 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -21038,7 +21038,7 @@ window-specific overlays, which can affect the results. | |||
| 21038 | 21038 | ||
| 21039 | Strong directional characters `L', `R', and `AL' can have their | 21039 | Strong directional characters `L', `R', and `AL' can have their |
| 21040 | intrinsic directionality overridden by directional override | 21040 | intrinsic directionality overridden by directional override |
| 21041 | control characters RLO \(u+202e) and LRO \(u+202d). See the | 21041 | control characters RLO (u+202e) and LRO (u+202d). See the |
| 21042 | function `get-char-code-property' for a way to inquire about | 21042 | function `get-char-code-property' for a way to inquire about |
| 21043 | the `bidi-class' property of a character. */) | 21043 | the `bidi-class' property of a character. */) |
| 21044 | (Lisp_Object from, Lisp_Object to, Lisp_Object object) | 21044 | (Lisp_Object from, Lisp_Object to, Lisp_Object object) |
| @@ -30994,18 +30994,18 @@ This variable is not guaranteed to be accurate except while processing | |||
| 30994 | 30994 | ||
| 30995 | DEFVAR_LISP ("frame-title-format", Vframe_title_format, | 30995 | DEFVAR_LISP ("frame-title-format", Vframe_title_format, |
| 30996 | doc: /* Template for displaying the title bar of visible frames. | 30996 | doc: /* Template for displaying the title bar of visible frames. |
| 30997 | \(Assuming the window manager supports this feature.) | 30997 | (Assuming the window manager supports this feature.) |
| 30998 | 30998 | ||
| 30999 | This variable has the same structure as `mode-line-format', except that | 30999 | This variable has the same structure as `mode-line-format', except that |
| 31000 | the %c and %l constructs are ignored. It is used only on frames for | 31000 | the %c and %l constructs are ignored. It is used only on frames for |
| 31001 | which no explicit name has been set \(see `modify-frame-parameters'). */); | 31001 | which no explicit name has been set (see `modify-frame-parameters'). */); |
| 31002 | 31002 | ||
| 31003 | DEFVAR_LISP ("icon-title-format", Vicon_title_format, | 31003 | DEFVAR_LISP ("icon-title-format", Vicon_title_format, |
| 31004 | doc: /* Template for displaying the title bar of an iconified frame. | 31004 | doc: /* Template for displaying the title bar of an iconified frame. |
| 31005 | \(Assuming the window manager supports this feature.) | 31005 | (Assuming the window manager supports this feature.) |
| 31006 | This variable has the same structure as `mode-line-format' (which see), | 31006 | This variable has the same structure as `mode-line-format' (which see), |
| 31007 | and is used only on frames for which no explicit name has been set | 31007 | and is used only on frames for which no explicit name has been set |
| 31008 | \(see `modify-frame-parameters'). */); | 31008 | (see `modify-frame-parameters'). */); |
| 31009 | Vicon_title_format | 31009 | Vicon_title_format |
| 31010 | = Vframe_title_format | 31010 | = Vframe_title_format |
| 31011 | = listn (CONSTYPE_PURE, 3, | 31011 | = listn (CONSTYPE_PURE, 3, |
| @@ -31064,9 +31064,9 @@ A positive number means delay autoselection by that many seconds: a | |||
| 31064 | window is autoselected only after the mouse has remained in that | 31064 | window is autoselected only after the mouse has remained in that |
| 31065 | window for the duration of the delay. | 31065 | window for the duration of the delay. |
| 31066 | A negative number has a similar effect, but causes windows to be | 31066 | A negative number has a similar effect, but causes windows to be |
| 31067 | autoselected only after the mouse has stopped moving. \(Because of | 31067 | autoselected only after the mouse has stopped moving. (Because of |
| 31068 | the way Emacs compares mouse events, you will occasionally wait twice | 31068 | the way Emacs compares mouse events, you will occasionally wait twice |
| 31069 | that time before the window gets selected.\) | 31069 | that time before the window gets selected.) |
| 31070 | Any other value means to autoselect window instantaneously when the | 31070 | Any other value means to autoselect window instantaneously when the |
| 31071 | mouse pointer enters it. | 31071 | mouse pointer enters it. |
| 31072 | 31072 | ||
diff --git a/src/xfaces.c b/src/xfaces.c index 453fd58d676..94f3c4d67c2 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -709,10 +709,10 @@ Optional THOROUGHLY non-nil means try to free unused fonts, too. */) | |||
| 709 | DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0, | 709 | DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0, |
| 710 | doc: /* Value is non-nil if OBJECT is a valid bitmap specification. | 710 | doc: /* Value is non-nil if OBJECT is a valid bitmap specification. |
| 711 | A bitmap specification is either a string, a file name, or a list | 711 | A bitmap specification is either a string, a file name, or a list |
| 712 | \(WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap, | 712 | (WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap, |
| 713 | HEIGHT is its height, and DATA is a string containing the bits of | 713 | HEIGHT is its height, and DATA is a string containing the bits of |
| 714 | the pixmap. Bits are stored row by row, each row occupies | 714 | the pixmap. Bits are stored row by row, each row occupies |
| 715 | \(WIDTH + 7)/8 bytes. */) | 715 | (WIDTH + 7)/8 bytes. */) |
| 716 | (Lisp_Object object) | 716 | (Lisp_Object object) |
| 717 | { | 717 | { |
| 718 | bool pixmap_p = false; | 718 | bool pixmap_p = false; |
| @@ -4631,8 +4631,8 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector, | |||
| 4631 | that a face containing all the attributes in ATTRS, when merged with the | 4631 | that a face containing all the attributes in ATTRS, when merged with the |
| 4632 | default face for display, can be represented in a way that's | 4632 | default face for display, can be represented in a way that's |
| 4633 | 4633 | ||
| 4634 | \(1) different in appearance than the default face, and | 4634 | (1) different in appearance than the default face, and |
| 4635 | \(2) `close in spirit' to what the attributes specify, if not exact. */ | 4635 | (2) `close in spirit' to what the attributes specify, if not exact. */ |
| 4636 | 4636 | ||
| 4637 | static bool | 4637 | static bool |
| 4638 | x_supports_face_attributes_p (struct frame *f, | 4638 | x_supports_face_attributes_p (struct frame *f, |
| @@ -4731,8 +4731,8 @@ x_supports_face_attributes_p (struct frame *f, | |||
| 4731 | that a face containing all the attributes in ATTRS, when merged | 4731 | that a face containing all the attributes in ATTRS, when merged |
| 4732 | with the default face for display, can be represented in a way that's | 4732 | with the default face for display, can be represented in a way that's |
| 4733 | 4733 | ||
| 4734 | \(1) different in appearance than the default face, and | 4734 | (1) different in appearance than the default face, and |
| 4735 | \(2) `close in spirit' to what the attributes specify, if not exact. | 4735 | (2) `close in spirit' to what the attributes specify, if not exact. |
| 4736 | 4736 | ||
| 4737 | Point (2) implies that a `:weight black' attribute will be satisfied | 4737 | Point (2) implies that a `:weight black' attribute will be satisfied |
| 4738 | by any terminal that can display bold, and a `:foreground "yellow"' as | 4738 | 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 | |||
| 4914 | that a face containing all the attributes in ATTRIBUTES, when merged | 4914 | that a face containing all the attributes in ATTRIBUTES, when merged |
| 4915 | with the default face for display, can be represented in a way that's | 4915 | with the default face for display, can be represented in a way that's |
| 4916 | 4916 | ||
| 4917 | \(1) different in appearance than the default face, and | 4917 | (1) different in appearance than the default face, and |
| 4918 | \(2) `close in spirit' to what the attributes specify, if not exact. | 4918 | (2) `close in spirit' to what the attributes specify, if not exact. |
| 4919 | 4919 | ||
| 4920 | Point (2) implies that a `:weight black' attribute will be satisfied by | 4920 | Point (2) implies that a `:weight black' attribute will be satisfied by |
| 4921 | any display that can display bold, and a `:foreground \"yellow\"' as long | 4921 | any display that can display bold, and a `:foreground \"yellow\"' as long |
| @@ -6521,7 +6521,7 @@ changing this variable for it to take effect. */); | |||
| 6521 | Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where | 6521 | Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where |
| 6522 | FONT-PATTERN is a font-spec or a regular expression matching a font name, and | 6522 | FONT-PATTERN is a font-spec or a regular expression matching a font name, and |
| 6523 | RESCALE-RATIO is a floating point number to specify how much larger | 6523 | RESCALE-RATIO is a floating point number to specify how much larger |
| 6524 | \(or smaller) font we should use. For instance, if a face requests | 6524 | (or smaller) font we should use. For instance, if a face requests |
| 6525 | a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); | 6525 | a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); |
| 6526 | Vface_font_rescale_alist = Qnil; | 6526 | Vface_font_rescale_alist = Qnil; |
| 6527 | 6527 | ||
diff --git a/src/xfns.c b/src/xfns.c index 42d32f6d9c2..d6a3d76e948 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3444,8 +3444,8 @@ x_focus_frame (struct frame *f) | |||
| 3444 | 3444 | ||
| 3445 | 3445 | ||
| 3446 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, | 3446 | DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, |
| 3447 | doc: /* Internal function called by `color-defined-p', which see | 3447 | doc: /* Internal function called by `color-defined-p', which see. |
| 3448 | .\(Note that the Nextstep version of this function ignores FRAME.) */) | 3448 | (Note that the Nextstep version of this function ignores FRAME.) */) |
| 3449 | (Lisp_Object color, Lisp_Object frame) | 3449 | (Lisp_Object color, Lisp_Object frame) |
| 3450 | { | 3450 | { |
| 3451 | XColor foo; | 3451 | XColor foo; |
| @@ -3612,7 +3612,7 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 3612 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, | 3612 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, |
| 3613 | doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. | 3613 | doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. |
| 3614 | 3614 | ||
| 3615 | \(Labeling every distributor as a "vendor" embodies the false assumption | 3615 | (Labeling every distributor as a "vendor" embodies the false assumption |
| 3616 | that operating systems cannot be developed and distributed noncommercially.) | 3616 | that operating systems cannot be developed and distributed noncommercially.) |
| 3617 | The optional argument TERMINAL specifies which display to ask about. | 3617 | The optional argument TERMINAL specifies which display to ask about. |
| 3618 | 3618 | ||
| @@ -4710,7 +4710,7 @@ DISPLAY is the name of the display to connect to. | |||
| 4710 | Optional second arg XRM-STRING is a string of resources in xrdb format. | 4710 | Optional second arg XRM-STRING is a string of resources in xrdb format. |
| 4711 | If the optional third arg MUST-SUCCEED is non-nil, | 4711 | If the optional third arg MUST-SUCCEED is non-nil, |
| 4712 | terminate Emacs if we can't open the connection. | 4712 | terminate Emacs if we can't open the connection. |
| 4713 | \(In the Nextstep version, the last two arguments are currently ignored.) */) | 4713 | (In the Nextstep version, the last two arguments are currently ignored.) */) |
| 4714 | (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) | 4714 | (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) |
| 4715 | { | 4715 | { |
| 4716 | char *xrm_option; | 4716 | char *xrm_option; |
diff --git a/src/xselect.c b/src/xselect.c index e7e3fe72b14..9aaa10c6efa 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1915,7 +1915,7 @@ DEFUN ("x-own-selection-internal", Fx_own_selection_internal, | |||
| 1915 | Sx_own_selection_internal, 2, 3, 0, | 1915 | Sx_own_selection_internal, 2, 3, 0, |
| 1916 | doc: /* Assert an X selection of type SELECTION and value VALUE. | 1916 | doc: /* Assert an X selection of type SELECTION and value VALUE. |
| 1917 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 1917 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 1918 | \(Those are literal upper-case symbol names, since that's what X expects.) | 1918 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 1919 | VALUE is typically a string, or a cons of two markers, but may be | 1919 | VALUE is typically a string, or a cons of two markers, but may be |
| 1920 | anything that the functions on `selection-converter-alist' know about. | 1920 | anything that the functions on `selection-converter-alist' know about. |
| 1921 | 1921 | ||
| @@ -1944,7 +1944,7 @@ DEFUN ("x-get-selection-internal", Fx_get_selection_internal, | |||
| 1944 | Sx_get_selection_internal, 2, 4, 0, | 1944 | Sx_get_selection_internal, 2, 4, 0, |
| 1945 | doc: /* Return text selected from some X window. | 1945 | doc: /* Return text selected from some X window. |
| 1946 | SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 1946 | SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 1947 | \(Those are literal upper-case symbol names, since that's what X expects.) | 1947 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 1948 | TARGET-TYPE is the type of data desired, typically `STRING'. | 1948 | TARGET-TYPE is the type of data desired, typically `STRING'. |
| 1949 | 1949 | ||
| 1950 | TIME-STAMP is the time to use in the XConvertSelection call for foreign | 1950 | 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, | |||
| 2048 | doc: /* Whether the current Emacs process owns the given X Selection. | 2048 | doc: /* Whether the current Emacs process owns the given X Selection. |
| 2049 | The arg should be the name of the selection in question, typically one of | 2049 | The arg should be the name of the selection in question, typically one of |
| 2050 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 2050 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 2051 | \(Those are literal upper-case symbol names, since that's what X expects.) | 2051 | (Those are literal upper-case symbol names, since that's what X expects.) |
| 2052 | For convenience, the symbol nil is the same as `PRIMARY', | 2052 | For convenience, the symbol nil is the same as `PRIMARY', |
| 2053 | and t is the same as `SECONDARY'. | 2053 | and t is the same as `SECONDARY'. |
| 2054 | 2054 | ||
| @@ -2623,7 +2623,7 @@ and the local selection value (whatever was given to | |||
| 2623 | `x-own-selection-internal'). | 2623 | `x-own-selection-internal'). |
| 2624 | 2624 | ||
| 2625 | The function should return the value to send to the X server | 2625 | The function should return the value to send to the X server |
| 2626 | \(typically a string). A return value of nil | 2626 | (typically a string). A return value of nil |
| 2627 | means that the conversion could not be done. | 2627 | means that the conversion could not be done. |
| 2628 | A return value which is the symbol `NULL' | 2628 | A return value which is the symbol `NULL' |
| 2629 | means that a side-effect was executed, | 2629 | means that a side-effect was executed, |
| @@ -2632,10 +2632,10 @@ and there is no meaningful selection value. */); | |||
| 2632 | 2632 | ||
| 2633 | DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions, | 2633 | DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions, |
| 2634 | doc: /* A list of functions to be called when Emacs loses an X selection. | 2634 | doc: /* A list of functions to be called when Emacs loses an X selection. |
| 2635 | \(This happens when some other X client makes its own selection | 2635 | (This happens when some other X client makes its own selection |
| 2636 | or when a Lisp program explicitly clears the selection.) | 2636 | or when a Lisp program explicitly clears the selection.) |
| 2637 | The functions are called with one argument, the selection type | 2637 | The functions are called with one argument, the selection type |
| 2638 | \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */); | 2638 | (a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */); |
| 2639 | Vx_lost_selection_functions = Qnil; | 2639 | Vx_lost_selection_functions = Qnil; |
| 2640 | 2640 | ||
| 2641 | DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions, | 2641 | DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions, |