[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9b14e312f4: Merge from origin/emacs-28
|
From: |
Stefan Kangas |
|
Subject: |
master 9b14e312f4: Merge from origin/emacs-28 |
|
Date: |
Wed, 21 Sep 2022 04:30:45 -0400 (EDT) |
branch: master
commit 9b14e312f409216dab647f839724d5df029e8195
Merge: 43c0ebd8bc 478b786d5a
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Merge from origin/emacs-28
478b786d5a ; * doc/lispref/windows.texi (Window Hooks): Fix a typo (b...
5085351645 * lisp/text-modes/tex-mode.el (tex-mode): Fix AUCTeX regre...
ee6f8598ca Add vc-annotate-switches to manual
616dcf27e5 ; Fix typos in Lisp symbols
5405852541 Remove mention of non-existent `annotate-switches'
191505b8a3 Mention that src/macuvs.h sometimes needs committing
10373c4b68 ; More comment fixes in font.h (bug#57935)
c2595b8dcc ; * src/font.h (struct font_driver): Comment fix.
97b928ce09 MacOS ld warning from native compilation (bug#57849)
---
admin/notes/unicode | 4 ++++
doc/emacs/maintaining.texi | 9 ++++++++-
doc/lispref/windows.texi | 2 +-
etc/NEWS.28 | 9 +++++++++
lisp/allout-widgets.el | 4 ++--
lisp/autorevert.el | 2 +-
lisp/cedet/ede/autoconf-edit.el | 3 +--
lisp/emacs-lisp/benchmark.el | 2 +-
lisp/emacs-lisp/bytecomp.el | 2 +-
lisp/emacs-lisp/comp.el | 5 +++--
lisp/epa-ks.el | 4 ++--
lisp/eshell/em-glob.el | 2 +-
lisp/frame.el | 2 +-
lisp/hexl.el | 2 +-
lisp/hilit-chg.el | 1 -
lisp/imenu.el | 2 +-
lisp/international/mule.el | 2 +-
lisp/org/ox.el | 2 +-
lisp/progmodes/cperl-mode.el | 2 +-
lisp/progmodes/flymake.el | 2 +-
lisp/progmodes/hideif.el | 4 ++--
lisp/progmodes/python.el | 4 ++--
lisp/tar-mode.el | 2 +-
lisp/textmodes/tex-mode.el | 5 ++++-
lisp/vc/add-log.el | 2 +-
lisp/vc/vc.el | 12 ++++++------
src/font.h | 2 +-
test/lisp/electric-tests.el | 2 +-
28 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/admin/notes/unicode b/admin/notes/unicode
index f699f4fb1c..014bfb9b0d 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -103,6 +103,10 @@ modified to follow suit. If there's trailing whitespace in
BidiCharacterTest.txt, it should be removed before committing the new
version.
+src/macuvs.h is a generated file, but if it has changed as a result
+of the updates, please commit it as well (see
+admin/unidata/Makefile.in for an explanation).
+
Visit "emoji-data.txt" with the rebuilt Emacs, and check that an
appropriate font is being used for the emoji (by default Emacs uses
"Noto Color Emoji"). Running the following command in that buffer
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 89e6b2215c..6ceda6d7a5 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -901,7 +901,14 @@ is non-@code{nil}, the colors expressing the age of each
line are
applied to the background color, leaving the foreground at its default
color.
- When you give a prefix argument to this command, Emacs reads two
+@vindex vc-annotate-switches
+ You can customize the @code{annotate} options that @kbd{C-x v g}
+uses by customizing @code{vc-@var{backend}-annotate-switches} and
+@code{vc-annotate-switches}. They function similarly to
+@code{vc-@var{backend}-diff-switches} and @code{vc-diff-switches},
+described above.
+
+ When you give a prefix argument to @kbd{C-x v g}, Emacs reads two
arguments using the minibuffer: the revision to display and annotate
(instead of the current file contents), and the time span in days the
color range should cover.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 33d0150a93..ee3b15992b 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -6492,7 +6492,7 @@ during redisplay provided a significant, non-scrolling
change of a
window has been detected. For simplicity, these hooks and the
functions they call will be collectively referred to as @dfn{window
change functions}. As any hook, these hooks can be set either
-globally of buffer-locally via the @var{local} argument of
+globally or buffer-locally via the @var{local} argument of
@code{add-hook} (@pxref{Setting Hooks}) when the hook is installed.
@cindex window buffer change
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 8694b575a7..6e5ddfa066 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -30,6 +30,15 @@ with a prefix argument or by typing 'C-u C-h C-n'.
* Changes in Specialized Modes and Packages in Emacs 28.3
+** 'native-comp-driver-options' on macOS
+
+The value of 'native-comp-driver-options' has been changed to contain
+"-Wl,-w" to suppress warnings of the form
+
+ ld: warning: -undefined dynamic_lookup may not work with chained fixups
+
+emitted during native compilation on macOS 12.6 with Xcode 14.
+
* New Modes and Packages in Emacs 28.3
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 736fb7d99d..7a65777d32 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -312,7 +312,7 @@ enhancements, directly.")
(defvar-local allout-inhibit-body-modification-hook nil
"Override de-escaping of text-prefixes in item bodies during specific
changes.
-This is used by `allout-buffer-modification-handler' to signal such changes
+This is used by `allout-body-modification-handler' to signal such changes
to `allout-body-modification-handler', and is always reset by
`allout-post-command-business'.")
;;;_ = allout-widgets-icons-cache
@@ -2180,7 +2180,7 @@ Operation is inhibited by
`allout-inhibit-body-modification-handler'."
;; `allout-before-modification-handler' and
;; `allout-inhibit-body-modification-handler'.
;;
-;; Adds the overlay to the `allout-unresolved-body-mod-workhash' during
+;; Adds the overlay to the `allout-unresolved-body-mod-workroster' during
;; before-change operation, and removes from that list during after-change
;; operation.
(cond (allout-inhibit-body-modification-hook nil)))
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 872a896689..576659675b 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -677,7 +677,7 @@ will use an up-to-date value of `auto-revert-interval'."
;;
;; We do this by reverting immediately in response to the first in a
;; flurry of notifications. Any notifications during the following
-;; `auto-revert-lockout-interval' seconds are noted but not acted upon
+;; `auto-revert--lockout-interval' seconds are noted but not acted upon
;; until the end of that interval.
(defconst auto-revert--lockout-interval 2.5
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index 78edea1da8..8458820bdd 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -34,8 +34,7 @@
"Initialize a new configure.ac in ROOTDIR for PROGRAM using TESTFILE.
ROOTDIR is the root directory of a given autoconf controlled project.
PROGRAM is the program to be configured.
-TESTFILE is the file used with AC_INIT.
-Configure the initial configure script using `autoconf-new-automake-string'."
+TESTFILE is the file used with AC_INIT."
(interactive "DRoot Dir: \nsProgram: \nsTest File: ")
(require 'ede/srecode)
(if (bufferp rootdir)
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 882b1d68c4..47bc3a4524 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -70,7 +70,7 @@ number of repetitions actually used."
(defun benchmark--adaptive (func time)
"Measure the run time of FUNC, calling it enough times to last TIME seconds.
-Result is (REPETITIONS . DATA) where DATA is as returned by `branchmark-call'."
+Result is (REPETITIONS . DATA) where DATA is as returned by `benchmark-call'."
(named-let loop ((repetitions 1)
(data (let ((x (list 0))) (setcdr x x) x)))
;; (message "Running %d iteration" repetitions)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3b3f7bb619..03c45e44a5 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1710,7 +1710,7 @@ URLs."
(seq "(" (* (not ")")) ")")))
")")))
""
- ;; Heuristic: We can't reliably do `subsititute-command-keys'
+ ;; Heuristic: We can't reliably do `substitute-command-keys'
;; substitutions, since the value of a keymap in general can't be
;; known at compile time. So instead, we assume that these
;; substitutions are of some length N.
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 35acbff9b1..abab9107ae 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -178,14 +178,15 @@ and above."
:type '(repeat string)
:version "28.1")
-(defcustom native-comp-driver-options nil
+(defcustom native-comp-driver-options (when (eq system-type 'darwin)
+ '("-Wl,-w"))
"Options passed verbatim to the native compiler's back-end driver.
Note that not all options are meaningful; typically only the options
affecting the assembler and linker are likely to be useful.
Passing these options is only available in libgccjit version 9
and above."
- :type '(repeat string) ; FIXME is this right?
+ :type '(repeat string)
:version "28.1")
(defcustom comp-libgccjit-reproducer nil
diff --git a/lisp/epa-ks.el b/lisp/epa-ks.el
index df8a72af70..4c539b56a3 100644
--- a/lisp/epa-ks.el
+++ b/lisp/epa-ks.el
@@ -41,7 +41,7 @@
(defcustom epa-keyserver "pgp.mit.edu"
"Domain of keyserver.
-This is used by `epa-ks-lookup-key', for looking up public keys."
+This is used by `epa-search-keys', for looking up public keys."
:type '(choice :tag "Keyserver"
(repeat :tag "Random pool"
(string :tag "Keyserver address"))
@@ -180,7 +180,7 @@ If EXACT is non-nil, don't accept approximate matches."
"Prepare KEYS for `tabulated-list-mode', for buffer BUF.
KEYS is a list of `epa-ks-key' structures, as parsed by
-`epa-ks-parse-result'."
+`epa-ks--parse-buffer'."
(when (buffer-live-p buf)
(let (entries)
(dolist (key keys)
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 58b7a83c09..9722aeae18 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -202,7 +202,7 @@ The basic syntax is:
[a-b] [a-b] matches a character or range
[^a] [^a] excludes a character or range
-If any characters in PATTERN have the text property `eshell-escaped'
+If any characters in PATTERN have the text property `escaped'
set to true, then these characters will match themselves in the
resulting regular expression."
(let ((matched-in-pattern 0) ; How much of PATTERN handled
diff --git a/lisp/frame.el b/lisp/frame.el
index 56a982562d..6bedffc358 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1793,7 +1793,7 @@ of frames like calls to map a frame or change its
visibility."
(insert (format ", DS=%sx%s" (nth 0 item) (nth 1 item))))
(insert "\n"))
((and (eq (nth 0 item) frame) (= (nth 1 item) 5))
- ;; Length 5 is an `adjust-frame-size' item.
+ ;; Length 5 is an 'adjust_frame_size' item.
(insert (format "%s (%s)" (nth 3 item) (nth 2 item)))
(setq item (nth 0 (cdr entry)))
(unless (and (= (nth 0 item) (nth 2 item))
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 7f965486ea..b8d25bfb1f 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -687,7 +687,7 @@ If there is no byte at the target address move to the last
byte in that line."
(defun hexl-beginning-of-buffer (arg)
"Move to the beginning of the hexl buffer.
-Leaves `hexl-mark' at previous position.
+Leaves mark at previous position.
With prefix arg N, puts point N bytes of the way from the true beginning."
(interactive "p")
(push-mark)
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 4832dd9023..00748e12da 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -118,7 +118,6 @@
;;
;; Other interactive functions (that could be bound if desired):
;; `highlight-changes-mode'
-;; `highlight-changes-toggle-visibility'
;; `highlight-changes-remove-highlight'
;; `highlight-compare-with-file'
;; `highlight-compare-buffers'
diff --git a/lisp/imenu.el b/lisp/imenu.el
index dcd816cb7a..c407f501d6 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -310,7 +310,7 @@ element recalculates the buffer's index alist.")
(defvar imenu--history-list nil
;; Making this buffer local caused it not to work!
- "History list for `jump-to-function-in-buffer'.")
+ "History list for `imenu-choose-buffer-index'.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ab74c2cffd..5cca5bf707 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -767,7 +767,7 @@ VALUE must be a translation table to use on encoding.
VALUE must be a function to call after some text is inserted and
decoded by the coding system itself and before any functions in
-`after-insert-functions' are called. This function is passed one
+`after-insert-file-functions' are called. This function is passed one
argument: the number of characters in the text to convert, with
point at the start of the text. The function should leave point
and the match data unchanged, and should return the new character
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 9a2a69b2c1..56bb4b74df 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -4642,7 +4642,7 @@ from the export back-end."
;; a given element, excluded. Note: "-n" switches reset that count.
;;
;; `org-export-unravel-code' extracts source code (along with a code
-;; references alist) from an `element-block' or `src-block' type
+;; references alist) from an `example-block' or `src-block' type
;; element.
;;
;; `org-export-format-code' applies a formatting function to each line
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index c3704a05db..fa428642fa 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3162,7 +3162,7 @@ Returns true if comment is found. In POD will not move
the point."
Mark as generic string if STRING, as generic comment otherwise.
A single character is marked as punctuation and directly
fontified. Do nothing if BEGIN and END are equal. If
-`cperl-use-syntax-text-property' is nil, just fontify."
+`cperl-use-syntax-table-text-property' is nil, just fontify."
(if (and cperl-use-syntax-table-text-property
(> end begin))
(progn
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 15ee5cb7d5..5bbbfa822f 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1538,7 +1538,7 @@ POS can be a buffer position or a button"
(flymake-show-diagnostic (if (button-type pos) (button-start pos) pos))))
(defun flymake--tabulated-entries-1 (diags project-root)
- "Helper for `flymake--diagnostic-buffer-entries'.
+ "Helper for `flymake--diagnostics-buffer-entries'.
PROJECT-ROOT indicates that each entry should be preceded by the
filename of the diagnostic relative to that directory."
(cl-loop
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 53788949ea..767216c03f 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -405,7 +405,7 @@ overlays created."
;; hidden with `hide-ifdef-lines' equals to nil while another part with 't,
;; this case happens.
;; TODO: Should we merge? or just create a container overlay? -- this can
- ;; prevent `hideif-show-ifdef' expanding too many hidden contents since there
+ ;; prevent `show-ifdefs' expanding too many hidden contents since there
;; is only a big overlay exists there without any smaller overlays.
(save-restriction
(widen) ; Otherwise `point-min' and `point-max' will be restricted and thus
@@ -725,7 +725,7 @@ Assuming we've just regexp-matched with
`hif-decfloat-regexp' and it matched.
if REMATCH is t, do a rematch."
;; In elisp `(string-to-number "01.e2")' will return 1 instead of the
expected
;; 100.0; therefore we need to write our own.
- ;; This function relies on the regexp groups of `hif-dexfloat-regexp'
+ ;; This function relies on the regexp groups of `hif-hexfloat-regexp'
(if (or fix exp)
(setq fix (hif-delete-char-in-string ?' fix)
exp (hif-delete-char-in-string ?' exp))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 09f94f4b34..d5ff059cc8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3087,8 +3087,8 @@ interpreter is run. Variables
`python-shell-font-lock-enable',
`python-shell-completion-setup-code',
`python-shell-completion-string-code',
-`python-eldoc-setup-code', `python-eldoc-string-code',
-`python-ffap-setup-code' and `python-ffap-string-code' can
+`python-eldoc-setup-code',
+`python-ffap-setup-code' can
customize this mode for different Python interpreters.
This mode resets `comint-output-filter-functions' locally, so you
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 20ad6e1e46..49d84319c5 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -169,7 +169,7 @@ This information is useful, but it takes screen space away
from file names."
(defun tar-swap-data ()
"Swap buffer contents between current buffer and `tar-data-buffer'.
-Preserve the modified states of the buffers and set `buffer-swapped-with'."
+Preserve the modified states of the buffers and set `tar-data-swapped'."
(let ((data-buffer-modified-p (buffer-modified-p tar-data-buffer))
(current-buffer-modified-p (buffer-modified-p)))
(buffer-swap-text tar-data-buffer)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index f624b604aa..77c0d23420 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1014,7 +1014,10 @@ such as if there are no commands in the file, the value
of `tex-default-mode'
says which mode to use."
(tex-common-initialization))
-(advice-add 'tex-mode :around #'tex--redirect-to-submode)
+(advice-add 'tex-mode :around #'tex--redirect-to-submode
+ ;; Give it lower precedence than normal advice, so
+ ;; AUCTeX's advice takes precedence over it.
+ '((depth . 50)))
(defvar tex-mode--recursing nil)
(defun tex--redirect-to-submode (orig-fun)
"Redirect to one of the submodes when called directly."
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index d617d5aebb..e3c0e2ca06 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -806,7 +806,7 @@ if it were to exist."
(defun add-log-find-changelog-buffer (changelog-file-name)
"Find a ChangeLog buffer for CHANGELOG-FILE-NAME.
-Respect `add-log-use-pseudo-changelog', which see."
+Respect `add-log--pseudo-changelog-buffer-name', which see."
(if (or (file-exists-p changelog-file-name)
(not add-log-dont-create-changelog-file))
(find-file-noselect changelog-file-name)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index c67dad69fc..6ee6e36a04 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -808,12 +808,12 @@ not specific to any particular backend."
(defcustom vc-annotate-switches nil
"A string or list of strings specifying switches for annotate under VC.
When running annotate under a given BACKEND, VC uses the first
-non-nil value of `vc-BACKEND-annotate-switches', `vc-annotate-switches',
-and `annotate-switches', in that order. Since nil means to check the
-next variable in the sequence, either of the first two may use
-the value t to mean no switches at all. `vc-annotate-switches'
-should contain switches that are specific to version control, but
-not specific to any particular backend.
+non-nil value of `vc-BACKEND-annotate-switches' and
+`vc-annotate-switches', in that order. Since nil means to check
+the next variable in the sequence, setting the first to the value
+t means no switches at all. `vc-annotate-switches' should
+contain switches that are specific to version control, but not
+specific to any particular backend.
As very few switches (if any) are used across different VC tools,
please consider using the specific `vc-BACKEND-annotate-switches'
diff --git a/src/font.h b/src/font.h
index 06bd297ccb..3475189206 100644
--- a/src/font.h
+++ b/src/font.h
@@ -660,7 +660,7 @@ struct font_driver
/* Optional.
Draw glyphs between FROM and TO of S->char2b at (X Y) pixel
- position of frame F with S->FACE and S->GC. If WITH_BACKGROUND,
+ position of frame S->f with S->face and S->gc. If WITH_BACKGROUND,
fill the background in advance. It is assured that WITH_BACKGROUND
is false when (FROM > 0 || TO < S->nchars). */
int (*draw) (struct glyph_string *s, int from, int to,
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 5d7e905cfa..d34737e609 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -901,7 +901,7 @@ baz\"\""
(should (equal (buffer-string) "int main () {\n \n}"))))
(ert-deftest electric-layout-control-reindentation ()
- "Same as `emacs-lisp-int-main-kernel-style', but checking
+ "Same as `electric-layout-int-main-kernel-style', but checking
Bug#35254."
(ert-with-test-buffer ()
(plainer-c-mode)