Commit 1903e996 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

5ca093d2 (origin/emacs-26) Fix doc of 'display-buffer-in-previous-wind...
add2cac5 lisp/*.el: Minor docstring fixes
parents e545d612 5ca093d2
Pipeline #1994 failed with stage
in 7 seconds
......@@ -2598,6 +2598,9 @@ If @var{alist} has a @code{previous-window} entry and the window
specified by that entry is live and not dedicated to another buffer,
that window will be preferred, even if it never showed @var{buffer}
before.
This function will not choose the selected window if it finds another
eligible window that has shown @var{buffer} previously.
@end defun
@defun display-buffer-use-some-window buffer alist
......
......@@ -5519,15 +5519,15 @@ This is the simplest safe way to acquire and release a mutex."
(defvar definition-prefixes (make-hash-table :test 'equal)
"Hash table mapping prefixes to the files in which they're used.
This can be used to automatically fetch not-yet-loaded definitions.
More specifically, if there is a value of the form (FILES...) for a string PREFIX
it means that the FILES define variables or functions with names that start
with PREFIX.
More specifically, if there is a value of the form (FILES...) for
a string PREFIX it means that the FILES define variables or functions
with names that start with PREFIX.
Note that it does not imply that all definitions starting with PREFIX can
be found in those files. E.g. if prefix is \"gnus-article-\" there might
still be definitions of the form \"gnus-article-toto-titi\" in other files, which would
presumably appear in this table under another prefix such as \"gnus-\"
or \"gnus-article-toto-\".")
still be definitions of the form \"gnus-article-toto-titi\" in other files,
which would presumably appear in this table under another prefix such as
\"gnus-\" or \"gnus-article-toto-\".")
(defun register-definition-prefixes (file prefixes)
"Register that FILE uses PREFIXES."
......
......@@ -30,7 +30,7 @@
(eval-when-compile (require 'subr-x))
(defun svg-create (width height &rest args)
"Create a new, empty SVG image with dimensions WIDTHxHEIGHT.
"Create a new, empty SVG image with dimensions WIDTH x HEIGHT.
ARGS can be used to provide `stroke' and `stroke-width' parameters to
any further elements added."
(dom-node 'svg
......@@ -42,8 +42,8 @@ any further elements added."
(defun svg-gradient (svg id type stops)
"Add a gradient with ID to SVG.
TYPE is `linear' or `radial'. STOPS is a list of percentage/color
pairs."
TYPE is `linear' or `radial'.
STOPS is a list of percentage/color pairs."
(svg--def
svg
(apply
......@@ -66,9 +66,9 @@ pairs."
"Create a rectangle on SVG, starting at position X/Y, of WIDTH/HEIGHT.
ARGS is a plist of modifiers. Possible values are
:stroke-width PIXELS. The line width.
:stroke-color COLOR. The line color.
:gradient ID. The gradient ID to use."
:stroke-width PIXELS The line width.
:stroke-color COLOR The line color.
:gradient ID The gradient ID to use."
(svg--append
svg
(dom-node 'rect
......
......@@ -7783,8 +7783,11 @@ selected frame if `display-buffer-reuse-frames' and
terminal if either of those variables is non-nil.
If ALIST has a `previous-window' entry, the window specified by
that entry will override any other window found by the methods
above, even if that window never showed BUFFER before."
that entry may override any other window found by the methods
above, even if that window never showed BUFFER before.
Avoid using the selected window if another eligible window has
shown BUFFER before."
(let* ((alist-entry (assq 'reusable-frames alist))
(inhibit-same-window
(cdr (assq 'inhibit-same-window alist)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment