aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2023-01-15 13:08:02 +0100
committerStefan Kangas2023-01-15 13:08:02 +0100
commitcc576cc410fd7567d6b22c0e80debfd835593847 (patch)
tree5acafa81bbaf1e8b41cb1cc6368d25ca79661347 /src
parent77ca6aa56e3425c87861cab8abce52bee3697cf4 (diff)
parent920a7d38e96134289393b7bfcc3a7b88be73925b (diff)
downloademacs-cc576cc410fd7567d6b22c0e80debfd835593847.tar.gz
emacs-cc576cc410fd7567d6b22c0e80debfd835593847.zip
Merge from origin/emacs-29
920a7d38e96 ; Fix typos 48a62c55465 Add constructor_declaration as java-ts-mode defun 72c45fa9109 Further improvement for non-string values in pcomplete 1ef359095ec ; * etc/NEWS (--with-native-compilation=aot): Tweak wording. a8eb9dd4006 Fix the case in first-completion revealed by minibuffer-t... # Conflicts: # doc/misc/modus-themes.org # etc/NEWS
Diffstat (limited to 'src')
-rw-r--r--src/ccl.c2
-rw-r--r--src/keyboard.c2
-rw-r--r--src/regex-emacs.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ccl.c b/src/ccl.c
index c92684f4bc7..6e780ef9f0c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1987,7 +1987,7 @@ ccl_get_compiled_code (Lisp_Object ccl_prog, ptrdiff_t *idx)
1987/* Setup fields of the structure pointed by CCL appropriately for the 1987/* Setup fields of the structure pointed by CCL appropriately for the
1988 execution of CCL program CCL_PROG. CCL_PROG is the name (symbol) 1988 execution of CCL program CCL_PROG. CCL_PROG is the name (symbol)
1989 of the CCL program or the already compiled code (vector). 1989 of the CCL program or the already compiled code (vector).
1990 Return true iff successful. 1990 Return true if successful.
1991 1991
1992 If CCL_PROG is nil, just reset the structure pointed by CCL. */ 1992 If CCL_PROG is nil, just reset the structure pointed by CCL. */
1993bool 1993bool
diff --git a/src/keyboard.c b/src/keyboard.c
index 0ed28070335..6f0f075e54e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10010,7 +10010,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
10010 10010
10011 if (/* first_unbound < indec.start && first_unbound < fkey.start && */ 10011 if (/* first_unbound < indec.start && first_unbound < fkey.start && */
10012 first_unbound < keytran.start) 10012 first_unbound < keytran.start)
10013 { /* The prefix upto first_unbound has no binding and has 10013 { /* The prefix up to first_unbound has no binding and has
10014 no translation left to do either, so we know it's unbound. 10014 no translation left to do either, so we know it's unbound.
10015 If we don't stop now, we risk staying here indefinitely 10015 If we don't stop now, we risk staying here indefinitely
10016 (if the user keeps entering fkey or keytran prefixes 10016 (if the user keeps entering fkey or keytran prefixes
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 6b2fa5df037..2dca0d16ad9 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -223,7 +223,7 @@ typedef enum
223 is followed by a range table: 223 is followed by a range table:
224 2 bytes of flags for character sets (low 8 bits, high 8 bits) 224 2 bytes of flags for character sets (low 8 bits, high 8 bits)
225 See RANGE_TABLE_WORK_BITS below. 225 See RANGE_TABLE_WORK_BITS below.
226 2 bytes, the number of pairs that follow (upto 32767) 226 2 bytes, the number of pairs that follow (up to 32767)
227 pairs, each 2 multibyte characters, 227 pairs, each 2 multibyte characters,
228 each multibyte character represented as 3 bytes. */ 228 each multibyte character represented as 3 bytes. */
229 charset, 229 charset,