master 1b73ac317f3 1/5: Merge from savannah/emacs-30

[Po Lu]

branch: master
commit 1b73ac317f3802715bf91f667dd758dcebb7e3f9
Merge: 2ba39a30bf4 164f75822b2
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge from savannah/emacs-30
    
    164f75822b2 ; Fix typos
    768e92b9c02 Update options that depend on 'which-key-dont-use-unicode'
    4b2682b17cd ; Remove debugging message in Completion Preview test
---
 ChangeLog.3                           | 12 ++++++------
 ChangeLog.4                           | 16 ++++++++--------
 lisp/which-key.el                     |  5 +++++
 test/lisp/completion-preview-tests.el |  1 -
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 8d227d8a47d..80ea900477e 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -17355,7 +17355,7 @@
        ([EmacsView viewDidResize:]):Don't explicitly release surfaces.
        ([EmacsView initFrameFromEmacs:]): Move the layer code to after the
        NSWindow has been created as creating the layer now relies on some of
-       it's properties.
+       its properties.
        ([EmacsView makeBackingLayer]): New function.
        ([EmacsView lockFocus]):
        ([EmacsView focusOnDrawingBuffer]): Rename to lockFocus.
@@ -128870,7 +128870,7 @@
 
        Change default offset of CC Mode syntactic symbol inlambda to 0
 
-       It's previous default was c-lineup-inexpr-block.  This change is mainly 
to
+       Its previous default was c-lineup-inexpr-block.  This change is mainly 
to
        prevent excessive indentation of the innards of C++ lambda functions.
 
        * lisp/progmodes/cc-vars.el (c-offsets-alist): Amend the offset for 
