diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 46 | ||||
| -rw-r--r-- | src/syntax.c | 9 | ||||
| -rw-r--r-- | src/xterm.c | 6 |
3 files changed, 33 insertions, 28 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 95e62ceddab..45cf15224a5 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1626,13 +1626,13 @@ COLLECTION can also be a function to do the completion itself. PREDICATE limits completion to a subset of COLLECTION. See `try-completion', `all-completions', `test-completion', and `completion-boundaries', for more details on completion, -COLLECTION, and PREDICATE. See also Info nodes `(elisp)Basic Completion' -for the details about completion, and `(elisp)Programmed Completion' for -expectations from COLLECTION when it's a function. +COLLECTION, and PREDICATE. See also Info node `(elisp)Basic Completion' +for the details about completion, and Info node `(elisp)Programmed +Completion' for expectations from COLLECTION when it's a function. REQUIRE-MATCH can take the following values: -- t means that the user is not allowed to exit unless - the input is (or completes to) an element of COLLECTION or is null. +- t means that the user is not allowed to exit unless the input is (or + completes to) an element of COLLECTION or is null. - nil means that the user can exit with any input. - `confirm' means that the user can exit with any input, but she needs to confirm her choice if the input is not an element of COLLECTION. @@ -1643,19 +1643,19 @@ REQUIRE-MATCH can take the following values: - anything else behaves like t except that typing RET does not exit if it does non-null completion. -If the input is null, `completing-read' returns DEF, or the first element -of the list of default values, or an empty string if DEF is nil, -regardless of the value of REQUIRE-MATCH. +If the input is null, `completing-read' returns DEF, or the first +element of the list of default values, or an empty string if DEF is +nil, regardless of the value of REQUIRE-MATCH. If INITIAL-INPUT is non-nil, insert it in the minibuffer initially, - with point positioned at the end. - If it is (STRING . POSITION), the initial input is STRING, but point - is placed at _zero-indexed_ position POSITION in STRING. (*Note* - that this is different from `read-from-minibuffer' and related - functions, which use one-indexing for POSITION.) This feature is - deprecated--it is best to pass nil for INITIAL-INPUT and supply the - default value DEF instead. The user can yank the default value into - the minibuffer easily using \\<minibuffer-local-map>\\[next-history-element]. + with point positioned at the end. If it is (STRING . POSITION), the + initial input is STRING, but point is placed at _zero-indexed_ + position POSITION in STRING. (*Note* that this is different from + `read-from-minibuffer' and related functions, which use one-indexing + for POSITION.) This feature is deprecated--it is best to pass nil + for INITIAL-INPUT and supply the default value DEF instead. The + user can yank the default value into the minibuffer easily using + \\<minibuffer-local-map>\\[next-history-element]. HIST, if non-nil, specifies a history list and optionally the initial position in the list. It can be a symbol, which is the history list @@ -1663,16 +1663,16 @@ HIST, if non-nil, specifies a history list and optionally the initial that case, HISTVAR is the history list variable to use, and HISTPOS is the initial position (the position in the list used by the minibuffer history commands). For consistency, you should also - specify that element of the history as the value of - INITIAL-INPUT. (This is the only case in which you should use - INITIAL-INPUT instead of DEF.) Positions are counted starting from - 1 at the beginning of the list. The variable `history-length' - controls the maximum length of a history list. + specify that element of the history as the value of INITIAL-INPUT. + (This is the only case in which you should use INITIAL-INPUT instead + of DEF.) Positions are counted starting from 1 at the beginning of + the list. The variable `history-length' controls the maximum length + of a history list. DEF, if non-nil, is the default value or the list of default values. -If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits - the current input method and the setting of `enable-multibyte-characters'. +If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits the + current input method and the setting of `enable-multibyte-characters'. Completion ignores case if the ambient value of `completion-ignore-case' is non-nil. diff --git a/src/syntax.c b/src/syntax.c index 20c607420c1..c5a4b03955b 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1573,10 +1573,11 @@ left there and the function returns nil. Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. The word boundaries are normally determined by the buffer's syntax -table, but `find-word-boundary-function-table', such as set up -by `subword-mode', can change that. If a Lisp program needs to -move by words determined strictly by the syntax table, it should -use `forward-word-strictly' instead. */) +table and character script (according to `char-script-table'), but +`find-word-boundary-function-table', such as set up by `subword-mode', +can change that. If a Lisp program needs to move by words determined +strictly by the syntax table, it should use `forward-word-strictly' +instead. See Info node `(elisp) Word Motion' for details. */) (Lisp_Object arg) { Lisp_Object tmp; diff --git a/src/xterm.c b/src/xterm.c index db5ea4ac55e..0fcd7ef7e2b 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -12422,12 +12422,16 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) unrequest_sigio (); /* See comment in x_display_ok. */ gtk_init (&argc, &argv2); request_sigio (); - fixup_locale (); g_log_remove_handler ("GLib", id); xg_initialize (); + /* Do this after the call to xg_initialize, because when + Fontconfig is used, xg_initialize calls its initialization + function which in some versions of Fontconfig calls setlocale. */ + fixup_locale (); + dpy = DEFAULT_GDK_DISPLAY (); #if ! GTK_CHECK_VERSION (2, 90, 0) |