diff options
| -rw-r--r-- | doc/lispref/sequences.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 14 | ||||
| -rw-r--r-- | doc/lispref/symbols.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 6 | ||||
| -rw-r--r-- | src/window.c | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index e879b82c8f7..421308665db 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -859,7 +859,7 @@ concatenation of @var{sequences}. @var{type} may be: @code{vector}, @example @group (seq-concatenate 'list '(1 2) '(3 4) [5 6]) -@result{} (1 2 3 5 6) +@result{} (1 2 3 4 5 6) @end group @group (seq-concatenate 'string "Hello " "world") diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index c5a6cb264d8..ff108511f23 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -508,20 +508,6 @@ filesystems generally don't honor linguistic equivalence of strings that collation implements. @end defun -@defun string-prefix-p string1 string2 &optional ignore-case -This function returns non-@code{nil} if @var{string1} is a prefix of -@var{string2}; i.e., if @var{string2} starts with @var{string1}. If -the optional argument @var{ignore-case} is non-@code{nil}, the -comparison ignores case differences. -@end defun - -@defun string-suffix-p suffix string &optional ignore-case -This function returns non-@code{nil} if @var{suffix} is a suffix of -@var{string}; i.e., if @var{string} ends with @var{suffix}. If the -optional argument @var{ignore-case} is non-@code{nil}, the comparison -ignores case differences. -@end defun - @cindex lexical comparison of strings @defun string< string1 string2 @c (findex string< causes problems for permuted index!!) diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 8c1ec3d85e2..36a2795d1dd 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -157,7 +157,7 @@ that cell can hold only one Lisp object at any given time. both as a variable (e.g., with @code{defvar}) and as a function or macro (e.g., with @code{defun}). Such definitions do not conflict. - These definition also act as guides for programming tools. For + These definitions also act as guides for programming tools. For example, the @kbd{C-h f} and @kbd{C-h v} commands create help buffers containing links to the relevant variable, function, or macro definitions. @xref{Name Help,,, emacs, The GNU Emacs Manual}. diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 2823cc55214..4dc671c41f3 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1620,9 +1620,9 @@ window or too small to ordinarily split. Furthermore, subsequently resizing or deleting @var{window} may resize all other windows in its combination. -The default is @code{nil}. Other values are reserved for future use. -The value of this variable is ignored when -@code{window-combination-limit} is non-@code{nil}. +The default is @code{nil}. Other values are reserved for future use. A +specific split operation may ignore the value of this variable if it is +affected by a non-@code{nil} value of @code{window-combination-limit}. @end defopt To illustrate the effect of @code{window-combination-resize}, consider diff --git a/src/window.c b/src/window.c index acbefcdad16..e8798f1e3ee 100644 --- a/src/window.c +++ b/src/window.c @@ -7421,8 +7421,8 @@ same combination. Other values are reserved for future use. -This variable takes no effect if the variable `window-combination-limit' is -non-nil. */); +A specific split operation may ignore the value of this variable if it +is affected by a non-nil value of `window-combination-limit'. */); Vwindow_combination_resize = Qnil; DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, |