From 3c29fb705cfa908afee4a3fc084f8f4b88e43c4c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 7 Oct 2021 18:48:09 +0300 Subject: ; * src/Makefile.in (../native-lisp): Make the long recipe silent. --- src/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.in b/src/Makefile.in index b8d0e7b54ce..0326b4a8f22 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -804,7 +804,7 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln) THEFILE=$< $ Date: Thu, 7 Oct 2021 19:27:49 +0300 Subject: ; * src/composite.h (LGSTRING_FONT): Add comment about its role. --- src/composite.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/composite.h b/src/composite.h index 67e87201bf2..945f2612915 100644 --- a/src/composite.h +++ b/src/composite.h @@ -254,6 +254,10 @@ composition_valid_p (ptrdiff_t start, ptrdiff_t end, Lisp_Object prop) #define LGSTRING_HEADER(lgs) AREF (lgs, 0) #define LGSTRING_SET_HEADER(lgs, header) ASET (lgs, 0, header) +/* LGSTRING_FONT retrieves the font used for LGSTRING, if we are going + to display it on a GUI frame. On text-mode frames, that slot + stores the coding-system that should be used to write output to the + frame's terminal. */ #define LGSTRING_FONT(lgs) AREF (LGSTRING_HEADER (lgs), 0) #define LGSTRING_CHAR(lgs, i) AREF (LGSTRING_HEADER (lgs), (i) + 1) #define LGSTRING_CHAR_LEN(lgs) (ASIZE (LGSTRING_HEADER (lgs)) - 1) -- cgit v1.3 From 89d64fca75557b3006532412d8c84885d5a6a873 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 7 Oct 2021 13:09:19 -0700 Subject: Pacify GCC 10.3 -Wmaybe-uninitialized Problem reported by Basil L. Contovounesios (Bug#51075). * src/term.c (encode_terminal_code): Add an UNINIT to pacify GCC 10 bug. --- src/term.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/term.c b/src/term.c index 0858f816851..6f0b827cfc8 100644 --- a/src/term.c +++ b/src/term.c @@ -550,7 +550,7 @@ encode_terminal_code (struct glyph *src, int src_len, if (src->type == COMPOSITE_GLYPH) { struct composition *cmp; - Lisp_Object gstring; + Lisp_Object gstring UNINIT; int i; nbytes = buf - encode_terminal_src; -- cgit v1.3 From 65de510c1663994dcbdec219ab1889d0f71a7be6 Mon Sep 17 00:00:00 2001 From: Stephen Gildea Date: Thu, 7 Oct 2021 20:10:09 -0700 Subject: ; Fix 'restore-buffer-modified-p' doc string typo * src/buffer.c (restore-buffer-modified-p): Fix typo in doc string: "and" for "or" regarding lock/unlock. Note that 'set-buffer-modified-p' doc string already uses the correct "or". --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/buffer.c b/src/buffer.c index 4eb7ab6d6ba..f405bcb5834 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1434,7 +1434,7 @@ and `buffer-file-truename' are non-nil. */) DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p, Srestore_buffer_modified_p, 1, 1, 0, doc: /* Like `set-buffer-modified-p', but doesn't redisplay buffer's mode line. -This function also locks and unlocks the file visited by the buffer, +This function also locks or unlocks the file visited by the buffer, if both `buffer-file-truename' and `buffer-file-name' are non-nil. It is not ensured that mode lines will be updated to show the modified -- cgit v1.3