diff options
| author | Chong Yidong | 2012-04-09 21:05:48 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-09 21:05:48 +0800 |
| commit | fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5 (patch) | |
| tree | eba43d1fa2427a77f1f6b1468838426b33ea5973 /src | |
| parent | a18ecafa99e7e7c3caa35ed68dd8a7b9b5d2b8e3 (diff) | |
| download | emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.tar.gz emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.zip | |
Remove * characters from the front of variable docstrings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 4 | ||||
| -rw-r--r-- | src/buffer.c | 48 | ||||
| -rw-r--r-- | src/callint.c | 2 | ||||
| -rw-r--r-- | src/callproc.c | 6 | ||||
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/dosfns.c | 8 | ||||
| -rw-r--r-- | src/eval.c | 12 | ||||
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/fns.c | 4 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/fringe.c | 2 | ||||
| -rw-r--r-- | src/indent.c | 2 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/msdos.c | 2 | ||||
| -rw-r--r-- | src/print.c | 4 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/syntax.c | 2 | ||||
| -rw-r--r-- | src/w32term.c | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 46 | ||||
| -rw-r--r-- | src/xfaces.c | 4 | ||||
| -rw-r--r-- | src/xfns.c | 10 | ||||
| -rw-r--r-- | src/xsettings.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
23 files changed, 89 insertions, 89 deletions
diff --git a/src/alloc.c b/src/alloc.c index 4cb0ae04664..16b004fc0e9 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6413,7 +6413,7 @@ void | |||
| 6413 | syms_of_alloc (void) | 6413 | syms_of_alloc (void) |
| 6414 | { | 6414 | { |
| 6415 | DEFVAR_INT ("gc-cons-threshold", gc_cons_threshold, | 6415 | DEFVAR_INT ("gc-cons-threshold", gc_cons_threshold, |
| 6416 | doc: /* *Number of bytes of consing between garbage collections. | 6416 | doc: /* Number of bytes of consing between garbage collections. |
| 6417 | Garbage collection can happen automatically once this many bytes have been | 6417 | Garbage collection can happen automatically once this many bytes have been |
| 6418 | allocated since the last garbage collection. All data types count. | 6418 | allocated since the last garbage collection. All data types count. |
| 6419 | 6419 | ||
| @@ -6424,7 +6424,7 @@ prevent garbage collection during a part of the program. | |||
| 6424 | See also `gc-cons-percentage'. */); | 6424 | See also `gc-cons-percentage'. */); |
| 6425 | 6425 | ||
| 6426 | DEFVAR_LISP ("gc-cons-percentage", Vgc_cons_percentage, | 6426 | DEFVAR_LISP ("gc-cons-percentage", Vgc_cons_percentage, |
| 6427 | doc: /* *Portion of the heap used for allocation. | 6427 | doc: /* Portion of the heap used for allocation. |
| 6428 | Garbage collection can happen automatically once this portion of the heap | 6428 | Garbage collection can happen automatically once this portion of the heap |
| 6429 | has been allocated since the last garbage collection. | 6429 | has been allocated since the last garbage collection. |
| 6430 | If this portion is smaller than `gc-cons-threshold', this is ignored. */); | 6430 | If this portion is smaller than `gc-cons-threshold', this is ignored. */); |
diff --git a/src/buffer.c b/src/buffer.c index 3f9b2744e96..ca8d1ec5db3 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5231,7 +5231,7 @@ This is the same as (default-value 'ctl-arrow). */); | |||
| 5231 | 5231 | ||
| 5232 | DEFVAR_BUFFER_DEFAULTS ("default-enable-multibyte-characters", | 5232 | DEFVAR_BUFFER_DEFAULTS ("default-enable-multibyte-characters", |
| 5233 | enable_multibyte_characters, | 5233 | enable_multibyte_characters, |
| 5234 | doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it. | 5234 | doc: /* Default value of `enable-multibyte-characters' for buffers not overriding it. |
| 5235 | This is the same as (default-value 'enable-multibyte-characters). */); | 5235 | This is the same as (default-value 'enable-multibyte-characters). */); |
| 5236 | 5236 | ||
| 5237 | DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system", | 5237 | DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system", |
| @@ -5393,7 +5393,7 @@ A string is printed verbatim in the mode line except for %-constructs: | |||
| 5393 | Decimal digits after the % specify field width to which to pad. */); | 5393 | Decimal digits after the % specify field width to which to pad. */); |
| 5394 | 5394 | ||
| 5395 | DEFVAR_BUFFER_DEFAULTS ("default-major-mode", major_mode, | 5395 | DEFVAR_BUFFER_DEFAULTS ("default-major-mode", major_mode, |
| 5396 | doc: /* *Value of `major-mode' for new buffers. */); | 5396 | doc: /* Value of `major-mode' for new buffers. */); |
| 5397 | 5397 | ||
| 5398 | DEFVAR_PER_BUFFER ("major-mode", &BVAR (current_buffer, major_mode), | 5398 | DEFVAR_PER_BUFFER ("major-mode", &BVAR (current_buffer, major_mode), |
| 5399 | make_number (Lisp_Symbol), | 5399 | make_number (Lisp_Symbol), |
| @@ -5424,25 +5424,25 @@ Use the command `abbrev-mode' to change this variable. */); | |||
| 5424 | 5424 | ||
| 5425 | DEFVAR_PER_BUFFER ("case-fold-search", &BVAR (current_buffer, case_fold_search), | 5425 | DEFVAR_PER_BUFFER ("case-fold-search", &BVAR (current_buffer, case_fold_search), |
| 5426 | Qnil, | 5426 | Qnil, |
| 5427 | doc: /* *Non-nil if searches and matches should ignore case. */); | 5427 | doc: /* Non-nil if searches and matches should ignore case. */); |
| 5428 | 5428 | ||
| 5429 | DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column), | 5429 | DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column), |
| 5430 | make_number (LISP_INT_TAG), | 5430 | make_number (LISP_INT_TAG), |
| 5431 | doc: /* *Column beyond which automatic line-wrapping should happen. | 5431 | doc: /* Column beyond which automatic line-wrapping should happen. |
| 5432 | Interactively, you can set the buffer local value using \\[set-fill-column]. */); | 5432 | Interactively, you can set the buffer local value using \\[set-fill-column]. */); |
| 5433 | 5433 | ||
| 5434 | DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin), | 5434 | DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin), |
| 5435 | make_number (LISP_INT_TAG), | 5435 | make_number (LISP_INT_TAG), |
| 5436 | doc: /* *Column for the default `indent-line-function' to indent to. | 5436 | doc: /* Column for the default `indent-line-function' to indent to. |
| 5437 | Linefeed indents to this column in Fundamental mode. */); | 5437 | Linefeed indents to this column in Fundamental mode. */); |
| 5438 | 5438 | ||
| 5439 | DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width), | 5439 | DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width), |
| 5440 | make_number (LISP_INT_TAG), | 5440 | make_number (LISP_INT_TAG), |
| 5441 | doc: /* *Distance between tab stops (for display of tab characters), in columns. | 5441 | doc: /* Distance between tab stops (for display of tab characters), in columns. |
| 5442 | This should be an integer greater than zero. */); | 5442 | This should be an integer greater than zero. */); |
| 5443 | 5443 | ||
| 5444 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, | 5444 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, |
| 5445 | doc: /* *Non-nil means display control chars with uparrow. | 5445 | doc: /* Non-nil means display control chars with uparrow. |
| 5446 | A value of nil means use backslash and octal digits. | 5446 | A value of nil means use backslash and octal digits. |
| 5447 | This variable does not apply to characters whose display is specified | 5447 | This variable does not apply to characters whose display is specified |
| 5448 | in the current display table (if there is one). */); | 5448 | in the current display table (if there is one). */); |
| @@ -5483,7 +5483,7 @@ This variable is never applied to a way of decoding a file while reading it. */ | |||
| 5483 | 5483 | ||
| 5484 | DEFVAR_PER_BUFFER ("bidi-paragraph-direction", | 5484 | DEFVAR_PER_BUFFER ("bidi-paragraph-direction", |
| 5485 | &BVAR (current_buffer, bidi_paragraph_direction), Qnil, | 5485 | &BVAR (current_buffer, bidi_paragraph_direction), Qnil, |
| 5486 | doc: /* *If non-nil, forces directionality of text paragraphs in the buffer. | 5486 | doc: /* If non-nil, forces directionality of text paragraphs in the buffer. |
| 5487 | 5487 | ||
| 5488 | If this is nil (the default), the direction of each paragraph is | 5488 | If this is nil (the default), the direction of each paragraph is |
| 5489 | determined by the first strong directional character of its text. | 5489 | determined by the first strong directional character of its text. |
| @@ -5494,7 +5494,7 @@ This variable has no effect unless the buffer's value of | |||
| 5494 | \`bidi-display-reordering' is non-nil. */); | 5494 | \`bidi-display-reordering' is non-nil. */); |
| 5495 | 5495 | ||
| 5496 | DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil, | 5496 | DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil, |
| 5497 | doc: /* *Non-nil means do not display continuation lines. | 5497 | doc: /* Non-nil means do not display continuation lines. |
| 5498 | Instead, give each line of text just one screen line. | 5498 | Instead, give each line of text just one screen line. |
| 5499 | 5499 | ||
| 5500 | Note that this is overridden by the variable | 5500 | Note that this is overridden by the variable |
| @@ -5504,7 +5504,7 @@ and this buffer is not full-frame width. | |||
| 5504 | Minibuffers set this variable to nil. */); | 5504 | Minibuffers set this variable to nil. */); |
| 5505 | 5505 | ||
| 5506 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, | 5506 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, |
| 5507 | doc: /* *Non-nil means to use word-wrapping for continuation lines. | 5507 | doc: /* Non-nil means to use word-wrapping for continuation lines. |
| 5508 | When word-wrapping is on, continuation lines are wrapped at the space | 5508 | When word-wrapping is on, continuation lines are wrapped at the space |
| 5509 | or tab character nearest to the right window edge. | 5509 | or tab character nearest to the right window edge. |
| 5510 | If nil, continuation lines are wrapped at the right screen edge. | 5510 | If nil, continuation lines are wrapped at the right screen edge. |
| @@ -5625,39 +5625,39 @@ See also the functions `display-table-slot' and `set-display-table-slot'. */); | |||
| 5625 | 5625 | ||
| 5626 | DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), | 5626 | DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), |
| 5627 | Qnil, | 5627 | Qnil, |
| 5628 | doc: /* *Width of left marginal area for display of a buffer. | 5628 | doc: /* Width of left marginal area for display of a buffer. |
| 5629 | A value of nil means no marginal area. */); | 5629 | A value of nil means no marginal area. */); |
| 5630 | 5630 | ||
| 5631 | DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), | 5631 | DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), |
| 5632 | Qnil, | 5632 | Qnil, |
| 5633 | doc: /* *Width of right marginal area for display of a buffer. | 5633 | doc: /* Width of right marginal area for display of a buffer. |
| 5634 | A value of nil means no marginal area. */); | 5634 | A value of nil means no marginal area. */); |
| 5635 | 5635 | ||
| 5636 | DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, left_fringe_width), | 5636 | DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, left_fringe_width), |
| 5637 | Qnil, | 5637 | Qnil, |
| 5638 | doc: /* *Width of this buffer's left fringe (in pixels). | 5638 | doc: /* Width of this buffer's left fringe (in pixels). |
| 5639 | A value of 0 means no left fringe is shown in this buffer's window. | 5639 | A value of 0 means no left fringe is shown in this buffer's window. |
| 5640 | A value of nil means to use the left fringe width from the window's frame. */); | 5640 | A value of nil means to use the left fringe width from the window's frame. */); |
| 5641 | 5641 | ||
| 5642 | DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, right_fringe_width), | 5642 | DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, right_fringe_width), |
| 5643 | Qnil, | 5643 | Qnil, |
| 5644 | doc: /* *Width of this buffer's right fringe (in pixels). | 5644 | doc: /* Width of this buffer's right fringe (in pixels). |
| 5645 | A value of 0 means no right fringe is shown in this buffer's window. | 5645 | A value of 0 means no right fringe is shown in this buffer's window. |
| 5646 | A value of nil means to use the right fringe width from the window's frame. */); | 5646 | A value of nil means to use the right fringe width from the window's frame. */); |
| 5647 | 5647 | ||
| 5648 | DEFVAR_PER_BUFFER ("fringes-outside-margins", &BVAR (current_buffer, fringes_outside_margins), | 5648 | DEFVAR_PER_BUFFER ("fringes-outside-margins", &BVAR (current_buffer, fringes_outside_margins), |
| 5649 | Qnil, | 5649 | Qnil, |
| 5650 | doc: /* *Non-nil means to display fringes outside display margins. | 5650 | doc: /* Non-nil means to display fringes outside display margins. |
| 5651 | A value of nil means to display fringes between margins and buffer text. */); | 5651 | A value of nil means to display fringes between margins and buffer text. */); |
| 5652 | 5652 | ||
| 5653 | DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, scroll_bar_width), | 5653 | DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, scroll_bar_width), |
| 5654 | Qnil, | 5654 | Qnil, |
| 5655 | doc: /* *Width of this buffer's scroll bars in pixels. | 5655 | doc: /* Width of this buffer's scroll bars in pixels. |
| 5656 | A value of nil means to use the scroll bar width from the window's frame. */); | 5656 | A value of nil means to use the scroll bar width from the window's frame. */); |
| 5657 | 5657 | ||
| 5658 | DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type), | 5658 | DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type), |
| 5659 | Qnil, | 5659 | Qnil, |
| 5660 | doc: /* *Position of this buffer's vertical scroll bar. | 5660 | doc: /* Position of this buffer's vertical scroll bar. |
| 5661 | The value takes effect whenever you tell a window to display this buffer; | 5661 | The value takes effect whenever you tell a window to display this buffer; |
| 5662 | for instance, with `set-window-buffer' or when `display-buffer' displays it. | 5662 | for instance, with `set-window-buffer' or when `display-buffer' displays it. |
| 5663 | 5663 | ||
| @@ -5667,13 +5667,13 @@ A value of t (the default) means do whatever the window's frame specifies. */); | |||
| 5667 | 5667 | ||
| 5668 | DEFVAR_PER_BUFFER ("indicate-empty-lines", | 5668 | DEFVAR_PER_BUFFER ("indicate-empty-lines", |
| 5669 | &BVAR (current_buffer, indicate_empty_lines), Qnil, | 5669 | &BVAR (current_buffer, indicate_empty_lines), Qnil, |
| 5670 | doc: /* *Visually indicate empty lines after the buffer end. | 5670 | doc: /* Visually indicate empty lines after the buffer end. |
| 5671 | If non-nil, a bitmap is displayed in the left fringe of a window on | 5671 | If non-nil, a bitmap is displayed in the left fringe of a window on |
| 5672 | window-systems. */); | 5672 | window-systems. */); |
| 5673 | 5673 | ||
| 5674 | DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", | 5674 | DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", |
| 5675 | &BVAR (current_buffer, indicate_buffer_boundaries), Qnil, | 5675 | &BVAR (current_buffer, indicate_buffer_boundaries), Qnil, |
| 5676 | doc: /* *Visually indicate buffer boundaries and scrolling. | 5676 | doc: /* Visually indicate buffer boundaries and scrolling. |
| 5677 | If non-nil, the first and last line of the buffer are marked in the fringe | 5677 | If non-nil, the first and last line of the buffer are marked in the fringe |
| 5678 | of a window on window-systems with angle bitmaps, or if the window can be | 5678 | of a window on window-systems with angle bitmaps, or if the window can be |
| 5679 | scrolled, the top and bottom line of the window are marked with up and down | 5679 | scrolled, the top and bottom line of the window are marked with up and down |
| @@ -5698,7 +5698,7 @@ fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */); | |||
| 5698 | 5698 | ||
| 5699 | DEFVAR_PER_BUFFER ("fringe-indicator-alist", | 5699 | DEFVAR_PER_BUFFER ("fringe-indicator-alist", |
| 5700 | &BVAR (current_buffer, fringe_indicator_alist), Qnil, | 5700 | &BVAR (current_buffer, fringe_indicator_alist), Qnil, |
| 5701 | doc: /* *Mapping from logical to physical fringe indicator bitmaps. | 5701 | doc: /* Mapping from logical to physical fringe indicator bitmaps. |
| 5702 | The value is an alist where each element (INDICATOR . BITMAPS) | 5702 | The value is an alist where each element (INDICATOR . BITMAPS) |
| 5703 | specifies the fringe bitmaps used to display a specific logical | 5703 | specifies the fringe bitmaps used to display a specific logical |
| 5704 | fringe indicator. | 5704 | fringe indicator. |
| @@ -5717,7 +5717,7 @@ symbol which is used in both left and right fringes. */); | |||
| 5717 | 5717 | ||
| 5718 | DEFVAR_PER_BUFFER ("fringe-cursor-alist", | 5718 | DEFVAR_PER_BUFFER ("fringe-cursor-alist", |
| 5719 | &BVAR (current_buffer, fringe_cursor_alist), Qnil, | 5719 | &BVAR (current_buffer, fringe_cursor_alist), Qnil, |
| 5720 | doc: /* *Mapping from logical to physical fringe cursor bitmaps. | 5720 | doc: /* Mapping from logical to physical fringe cursor bitmaps. |
| 5721 | The value is an alist where each element (CURSOR . BITMAP) | 5721 | The value is an alist where each element (CURSOR . BITMAP) |
| 5722 | specifies the fringe bitmaps used to display a specific logical | 5722 | specifies the fringe bitmaps used to display a specific logical |
| 5723 | cursor type in the fringe. | 5723 | cursor type in the fringe. |
| @@ -5881,7 +5881,7 @@ set when a file is visited. */); | |||
| 5881 | 5881 | ||
| 5882 | DEFVAR_PER_BUFFER ("buffer-auto-save-file-format", | 5882 | DEFVAR_PER_BUFFER ("buffer-auto-save-file-format", |
| 5883 | &BVAR (current_buffer, auto_save_file_format), Qnil, | 5883 | &BVAR (current_buffer, auto_save_file_format), Qnil, |
| 5884 | doc: /* *Format in which to write auto-save files. | 5884 | doc: /* Format in which to write auto-save files. |
| 5885 | Should be a list of symbols naming formats that are defined in `format-alist'. | 5885 | Should be a list of symbols naming formats that are defined in `format-alist'. |
| 5886 | If it is t, which is the default, auto-save files are written in the | 5886 | If it is t, which is the default, auto-save files are written in the |
| 5887 | same format as a regular save would use. */); | 5887 | same format as a regular save would use. */); |
| @@ -5931,7 +5931,7 @@ Lisp programs may give this variable certain special values: | |||
| 5931 | Vtransient_mark_mode = Qnil; | 5931 | Vtransient_mark_mode = Qnil; |
| 5932 | 5932 | ||
| 5933 | DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only, | 5933 | DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only, |
| 5934 | doc: /* *Non-nil means disregard read-only status of buffers or characters. | 5934 | doc: /* Non-nil means disregard read-only status of buffers or characters. |
| 5935 | If the value is t, disregard `buffer-read-only' and all `read-only' | 5935 | If the value is t, disregard `buffer-read-only' and all `read-only' |
| 5936 | text properties. If the value is a list, disregard `buffer-read-only' | 5936 | text properties. If the value is a list, disregard `buffer-read-only' |
| 5937 | and disregard a `read-only' text property if the property value | 5937 | and disregard a `read-only' text property if the property value |
| @@ -5966,7 +5966,7 @@ to the default frame line height. A value of nil means add no extra space. */) | |||
| 5966 | 5966 | ||
| 5967 | DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", | 5967 | DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", |
| 5968 | &BVAR (current_buffer, cursor_in_non_selected_windows), Qnil, | 5968 | &BVAR (current_buffer, cursor_in_non_selected_windows), Qnil, |
| 5969 | doc: /* *Non-nil means show a cursor in non-selected windows. | 5969 | doc: /* Non-nil means show a cursor in non-selected windows. |
| 5970 | If nil, only shows a cursor in the selected window. | 5970 | If nil, only shows a cursor in the selected window. |
| 5971 | If t, displays a cursor related to the usual cursor type | 5971 | If t, displays a cursor related to the usual cursor type |
| 5972 | \(a solid box becomes hollow, a bar becomes a narrower bar). | 5972 | \(a solid box becomes hollow, a bar becomes a narrower bar). |
diff --git a/src/callint.c b/src/callint.c index 96e2e10b9d5..c70082e8ae0 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -945,7 +945,7 @@ may be set by the debugger as a reminder for itself. */); | |||
| 945 | Vcommand_debug_status = Qnil; | 945 | Vcommand_debug_status = Qnil; |
| 946 | 946 | ||
| 947 | DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive, | 947 | DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive, |
| 948 | doc: /* *Non-nil means you can use the mark even when inactive. | 948 | doc: /* Non-nil means you can use the mark even when inactive. |
| 949 | This option makes a difference in Transient Mark mode. | 949 | This option makes a difference in Transient Mark mode. |
| 950 | When the option is non-nil, deactivation of the mark | 950 | When the option is non-nil, deactivation of the mark |
| 951 | turns off region highlighting, but commands that use the mark | 951 | turns off region highlighting, but commands that use the mark |
diff --git a/src/callproc.c b/src/callproc.c index b5b8cadeb68..9528c9644d8 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1637,16 +1637,16 @@ syms_of_callproc (void) | |||
| 1637 | staticpro (&Vtemp_file_name_pattern); | 1637 | staticpro (&Vtemp_file_name_pattern); |
| 1638 | 1638 | ||
| 1639 | DEFVAR_LISP ("shell-file-name", Vshell_file_name, | 1639 | DEFVAR_LISP ("shell-file-name", Vshell_file_name, |
| 1640 | doc: /* *File name to load inferior shells from. | 1640 | doc: /* File name to load inferior shells from. |
| 1641 | Initialized from the SHELL environment variable, or to a system-dependent | 1641 | Initialized from the SHELL environment variable, or to a system-dependent |
| 1642 | default if SHELL is not set. */); | 1642 | default if SHELL is not set. */); |
| 1643 | 1643 | ||
| 1644 | DEFVAR_LISP ("exec-path", Vexec_path, | 1644 | DEFVAR_LISP ("exec-path", Vexec_path, |
| 1645 | doc: /* *List of directories to search programs to run in subprocesses. | 1645 | doc: /* List of directories to search programs to run in subprocesses. |
| 1646 | Each element is a string (directory name) or nil (try default directory). */); | 1646 | Each element is a string (directory name) or nil (try default directory). */); |
| 1647 | 1647 | ||
| 1648 | DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, | 1648 | DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, |
| 1649 | doc: /* *List of suffixes to try to find executable file names. | 1649 | doc: /* List of suffixes to try to find executable file names. |
| 1650 | Each element is a string. */); | 1650 | Each element is a string. */); |
| 1651 | Vexec_suffixes = Qnil; | 1651 | Vexec_suffixes = Qnil; |
| 1652 | 1652 | ||
diff --git a/src/charset.c b/src/charset.c index 57e1603fc19..7b963a94800 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -2403,7 +2403,7 @@ syms_of_charset (void) | |||
| 2403 | defsubr (&Ssort_charsets); | 2403 | defsubr (&Ssort_charsets); |
| 2404 | 2404 | ||
| 2405 | DEFVAR_LISP ("charset-map-path", Vcharset_map_path, | 2405 | DEFVAR_LISP ("charset-map-path", Vcharset_map_path, |
| 2406 | doc: /* *List of directories to search for charset map files. */); | 2406 | doc: /* List of directories to search for charset map files. */); |
| 2407 | Vcharset_map_path = Qnil; | 2407 | Vcharset_map_path = Qnil; |
| 2408 | 2408 | ||
| 2409 | DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, | 2409 | DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, |
diff --git a/src/dosfns.c b/src/dosfns.c index 8ef672fb8bb..d4b96e9df90 100644 --- a/src/dosfns.c +++ b/src/dosfns.c | |||
| @@ -710,7 +710,7 @@ Implicitly modified when the TZ variable is changed. */); | |||
| 710 | #endif | 710 | #endif |
| 711 | 711 | ||
| 712 | DEFVAR_LISP ("dos-display-scancodes", Vdos_display_scancodes, | 712 | DEFVAR_LISP ("dos-display-scancodes", Vdos_display_scancodes, |
| 713 | doc: /* *Controls whether DOS raw keyboard events are displayed as you type. | 713 | doc: /* Whether DOS raw keyboard events are displayed as you type. |
| 714 | When non-nil, the keyboard scan-codes are displayed at the bottom right | 714 | When non-nil, the keyboard scan-codes are displayed at the bottom right |
| 715 | corner of the display (typically at the end of the mode line). | 715 | corner of the display (typically at the end of the mode line). |
| 716 | The output format is: scan code:char code*modifiers. */); | 716 | The output format is: scan code:char code*modifiers. */); |
| @@ -718,17 +718,17 @@ The output format is: scan code:char code*modifiers. */); | |||
| 718 | Vdos_display_scancodes = Qnil; | 718 | Vdos_display_scancodes = Qnil; |
| 719 | 719 | ||
| 720 | DEFVAR_INT ("dos-hyper-key", dos_hyper_key, | 720 | DEFVAR_INT ("dos-hyper-key", dos_hyper_key, |
| 721 | doc: /* *If set to 1, use right ALT key as hyper key. | 721 | doc: /* If set to 1, use right ALT key as hyper key. |
| 722 | If set to 2, use right CTRL key as hyper key. */); | 722 | If set to 2, use right CTRL key as hyper key. */); |
| 723 | dos_hyper_key = 0; | 723 | dos_hyper_key = 0; |
| 724 | 724 | ||
| 725 | DEFVAR_INT ("dos-super-key", dos_super_key, | 725 | DEFVAR_INT ("dos-super-key", dos_super_key, |
| 726 | doc: /* *If set to 1, use right ALT key as super key. | 726 | doc: /* If set to 1, use right ALT key as super key. |
| 727 | If set to 2, use right CTRL key as super key. */); | 727 | If set to 2, use right CTRL key as super key. */); |
| 728 | dos_super_key = 0; | 728 | dos_super_key = 0; |
| 729 | 729 | ||
| 730 | DEFVAR_INT ("dos-keypad-mode", dos_keypad_mode, | 730 | DEFVAR_INT ("dos-keypad-mode", dos_keypad_mode, |
| 731 | doc: /* *Controls what key code is returned by a key in the numeric keypad. | 731 | doc: /* Controls what key code is returned by a key in the numeric keypad. |
| 732 | The `numlock ON' action is only taken if no modifier keys are pressed. | 732 | The `numlock ON' action is only taken if no modifier keys are pressed. |
| 733 | The value is an integer constructed by adding the following bits together: | 733 | The value is an integer constructed by adding the following bits together: |
| 734 | 734 | ||
diff --git a/src/eval.c b/src/eval.c index 1a6501a2b68..cb0518f34ec 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3563,7 +3563,7 @@ void | |||
| 3563 | syms_of_eval (void) | 3563 | syms_of_eval (void) |
| 3564 | { | 3564 | { |
| 3565 | DEFVAR_INT ("max-specpdl-size", max_specpdl_size, | 3565 | DEFVAR_INT ("max-specpdl-size", max_specpdl_size, |
| 3566 | doc: /* *Limit on number of Lisp variable bindings and `unwind-protect's. | 3566 | doc: /* Limit on number of Lisp variable bindings and `unwind-protect's. |
| 3567 | If Lisp code tries to increase the total number past this amount, | 3567 | If Lisp code tries to increase the total number past this amount, |
| 3568 | an error is signaled. | 3568 | an error is signaled. |
| 3569 | You can safely use a value considerably larger than the default value, | 3569 | You can safely use a value considerably larger than the default value, |
| @@ -3571,7 +3571,7 @@ if that proves inconveniently small. However, if you increase it too far, | |||
| 3571 | Emacs could run out of memory trying to make the stack bigger. */); | 3571 | Emacs could run out of memory trying to make the stack bigger. */); |
| 3572 | 3572 | ||
| 3573 | DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth, | 3573 | DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth, |
| 3574 | doc: /* *Limit on depth in `eval', `apply' and `funcall' before error. | 3574 | doc: /* Limit on depth in `eval', `apply' and `funcall' before error. |
| 3575 | 3575 | ||
| 3576 | This limit serves to catch infinite recursions for you before they cause | 3576 | This limit serves to catch infinite recursions for you before they cause |
| 3577 | actual stack overflow in C, which would be fatal for Emacs. | 3577 | actual stack overflow in C, which would be fatal for Emacs. |
| @@ -3615,7 +3615,7 @@ before making `inhibit-quit' nil. */); | |||
| 3615 | DEFSYM (Qdebug, "debug"); | 3615 | DEFSYM (Qdebug, "debug"); |
| 3616 | 3616 | ||
| 3617 | DEFVAR_LISP ("debug-on-error", Vdebug_on_error, | 3617 | DEFVAR_LISP ("debug-on-error", Vdebug_on_error, |
| 3618 | doc: /* *Non-nil means enter debugger if an error is signaled. | 3618 | doc: /* Non-nil means enter debugger if an error is signaled. |
| 3619 | Does not apply to errors handled by `condition-case' or those | 3619 | Does not apply to errors handled by `condition-case' or those |
| 3620 | matched by `debug-ignored-errors'. | 3620 | matched by `debug-ignored-errors'. |
| 3621 | If the value is a list, an error only means to enter the debugger | 3621 | If the value is a list, an error only means to enter the debugger |
| @@ -3627,7 +3627,7 @@ See also the variable `debug-on-quit'. */); | |||
| 3627 | Vdebug_on_error = Qnil; | 3627 | Vdebug_on_error = Qnil; |
| 3628 | 3628 | ||
| 3629 | DEFVAR_LISP ("debug-ignored-errors", Vdebug_ignored_errors, | 3629 | DEFVAR_LISP ("debug-ignored-errors", Vdebug_ignored_errors, |
| 3630 | doc: /* *List of errors for which the debugger should not be called. | 3630 | doc: /* List of errors for which the debugger should not be called. |
| 3631 | Each element may be a condition-name or a regexp that matches error messages. | 3631 | Each element may be a condition-name or a regexp that matches error messages. |
| 3632 | If any element applies to a given error, that error skips the debugger | 3632 | If any element applies to a given error, that error skips the debugger |
| 3633 | and just returns to top level. | 3633 | and just returns to top level. |
| @@ -3636,7 +3636,7 @@ It does not apply to errors handled by `condition-case'. */); | |||
| 3636 | Vdebug_ignored_errors = Qnil; | 3636 | Vdebug_ignored_errors = Qnil; |
| 3637 | 3637 | ||
| 3638 | DEFVAR_BOOL ("debug-on-quit", debug_on_quit, | 3638 | DEFVAR_BOOL ("debug-on-quit", debug_on_quit, |
| 3639 | doc: /* *Non-nil means enter debugger if quit is signaled (C-g, for example). | 3639 | doc: /* Non-nil means enter debugger if quit is signaled (C-g, for example). |
| 3640 | Does not apply if quit is handled by a `condition-case'. */); | 3640 | Does not apply if quit is handled by a `condition-case'. */); |
| 3641 | debug_on_quit = 0; | 3641 | debug_on_quit = 0; |
| 3642 | 3642 | ||
| @@ -3665,7 +3665,7 @@ The Edebug package uses this to regain control. */); | |||
| 3665 | Vsignal_hook_function = Qnil; | 3665 | Vsignal_hook_function = Qnil; |
| 3666 | 3666 | ||
| 3667 | DEFVAR_LISP ("debug-on-signal", Vdebug_on_signal, | 3667 | DEFVAR_LISP ("debug-on-signal", Vdebug_on_signal, |
| 3668 | doc: /* *Non-nil means call the debugger regardless of condition handlers. | 3668 | doc: /* Non-nil means call the debugger regardless of condition handlers. |
| 3669 | Note that `debug-on-error', `debug-on-quit' and friends | 3669 | Note that `debug-on-error', `debug-on-quit' and friends |
| 3670 | still determine whether to handle the particular condition. */); | 3670 | still determine whether to handle the particular condition. */); |
| 3671 | Vdebug_on_signal = Qnil; | 3671 | Vdebug_on_signal = Qnil; |
diff --git a/src/fileio.c b/src/fileio.c index 7efe919a9f0..3a74672b9a6 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -5611,7 +5611,7 @@ syms_of_fileio (void) | |||
| 5611 | DEFSYM (Qexcl, "excl"); | 5611 | DEFSYM (Qexcl, "excl"); |
| 5612 | 5612 | ||
| 5613 | DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system, | 5613 | DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system, |
| 5614 | doc: /* *Coding system for encoding file names. | 5614 | doc: /* Coding system for encoding file names. |
| 5615 | If it is nil, `default-file-name-coding-system' (which see) is used. */); | 5615 | If it is nil, `default-file-name-coding-system' (which see) is used. */); |
| 5616 | Vfile_name_coding_system = Qnil; | 5616 | Vfile_name_coding_system = Qnil; |
| 5617 | 5617 | ||
| @@ -5765,7 +5765,7 @@ file is usually more useful if it contains the deleted text. */); | |||
| 5765 | 5765 | ||
| 5766 | #ifdef HAVE_FSYNC | 5766 | #ifdef HAVE_FSYNC |
| 5767 | DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync, | 5767 | DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync, |
| 5768 | doc: /* *Non-nil means don't call fsync in `write-region'. | 5768 | doc: /* Non-nil means don't call fsync in `write-region'. |
| 5769 | This variable affects calls to `write-region' as well as save commands. | 5769 | This variable affects calls to `write-region' as well as save commands. |
| 5770 | A non-nil value may result in data loss! */); | 5770 | A non-nil value may result in data loss! */); |
| 5771 | write_region_inhibit_fsync = 0; | 5771 | write_region_inhibit_fsync = 0; |
| @@ -4933,7 +4933,7 @@ Used by `featurep' and `require', and altered by `provide'. */); | |||
| 4933 | #endif /* HAVE_LANGINFO_CODESET */ | 4933 | #endif /* HAVE_LANGINFO_CODESET */ |
| 4934 | 4934 | ||
| 4935 | DEFVAR_BOOL ("use-dialog-box", use_dialog_box, | 4935 | DEFVAR_BOOL ("use-dialog-box", use_dialog_box, |
| 4936 | doc: /* *Non-nil means mouse commands use dialog boxes to ask questions. | 4936 | doc: /* Non-nil means mouse commands use dialog boxes to ask questions. |
| 4937 | This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands | 4937 | This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands |
| 4938 | invoked by mouse clicks and mouse menu items. | 4938 | invoked by mouse clicks and mouse menu items. |
| 4939 | 4939 | ||
| @@ -4942,7 +4942,7 @@ non-nil. */); | |||
| 4942 | use_dialog_box = 1; | 4942 | use_dialog_box = 1; |
| 4943 | 4943 | ||
| 4944 | DEFVAR_BOOL ("use-file-dialog", use_file_dialog, | 4944 | DEFVAR_BOOL ("use-file-dialog", use_file_dialog, |
| 4945 | doc: /* *Non-nil means mouse commands use a file dialog to ask for files. | 4945 | doc: /* Non-nil means mouse commands use a file dialog to ask for files. |
| 4946 | This applies to commands from menus and tool bar buttons even when | 4946 | This applies to commands from menus and tool bar buttons even when |
| 4947 | they are initiated from the keyboard. If `use-dialog-box' is nil, | 4947 | they are initiated from the keyboard. If `use-dialog-box' is nil, |
| 4948 | that disables the use of a file dialog, regardless of the value of | 4948 | that disables the use of a file dialog, regardless of the value of |
diff --git a/src/fontset.c b/src/fontset.c index d06491ddf25..8a61f09f590 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -2227,7 +2227,7 @@ alternate fontnames (if any) are tried instead. */); | |||
| 2227 | 2227 | ||
| 2228 | DEFVAR_LISP ("vertical-centering-font-regexp", | 2228 | DEFVAR_LISP ("vertical-centering-font-regexp", |
| 2229 | Vvertical_centering_font_regexp, | 2229 | Vvertical_centering_font_regexp, |
| 2230 | doc: /* *Regexp matching font names that require vertical centering on display. | 2230 | doc: /* Regexp matching font names that require vertical centering on display. |
| 2231 | When a character is displayed with such fonts, the character is displayed | 2231 | When a character is displayed with such fonts, the character is displayed |
| 2232 | at the vertical center of lines. */); | 2232 | at the vertical center of lines. */); |
| 2233 | Vvertical_centering_font_regexp = Qnil; | 2233 | Vvertical_centering_font_regexp = Qnil; |
diff --git a/src/fringe.c b/src/fringe.c index 5285d09dfb0..62c50e0d420 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -1754,7 +1754,7 @@ syms_of_fringe (void) | |||
| 1754 | defsubr (&Sset_fringe_bitmap_face); | 1754 | defsubr (&Sset_fringe_bitmap_face); |
| 1755 | 1755 | ||
| 1756 | DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, | 1756 | DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, |
| 1757 | doc: /* *Non-nil means that newline may flow into the right fringe. | 1757 | doc: /* Non-nil means that newline may flow into the right fringe. |
| 1758 | This means that display lines which are exactly as wide as the window | 1758 | This means that display lines which are exactly as wide as the window |
| 1759 | (not counting the final newline) will only occupy one screen line, by | 1759 | (not counting the final newline) will only occupy one screen line, by |
| 1760 | showing (or hiding) the final newline in the right fringe; when point | 1760 | showing (or hiding) the final newline in the right fringe; when point |
diff --git a/src/indent.c b/src/indent.c index 9b4279f0c4e..1531d2ffde8 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -2163,7 +2163,7 @@ void | |||
| 2163 | syms_of_indent (void) | 2163 | syms_of_indent (void) |
| 2164 | { | 2164 | { |
| 2165 | DEFVAR_BOOL ("indent-tabs-mode", indent_tabs_mode, | 2165 | DEFVAR_BOOL ("indent-tabs-mode", indent_tabs_mode, |
| 2166 | doc: /* *Indentation can insert tabs if this is non-nil. */); | 2166 | doc: /* Indentation can insert tabs if this is non-nil. */); |
| 2167 | indent_tabs_mode = 1; | 2167 | indent_tabs_mode = 1; |
| 2168 | 2168 | ||
| 2169 | defsubr (&Scurrent_indentation); | 2169 | defsubr (&Scurrent_indentation); |
diff --git a/src/lread.c b/src/lread.c index 353f4a3064d..bfb37b4fc89 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4442,7 +4442,7 @@ were read in. */); | |||
| 4442 | Vread_circle = Qt; | 4442 | Vread_circle = Qt; |
| 4443 | 4443 | ||
| 4444 | DEFVAR_LISP ("load-path", Vload_path, | 4444 | DEFVAR_LISP ("load-path", Vload_path, |
| 4445 | doc: /* *List of directories to search for files to load. | 4445 | doc: /* List of directories to search for files to load. |
| 4446 | Each element is a string (directory name) or nil (try default directory). | 4446 | Each element is a string (directory name) or nil (try default directory). |
| 4447 | Initialized based on EMACSLOADPATH environment variable, if any, | 4447 | Initialized based on EMACSLOADPATH environment variable, if any, |
| 4448 | otherwise to default specified by file `epaths.h' when Emacs was built. */); | 4448 | otherwise to default specified by file `epaths.h' when Emacs was built. */); |
diff --git a/src/msdos.c b/src/msdos.c index 885cedd3df0..5f46829aefd 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -4270,7 +4270,7 @@ syms_of_msdos (void) | |||
| 4270 | DEFSYM (Qreverse, "reverse"); | 4270 | DEFSYM (Qreverse, "reverse"); |
| 4271 | 4271 | ||
| 4272 | DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph, | 4272 | DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph, |
| 4273 | doc: /* *Glyph to display instead of chars not supported by current codepage. | 4273 | doc: /* Glyph to display instead of chars not supported by current codepage. |
| 4274 | This variable is used only by MS-DOS terminals. */); | 4274 | This variable is used only by MS-DOS terminals. */); |
| 4275 | Vdos_unsupported_char_glyph = make_number ('\177'); | 4275 | Vdos_unsupported_char_glyph = make_number ('\177'); |
| 4276 | 4276 | ||
diff --git a/src/print.c b/src/print.c index 40e0fb6b855..dac7a79d599 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -2149,7 +2149,7 @@ shared once again when the text is read back. */); | |||
| 2149 | Vprint_gensym = Qnil; | 2149 | Vprint_gensym = Qnil; |
| 2150 | 2150 | ||
| 2151 | DEFVAR_LISP ("print-circle", Vprint_circle, | 2151 | DEFVAR_LISP ("print-circle", Vprint_circle, |
| 2152 | doc: /* *Non-nil means print recursive structures using #N= and #N# syntax. | 2152 | doc: /* Non-nil means print recursive structures using #N= and #N# syntax. |
| 2153 | If nil, printing proceeds recursively and may lead to | 2153 | If nil, printing proceeds recursively and may lead to |
| 2154 | `max-lisp-eval-depth' being exceeded or an error may occur: | 2154 | `max-lisp-eval-depth' being exceeded or an error may occur: |
| 2155 | \"Apparently circular structure being printed.\" Also see | 2155 | \"Apparently circular structure being printed.\" Also see |
| @@ -2161,7 +2161,7 @@ where N is a positive decimal integer. */); | |||
| 2161 | Vprint_circle = Qnil; | 2161 | Vprint_circle = Qnil; |
| 2162 | 2162 | ||
| 2163 | DEFVAR_LISP ("print-continuous-numbering", Vprint_continuous_numbering, | 2163 | DEFVAR_LISP ("print-continuous-numbering", Vprint_continuous_numbering, |
| 2164 | doc: /* *Non-nil means number continuously across print calls. | 2164 | doc: /* Non-nil means number continuously across print calls. |
| 2165 | This affects the numbers printed for #N= labels and #M# references. | 2165 | This affects the numbers printed for #N= labels and #M# references. |
| 2166 | See also `print-circle', `print-gensym', and `print-number-table'. | 2166 | See also `print-circle', `print-gensym', and `print-number-table'. |
| 2167 | This variable should not be set with `setq'; bind it with a `let' instead. */); | 2167 | This variable should not be set with `setq'; bind it with a `let' instead. */); |
diff --git a/src/process.c b/src/process.c index dc43191ebef..65020299e75 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7456,7 +7456,7 @@ syms_of_process (void) | |||
| 7456 | DEFSYM (Qargs, "args"); | 7456 | DEFSYM (Qargs, "args"); |
| 7457 | 7457 | ||
| 7458 | DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes, | 7458 | DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes, |
| 7459 | doc: /* *Non-nil means delete processes immediately when they exit. | 7459 | doc: /* Non-nil means delete processes immediately when they exit. |
| 7460 | A value of nil means don't delete them until `list-processes' is run. */); | 7460 | A value of nil means don't delete them until `list-processes' is run. */); |
| 7461 | 7461 | ||
| 7462 | delete_exited_processes = 1; | 7462 | delete_exited_processes = 1; |
diff --git a/src/syntax.c b/src/syntax.c index 16012d9f88e..7a0e0fd7c52 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -3494,7 +3494,7 @@ See the info node `(elisp)Syntax Properties' for a description of the | |||
| 3494 | 3494 | ||
| 3495 | DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start", | 3495 | DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start", |
| 3496 | open_paren_in_column_0_is_defun_start, | 3496 | open_paren_in_column_0_is_defun_start, |
| 3497 | doc: /* *Non-nil means an open paren in column 0 denotes the start of a defun. */); | 3497 | doc: /* Non-nil means an open paren in column 0 denotes the start of a defun. */); |
| 3498 | open_paren_in_column_0_is_defun_start = 1; | 3498 | open_paren_in_column_0_is_defun_start = 1; |
| 3499 | 3499 | ||
| 3500 | 3500 | ||
diff --git a/src/w32term.c b/src/w32term.c index 8a0e9efc943..18a3753f9e9 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -6411,7 +6411,7 @@ the cursor have no effect. */); | |||
| 6411 | from cus-start.el and other places, like "M-x set-variable". */ | 6411 | from cus-start.el and other places, like "M-x set-variable". */ |
| 6412 | DEFVAR_BOOL ("x-use-underline-position-properties", | 6412 | DEFVAR_BOOL ("x-use-underline-position-properties", |
| 6413 | x_use_underline_position_properties, | 6413 | x_use_underline_position_properties, |
| 6414 | doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. | 6414 | doc: /* Non-nil means make use of UNDERLINE_POSITION font properties. |
| 6415 | A value of nil means ignore them. If you encounter fonts with bogus | 6415 | A value of nil means ignore them. If you encounter fonts with bogus |
| 6416 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior | 6416 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior |
| 6417 | to 4.1, set this to nil. You can also use `underline-minimum-offset' | 6417 | to 4.1, set this to nil. You can also use `underline-minimum-offset' |
| @@ -6421,7 +6421,7 @@ sizes. */); | |||
| 6421 | 6421 | ||
| 6422 | DEFVAR_BOOL ("x-underline-at-descent-line", | 6422 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 6423 | x_underline_at_descent_line, | 6423 | x_underline_at_descent_line, |
| 6424 | doc: /* *Non-nil means to draw the underline at the same place as the descent line. | 6424 | doc: /* Non-nil means to draw the underline at the same place as the descent line. |
| 6425 | A value of nil means to draw the underline according to the value of the | 6425 | A value of nil means to draw the underline according to the value of the |
| 6426 | variable `x-use-underline-position-properties', which is usually at the | 6426 | variable `x-use-underline-position-properties', which is usually at the |
| 6427 | baseline level. The default value is nil. */); | 6427 | baseline level. The default value is nil. */); |
diff --git a/src/xdisp.c b/src/xdisp.c index 7fb3f8035df..c6939a5dcf9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -28284,14 +28284,14 @@ syms_of_xdisp (void) | |||
| 28284 | 28284 | ||
| 28285 | #ifdef HAVE_WINDOW_SYSTEM | 28285 | #ifdef HAVE_WINDOW_SYSTEM |
| 28286 | DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p, | 28286 | DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p, |
| 28287 | doc: /* *Non-nil means draw block cursor as wide as the glyph under it. | 28287 | doc: /* Non-nil means draw block cursor as wide as the glyph under it. |
| 28288 | For example, if a block cursor is over a tab, it will be drawn as | 28288 | For example, if a block cursor is over a tab, it will be drawn as |
| 28289 | wide as that tab on the display. */); | 28289 | wide as that tab on the display. */); |
| 28290 | x_stretch_cursor_p = 0; | 28290 | x_stretch_cursor_p = 0; |
| 28291 | #endif | 28291 | #endif |
| 28292 | 28292 | ||
| 28293 | DEFVAR_LISP ("show-trailing-whitespace", Vshow_trailing_whitespace, | 28293 | DEFVAR_LISP ("show-trailing-whitespace", Vshow_trailing_whitespace, |
| 28294 | doc: /* *Non-nil means highlight trailing whitespace. | 28294 | doc: /* Non-nil means highlight trailing whitespace. |
| 28295 | The face used for trailing whitespace is `trailing-whitespace'. */); | 28295 | The face used for trailing whitespace is `trailing-whitespace'. */); |
| 28296 | Vshow_trailing_whitespace = Qnil; | 28296 | Vshow_trailing_whitespace = Qnil; |
| 28297 | 28297 | ||
| @@ -28311,7 +28311,7 @@ A value of nil means no special handling of these characters. */); | |||
| 28311 | Vnobreak_char_display = Qt; | 28311 | Vnobreak_char_display = Qt; |
| 28312 | 28312 | ||
| 28313 | DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer, | 28313 | DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer, |
| 28314 | doc: /* *The pointer shape to show in void text areas. | 28314 | doc: /* The pointer shape to show in void text areas. |
| 28315 | A value of nil means to show the text pointer. Other options are `arrow', | 28315 | A value of nil means to show the text pointer. Other options are `arrow', |
| 28316 | `text', `hand', `vdrag', `hdrag', `modeline', and `hourglass'. */); | 28316 | `text', `hand', `vdrag', `hdrag', `modeline', and `hourglass'. */); |
| 28317 | Vvoid_text_area_pointer = Qarrow; | 28317 | Vvoid_text_area_pointer = Qarrow; |
| @@ -28344,14 +28344,14 @@ where to display overlay arrows. */); | |||
| 28344 | = Fcons (intern_c_string ("overlay-arrow-position"), Qnil); | 28344 | = Fcons (intern_c_string ("overlay-arrow-position"), Qnil); |
| 28345 | 28345 | ||
| 28346 | DEFVAR_INT ("scroll-step", emacs_scroll_step, | 28346 | DEFVAR_INT ("scroll-step", emacs_scroll_step, |
| 28347 | doc: /* *The number of lines to try scrolling a window by when point moves out. | 28347 | doc: /* The number of lines to try scrolling a window by when point moves out. |
| 28348 | If that fails to bring point back on frame, point is centered instead. | 28348 | If that fails to bring point back on frame, point is centered instead. |
| 28349 | If this is zero, point is always centered after it moves off frame. | 28349 | If this is zero, point is always centered after it moves off frame. |
| 28350 | If you want scrolling to always be a line at a time, you should set | 28350 | If you want scrolling to always be a line at a time, you should set |
| 28351 | `scroll-conservatively' to a large value rather than set this to 1. */); | 28351 | `scroll-conservatively' to a large value rather than set this to 1. */); |
| 28352 | 28352 | ||
| 28353 | DEFVAR_INT ("scroll-conservatively", scroll_conservatively, | 28353 | DEFVAR_INT ("scroll-conservatively", scroll_conservatively, |
| 28354 | doc: /* *Scroll up to this many lines, to bring point back on screen. | 28354 | doc: /* Scroll up to this many lines, to bring point back on screen. |
| 28355 | If point moves off-screen, redisplay will scroll by up to | 28355 | If point moves off-screen, redisplay will scroll by up to |
| 28356 | `scroll-conservatively' lines in order to bring point just barely | 28356 | `scroll-conservatively' lines in order to bring point just barely |
| 28357 | onto the screen again. If that cannot be done, then redisplay | 28357 | onto the screen again. If that cannot be done, then redisplay |
| @@ -28365,7 +28365,7 @@ A value of zero means always recenter point if it moves off screen. */); | |||
| 28365 | scroll_conservatively = 0; | 28365 | scroll_conservatively = 0; |
| 28366 | 28366 | ||
| 28367 | DEFVAR_INT ("scroll-margin", scroll_margin, | 28367 | DEFVAR_INT ("scroll-margin", scroll_margin, |
| 28368 | doc: /* *Number of lines of margin at the top and bottom of a window. | 28368 | doc: /* Number of lines of margin at the top and bottom of a window. |
| 28369 | Recenter the window whenever point gets within this many lines | 28369 | Recenter the window whenever point gets within this many lines |
| 28370 | of the top or bottom of the window. */); | 28370 | of the top or bottom of the window. */); |
| 28371 | scroll_margin = 0; | 28371 | scroll_margin = 0; |
| @@ -28401,20 +28401,20 @@ Any other value means to use the appropriate face, `mode-line', | |||
| 28401 | mode_line_inverse_video = 1; | 28401 | mode_line_inverse_video = 1; |
| 28402 | 28402 | ||
| 28403 | DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit, | 28403 | DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit, |
| 28404 | doc: /* *Maximum buffer size for which line number should be displayed. | 28404 | doc: /* Maximum buffer size for which line number should be displayed. |
| 28405 | If the buffer is bigger than this, the line number does not appear | 28405 | If the buffer is bigger than this, the line number does not appear |
| 28406 | in the mode line. A value of nil means no limit. */); | 28406 | in the mode line. A value of nil means no limit. */); |
| 28407 | Vline_number_display_limit = Qnil; | 28407 | Vline_number_display_limit = Qnil; |
| 28408 | 28408 | ||
| 28409 | DEFVAR_INT ("line-number-display-limit-width", | 28409 | DEFVAR_INT ("line-number-display-limit-width", |
| 28410 | line_number_display_limit_width, | 28410 | line_number_display_limit_width, |
| 28411 | doc: /* *Maximum line width (in characters) for line number display. | 28411 | doc: /* Maximum line width (in characters) for line number display. |
| 28412 | If the average length of the lines near point is bigger than this, then the | 28412 | If the average length of the lines near point is bigger than this, then the |
| 28413 | line number may be omitted from the mode line. */); | 28413 | line number may be omitted from the mode line. */); |
| 28414 | line_number_display_limit_width = 200; | 28414 | line_number_display_limit_width = 200; |
| 28415 | 28415 | ||
| 28416 | DEFVAR_BOOL ("highlight-nonselected-windows", highlight_nonselected_windows, | 28416 | DEFVAR_BOOL ("highlight-nonselected-windows", highlight_nonselected_windows, |
| 28417 | doc: /* *Non-nil means highlight region even in nonselected windows. */); | 28417 | doc: /* Non-nil means highlight region even in nonselected windows. */); |
| 28418 | highlight_nonselected_windows = 0; | 28418 | highlight_nonselected_windows = 0; |
| 28419 | 28419 | ||
| 28420 | DEFVAR_BOOL ("multiple-frames", multiple_frames, | 28420 | DEFVAR_BOOL ("multiple-frames", multiple_frames, |
| @@ -28486,7 +28486,7 @@ See `set-window-redisplay-end-trigger'. */); | |||
| 28486 | Vredisplay_end_trigger_functions = Qnil; | 28486 | Vredisplay_end_trigger_functions = Qnil; |
| 28487 | 28487 | ||
| 28488 | DEFVAR_LISP ("mouse-autoselect-window", Vmouse_autoselect_window, | 28488 | DEFVAR_LISP ("mouse-autoselect-window", Vmouse_autoselect_window, |
| 28489 | doc: /* *Non-nil means autoselect window with mouse pointer. | 28489 | doc: /* Non-nil means autoselect window with mouse pointer. |
| 28490 | If nil, do not autoselect windows. | 28490 | If nil, do not autoselect windows. |
| 28491 | A positive number means delay autoselection by that many seconds: a | 28491 | A positive number means delay autoselection by that many seconds: a |
| 28492 | window is autoselected only after the mouse has remained in that | 28492 | window is autoselected only after the mouse has remained in that |
| @@ -28506,7 +28506,7 @@ When customizing this variable make sure that the actual value of | |||
| 28506 | Vmouse_autoselect_window = Qnil; | 28506 | Vmouse_autoselect_window = Qnil; |
| 28507 | 28507 | ||
| 28508 | DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars, | 28508 | DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars, |
| 28509 | doc: /* *Non-nil means automatically resize tool-bars. | 28509 | doc: /* Non-nil means automatically resize tool-bars. |
| 28510 | This dynamically changes the tool-bar's height to the minimum height | 28510 | This dynamically changes the tool-bar's height to the minimum height |
| 28511 | that is needed to make all tool-bar items visible. | 28511 | that is needed to make all tool-bar items visible. |
| 28512 | If value is `grow-only', the tool-bar's height is only increased | 28512 | If value is `grow-only', the tool-bar's height is only increased |
| @@ -28514,15 +28514,15 @@ automatically; to decrease the tool-bar height, use \\[recenter]. */); | |||
| 28514 | Vauto_resize_tool_bars = Qt; | 28514 | Vauto_resize_tool_bars = Qt; |
| 28515 | 28515 | ||
| 28516 | DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p, | 28516 | DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p, |
| 28517 | doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them. */); | 28517 | doc: /* Non-nil means raise tool-bar buttons when the mouse moves over them. */); |
| 28518 | auto_raise_tool_bar_buttons_p = 1; | 28518 | auto_raise_tool_bar_buttons_p = 1; |
| 28519 | 28519 | ||
| 28520 | DEFVAR_BOOL ("make-cursor-line-fully-visible", make_cursor_line_fully_visible_p, | 28520 | DEFVAR_BOOL ("make-cursor-line-fully-visible", make_cursor_line_fully_visible_p, |
| 28521 | doc: /* *Non-nil means to scroll (recenter) cursor line if it is not fully visible. */); | 28521 | doc: /* Non-nil means to scroll (recenter) cursor line if it is not fully visible. */); |
| 28522 | make_cursor_line_fully_visible_p = 1; | 28522 | make_cursor_line_fully_visible_p = 1; |
| 28523 | 28523 | ||
| 28524 | DEFVAR_LISP ("tool-bar-border", Vtool_bar_border, | 28524 | DEFVAR_LISP ("tool-bar-border", Vtool_bar_border, |
| 28525 | doc: /* *Border below tool-bar in pixels. | 28525 | doc: /* Border below tool-bar in pixels. |
| 28526 | If an integer, use it as the height of the border. | 28526 | If an integer, use it as the height of the border. |
| 28527 | If it is one of `internal-border-width' or `border-width', use the | 28527 | If it is one of `internal-border-width' or `border-width', use the |
| 28528 | value of the corresponding frame parameter. | 28528 | value of the corresponding frame parameter. |
| @@ -28530,7 +28530,7 @@ Otherwise, no border is added below the tool-bar. */); | |||
| 28530 | Vtool_bar_border = Qinternal_border_width; | 28530 | Vtool_bar_border = Qinternal_border_width; |
| 28531 | 28531 | ||
| 28532 | DEFVAR_LISP ("tool-bar-button-margin", Vtool_bar_button_margin, | 28532 | DEFVAR_LISP ("tool-bar-button-margin", Vtool_bar_button_margin, |
| 28533 | doc: /* *Margin around tool-bar buttons in pixels. | 28533 | doc: /* Margin around tool-bar buttons in pixels. |
| 28534 | If an integer, use that for both horizontal and vertical margins. | 28534 | If an integer, use that for both horizontal and vertical margins. |
| 28535 | Otherwise, value should be a pair of integers `(HORZ . VERT)' with | 28535 | Otherwise, value should be a pair of integers `(HORZ . VERT)' with |
| 28536 | HORZ specifying the horizontal margin, and VERT specifying the | 28536 | HORZ specifying the horizontal margin, and VERT specifying the |
| @@ -28538,7 +28538,7 @@ vertical margin. */); | |||
| 28538 | Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN); | 28538 | Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
| 28539 | 28539 | ||
| 28540 | DEFVAR_INT ("tool-bar-button-relief", tool_bar_button_relief, | 28540 | DEFVAR_INT ("tool-bar-button-relief", tool_bar_button_relief, |
| 28541 | doc: /* *Relief thickness of tool-bar buttons. */); | 28541 | doc: /* Relief thickness of tool-bar buttons. */); |
| 28542 | tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF; | 28542 | tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF; |
| 28543 | 28543 | ||
| 28544 | DEFVAR_LISP ("tool-bar-style", Vtool_bar_style, | 28544 | DEFVAR_LISP ("tool-bar-style", Vtool_bar_style, |
| @@ -28553,7 +28553,7 @@ It can be one of | |||
| 28553 | Vtool_bar_style = Qnil; | 28553 | Vtool_bar_style = Qnil; |
| 28554 | 28554 | ||
| 28555 | DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size, | 28555 | DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size, |
| 28556 | doc: /* *Maximum number of characters a label can have to be shown. | 28556 | doc: /* Maximum number of characters a label can have to be shown. |
| 28557 | The tool bar style must also show labels for this to have any effect, see | 28557 | The tool bar style must also show labels for this to have any effect, see |
| 28558 | `tool-bar-style'. */); | 28558 | `tool-bar-style'. */); |
| 28559 | tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE; | 28559 | tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE; |
| @@ -28568,7 +28568,7 @@ fontified regions the property `fontified'. */); | |||
| 28568 | 28568 | ||
| 28569 | DEFVAR_BOOL ("unibyte-display-via-language-environment", | 28569 | DEFVAR_BOOL ("unibyte-display-via-language-environment", |
| 28570 | unibyte_display_via_language_environment, | 28570 | unibyte_display_via_language_environment, |
| 28571 | doc: /* *Non-nil means display unibyte text according to language environment. | 28571 | doc: /* Non-nil means display unibyte text according to language environment. |
| 28572 | Specifically, this means that raw bytes in the range 160-255 decimal | 28572 | Specifically, this means that raw bytes in the range 160-255 decimal |
| 28573 | are displayed by converting them to the equivalent multibyte characters | 28573 | are displayed by converting them to the equivalent multibyte characters |
| 28574 | according to the current language environment. As a result, they are | 28574 | according to the current language environment. As a result, they are |
| @@ -28579,7 +28579,7 @@ but does not change the fact they are interpreted as raw bytes. */); | |||
| 28579 | unibyte_display_via_language_environment = 0; | 28579 | unibyte_display_via_language_environment = 0; |
| 28580 | 28580 | ||
| 28581 | DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height, | 28581 | DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height, |
| 28582 | doc: /* *Maximum height for resizing mini-windows (the minibuffer and the echo area). | 28582 | doc: /* Maximum height for resizing mini-windows (the minibuffer and the echo area). |
| 28583 | If a float, it specifies a fraction of the mini-window frame's height. | 28583 | If a float, it specifies a fraction of the mini-window frame's height. |
| 28584 | If an integer, it specifies a number of lines. */); | 28584 | If an integer, it specifies a number of lines. */); |
| 28585 | Vmax_mini_window_height = make_float (0.25); | 28585 | Vmax_mini_window_height = make_float (0.25); |
| @@ -28613,12 +28613,12 @@ point visible. */); | |||
| 28613 | DEFSYM (Qauto_hscroll_mode, "auto-hscroll-mode"); | 28613 | DEFSYM (Qauto_hscroll_mode, "auto-hscroll-mode"); |
| 28614 | 28614 | ||
| 28615 | DEFVAR_INT ("hscroll-margin", hscroll_margin, | 28615 | DEFVAR_INT ("hscroll-margin", hscroll_margin, |
| 28616 | doc: /* *How many columns away from the window edge point is allowed to get | 28616 | doc: /* How many columns away from the window edge point is allowed to get |
| 28617 | before automatic hscrolling will horizontally scroll the window. */); | 28617 | before automatic hscrolling will horizontally scroll the window. */); |
| 28618 | hscroll_margin = 5; | 28618 | hscroll_margin = 5; |
| 28619 | 28619 | ||
| 28620 | DEFVAR_LISP ("hscroll-step", Vhscroll_step, | 28620 | DEFVAR_LISP ("hscroll-step", Vhscroll_step, |
| 28621 | doc: /* *How many columns to scroll the window when point gets too close to the edge. | 28621 | doc: /* How many columns to scroll the window when point gets too close to the edge. |
| 28622 | When point is less than `hscroll-margin' columns from the window | 28622 | When point is less than `hscroll-margin' columns from the window |
| 28623 | edge, automatic hscrolling will scroll the window by the amount of columns | 28623 | edge, automatic hscrolling will scroll the window by the amount of columns |
| 28624 | determined by this variable. If its value is a positive integer, scroll that | 28624 | determined by this variable. If its value is a positive integer, scroll that |
| @@ -28705,7 +28705,7 @@ To add a prefix to continuation lines, use `wrap-prefix'. */); | |||
| 28705 | #endif /* GLYPH_DEBUG */ | 28705 | #endif /* GLYPH_DEBUG */ |
| 28706 | 28706 | ||
| 28707 | DEFVAR_INT ("overline-margin", overline_margin, | 28707 | DEFVAR_INT ("overline-margin", overline_margin, |
| 28708 | doc: /* *Space between overline and text, in pixels. | 28708 | doc: /* Space between overline and text, in pixels. |
| 28709 | The default value is 2: the height of the overline (1 pixel) plus 1 pixel | 28709 | The default value is 2: the height of the overline (1 pixel) plus 1 pixel |
| 28710 | margin to the character height. */); | 28710 | margin to the character height. */); |
| 28711 | overline_margin = 2; | 28711 | overline_margin = 2; |
| @@ -28726,7 +28726,7 @@ cursor shapes. */); | |||
| 28726 | display_hourglass_p = 1; | 28726 | display_hourglass_p = 1; |
| 28727 | 28727 | ||
| 28728 | DEFVAR_LISP ("hourglass-delay", Vhourglass_delay, | 28728 | DEFVAR_LISP ("hourglass-delay", Vhourglass_delay, |
| 28729 | doc: /* *Seconds to wait before displaying an hourglass pointer when Emacs is busy. */); | 28729 | doc: /* Seconds to wait before displaying an hourglass pointer when Emacs is busy. */); |
| 28730 | Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); | 28730 | Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); |
| 28731 | 28731 | ||
| 28732 | hourglass_atimer = NULL; | 28732 | hourglass_atimer = NULL; |
diff --git a/src/xfaces.c b/src/xfaces.c index 476fb1e0366..972de234510 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -6558,7 +6558,7 @@ syms_of_xfaces (void) | |||
| 6558 | #endif | 6558 | #endif |
| 6559 | 6559 | ||
| 6560 | DEFVAR_LISP ("font-list-limit", Vfont_list_limit, | 6560 | DEFVAR_LISP ("font-list-limit", Vfont_list_limit, |
| 6561 | doc: /* *Limit for font matching. | 6561 | doc: /* Limit for font matching. |
| 6562 | If an integer > 0, font matching functions won't load more than | 6562 | If an integer > 0, font matching functions won't load more than |
| 6563 | that number of fonts when searching for a matching font. */); | 6563 | that number of fonts when searching for a matching font. */); |
| 6564 | Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); | 6564 | Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
| @@ -6568,7 +6568,7 @@ that number of fonts when searching for a matching font. */); | |||
| 6568 | Vface_new_frame_defaults = Qnil; | 6568 | Vface_new_frame_defaults = Qnil; |
| 6569 | 6569 | ||
| 6570 | DEFVAR_LISP ("face-default-stipple", Vface_default_stipple, | 6570 | DEFVAR_LISP ("face-default-stipple", Vface_default_stipple, |
| 6571 | doc: /* *Default stipple pattern used on monochrome displays. | 6571 | doc: /* Default stipple pattern used on monochrome displays. |
| 6572 | This stipple pattern is used on monochrome displays | 6572 | This stipple pattern is used on monochrome displays |
| 6573 | instead of shades of gray for a face background color. | 6573 | instead of shades of gray for a face background color. |
| 6574 | See `set-face-stipple' for possible values for this variable. */); | 6574 | See `set-face-stipple' for possible values for this variable. */); |
diff --git a/src/xfns.c b/src/xfns.c index 6f08ada1bb9..df1b39b018f 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -5920,32 +5920,32 @@ Chinese, Japanese, and Korean. */); | |||
| 5920 | 5920 | ||
| 5921 | /* This is not ifdef:ed, so other builds than GTK can customize it. */ | 5921 | /* This is not ifdef:ed, so other builds than GTK can customize it. */ |
| 5922 | DEFVAR_BOOL ("x-gtk-use-old-file-dialog", x_gtk_use_old_file_dialog, | 5922 | DEFVAR_BOOL ("x-gtk-use-old-file-dialog", x_gtk_use_old_file_dialog, |
| 5923 | doc: /* *Non-nil means prompt with the old GTK file selection dialog. | 5923 | doc: /* Non-nil means prompt with the old GTK file selection dialog. |
| 5924 | If nil or if the file selection dialog is not available, the new GTK file | 5924 | If nil or if the file selection dialog is not available, the new GTK file |
| 5925 | chooser is used instead. To turn off all file dialogs set the | 5925 | chooser is used instead. To turn off all file dialogs set the |
| 5926 | variable `use-file-dialog'. */); | 5926 | variable `use-file-dialog'. */); |
| 5927 | x_gtk_use_old_file_dialog = 0; | 5927 | x_gtk_use_old_file_dialog = 0; |
| 5928 | 5928 | ||
| 5929 | DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files, | 5929 | DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files, |
| 5930 | doc: /* *If non-nil, the GTK file chooser will by default show hidden files. | 5930 | doc: /* If non-nil, the GTK file chooser will by default show hidden files. |
| 5931 | Note that this is just the default, there is a toggle button on the file | 5931 | Note that this is just the default, there is a toggle button on the file |
| 5932 | chooser to show or not show hidden files on a case by case basis. */); | 5932 | chooser to show or not show hidden files on a case by case basis. */); |
| 5933 | x_gtk_show_hidden_files = 0; | 5933 | x_gtk_show_hidden_files = 0; |
| 5934 | 5934 | ||
| 5935 | DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text, | 5935 | DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text, |
| 5936 | doc: /* *If non-nil, the GTK file chooser will show additional help text. | 5936 | doc: /* If non-nil, the GTK file chooser will show additional help text. |
| 5937 | If more space for files in the file chooser dialog is wanted, set this to nil | 5937 | If more space for files in the file chooser dialog is wanted, set this to nil |
| 5938 | to turn the additional text off. */); | 5938 | to turn the additional text off. */); |
| 5939 | x_gtk_file_dialog_help_text = 1; | 5939 | x_gtk_file_dialog_help_text = 1; |
| 5940 | 5940 | ||
| 5941 | DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar, | 5941 | DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar, |
| 5942 | doc: /* *If non-nil, a detached tool bar is shown in full. | 5942 | doc: /* If non-nil, a detached tool bar is shown in full. |
| 5943 | The default is to just show an arrow and pressing on that arrow shows | 5943 | The default is to just show an arrow and pressing on that arrow shows |
| 5944 | the tool bar buttons. */); | 5944 | the tool bar buttons. */); |
| 5945 | x_gtk_whole_detached_tool_bar = 0; | 5945 | x_gtk_whole_detached_tool_bar = 0; |
| 5946 | 5946 | ||
| 5947 | DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, | 5947 | DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, |
| 5948 | doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. | 5948 | doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. |
| 5949 | Otherwise use Emacs own tooltip implementation. | 5949 | Otherwise use Emacs own tooltip implementation. |
| 5950 | When using Gtk+ tooltips, the tooltip face is not used. */); | 5950 | When using Gtk+ tooltips, the tooltip face is not used. */); |
| 5951 | x_gtk_use_system_tooltips = 1; | 5951 | x_gtk_use_system_tooltips = 1; |
diff --git a/src/xsettings.c b/src/xsettings.c index 066c6e795e9..69ef22f55d7 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -1024,7 +1024,7 @@ syms_of_xsettings (void) | |||
| 1024 | defsubr (&Sfont_get_system_normal_font); | 1024 | defsubr (&Sfont_get_system_normal_font); |
| 1025 | 1025 | ||
| 1026 | DEFVAR_BOOL ("font-use-system-font", use_system_font, | 1026 | DEFVAR_BOOL ("font-use-system-font", use_system_font, |
| 1027 | doc: /* *Non-nil means to apply the system defined font dynamically. | 1027 | doc: /* Non-nil means to apply the system defined font dynamically. |
| 1028 | When this is non-nil and the system defined fixed width font changes, we | 1028 | When this is non-nil and the system defined fixed width font changes, we |
| 1029 | update frames dynamically. | 1029 | update frames dynamically. |
| 1030 | If this variable is nil, Emacs ignores system font changes. */); | 1030 | If this variable is nil, Emacs ignores system font changes. */); |
diff --git a/src/xterm.c b/src/xterm.c index 9ce166883c3..f5272fc7630 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10830,7 +10830,7 @@ syms_of_xterm (void) | |||
| 10830 | 10830 | ||
| 10831 | DEFVAR_BOOL ("x-use-underline-position-properties", | 10831 | DEFVAR_BOOL ("x-use-underline-position-properties", |
| 10832 | x_use_underline_position_properties, | 10832 | x_use_underline_position_properties, |
| 10833 | doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. | 10833 | doc: /* Non-nil means make use of UNDERLINE_POSITION font properties. |
| 10834 | A value of nil means ignore them. If you encounter fonts with bogus | 10834 | A value of nil means ignore them. If you encounter fonts with bogus |
| 10835 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior | 10835 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior |
| 10836 | to 4.1, set this to nil. You can also use `underline-minimum-offset' | 10836 | to 4.1, set this to nil. You can also use `underline-minimum-offset' |
| @@ -10840,7 +10840,7 @@ sizes. */); | |||
| 10840 | 10840 | ||
| 10841 | DEFVAR_BOOL ("x-underline-at-descent-line", | 10841 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 10842 | x_underline_at_descent_line, | 10842 | x_underline_at_descent_line, |
| 10843 | doc: /* *Non-nil means to draw the underline at the same place as the descent line. | 10843 | doc: /* Non-nil means to draw the underline at the same place as the descent line. |
| 10844 | A value of nil means to draw the underline according to the value of the | 10844 | A value of nil means to draw the underline according to the value of the |
| 10845 | variable `x-use-underline-position-properties', which is usually at the | 10845 | variable `x-use-underline-position-properties', which is usually at the |
| 10846 | baseline level. The default value is nil. */); | 10846 | baseline level. The default value is nil. */); |