Merge from origin/emacs-28

eb11dae499 Improve documentation of column-related functions
c95a34c960 * src/macfont.m (macfont_open): Initialize font->space_wid...
31a6a37d45 Improve indexing of keymap variables

6 files changed, 24 insertions, 2 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index d2e075c54ec..ace67fbedb7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -7477,6 +7477,7 @@ the usual Emacs @code{highlight} face.
 
 @item keymap
 @kindex keymap @r{(button property)}
+@vindex button-map
 The button's keymap, defining bindings active within the button
 region.  By default this is the usual button region keymap, stored
 in the variable @code{button-map}, which defines @key{RET} and
@@ -7691,6 +7692,7 @@ Return @code{t} if button-type @var{type} is a subtype of @var{supertype}.
 These are commands and functions for locating and operating on
 buttons in an Emacs buffer.
 
+@cindex buffer-button-map
 @code{push-button} is the command that a user uses to actually push
 a button, and is bound by default in the button itself to @key{RET}
 and to @key{mouse-2} using a local keymap in the button's overlay or
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index f5341f40f0a..5cb5367bc0e 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1882,6 +1882,7 @@ to make entries in @code{input-decode-map} beyond those that can be
 deduced from Termcap and Terminfo.  @xref{Terminal-Specific}.
 @end defvar
 
+@cindex function-key-map
 @defvar local-function-key-map
 This variable holds a keymap similar to @code{input-decode-map} except
 that it describes key sequences which should be translated to
diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 90497728a1c..d18b553dc19 100644
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -125,6 +125,7 @@ setup-language-environment-map, describe-language-environment-map,
 menu-bar-epatch-menu, menu-bar-ediff-merge-menu, menu-bar-ediff-menu, etc.
 @end ignore
 
+@cindex minibuffer-inactive-mode-map
 @item minibuffer-inactive-mode-map
 A full keymap used in the minibuffer when it is not active.@*
 @xref{Minibuffer Edit,, Editing in the Minibuffer, emacs, The GNU Emacs Manual}.
@@ -156,6 +157,7 @@ The global keymap used for the @kbd{C-x @key{RET}} prefix key.
 @vindex narrow-map
 A sparse keymap for subcommands of the prefix @kbd{C-x n}.
 
+@cindex prog-mode-map
 @item prog-mode-map
 The keymap used by Prog mode.@*
 @xref{Basic Major Modes}.
@@ -171,6 +173,7 @@ for multi-buffer replacements.  @xref{Search and Replace, query-replace-map}.
 @item search-map
 A sparse keymap that provides global bindings for search-related commands.
 
+@cindex special-mode-map
 @item special-mode-map
 The keymap used by Special mode.@*
 @xref{Basic Major Modes}.
@@ -179,6 +182,7 @@ The keymap used by Special mode.@*
 The global keymap used for the @kbd{C-x t} prefix key for tab-bar related commands.@*
 @xref{Tab Bars,,, emacs, The GNU Emacs Manual}.
 
+@cindex tab-bar-map
 @item tab-bar-map
 The keymap defining the contents of the tab bar.@*
 @xref{Tab Bars,,, emacs, The GNU Emacs Manual}.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 8b0e1981955..c2161b9341d 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2366,6 +2366,9 @@ begins.  @xref{Usual Display}.
 amount of horizontal scrolling.  Consequently, a column value can be
 arbitrarily high.  The first (or leftmost) column is numbered 0.  They
 also ignore overlays and text properties, aside from invisibility.
+Invisible text is considered as having zero width, unless
+@code{buffer-invisibility-spec} specifies that invisible text should
+be displayed as ellipsis (@pxref{Invisible Text}).
 
 @defun current-column
 This function returns the horizontal position of point, measured in
@@ -2439,6 +2442,10 @@ This function returns the indentation of the current line, which is
 the horizontal position of the first nonblank character.  If the
 contents are entirely blank, then this is the horizontal position of the
 end of the line.
+
+This function considers invisible text as having zero width, unless
+@code{buffer-invisibility-spec} specifies that invisible text should
+be displayed as ellipsis.  @xref{Invisible Text}.
 @end defun
 
 @deffn Command indent-to column &optional minimum
diff --git a/src/indent.c b/src/indent.c
index e90e3fde203..fd2e7636656 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -882,8 +882,10 @@ The return value is the column where the insertion ends.  */)
 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
        0, 0, 0,
        doc: /* Return the indentation of the current line.
-This is the horizontal position of the character
-following any initial whitespace.  */)
+This is the horizontal position of the character following any initial
+whitespace.
+Text that has an invisible property is considered as having width 0, unless
+`buffer-invisibility-spec' specifies that it is replaced by an ellipsis.  */)
   (void)
 {
   ptrdiff_t posbyte;
@@ -1001,6 +1003,9 @@ as displayed of the previous characters in the line.
 This function ignores line-continuation;
 there is no upper limit on the column number a character can have
 and horizontal scrolling has no effect.
+Text that has an invisible property is considered as having width 0,
+unless `buffer-invisibility-spec' specifies that it is replaced by
+an ellipsis.
 
 If specified column is within a character, point goes after that character.
 If it's past end of line, point goes to end of line.
diff --git a/src/macfont.m b/src/macfont.m
index fe30908f5d6..4de056cb361 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2645,6 +2645,9 @@ macfont_open (struct frame * f, Lisp_Object entity, int pixel_size)
   font->pixel_size = size;
   font->driver = &macfont_driver;
   font->encoding_charset = font->repertory_charset = -1;
+  /* Clear font->space_width so macfont_monospace_width_multiplier may
+     not be confused by an uninitialized value.  */
+  font->space_width = 0;
 
   block_input ();