inlambda
@@ -155238,7 +155238,7 @@
        d6aa55e Avoid segfaults in replace-buffer-contents with large buffers
        d22b8d1 Adjust for scaling for mode-line popup menus (Bug#31880)
        3d2e3dc Change name of `seqp' argument (Bug#26411)
-       40e1db8 Change index of ";" to better reflect it's usage (Bug#31623)
+       40e1db8 Change index of ";" to better reflect its usage (Bug#31623)
        d289e7e Fix bug of 'mouse-drag-and-drop-region' to detect edges of re...
        e292c09 Fix #'fun handling inside `labels' (Bug#31792)
 
@@ -176477,7 +176477,7 @@
 
 2018-06-20  Noam Postavsky  <npostavs@gmail.com>
 
-       Change index of ";" to better reflect it's usage (Bug#31623)
+       Change index of ";" to better reflect its usage (Bug#31623)
 
        * doc/lispref/objects.texi (Comments): "; for commenting" fits better
        with the following text about how a semicolon begins a comment.  Also
@@ -217678,7 +217678,7 @@
        Add seq-random-elt to seq.el
 
        * lisp/emacs-lisp/seq.el (seq-random-elt): Add function to return a
-         random element from it's sequence parameter.
+         random element from its sequence parameter.
 
        * test/lisp/emacs-lisp/seq-tests.el (test-seq-random-elt-take-all
          test-seq-random-elt-return-nil): Test the new function
@@ -223245,7 +223245,7 @@
        Make ‘delete-trailing-whitespace’ delete spaces after form feed
 
        * lisp/simple.el (delete-trailing-whitespace): Treat form fead as
-       a non-whitespace character (regardless of whether it’s character syntax
+       a non-whitespace character (regardless of whether its character syntax
        is whitespace) and delete any whitespace following it instead of leaving
        lines with form feeds completely unchanged.  I.e. a line like "\f " will
        now became "\f".
diff --git a/ChangeLog.4 b/ChangeLog.4
index e510dec7b51..be1eb2f80b4 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -8476,8 +8476,8 @@
        changes, make hint overlays span one character (instead of being
        length 0).  Give the overlays an "evaporate" property.
 
-       Given an inlay hints at position POS, its attached to [POS, POS+1] if
-       it's kind=1 (usually type hints) and [POS-1, POS] otherwise.  For
+       Given an inlay hints at position POS, it's attached to [POS, POS+1] if
+       its kind=1 (usually type hints) and [POS-1, POS] otherwise.  For
        kind=1 hints, the 'cursor position of the first such overlay is also
        tweaked, so that's it's less awkward to edit around it.
 
@@ -9313,7 +9313,7 @@
        Not the subject of it, but mentioned in bug#61893.
 
        * lisp/progmodes/c-ts-mode.el (c-ts-mode--anchor-prev-sibling): Skip
-       the sibling if it doesn't start on it's own line.
+       the sibling if it doesn't start on its own line.
        * test/lisp/progmodes/c-ts-mode-resources/indent.erts: New test.
 
 2023-03-05  Kyle Meyer  <kyle@kyleam.com>
@@ -24470,7 +24470,7 @@
        (treesit-major-mode-setup): Instead of binding
        font-lock-fontify-region-function, now bind to
        font-lock-fontify-syntactically-function.  And we can let font-lock do
-       it's thing.
+       its thing.
 
 2022-10-31  Yuan Fu  <casouri@gmail.com>
 
@@ -28715,7 +28715,7 @@
        Fix Tramp completion on MS Windows
 
        * lisp/net/tramp.el (tramp-build-remote-file-name-spec-regexp):
-       Revert previous change, it's too complicate.
+       Revert previous change, it's too complicated.
        (tramp-build-completion-file-name-regexp):
        Use `tramp-prefix-format' instead of `tramp-prefix-regexp'.  
(Bug#558133)
 
@@ -37079,7 +37079,7 @@
 
        * src/xselect.c (lisp_data_to_selection_data): Assume an empty
        vector represents INTEGER data, instead of blindly trying to
-       aref it's first element.
+       aref its first element.
 
 2022-09-04  Jim Porter  <jporterbugs@gmail.com>
 
@@ -40542,7 +40542,7 @@
 
        * doc/misc/gnus.texi (The problem of spam): Don't explain what
        spam is; there is no need for that in 2022.  Don't explain
-       limitations of obsolete software TMDA; it's website has stopped
+       limitations of obsolete software TMDA; its website has stopped
        working but seems to have been updated last in 2007.
        (Thwarting Email Spam, Anti-Spam Basics)
        (Spam Package Configuration Examples): Prefer "spam" to "UCE".
@@ -63333,7 +63333,7 @@
        Correct indentation of opening brace in xdisp.c, which isn't at start 
of defun
 
        * xdisp.c (calc_pixel_width_or_height): indent the opening brace of a
-       substatement correctly.  It's previous position, in column 0, caused
+       substatement correctly.  Its previous position, in column 0, caused
        indentation errors in C Mode.
 
 2022-05-17  Po Lu  <luangruo@yahoo.com>
diff --git a/lisp/which-key.el b/lisp/which-key.el
index ee7a1cea333..91007ce4ada 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -128,6 +128,11 @@ of the which-key popup."
   "If non-nil, don't use any unicode characters in default setup.
 For affected settings, see `which-key-replacement-alist', `which-key-ellipsis'
 `which-key-separator'."
+  :set (lambda (sym val)
+         (custom-set-default sym val)
+         (mapc #'custom-reevaluate-setting
+               '(which-key-separator
+                 which-key-ellipsis)))
   :type 'boolean
   :package-version "1.0" :version "30.1")
 
diff --git a/test/lisp/completion-preview-tests.el 
b/test/lisp/completion-preview-tests.el
index 7d358d07519..3f64fe02e18 100644
--- a/test/lisp/completion-preview-tests.el
+++ b/test/lisp/completion-preview-tests.el
@@ -228,7 +228,6 @@ instead."
       (insert "foo")
       (let ((this-command 'self-insert-command))
         (completion-preview--post-command))
-      (message "here")
 
       (completion-preview-tests--check-preview "bar" 
'completion-preview-common)