diff options
| author | Glenn Morris | 2018-02-13 14:22:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-13 14:22:16 -0800 |
| commit | 4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d (patch) | |
| tree | dc5dc2098f8956b66620cc1003601f705c289cd2 /src/w32term.c | |
| parent | 6c7186de3bbb2b7652cdc01a68bee035761197e5 (diff) | |
| download | emacs-4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d.tar.gz emacs-4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d.zip | |
Stop keeping multiple doc copies for items defined multiple times
It was always a nuisance to keep all the copies in sync.
* src/doc.c (Fsnarf_documentation): Don't skip entire files.
Instead, skip individual doc strings starting with "SKIP".
* doc/lispref/internals.texi (Writing Emacs Primitives):
Mention this skipping.
* lisp/term/ns-win.el, lisp/term/pc-win.el, src/dosfns.c:
* src/frame.c, src/nsfns.m, src/nsmenu.m, src/nsterm.m:
* src/w16select.c, src/w32fns.c, src/w32menu.c, src/w32select.c:
* src/w32term.c, src/xmenu.c: Remove duplicated doc strings.
* src/xfns.c: Merge in information from doc string duplicates.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/w32term.c b/src/w32term.c index c1d039c1375..97afb678c1d 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -7329,14 +7329,7 @@ syms_of_w32term (void) | |||
| 7329 | DEFSYM (Qrenamed_to, "renamed-to"); | 7329 | DEFSYM (Qrenamed_to, "renamed-to"); |
| 7330 | 7330 | ||
| 7331 | DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout, | 7331 | DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout, |
| 7332 | doc: /* How long to wait for X events. | 7332 | doc: /* SKIP: real doc in xterm.c. */); |
| 7333 | |||
| 7334 | Emacs will wait up to this many seconds to receive X events after | ||
| 7335 | making changes which affect the state of the graphical interface. | ||
| 7336 | Under some window managers this can take an indefinite amount of time, | ||
| 7337 | so it is important to limit the wait. | ||
| 7338 | |||
| 7339 | If set to a non-float value, there will be no wait at all. */); | ||
| 7340 | Vx_wait_for_event_timeout = make_float (0.1); | 7333 | Vx_wait_for_event_timeout = make_float (0.1); |
| 7341 | 7334 | ||
| 7342 | DEFVAR_INT ("w32-num-mouse-buttons", | 7335 | DEFVAR_INT ("w32-num-mouse-buttons", |
| @@ -7390,28 +7383,16 @@ the cursor have no effect. */); | |||
| 7390 | from cus-start.el and other places, like "M-x set-variable". */ | 7383 | from cus-start.el and other places, like "M-x set-variable". */ |
| 7391 | DEFVAR_BOOL ("x-use-underline-position-properties", | 7384 | DEFVAR_BOOL ("x-use-underline-position-properties", |
| 7392 | x_use_underline_position_properties, | 7385 | x_use_underline_position_properties, |
| 7393 | doc: /* Non-nil means make use of UNDERLINE_POSITION font properties. | 7386 | doc: /* SKIP: real doc in xterm.c. */); |
| 7394 | A value of nil means ignore them. If you encounter fonts with bogus | ||
| 7395 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior | ||
| 7396 | to 4.1, set this to nil. You can also use `underline-minimum-offset' | ||
| 7397 | to override the font's UNDERLINE_POSITION for small font display | ||
| 7398 | sizes. */); | ||
| 7399 | x_use_underline_position_properties = 0; | 7387 | x_use_underline_position_properties = 0; |
| 7400 | 7388 | ||
| 7401 | DEFVAR_BOOL ("x-underline-at-descent-line", | 7389 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 7402 | x_underline_at_descent_line, | 7390 | x_underline_at_descent_line, |
| 7403 | doc: /* Non-nil means to draw the underline at the same place as the descent line. | 7391 | doc: /* SKIP: real doc in xterm.c. */); |
| 7404 | A value of nil means to draw the underline according to the value of the | ||
| 7405 | variable `x-use-underline-position-properties', which is usually at the | ||
| 7406 | baseline level. The default value is nil. */); | ||
| 7407 | x_underline_at_descent_line = 0; | 7392 | x_underline_at_descent_line = 0; |
| 7408 | 7393 | ||
| 7409 | DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, | 7394 | DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, |
| 7410 | doc: /* Which toolkit scroll bars Emacs uses, if any. | 7395 | doc: /* SKIP: real doc in xterm.c. */); |
| 7411 | A value of nil means Emacs doesn't use toolkit scroll bars. | ||
| 7412 | With the X Window system, the value is a symbol describing the | ||
| 7413 | X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. | ||
| 7414 | With MS Windows or Nextstep, the value is t. */); | ||
| 7415 | Vx_toolkit_scroll_bars = Qt; | 7396 | Vx_toolkit_scroll_bars = Qt; |
| 7416 | 7397 | ||
| 7417 | DEFVAR_BOOL ("w32-unicode-filenames", | 7398 | DEFVAR_BOOL ("w32-unicode-filenames", |