aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2025-01-23 03:13:01 +0100
committerStefan Kangas2025-01-23 03:14:37 +0100
commitcda78edc7d9194181bcda1790f29cb7cf3ceb0b9 (patch)
tree389233e91d4734810d553bc48c57d9d107afe2a9
parentce50a1d3c18bcf0e5f51f4ed49f292f7be31010d (diff)
downloademacs-cda78edc7d9194181bcda1790f29cb7cf3ceb0b9.tar.gz
emacs-cda78edc7d9194181bcda1790f29cb7cf3ceb0b9.zip
; Fix typos
-rw-r--r--ChangeLog.38
-rw-r--r--ChangeLog.412
-rw-r--r--admin/codespell/codespell.exclude13
-rwxr-xr-xadmin/nt/dist-build/build-dep-zips.py8
-rw-r--r--admin/nt/dist-build/emacs.nsi6
-rw-r--r--doc/lispref/frames.texi2
-rw-r--r--doc/lispref/internals.texi2
-rw-r--r--etc/PROBLEMS4
-rw-r--r--etc/future-bug2
-rw-r--r--lisp/calendar/calendar.el2
-rw-r--r--lisp/progmodes/meta-mode.el2
-rw-r--r--lisp/type-break.el4
-rw-r--r--nextstep/README12
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/keyboard.c2
15 files changed, 47 insertions, 34 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index 067a60cdb0a..8fcec8da85b 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -47356,7 +47356,7 @@
47356 possible bug. 47356 possible bug.
47357 47357
47358 * lisp/progmodes/flymake.el (flymake--mode-line-counter): Must 47358 * lisp/progmodes/flymake.el (flymake--mode-line-counter): Must
47359 explicily create a new string unpropertized string 47359 explicitly create a new string unpropertized string
47360 47360
473612020-12-31 João Távora <joaotavora@gmail.com> 473612020-12-31 João Távora <joaotavora@gmail.com>
47362 47362
@@ -160589,7 +160589,7 @@
160589 to be replaced with an appropriate character reference. Make 160589 to be replaced with an appropriate character reference. Make
160590 ‘sgml-quote’ do that. 160590 ‘sgml-quote’ do that.
160591 160591
160592 While at it, fix entiteis not being unquoted if they lack closing 160592 While at it, fix entities not being unquoted if they lack closing
160593 semicolon (e.g. ‘&amp’) occurring at the very end of a region. 160593 semicolon (e.g. ‘&amp’) occurring at the very end of a region.
160594 Even though unlikely, make ‘sgml-quote’ handle this scenario. 160594 Even though unlikely, make ‘sgml-quote’ handle this scenario.
160595 160595
@@ -186569,7 +186569,7 @@
186569 Delete a Flymake obsolete alias that can't possibly work 186569 Delete a Flymake obsolete alias that can't possibly work
186570 186570
186571 The function `flymake-ler-make-ler' can't possibly work as an backward 186571 The function `flymake-ler-make-ler' can't possibly work as an backward
186572 compatible interface to existing extensinos (even purely hypothetical 186572 compatible interface to existing extensions (even purely hypothetical
186573 ones, since none are known). This is because every diagnostic 186573 ones, since none are known). This is because every diagnostic
186574 considered by Flymake has to passed to a report-fn function. 186574 considered by Flymake has to passed to a report-fn function.
186575 186575
@@ -223234,7 +223234,7 @@
223234 called any longer. 223234 called any longer.
223235 223235
223236 Furthermore, when newline has whitespace syntax, ‘\s-$’ regular 223236 Furthermore, when newline has whitespace syntax, ‘\s-$’ regular
223237 expression ends up matching empty lins since ‘\s-’ matches newline 223237 expression ends up matching empty lines since ‘\s-’ matches newline
223238 characetr of proceeding line. This leads to needless loop iterations. 223238 characetr of proceeding line. This leads to needless loop iterations.
223239 223239
223240 Since previous change to ‘delete-trailing-whitespace’ already introduced 223240 Since previous change to ‘delete-trailing-whitespace’ already introduced
diff --git a/ChangeLog.4 b/ChangeLog.4
index 80e16869ad7..accbf824c7e 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -342,7 +342,7 @@
342 342
343 Improve documentation for 'while-let' 343 Improve documentation for 'while-let'
344 344
345 * doc/lispref/control.texi (Conditionals): Reorganise describing 345 * doc/lispref/control.texi (Conditionals): Reorganize describing
346 what's overlapping between the macros (and between the macros 346 what's overlapping between the macros (and between the macros
347 and let*), and then improve the documentation for 'while-let'. 347 and let*), and then improve the documentation for 'while-let'.
348 348
@@ -15155,7 +15155,7 @@
15155 15155
15156 Remove unnecessary (delq nil...). 15156 Remove unnecessary (delq nil...).
15157 15157
15158 This is presumed to be an artifacto of an old default. 15158 This is presumed to be an artifact of an old default.
15159 15159
15160 * lisp/which-key.el (which-key-replacement-alist): 15160 * lisp/which-key.el (which-key-replacement-alist):
15161 Remove unnecessary (delq nil...). 15161 Remove unnecessary (delq nil...).
@@ -50535,7 +50535,7 @@
50535 50535
50536 The Emacs regexp engine interprets character ranges from ASCII to raw 50536 The Emacs regexp engine interprets character ranges from ASCII to raw
50537 bytes, such as [a-\xfe], as not including non-ASCII Unicode at all; 50537 bytes, such as [a-\xfe], as not including non-ASCII Unicode at all;
50538 ranges from non-ACII Unicode to raw bytes, such as [ü-\x91], are 50538 ranges from non-ASCII Unicode to raw bytes, such as [ü-\x91], are
50539 ignored entirely. 50539 ignored entirely.
50540 50540
50541 To make rx produce a translation that works as intended, split ranges 50541 To make rx produce a translation that works as intended, split ranges
@@ -53275,7 +53275,7 @@
53275 53275
53276 * lisp/emacs-lisp/cl-macs.el (cl--slet): Add `nowarn` arg. 53276 * lisp/emacs-lisp/cl-macs.el (cl--slet): Add `nowarn` arg.
53277 (cl--defsubst-expand): Use it. 53277 (cl--defsubst-expand): Use it.
53278 (cl-defstruct): Silence warnings abour lexical shadowing when a slot's 53278 (cl-defstruct): Silence warnings about lexical shadowing when a slot's
53279 name happens to be the same as a dynbound var. 53279 name happens to be the same as a dynbound var.
53280 53280
532812023-06-25 Stefan Monnier <monnier@iro.umontreal.ca> 532812023-06-25 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -68708,7 +68708,7 @@
68708 works. 68708 works.
68709 68709
68710 * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): 68710 * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
68711 Instead of re-using local variables through mutation, bind them at 68711 Instead of reusing local variables through mutation, bind them at
68712 point of use. This ensures that there is no value leakage by mistake 68712 point of use. This ensures that there is no value leakage by mistake
68713 and actually reduces the static size of the bytecode of this function 68713 and actually reduces the static size of the bytecode of this function
68714 somewhat. 68714 somewhat.
@@ -75501,7 +75501,7 @@
75501 4004dde6ea Avoid positional arguments to define-minor-mode 75501 4004dde6ea Avoid positional arguments to define-minor-mode
75502 cb85f9c274 Fix typo in use-package docstring 75502 cb85f9c274 Fix typo in use-package docstring
75503 30b35d6d62 Update use-package.texi 75503 30b35d6d62 Update use-package.texi
75504 9be2580f5f optimization: constand folding for read-kbd-macro 75504 9be2580f5f optimization: constant folding for read-kbd-macro
75505 1143f14d65 bind-keys-form: error for repeat sub-keywords without :rep... 75505 1143f14d65 bind-keys-form: error for repeat sub-keywords without :rep...
75506 c4bd2aa3b8 bind-key-form: allow :continue keyword inside repeat map 75506 c4bd2aa3b8 bind-key-form: allow :continue keyword inside repeat map
75507 5ef327ce9f bind-key-form: allow :exit keyword inside repeat map 75507 5ef327ce9f bind-key-form: allow :exit keyword inside repeat map
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index f4c67ae83e8..5bb85a0dac3 100644
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1743,3 +1743,16 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
1743 2a85d81c47 Add support for gathering statistics on use-package declar... 1743 2a85d81c47 Add support for gathering statistics on use-package declar...
1744 (let* ((nam (buffer-substring (match-beginning 2) (match-end 2))) 1744 (let* ((nam (buffer-substring (match-beginning 2) (match-end 2)))
1745 (setq nmlst (cons nam nmlst) 1745 (setq nmlst (cons nam nmlst)
1746 (elisp--safe-macroexpand-all): Make the warning more discrete.
1747|PACK|UNPK|INDX|BLD |LEN |... |
1748@key{INDX} removes an integer @var{n}, then builds a vector of
1749integers from 1 to @var{n}. @kbd{INV INDX} takes three numbers
1750(sref STRING INDX) returns the character in STRING at INDEX. INDEX
1751;; |PACK|UNPK|INDX|BLD |LEN |... |
1752 ( "INDX" (progn calc-num-prefix calc-index) "\C-u\excalc-index\r" )
1753 (calc-enter-result 3 "indx" (cons 'calcFunc-index (calc-top-list-n 3)))
1754 (calc-enter-result 0 "indx" (list 'calcFunc-index
1755 (elisp--safe-macroexpand-all): Make the warning more discreet.
1756 dee6b36286 If use-package-verbose is t, show loading times when :afte...
1757 267fc6d00c4 ruby-smie-rules: Fix misindentation of a method call afte...
1758 b0181dafb9e Improve documentation of 'enable-local-variables' in Emac...
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 567e8eb2133..af3036eb8e6 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -30,7 +30,7 @@ EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "30"
30# Base URI for the package sources mapped in PKG_REQ 30# Base URI for the package sources mapped in PKG_REQ
31SRC_REPO="https://repo.msys2.org/mingw/sources" 31SRC_REPO="https://repo.msys2.org/mingw/sources"
32 32
33# Map items in `dynamic-library-alist' to source pakages 33# Map items in `dynamic-library-alist' to source packages
34PKG_REQ='''mingw-w64-x86_64-giflib 34PKG_REQ='''mingw-w64-x86_64-giflib
35mingw-w64-x86_64-gnutls 35mingw-w64-x86_64-gnutls
36mingw-w64-x86_64-harfbuzz 36mingw-w64-x86_64-harfbuzz
@@ -47,7 +47,7 @@ mingw-w64-x86_64-xpm-nox
47mingw-w64-x86_64-tree-sitter 47mingw-w64-x86_64-tree-sitter
48mingw-w64-x86_64-sqlite3'''.split() 48mingw-w64-x86_64-sqlite3'''.split()
49 49
50# Emacs style path to dependancy DLLs on build system 50# Emacs style path to dependency DLLs on build system
51DLL_SRC="c:/msys64/mingw64/bin" 51DLL_SRC="c:/msys64/mingw64/bin"
52 52
53# libraries we never include 53# libraries we never include
@@ -110,7 +110,7 @@ def gather_deps():
110 print("Deps updated in", os.getcwd(), "as", zipfile) 110 print("Deps updated in", os.getcwd(), "as", zipfile)
111 os.chdir("../") 111 os.chdir("../")
112 112
113# Return dependancies listed in Emacs 113# Return dependencies listed in Emacs
114def init_deps(): 114def init_deps():
115 return '''libXpm-nox4.dll 115 return '''libXpm-nox4.dll
116libpng16-16.dll 116libpng16-16.dll
@@ -382,7 +382,7 @@ parser.add_argument("-d", help="dry run",
382parser.add_argument("-l", help="list dependencies", 382parser.add_argument("-l", help="list dependencies",
383 action="store_true") 383 action="store_true")
384 384
385parser.add_argument("-e", help="extract direct dependancies", 385parser.add_argument("-e", help="extract direct dependencies",
386 action="store_true") 386 action="store_true")
387 387
388args = parser.parse_args() 388args = parser.parse_args()
diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi
index b8226d69423..4a5de4f85f9 100644
--- a/admin/nt/dist-build/emacs.nsi
+++ b/admin/nt/dist-build/emacs.nsi
@@ -92,7 +92,7 @@ Section "Uninstall"
92 # remove All Users shortcuts only 92 # remove All Users shortcuts only
93 # SetShellVarContext all 93 # SetShellVarContext all
94 94
95 # retreive/recalculate uninstaller location 95 # retrieve/recalculate uninstaller location
96 StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" 96 StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe"
97 97
98 # remove registry key 98 # remove registry key
@@ -101,7 +101,7 @@ Section "Uninstall"
101 # delete uninstaller 101 # delete uninstaller
102 Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" 102 Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe"
103 103
104 # retreive/reclculate startmenu shortcuts location 104 # retrieve/recalculate startmenu shortcuts location
105 !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder 105 !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
106 StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder" 106 StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder"
107 107
@@ -120,7 +120,7 @@ Section "Uninstall"
120 # we're basically using GOTO, above, so we should get here.. 120 # we're basically using GOTO, above, so we should get here..
121 startMenuDeleteLoopDone: 121 startMenuDeleteLoopDone:
122 122
123 # next we remove stuff from program-files/instalation path 123 # next we remove stuff from program-files/installation path
124 # start with recursive delete of the Emacs we installed 124 # start with recursive delete of the Emacs we installed
125 RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}" 125 RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}"
126 126
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 23d770ce450..53cc73a1650 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -4712,7 +4712,7 @@ and secondary selections by saving the value supplied into a variable
4712subsequent calls to @code{gui-get-selection} return. 4712subsequent calls to @code{gui-get-selection} return.
4713 4713
4714 From the clipboard, @code{gui-get-selection} is capable of returning 4714 From the clipboard, @code{gui-get-selection} is capable of returning
4715UTF-8 string data of the type @code{STRING}, the @code{TAREGTS} data 4715UTF-8 string data of the type @code{STRING}, the @code{TARGETS} data
4716type, or image and application data of any MIME type. 4716type, or image and application data of any MIME type.
4717@code{gui-set-selection} sets only string data, much as under 4717@code{gui-set-selection} sets only string data, much as under
4718MS-Windows, although this data is not affected by the value of 4718MS-Windows, although this data is not affected by the value of
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index f598d96c625..cc82a03db98 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -2745,7 +2745,7 @@ The window-relative vertical position of the line containing
2745@item window_end_valid 2745@item window_end_valid
2746This field is set to a non-zero value if @code{window_end_pos} and 2746This field is set to a non-zero value if @code{window_end_pos} and
2747@code{window_end_vpos} are truly valid. This is zero if nontrivial 2747@code{window_end_vpos} are truly valid. This is zero if nontrivial
2748redisplay is pre-empted, since in that case the display that 2748redisplay is preempted, since in that case the display that
2749@code{window_end_pos} was computed for did not get onto the screen. 2749@code{window_end_pos} was computed for did not get onto the screen.
2750 2750
2751@item cursor 2751@item cursor
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 1dcbe017353..49e9248c688 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1600,7 +1600,7 @@ https://lists.gnu.org/r/emacs-devel/2016-07/msg00154.html.
1600 1600
1601*** In Emacs built with GTK+ toolkit, menu-bar background becomes transparent. 1601*** In Emacs built with GTK+ toolkit, menu-bar background becomes transparent.
1602 1602
1603This happens when 'alpha-background' is less than 100. This is due a 1603This happens when 'alpha-background' is less than 100. This is due to a
1604GTK limitation, for which no workaround is currently known, 1604GTK limitation, for which no workaround is currently known,
1605unfortunately. 1605unfortunately.
1606 1606
@@ -1622,7 +1622,7 @@ after switching back from another virtual desktop. Setting the variable
1622 1622
1623*** Gnome desktop does not respect frame size specified in .Xresources 1623*** Gnome desktop does not respect frame size specified in .Xresources
1624 1624
1625This has been obeserved when running a GTK+ build of Emacs 29 from the 1625This has been observed when running a GTK+ build of Emacs 29 from the
1626launch pad on Ubuntu 24.04 with mutter as window manager. The problem 1626launch pad on Ubuntu 24.04 with mutter as window manager. The problem
1627can be resolved by running Emacs from the command line instead. 1627can be resolved by running Emacs from the command line instead.
1628 1628
diff --git a/etc/future-bug b/etc/future-bug
index c18dd995d66..a9c871d6cee 100644
--- a/etc/future-bug
+++ b/etc/future-bug
@@ -30,7 +30,7 @@ comments when you write it (sometime in 2198 as I recall).
30 30
31 31
32P.S. You'll be pleased to know that since (time-forward N) still works 32P.S. You'll be pleased to know that since (time-forward N) still works
33 for N >= 0, we've used it to pre-emptively update configure.ac. 33 for N >= 0, we've used it to preemptively update configure.ac.
34 Emacs now configures and builds on every platform that will ever 34 Emacs now configures and builds on every platform that will ever
35 be made. It wasn't easy, but at least that's one problem out of 35 be made. It wasn't easy, but at least that's one problem out of
36 the way for good. If you'd like the patch, just ask. 36 the way for good. If you'd like the patch, just ask.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 457f4ed42ec..d94cbed94e9 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -102,7 +102,7 @@
102;; the absolute format (see e.g. `calendar-iso-from-absolute' in 102;; the absolute format (see e.g. `calendar-iso-from-absolute' in
103;; cal-iso.el). This representation is also useful for certain 103;; cal-iso.el). This representation is also useful for certain
104;; calculations; e.g. `calendar-day-of-week' is simply the absolute 104;; calculations; e.g. `calendar-day-of-week' is simply the absolute
105;; represention modulo 7, because December 31, 1BC is a Sunday. 105;; representation modulo 7, because December 31, 1BC is a Sunday.
106 106
107;; A note on free variables: 107;; A note on free variables:
108 108
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index abc789d403c..36cbc1c08fe 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -198,7 +198,7 @@
198 ;; 198 ;;
199 ;; The expected syntax of an item is either "word" or "symbol", 199 ;; The expected syntax of an item is either "word" or "symbol",
200 ;; possibly ending with optional whitespace. Everything following 200 ;; possibly ending with optional whitespace. Everything following
201 ;; the item (but belonging to it) is expected to by skipable by 201 ;; the item (but belonging to it) is expected to by skippable by
202 ;; `forward-sexp'. The list of items is expected to be separated 202 ;; `forward-sexp'. The list of items is expected to be separated
203 ;; by commas and terminated by semicolons or equals signs. 203 ;; by commas and terminated by semicolons or equals signs.
204 ;; 204 ;;
diff --git a/lisp/type-break.el b/lisp/type-break.el
index b36860e48ef..551af70a484 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -116,8 +116,8 @@ then there is no minimum threshold; as soon as the scheduled time has
116elapsed, the user will always be queried. 116elapsed, the user will always be queried.
117 117
118The second number is the maximum number of keystrokes that can be entered 118The second number is the maximum number of keystrokes that can be entered
119before a typing break is requested immediately, pre-empting the originally 119before a typing break is requested immediately, preempting the originally
120scheduled break. If this second value is nil, then no pre-emptive breaks 120scheduled break. If this second value is nil, then no preemptive breaks
121will occur; only scheduled ones will. 121will occur; only scheduled ones will.
122 122
123Keys with bucky bits (shift, control, meta, etc) are counted as only one 123Keys with bucky bits (shift, control, meta, etc) are counted as only one
diff --git a/nextstep/README b/nextstep/README
index 487ea52ead4..853d6bcda35 100644
--- a/nextstep/README
+++ b/nextstep/README
@@ -14,7 +14,7 @@ OpenStep and then Rhapsody, which became Mac OS X. In 2004 it was
14adapted to GNUstep, a free OpenStep implementation, and in 2008 it was 14adapted to GNUstep, a free OpenStep implementation, and in 2008 it was
15merged to the GNU Emacs trunk and released with Emacs 23. Around the 15merged to the GNU Emacs trunk and released with Emacs 23. Around the
16same time a separate Mac-only port using the Carbon APIs and 16same time a separate Mac-only port using the Carbon APIs and
17descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It 17descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It
18remains available externally under the name "mac".) 18remains available externally under the name "mac".)
19 19
20 20
@@ -48,12 +48,12 @@ Classes are declared like the following:
48 48
49 GUIDELINES 49 GUIDELINES
50 50
51* Adhere the to the FSF philosophy that a feature in GNU software 51* Adhere to the FSF philosophy that a feature in GNU software should not
52 should not only be available on non-free systems. 52 only be available on non-free systems.
53 53
54* People with varying Cocoa and Objective-C skills will read and 54* People with varying Cocoa and Objective-C skills will read and
55 modify the NS code over a long period of time. Keep the code simple 55 modify the NS code over a long period of time. Keep the code simple
56 and avoid language constructs that makes the code hard to maintain. 56 and avoid language constructs that make the code hard to maintain.
57 57
58* Don't use macros and types intended for the XCode Interface Builder, 58* Don't use macros and types intended for the XCode Interface Builder,
59 like 'IBAction'. 59 like 'IBAction'.
@@ -81,7 +81,7 @@ GNUstep. Even though they are less frequently used, this is important
81for a number of reasons: 81for a number of reasons:
82 82
83* It supports the GNUstep project and provides an Emacs with the same 83* It supports the GNUstep project and provides an Emacs with the same
84 look-and-feel as the rest of the system. 84 look and feel as the rest of the system.
85 85
86* This allows other Emacs developers to test their changes on the NS 86* This allows other Emacs developers to test their changes on the NS
87 interface without having access to a macOS machine. 87 interface without having access to a macOS machine.
@@ -93,7 +93,7 @@ for a number of reasons:
93 93
94 SEE ALSO 94 SEE ALSO
95 95
96The src/ns... files contains the C and Objective-C parts. 96The src/ns... files contain the C and Objective-C parts.
97 97
98The lisp/term/ns-win.el file contains the lisp part of the NS 98The lisp/term/ns-win.el file contains the lisp part of the NS
99interface. 99interface.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 0051330f556..259bd1836f4 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15583,7 +15583,7 @@
15583 15583
155841989-04-29 Joe Arceneaux (jla@apple-gunkies.ai.mit.edu) 155841989-04-29 Joe Arceneaux (jla@apple-gunkies.ai.mit.edu)
15585 15585
15586 * xterm.c (x_term_init): Don't set visible bell, as it pre-empts 15586 * xterm.c (x_term_init): Don't set visible bell, as it preempts
15587 .emacs control. 15587 .emacs control.
15588 15588
155891989-04-26 Richard Stallman (rms@sugar-bombs.ai.mit.edu) 155891989-04-26 Richard Stallman (rms@sugar-bombs.ai.mit.edu)
diff --git a/src/keyboard.c b/src/keyboard.c
index ffb90c56f4a..a9548011c93 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2681,7 +2681,7 @@ read_char (int commandflag, Lisp_Object map,
2681 /* Normal case: no input arrived during redisplay. */ 2681 /* Normal case: no input arrived during redisplay. */
2682 break; 2682 break;
2683 2683
2684 /* Input arrived and pre-empted redisplay. 2684 /* Input arrived and preempted redisplay.
2685 Process any events which are not user-visible. */ 2685 Process any events which are not user-visible. */
2686 swallow_events (false); 2686 swallow_events (false);
2687 /* If that cleared input_pending, try again to redisplay. */ 2687 /* If that cleared input_pending, try again to redisplay. */