master f4e20656979 2/2: ; Minor fixes of the last change

branch: master
commit f4e20656979fae59044ce71ec67c6f3bf4f38105
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Minor fixes of the last change
    
    * etc/NEWS: Fix last changes.
    
    * doc/lispref/internals.texi (Module Canvas API):
    * doc/lispref/display.texi (Canvas Images): Fix punctuation and
    markup.
---
 doc/lispref/display.texi   | 4 ++--
 doc/lispref/internals.texi | 4 ++--
 etc/NEWS                   | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 72bbf0ffdc1..53b1e3dbe6c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -7544,7 +7544,7 @@ Once a canvas image object has been created and displayed, it can be
 ``refreshed'' via @code{canvas-refresh}.
 
 @defun canvas-refresh image &optional reload-data
-Refresh canvas @var{image} and update it on screen. If the optional
+Refresh canvas @var{image} and update it on screen.  If the optional
 argument @var{reload-data} is non-nil, reload the @code{:data} or
 @code{file} from the image specification before redrawing the canvas.
 @end defun
@@ -7571,7 +7571,7 @@ When refreshing the canvas in a loop, we must explicitly call @code{redisplay}:
 @end example
 
 But, if we are refreshing the canvas via a timer or a command, @code{redisplay}
-is implicitly called after the timer or command. The following example updates
+is implicitly called after the timer or command.  The following example updates
 the above canvas in a timer ~30 times per second:
 
 @example
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index ef98afa36df..5723412e37c 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -2035,7 +2035,7 @@ with dynamic modules:
 @anchor{canvas_data}
 @deftypefn Function uint32_t *canvas_data (emacs_env *@var{env}, emacs_value @var{canvas})
 The function gives access to the pixel buffer of @var{canvas}.  The
-pixel buffer is in row-major order with a size @var{width} * @var{height}.
+pixel buffer is in row-major order with a size @code{@var{width}x@var{height}}.
 The pixel format is ARGB32 on all platforms.  Return @code{NULL} in case
 of error.
 @end deftypefn
@@ -2061,7 +2061,7 @@ env->funcall(env, env->intern(env, "canvas-refresh"), 2,
 Note that @code{canvas-refresh} has an optional boolean argument to
 reload the @code{:data} vector or string from the canvas image
 specification.  When called from dynamic modules, the argument should
-usually be @code{nil}.
+usually be @code{Qnil}.
 
 Thus, one can simply define a module function that takes as an argument
 a canvas image object, following the specification as laid down in
diff --git a/etc/NEWS b/etc/NEWS
index 61fac3b1cae..232eb6a6ca2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -33,8 +33,6 @@ systems.
 
 * Changes in Emacs 32.1
 
-+++
-
 ---
 ** Emacs no longer kills child processes after EPIPE.
 Previously, Emacs would immediately kill a child process and set its
@@ -316,7 +314,7 @@ older '(HIGH LOW USEC PSEC)' form.
 +++
 ** Support for canvas image objects.
 Canvas images support efficient updating and refreshing.  An image
-specifier with ':type canvas' creates a canvas image.  The canvas has an
+specifier with type 'canvas' creates a canvas image.  The canvas has an
 associated writable pixel buffer.  The dynamic module function 'canvas_data'
 provides access to the pixel buffer.  After changing the ':data' vector or
 writing to the pixel buffer a call to 'canvas-refresh' redraws the canvas