aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2024-01-20 16:52:31 -0800
committerPaul Eggert2024-01-20 17:28:53 -0800
commitb6ed79b71ccb3df8df05531d473ff9510cf9a39f (patch)
treecea1f448b8e163fc0972b09774f075f9c2277372
parent0a47a5a4bef0a33c012302346685ecab861cc306 (diff)
downloademacs-b6ed79b71ccb3df8df05531d473ff9510cf9a39f.tar.gz
emacs-b6ed79b71ccb3df8df05531d473ff9510cf9a39f.zip
Be more systematic about parens in C source code
Be more systematic about putting space before paren in calls, and in avoiding unnecessary parentheses in macros. This was partly inspired by my wading through gcc -E output while debugging something else, and seeing too many parens. This patch does not change the generated .o files on my platform.
Diffstat
-rw-r--r--admin/notes/java2
-rw-r--r--lib-src/etags.c6
-rw-r--r--lib-src/seccomp-filter.c4
-rw-r--r--src/alloc.c50
-rw-r--r--src/android.c2
-rw-r--r--src/android.h2
-rw-r--r--src/androidterm.h4
-rw-r--r--src/buffer.h2
-rw-r--r--src/ccl.c10
-rw-r--r--src/ccl.h2
-rw-r--r--src/charset.c2
-rw-r--r--src/charset.h68
-rw-r--r--src/coding.c14
-rw-r--r--src/coding.h23
-rw-r--r--src/comp.c2
-rw-r--r--src/composite.h48
-rw-r--r--src/conf_post.h6
-rw-r--r--src/dispextern.h58
-rw-r--r--src/dispnew.c6
-rw-r--r--src/disptab.h8
-rw-r--r--src/editfns.c2
-rw-r--r--src/emacsgtkfixed.h4
-rw-r--r--src/font.h26
-rw-r--r--src/fontset.c12
-rw-r--r--src/frame.h10
-rw-r--r--src/gtkutil.c4
-rw-r--r--src/image.c4
-rw-r--r--src/keyboard.c4
-rw-r--r--src/keyboard.h26
-rw-r--r--src/lisp.h68
-rw-r--r--src/lread.c2
-rw-r--r--src/macfont.h4
-rw-r--r--src/msdos.c2
-rw-r--r--src/nsfont.m2
-rw-r--r--src/nsterm.h6
-rw-r--r--src/pdumper.h2
-rw-r--r--src/pgtkterm.h2
-rw-r--r--src/regex-emacs.c16
-rw-r--r--src/sfnt.c2
-rw-r--r--src/term.c11
-rw-r--r--src/w32font.c4
-rw-r--r--src/window.h22
-rw-r--r--src/xdisp.c10
-rw-r--r--src/xfaces.c44
-rw-r--r--src/xterm.h6
-rw-r--r--test/src/emacs-module-resources/mod-test.c4
46 files changed, 309 insertions, 309 deletions
diff --git a/admin/notes/java b/admin/notes/java
index 891096cd406..e10f09f780f 100644
--- a/admin/notes/java
+++ b/admin/notes/java
@@ -445,7 +445,7 @@ loaded by the special invocation:
445where ``static'' defines a section of code which will be run upon the 445where ``static'' defines a section of code which will be run upon the
446object (containing class) being loaded. This is like: 446object (containing class) being loaded. This is like:
447 447
448 __attribute__((constructor)) 448 __attribute__ ((constructor))
449 449
450on systems where shared object constructors are supported. 450on systems where shared object constructors are supported.
451 451
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 506366141e6..032cfa8010b 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3825,7 +3825,7 @@ C_entries (int c_ext, /* extension of C */
3825 { 3825 {
3826 case fstartlist: 3826 case fstartlist:
3827 /* This prevents tagging fb in 3827 /* This prevents tagging fb in
3828 void (__attribute__((noreturn)) *fb) (void); 3828 void (__attribute__ ((noreturn)) *fb) (void);
3829 Fixing this is not easy and not very important. */ 3829 Fixing this is not easy and not very important. */
3830 fvdef = finlist; 3830 fvdef = finlist;
3831 continue; 3831 continue;
@@ -4380,14 +4380,14 @@ Yacc_entries (FILE *inf)
4380 4380
4381#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \ 4381#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \
4382 ((assert ("" kw), true) /* syntax error if not a literal string */ \ 4382 ((assert ("" kw), true) /* syntax error if not a literal string */ \
4383 && strneq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ 4383 && strneq (cp, kw, sizeof (kw) - 1) /* cp points at kw */ \
4384 && notinname ((cp)[sizeof (kw)-1]) /* end of kw */ \ 4384 && notinname ((cp)[sizeof (kw)-1]) /* end of kw */ \
4385 && ((cp) = skip_spaces ((cp) + sizeof (kw) - 1), true)) /* skip spaces */ 4385 && ((cp) = skip_spaces ((cp) + sizeof (kw) - 1), true)) /* skip spaces */
4386 4386
4387/* Similar to LOOKING_AT but does not use notinname, does not skip */ 4387/* Similar to LOOKING_AT but does not use notinname, does not skip */
4388#define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \ 4388#define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \
4389 ((assert ("" kw), true) /* syntax error if not a literal string */ \ 4389 ((assert ("" kw), true) /* syntax error if not a literal string */ \
4390 && strncaseeq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ 4390 && strncaseeq (cp, kw, sizeof (kw) - 1) /* cp points at kw */ \
4391 && ((cp) += sizeof (kw) - 1, true)) /* skip spaces */ 4391 && ((cp) += sizeof (kw) - 1, true)) /* skip spaces */
4392 4392
4393/* 4393/*
diff --git a/lib-src/seccomp-filter.c b/lib-src/seccomp-filter.c
index 8846e6aedae..0aeb6e8d88a 100644
--- a/lib-src/seccomp-filter.c
+++ b/lib-src/seccomp-filter.c
@@ -114,7 +114,7 @@ set_attribute (enum scmp_filter_attr attr, uint32_t value)
114 { \ 114 { \
115 const struct scmp_arg_cmp arg_array[] = {__VA_ARGS__}; \ 115 const struct scmp_arg_cmp arg_array[] = {__VA_ARGS__}; \
116 enum { arg_cnt = sizeof arg_array / sizeof *arg_array }; \ 116 enum { arg_cnt = sizeof arg_array / sizeof *arg_array }; \
117 int status = seccomp_rule_add_array (ctx, (action), (syscall), \ 117 int status = seccomp_rule_add_array (ctx, action, syscall, \
118 arg_cnt, arg_array); \ 118 arg_cnt, arg_array); \
119 if (status < 0) \ 119 if (status < 0) \
120 fail (-status, "seccomp_rule_add_array (%s, %s, %d, {%s})", \ 120 fail (-status, "seccomp_rule_add_array (%s, %s, %d, {%s})", \
@@ -143,7 +143,7 @@ export_filter (const char *file,
143} 143}
144 144
145#define EXPORT_FILTER(file, function) \ 145#define EXPORT_FILTER(file, function) \
146 export_filter ((file), (function), #function) 146 export_filter (file, function, #function)
147 147
148int 148int
149main (int argc, char **argv) 149main (int argc, char **argv)
diff --git a/src/alloc.c b/src/alloc.c
index 16aaa32e15f..b78445f65df 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1466,9 +1466,9 @@ static INTERVAL interval_free_list;
1466 __asan_unpoison_memory_region ((b)->intervals, \ 1466 __asan_unpoison_memory_region ((b)->intervals, \
1467 sizeof ((b)->intervals)) 1467 sizeof ((b)->intervals))
1468# define ASAN_POISON_INTERVAL(i) \ 1468# define ASAN_POISON_INTERVAL(i) \
1469 __asan_poison_memory_region ((i), sizeof (*(i))) 1469 __asan_poison_memory_region (i, sizeof *(i))
1470# define ASAN_UNPOISON_INTERVAL(i) \ 1470# define ASAN_UNPOISON_INTERVAL(i) \
1471 __asan_unpoison_memory_region ((i), sizeof (*(i))) 1471 __asan_unpoison_memory_region (i, sizeof *(i))
1472#else 1472#else
1473# define ASAN_POISON_INTERVAL_BLOCK(b) ((void) 0) 1473# define ASAN_POISON_INTERVAL_BLOCK(b) ((void) 0)
1474# define ASAN_UNPOISON_INTERVAL_BLOCK(b) ((void) 0) 1474# define ASAN_UNPOISON_INTERVAL_BLOCK(b) ((void) 0)
@@ -1752,25 +1752,25 @@ init_strings (void)
1752 */ 1752 */
1753# define ASAN_PREPARE_DEAD_SDATA(s, size) \ 1753# define ASAN_PREPARE_DEAD_SDATA(s, size) \
1754 do { \ 1754 do { \
1755 __asan_poison_memory_region ((s), sdata_size ((size))); \ 1755 __asan_poison_memory_region (s, sdata_size (size)); \
1756 __asan_unpoison_memory_region (&(((s))->string), \ 1756 __asan_unpoison_memory_region (&(s)->string, \
1757 sizeof (struct Lisp_String *)); \ 1757 sizeof (struct Lisp_String *)); \
1758 __asan_unpoison_memory_region (&SDATA_NBYTES ((s)), \ 1758 __asan_unpoison_memory_region (&SDATA_NBYTES (s), \
1759 sizeof (SDATA_NBYTES ((s)))); \ 1759 sizeof SDATA_NBYTES (s)); \
1760 } while (false) 1760 } while (false)
1761/* Prepare s for storing string data for NBYTES bytes. */ 1761/* Prepare s for storing string data for NBYTES bytes. */
1762# define ASAN_PREPARE_LIVE_SDATA(s, nbytes) \ 1762# define ASAN_PREPARE_LIVE_SDATA(s, nbytes) \
1763 __asan_unpoison_memory_region ((s), sdata_size ((nbytes))) 1763 __asan_unpoison_memory_region (s, sdata_size (nbytes))
1764# define ASAN_POISON_SBLOCK_DATA(b, size) \ 1764# define ASAN_POISON_SBLOCK_DATA(b, size) \
1765 __asan_poison_memory_region ((b)->data, (size)) 1765 __asan_poison_memory_region ((b)->data, size)
1766# define ASAN_POISON_STRING_BLOCK(b) \ 1766# define ASAN_POISON_STRING_BLOCK(b) \
1767 __asan_poison_memory_region ((b)->strings, STRING_BLOCK_SIZE) 1767 __asan_poison_memory_region ((b)->strings, STRING_BLOCK_SIZE)
1768# define ASAN_UNPOISON_STRING_BLOCK(b) \ 1768# define ASAN_UNPOISON_STRING_BLOCK(b) \
1769 __asan_unpoison_memory_region ((b)->strings, STRING_BLOCK_SIZE) 1769 __asan_unpoison_memory_region ((b)->strings, STRING_BLOCK_SIZE)
1770# define ASAN_POISON_STRING(s) \ 1770# define ASAN_POISON_STRING(s) \
1771 __asan_poison_memory_region ((s), sizeof (*(s))) 1771 __asan_poison_memory_region (s, sizeof *(s))
1772# define ASAN_UNPOISON_STRING(s) \ 1772# define ASAN_UNPOISON_STRING(s) \
1773 __asan_unpoison_memory_region ((s), sizeof (*(s))) 1773 __asan_unpoison_memory_region (s, sizeof *(s))
1774#else 1774#else
1775# define ASAN_PREPARE_DEAD_SDATA(s, size) ((void) 0) 1775# define ASAN_PREPARE_DEAD_SDATA(s, size) ((void) 0)
1776# define ASAN_PREPARE_LIVE_SDATA(s, nbytes) ((void) 0) 1776# define ASAN_PREPARE_LIVE_SDATA(s, nbytes) ((void) 0)
@@ -2691,13 +2691,13 @@ struct float_block
2691}; 2691};
2692 2692
2693#define XFLOAT_MARKED_P(fptr) \ 2693#define XFLOAT_MARKED_P(fptr) \
2694 GETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))) 2694 GETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX (fptr))
2695 2695
2696#define XFLOAT_MARK(fptr) \ 2696#define XFLOAT_MARK(fptr) \
2697 SETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))) 2697 SETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX (fptr))
2698 2698
2699#define XFLOAT_UNMARK(fptr) \ 2699#define XFLOAT_UNMARK(fptr) \
2700 UNSETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))) 2700 UNSETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX (fptr))
2701 2701
2702#if GC_ASAN_POISON_OBJECTS 2702#if GC_ASAN_POISON_OBJECTS
2703# define ASAN_POISON_FLOAT_BLOCK(fblk) \ 2703# define ASAN_POISON_FLOAT_BLOCK(fblk) \
@@ -2707,9 +2707,9 @@ struct float_block
2707 __asan_unpoison_memory_region ((fblk)->floats, \ 2707 __asan_unpoison_memory_region ((fblk)->floats, \
2708 sizeof ((fblk)->floats)) 2708 sizeof ((fblk)->floats))
2709# define ASAN_POISON_FLOAT(p) \ 2709# define ASAN_POISON_FLOAT(p) \
2710 __asan_poison_memory_region ((p), sizeof (struct Lisp_Float)) 2710 __asan_poison_memory_region (p, sizeof (struct Lisp_Float))
2711# define ASAN_UNPOISON_FLOAT(p) \ 2711# define ASAN_UNPOISON_FLOAT(p) \
2712 __asan_unpoison_memory_region ((p), sizeof (struct Lisp_Float)) 2712 __asan_unpoison_memory_region (p, sizeof (struct Lisp_Float))
2713#else 2713#else
2714# define ASAN_POISON_FLOAT_BLOCK(fblk) ((void) 0) 2714# define ASAN_POISON_FLOAT_BLOCK(fblk) ((void) 0)
2715# define ASAN_UNPOISON_FLOAT_BLOCK(fblk) ((void) 0) 2715# define ASAN_UNPOISON_FLOAT_BLOCK(fblk) ((void) 0)
@@ -2803,13 +2803,13 @@ struct cons_block
2803}; 2803};
2804 2804
2805#define XCONS_MARKED_P(fptr) \ 2805#define XCONS_MARKED_P(fptr) \
2806 GETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX ((fptr))) 2806 GETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX (fptr))
2807 2807
2808#define XMARK_CONS(fptr) \ 2808#define XMARK_CONS(fptr) \
2809 SETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX ((fptr))) 2809 SETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX (fptr))
2810 2810
2811#define XUNMARK_CONS(fptr) \ 2811#define XUNMARK_CONS(fptr) \
2812 UNSETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX ((fptr))) 2812 UNSETMARKBIT (CONS_BLOCK (fptr), CONS_INDEX (fptr))
2813 2813
2814/* Minimum number of bytes of consing since GC before next GC, 2814/* Minimum number of bytes of consing since GC before next GC,
2815 when memory is full. */ 2815 when memory is full. */
@@ -2832,9 +2832,9 @@ static struct Lisp_Cons *cons_free_list;
2832# define ASAN_POISON_CONS_BLOCK(b) \ 2832# define ASAN_POISON_CONS_BLOCK(b) \
2833 __asan_poison_memory_region ((b)->conses, sizeof ((b)->conses)) 2833 __asan_poison_memory_region ((b)->conses, sizeof ((b)->conses))
2834# define ASAN_POISON_CONS(p) \ 2834# define ASAN_POISON_CONS(p) \
2835 __asan_poison_memory_region ((p), sizeof (struct Lisp_Cons)) 2835 __asan_poison_memory_region (p, sizeof (struct Lisp_Cons))
2836# define ASAN_UNPOISON_CONS(p) \ 2836# define ASAN_UNPOISON_CONS(p) \
2837 __asan_unpoison_memory_region ((p), sizeof (struct Lisp_Cons)) 2837 __asan_unpoison_memory_region (p, sizeof (struct Lisp_Cons))
2838#else 2838#else
2839# define ASAN_POISON_CONS_BLOCK(b) ((void) 0) 2839# define ASAN_POISON_CONS_BLOCK(b) ((void) 0)
2840# define ASAN_POISON_CONS(p) ((void) 0) 2840# define ASAN_POISON_CONS(p) ((void) 0)
@@ -3152,11 +3152,11 @@ Lisp_Object zero_vector;
3152 3152
3153#if GC_ASAN_POISON_OBJECTS 3153#if GC_ASAN_POISON_OBJECTS
3154# define ASAN_POISON_VECTOR_CONTENTS(v, bytes) \ 3154# define ASAN_POISON_VECTOR_CONTENTS(v, bytes) \
3155 __asan_poison_memory_region ((v)->contents, (bytes)) 3155 __asan_poison_memory_region ((v)->contents, bytes)
3156# define ASAN_UNPOISON_VECTOR_CONTENTS(v, bytes) \ 3156# define ASAN_UNPOISON_VECTOR_CONTENTS(v, bytes) \
3157 __asan_unpoison_memory_region ((v)->contents, (bytes)) 3157 __asan_unpoison_memory_region ((v)->contents, bytes)
3158# define ASAN_UNPOISON_VECTOR_BLOCK(b) \ 3158# define ASAN_UNPOISON_VECTOR_BLOCK(b) \
3159 __asan_unpoison_memory_region ((b)->data, sizeof ((b)->data)) 3159 __asan_unpoison_memory_region ((b)->data, sizeof (b)->data)
3160#else 3160#else
3161# define ASAN_POISON_VECTOR_CONTENTS(v, bytes) ((void) 0) 3161# define ASAN_POISON_VECTOR_CONTENTS(v, bytes) ((void) 0)
3162# define ASAN_UNPOISON_VECTOR_CONTENTS(v, bytes) ((void) 0) 3162# define ASAN_UNPOISON_VECTOR_CONTENTS(v, bytes) ((void) 0)
@@ -3886,9 +3886,9 @@ struct symbol_block
3886# define ASAN_UNPOISON_SYMBOL_BLOCK(s) \ 3886# define ASAN_UNPOISON_SYMBOL_BLOCK(s) \
3887 __asan_unpoison_memory_region ((s)->symbols, sizeof ((s)->symbols)) 3887 __asan_unpoison_memory_region ((s)->symbols, sizeof ((s)->symbols))
3888# define ASAN_POISON_SYMBOL(sym) \ 3888# define ASAN_POISON_SYMBOL(sym) \
3889 __asan_poison_memory_region ((sym), sizeof (*(sym))) 3889 __asan_poison_memory_region (sym, sizeof *(sym))
3890# define ASAN_UNPOISON_SYMBOL(sym) \ 3890# define ASAN_UNPOISON_SYMBOL(sym) \
3891 __asan_unpoison_memory_region ((sym), sizeof (*(sym))) 3891 __asan_unpoison_memory_region (sym, sizeof *(sym))
3892 3892
3893#else 3893#else
3894# define ASAN_POISON_SYMBOL_BLOCK(s) ((void) 0) 3894# define ASAN_POISON_SYMBOL_BLOCK(s) ((void) 0)
diff --git a/src/android.c b/src/android.c
index fb7703d84ab..509f30a759b 100644
--- a/src/android.c
+++ b/src/android.c
@@ -6008,7 +6008,7 @@ android_build_jstring (const char *text)
6008 is created. */ 6008 is created. */
6009 6009
6010#if __GNUC__ >= 3 6010#if __GNUC__ >= 3
6011#define likely(cond) __builtin_expect ((cond), 1) 6011#define likely(cond) __builtin_expect (cond, 1)
6012#else /* __GNUC__ < 3 */ 6012#else /* __GNUC__ < 3 */
6013#define likely(cond) (cond) 6013#define likely(cond) (cond)
6014#endif /* __GNUC__ >= 3 */ 6014#endif /* __GNUC__ >= 3 */
diff --git a/src/android.h b/src/android.h
index 1059933d339..2f5f32037c5 100644
--- a/src/android.h
+++ b/src/android.h
@@ -309,7 +309,7 @@ extern struct timespec emacs_installation_time;
309 309
310#define ANDROID_DELETE_LOCAL_REF(ref) \ 310#define ANDROID_DELETE_LOCAL_REF(ref) \
311 ((*android_java_env)->DeleteLocalRef (android_java_env, \ 311 ((*android_java_env)->DeleteLocalRef (android_java_env, \
312 (ref))) 312 ref))
313 313
314#define NATIVE_NAME(name) Java_org_gnu_emacs_EmacsNative_##name 314#define NATIVE_NAME(name) Java_org_gnu_emacs_EmacsNative_##name
315 315
diff --git a/src/androidterm.h b/src/androidterm.h
index 7568055a20b..41c93067e82 100644
--- a/src/androidterm.h
+++ b/src/androidterm.h
@@ -298,8 +298,8 @@ enum
298 code after any drawing command, but code can be run whenever 298 code after any drawing command, but code can be run whenever
299 someone asks for the handle necessary to draw. */ 299 someone asks for the handle necessary to draw. */
300#define FRAME_ANDROID_DRAWABLE(f) \ 300#define FRAME_ANDROID_DRAWABLE(f) \
301 (((f))->output_data.android->need_buffer_flip = true, \ 301 ((f)->output_data.android->need_buffer_flip = true, \
302 FRAME_ANDROID_WINDOW ((f))) 302 FRAME_ANDROID_WINDOW (f))
303 303
304/* Return whether or not the frame F has been completely drawn. Used 304/* Return whether or not the frame F has been completely drawn. Used
305 while handling async input. */ 305 while handling async input. */
diff --git a/src/buffer.h b/src/buffer.h
index 80edfdcbc22..9e0982f5da7 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -216,7 +216,7 @@ extern ptrdiff_t advance_to_char_boundary (ptrdiff_t byte_pos);
216/* Return the byte at byte position N. 216/* Return the byte at byte position N.
217 Do not check that the position is in range. */ 217 Do not check that the position is in range. */
218 218
219#define FETCH_BYTE(n) *(BYTE_POS_ADDR ((n))) 219#define FETCH_BYTE(n) (*BYTE_POS_ADDR (n))
220 220
221/* Define the actual buffer data structures. */ 221/* Define the actual buffer data structures. */
222 222
diff --git a/src/ccl.c b/src/ccl.c
index 7df50ba7022..a3a03a5b7b1 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -51,7 +51,7 @@ static Lisp_Object Vccl_program_table;
51 51
52/* Return a hash table of id number ID. */ 52/* Return a hash table of id number ID. */
53#define GET_HASH_TABLE(id) \ 53#define GET_HASH_TABLE(id) \
54 (XHASH_TABLE (XCDR (AREF (Vtranslation_hash_table_vector, (id))))) 54 XHASH_TABLE (XCDR (AREF (Vtranslation_hash_table_vector, id)))
55 55
56/* CCL (Code Conversion Language) is a simple language which has 56/* CCL (Code Conversion Language) is a simple language which has
57 operations on one input buffer, one output buffer, and 7 registers. 57 operations on one input buffer, one output buffer, and 7 registers.
@@ -627,7 +627,7 @@ do \
627 { \ 627 { \
628 struct ccl_program called_ccl; \ 628 struct ccl_program called_ccl; \
629 if (stack_idx >= 256 \ 629 if (stack_idx >= 256 \
630 || ! setup_ccl_program (&called_ccl, (symbol))) \ 630 || ! setup_ccl_program (&called_ccl, symbol)) \
631 { \ 631 { \
632 if (stack_idx > 0) \ 632 if (stack_idx > 0) \
633 { \ 633 { \
@@ -818,7 +818,7 @@ while (0)
818 818
819#define CCL_DECODE_CHAR(id, code) \ 819#define CCL_DECODE_CHAR(id, code) \
820 ((id) == 0 ? (code) \ 820 ((id) == 0 ? (code) \
821 : (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code)))) 821 : (charset = CHARSET_FROM_ID (id), DECODE_CHAR (charset, code)))
822 822
823/* Encode character C by some of charsets in CHARSET_LIST. Set ID to 823/* Encode character C by some of charsets in CHARSET_LIST. Set ID to
824 the id of the used charset, ENCODED to the result of encoding. 824 the id of the used charset, ENCODED to the result of encoding.
@@ -828,9 +828,9 @@ while (0)
828 do { \ 828 do { \
829 unsigned ncode; \ 829 unsigned ncode; \
830 \ 830 \
831 charset = char_charset ((c), (charset_list), &ncode); \ 831 charset = char_charset (c, charset_list, &ncode); \
832 if (! charset && ! NILP (charset_list)) \ 832 if (! charset && ! NILP (charset_list)) \
833 charset = char_charset ((c), Qnil, &ncode); \ 833 charset = char_charset (c, Qnil, &ncode); \
834 if (charset) \ 834 if (charset) \
835 { \ 835 { \
836 (id) = CHARSET_ID (charset); \ 836 (id) = CHARSET_ID (charset); \
diff --git a/src/ccl.h b/src/ccl.h
index 8eb9d7eb2e8..b8bdcad4c32 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -82,7 +82,7 @@ extern void ccl_driver (struct ccl_program *, int *, int *, int, int,
82#define CHECK_CCL_PROGRAM(x) \ 82#define CHECK_CCL_PROGRAM(x) \
83 do { \ 83 do { \
84 if (NILP (Fccl_program_p (x))) \ 84 if (NILP (Fccl_program_p (x))) \
85 wrong_type_argument (Qcclp, (x)); \ 85 wrong_type_argument (Qcclp, x); \
86 } while (false); 86 } while (false);
87 87
88#endif /* EMACS_CCL_H */ 88#endif /* EMACS_CCL_H */
diff --git a/src/charset.c b/src/charset.c
index 6a74f294ad8..f562af90cb2 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1790,7 +1790,7 @@ encode_char (struct charset *charset, int c)
1790 return CHARSET_INVALID_CODE (charset); 1790 return CHARSET_INVALID_CODE (charset);
1791 } 1791 }
1792 1792
1793 if (! CHARSET_FAST_MAP_REF ((c), charset->fast_map) 1793 if (! CHARSET_FAST_MAP_REF (c, charset->fast_map)
1794 || c < CHARSET_MIN_CHAR (charset) || c > CHARSET_MAX_CHAR (charset)) 1794 || c < CHARSET_MIN_CHAR (charset) || c > CHARSET_MAX_CHAR (charset))
1795 return CHARSET_INVALID_CODE (charset); 1795 return CHARSET_INVALID_CODE (charset);
1796 1796
diff --git a/src/charset.h b/src/charset.h
index 91454d3d73e..ba83cd5ccb2 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -267,18 +267,18 @@ extern int emacs_mule_charset[256];
267 267
268/* Return the attribute vector of charset whose symbol is SYMBOL. */ 268/* Return the attribute vector of charset whose symbol is SYMBOL. */
269#define CHARSET_SYMBOL_ATTRIBUTES(symbol) \ 269#define CHARSET_SYMBOL_ATTRIBUTES(symbol) \
270 Fgethash ((symbol), Vcharset_hash_table, Qnil) 270 Fgethash (symbol, Vcharset_hash_table, Qnil)
271 271
272#define CHARSET_ATTR_ID(attrs) AREF ((attrs), charset_id) 272#define CHARSET_ATTR_ID(attrs) AREF (attrs, charset_id)
273#define CHARSET_ATTR_NAME(attrs) AREF ((attrs), charset_name) 273#define CHARSET_ATTR_NAME(attrs) AREF (attrs, charset_name)
274#define CHARSET_ATTR_PLIST(attrs) AREF ((attrs), charset_plist) 274#define CHARSET_ATTR_PLIST(attrs) AREF (attrs, charset_plist)
275#define CHARSET_ATTR_MAP(attrs) AREF ((attrs), charset_map) 275#define CHARSET_ATTR_MAP(attrs) AREF (attrs, charset_map)
276#define CHARSET_ATTR_DECODER(attrs) AREF ((attrs), charset_decoder) 276#define CHARSET_ATTR_DECODER(attrs) AREF (attrs, charset_decoder)
277#define CHARSET_ATTR_ENCODER(attrs) AREF ((attrs), charset_encoder) 277#define CHARSET_ATTR_ENCODER(attrs) AREF (attrs, charset_encoder)
278#define CHARSET_ATTR_SUBSET(attrs) AREF ((attrs), charset_subset) 278#define CHARSET_ATTR_SUBSET(attrs) AREF (attrs, charset_subset)
279#define CHARSET_ATTR_SUPERSET(attrs) AREF ((attrs), charset_superset) 279#define CHARSET_ATTR_SUPERSET(attrs) AREF (attrs, charset_superset)
280#define CHARSET_ATTR_UNIFY_MAP(attrs) AREF ((attrs), charset_unify_map) 280#define CHARSET_ATTR_UNIFY_MAP(attrs) AREF (attrs, charset_unify_map)
281#define CHARSET_ATTR_DEUNIFIER(attrs) AREF ((attrs), charset_deunifier) 281#define CHARSET_ATTR_DEUNIFIER(attrs) AREF (attrs, charset_deunifier)
282 282
283#define CHARSET_SYMBOL_ID(symbol) \ 283#define CHARSET_SYMBOL_ID(symbol) \
284 CHARSET_ATTR_ID (CHARSET_SYMBOL_ATTRIBUTES (symbol)) 284 CHARSET_ATTR_ID (CHARSET_SYMBOL_ATTRIBUTES (symbol))
@@ -290,7 +290,7 @@ extern int emacs_mule_charset[256];
290 290
291/* Return the attribute vector of CHARSET. */ 291/* Return the attribute vector of CHARSET. */
292#define CHARSET_ATTRIBUTES(charset) \ 292#define CHARSET_ATTRIBUTES(charset) \
293 (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), (charset)->hash_index)) 293 HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), (charset)->hash_index)
294 294
295#define CHARSET_ID(charset) ((charset)->id) 295#define CHARSET_ID(charset) ((charset)->id)
296#define CHARSET_HASH_INDEX(charset) ((charset)->hash_index) 296#define CHARSET_HASH_INDEX(charset) ((charset)->hash_index)
@@ -314,21 +314,21 @@ extern int emacs_mule_charset[256];
314#define CHARSET_UNIFIED_P(charset) ((charset)->unified_p) 314#define CHARSET_UNIFIED_P(charset) ((charset)->unified_p)
315 315
316#define CHARSET_NAME(charset) \ 316#define CHARSET_NAME(charset) \
317 (CHARSET_ATTR_NAME (CHARSET_ATTRIBUTES (charset))) 317 CHARSET_ATTR_NAME (CHARSET_ATTRIBUTES (charset))
318#define CHARSET_MAP(charset) \ 318#define CHARSET_MAP(charset) \
319 (CHARSET_ATTR_MAP (CHARSET_ATTRIBUTES (charset))) 319 CHARSET_ATTR_MAP (CHARSET_ATTRIBUTES (charset))
320#define CHARSET_DECODER(charset) \ 320#define CHARSET_DECODER(charset) \
321 (CHARSET_ATTR_DECODER (CHARSET_ATTRIBUTES (charset))) 321 CHARSET_ATTR_DECODER (CHARSET_ATTRIBUTES (charset))
322#define CHARSET_ENCODER(charset) \ 322#define CHARSET_ENCODER(charset) \
323 (CHARSET_ATTR_ENCODER (CHARSET_ATTRIBUTES (charset))) 323 CHARSET_ATTR_ENCODER (CHARSET_ATTRIBUTES (charset))
324#define CHARSET_SUBSET(charset) \ 324#define CHARSET_SUBSET(charset) \
325 (CHARSET_ATTR_SUBSET (CHARSET_ATTRIBUTES (charset))) 325 CHARSET_ATTR_SUBSET (CHARSET_ATTRIBUTES (charset))
326#define CHARSET_SUPERSET(charset) \ 326#define CHARSET_SUPERSET(charset) \
327 (CHARSET_ATTR_SUPERSET (CHARSET_ATTRIBUTES (charset))) 327 CHARSET_ATTR_SUPERSET (CHARSET_ATTRIBUTES (charset))
328#define CHARSET_UNIFY_MAP(charset) \ 328#define CHARSET_UNIFY_MAP(charset) \
329 (CHARSET_ATTR_UNIFY_MAP (CHARSET_ATTRIBUTES (charset))) 329 CHARSET_ATTR_UNIFY_MAP (CHARSET_ATTRIBUTES (charset))
330#define CHARSET_DEUNIFIER(charset) \ 330#define CHARSET_DEUNIFIER(charset) \
331 (CHARSET_ATTR_DEUNIFIER (CHARSET_ATTRIBUTES (charset))) 331 CHARSET_ATTR_DEUNIFIER (CHARSET_ATTRIBUTES (charset))
332 332
333INLINE void 333INLINE void
334set_charset_attr (struct charset *charset, enum charset_attr_index idx, 334set_charset_attr (struct charset *charset, enum charset_attr_index idx,
@@ -345,7 +345,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
345#define CHECK_CHARSET(x) \ 345#define CHECK_CHARSET(x) \
346 do { \ 346 do { \
347 if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0) \ 347 if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0) \
348 wrong_type_argument (Qcharsetp, (x)); \ 348 wrong_type_argument (Qcharsetp, x); \
349 } while (false) 349 } while (false)
350 350
351 351
@@ -356,7 +356,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
356 ptrdiff_t idx; \ 356 ptrdiff_t idx; \
357 \ 357 \
358 if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0) \ 358 if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0) \
359 wrong_type_argument (Qcharsetp, (x)); \ 359 wrong_type_argument (Qcharsetp, x); \
360 id = XFIXNUM (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \ 360 id = XFIXNUM (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
361 charset_id)); \ 361 charset_id)); \
362 } while (false) 362 } while (false)
@@ -367,7 +367,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
367#define CHECK_CHARSET_GET_ATTR(x, attr) \ 367#define CHECK_CHARSET_GET_ATTR(x, attr) \
368 do { \ 368 do { \
369 if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x))) \ 369 if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x))) \
370 wrong_type_argument (Qcharsetp, (x)); \ 370 wrong_type_argument (Qcharsetp, x); \
371 } while (false) 371 } while (false)
372 372
373 373
@@ -383,7 +383,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
383 contains the character C. */ 383 contains the character C. */
384#define CHAR_CHARSET(c) \ 384#define CHAR_CHARSET(c) \
385 ((c) < 0x80 ? CHARSET_FROM_ID (charset_ascii) \ 385 ((c) < 0x80 ? CHARSET_FROM_ID (charset_ascii) \
386 : char_charset ((c), Qnil, NULL)) 386 : char_charset (c, Qnil, NULL))
387 387
388#if false 388#if false
389/* Char-table of charset-sets. Each element is a bool vector indexed 389/* Char-table of charset-sets. Each element is a bool vector indexed
@@ -410,18 +410,18 @@ extern Lisp_Object Vchar_charset_set;
410 : ((code) < (charset)->min_code || (code) > (charset)->max_code) \ 410 : ((code) < (charset)->min_code || (code) > (charset)->max_code) \
411 ? -1 \ 411 ? -1 \
412 : (charset)->unified_p \ 412 : (charset)->unified_p \
413 ? decode_char ((charset), (code)) \ 413 ? decode_char (charset, code) \
414 : (charset)->method == CHARSET_METHOD_OFFSET \ 414 : (charset)->method == CHARSET_METHOD_OFFSET \
415 ? ((charset)->code_linear_p \ 415 ? ((charset)->code_linear_p \
416 ? (int) ((code) - (charset)->min_code) + (charset)->code_offset \ 416 ? (int) ((code) - (charset)->min_code) + (charset)->code_offset \
417 : decode_char ((charset), (code))) \ 417 : decode_char (charset, code)) \
418 : (charset)->method == CHARSET_METHOD_MAP \ 418 : (charset)->method == CHARSET_METHOD_MAP \
419 ? (((charset)->code_linear_p \ 419 ? (((charset)->code_linear_p \
420 && VECTORP (CHARSET_DECODER (charset))) \ 420 && VECTORP (CHARSET_DECODER (charset))) \
421 ? XFIXNUM (AREF (CHARSET_DECODER (charset), \ 421 ? XFIXNUM (AREF (CHARSET_DECODER (charset), \
422 (code) - (charset)->min_code)) \ 422 (code) - (charset)->min_code)) \
423 : decode_char ((charset), (code))) \ 423 : decode_char (charset, code)) \
424 : decode_char ((charset), (code))) 424 : decode_char (charset, code))
425 425
426extern Lisp_Object charset_work; 426extern Lisp_Object charset_work;
427 427
@@ -462,7 +462,7 @@ extern bool charset_map_loaded;
462/* Set CHARSET to the charset highest priority of C, CODE to the 462/* Set CHARSET to the charset highest priority of C, CODE to the
463 code-point of C in CHARSET. */ 463 code-point of C in CHARSET. */
464#define SPLIT_CHAR(c, charset, code) \ 464#define SPLIT_CHAR(c, charset, code) \
465 ((charset) = char_charset ((c), Qnil, &(code))) 465 ((charset) = char_charset (c, Qnil, &(code)))
466 466
467 467
468#define ISO_MAX_DIMENSION 3 468#define ISO_MAX_DIMENSION 3
@@ -501,15 +501,15 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
501 || ((CHARSET_UNIFIED_P (charset) \ 501 || ((CHARSET_UNIFIED_P (charset) \
502 || (charset)->method == CHARSET_METHOD_SUBSET \ 502 || (charset)->method == CHARSET_METHOD_SUBSET \
503 || (charset)->method == CHARSET_METHOD_SUPERSET) \ 503 || (charset)->method == CHARSET_METHOD_SUPERSET) \
504 ? encode_char ((charset), (c)) != (charset)->invalid_code \ 504 ? encode_char (charset, c) != (charset)->invalid_code \
505 : (CHARSET_FAST_MAP_REF ((c), (charset)->fast_map) \ 505 : (CHARSET_FAST_MAP_REF (c, (charset)->fast_map) \
506 && ((charset)->method == CHARSET_METHOD_OFFSET \ 506 && ((charset)->method == CHARSET_METHOD_OFFSET \
507 ? (c) >= (charset)->min_char && (c) <= (charset)->max_char \ 507 ? (c) >= (charset)->min_char && (c) <= (charset)->max_char \
508 : ((charset)->method == CHARSET_METHOD_MAP \ 508 : ((charset)->method == CHARSET_METHOD_MAP \
509 && (charset)->compact_codes_p \ 509 && (charset)->compact_codes_p \
510 && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \ 510 && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \
511 ? ! NILP (CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c))) \ 511 ? ! NILP (CHAR_TABLE_REF (CHARSET_ENCODER (charset), c)) \
512 : encode_char ((charset), (c)) != (charset)->invalid_code)))) 512 : encode_char (charset, c) != (charset)->invalid_code))))
513 513
514 514
515/* Special macros for emacs-mule encoding. */ 515/* Special macros for emacs-mule encoding. */
diff --git a/src/coding.c b/src/coding.c
index a5bec8b6305..5f3ceab718b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -314,9 +314,9 @@ static Lisp_Object Vbig5_coding_system;
314/* ISO2022 section */ 314/* ISO2022 section */
315 315
316#define CODING_ISO_INITIAL(coding, reg) \ 316#define CODING_ISO_INITIAL(coding, reg) \
317 (XFIXNUM (AREF (AREF (CODING_ID_ATTRS ((coding)->id), \ 317 XFIXNUM (AREF (AREF (CODING_ID_ATTRS ((coding)->id), \
318 coding_attr_iso_initial), \ 318 coding_attr_iso_initial), \
319 reg))) 319 reg))
320 320
321 321
322#define CODING_ISO_REQUEST(coding, charset_id) \ 322#define CODING_ISO_REQUEST(coding, charset_id) \
@@ -466,7 +466,7 @@ enum iso_code_class_type
466#define CODING_CCL_ENCODER(coding) \ 466#define CODING_CCL_ENCODER(coding) \
467 AREF (CODING_ID_ATTRS ((coding)->id), coding_attr_ccl_encoder) 467 AREF (CODING_ID_ATTRS ((coding)->id), coding_attr_ccl_encoder)
468#define CODING_CCL_VALIDS(coding) \ 468#define CODING_CCL_VALIDS(coding) \
469 (SDATA (AREF (CODING_ID_ATTRS ((coding)->id), coding_attr_ccl_valids))) 469 SDATA (AREF (CODING_ID_ATTRS ((coding)->id), coding_attr_ccl_valids))
470 470
471/* Index for each coding category in `coding_categories' */ 471/* Index for each coding category in `coding_categories' */
472 472
@@ -4198,12 +4198,12 @@ decode_coding_iso_2022 (struct coding_system *coding)
4198#define ENCODE_ISO_CHARACTER(charset, c) \ 4198#define ENCODE_ISO_CHARACTER(charset, c) \
4199 do { \ 4199 do { \
4200 unsigned code; \ 4200 unsigned code; \
4201 CODING_ENCODE_CHAR (coding, dst, dst_end, (charset), (c), code); \ 4201 CODING_ENCODE_CHAR (coding, dst, dst_end, charset, c, code); \
4202 \ 4202 \
4203 if (CHARSET_DIMENSION (charset) == 1) \ 4203 if (CHARSET_DIMENSION (charset) == 1) \
4204 ENCODE_ISO_CHARACTER_DIMENSION1 ((charset), code); \ 4204 ENCODE_ISO_CHARACTER_DIMENSION1 (charset, code); \
4205 else \ 4205 else \
4206 ENCODE_ISO_CHARACTER_DIMENSION2 ((charset), code >> 8, code & 0xFF); \ 4206 ENCODE_ISO_CHARACTER_DIMENSION2 (charset, code >> 8, code & 0xFF); \
4207 } while (0) 4207 } while (0)
4208 4208
4209 4209
diff --git a/src/coding.h b/src/coding.h
index 9beb4350bbf..8905e36838d 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -166,28 +166,28 @@ enum coding_attr_index
166 166
167/* Return the name of a coding system specified by ID. */ 167/* Return the name of a coding system specified by ID. */
168#define CODING_ID_NAME(id) \ 168#define CODING_ID_NAME(id) \
169 (HASH_KEY (XHASH_TABLE (Vcoding_system_hash_table), id)) 169 HASH_KEY (XHASH_TABLE (Vcoding_system_hash_table), id)
170 170
171/* Return the attribute vector of a coding system specified by ID. */ 171/* Return the attribute vector of a coding system specified by ID. */
172 172
173#define CODING_ID_ATTRS(id) \ 173#define CODING_ID_ATTRS(id) \
174 (AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 0)) 174 AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 0)
175 175
176/* Return the list of aliases of a coding system specified by ID. */ 176/* Return the list of aliases of a coding system specified by ID. */
177 177
178#define CODING_ID_ALIASES(id) \ 178#define CODING_ID_ALIASES(id) \
179 (AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 1)) 179 AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 1)
180 180
181/* Return the eol-type of a coding system specified by ID. */ 181/* Return the eol-type of a coding system specified by ID. */
182 182
183#define CODING_ID_EOL_TYPE(id) \ 183#define CODING_ID_EOL_TYPE(id) \
184 (AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 2)) 184 AREF (HASH_VALUE (XHASH_TABLE (Vcoding_system_hash_table), id), 2)
185 185
186 186
187/* Return the spec vector of CODING_SYSTEM_SYMBOL. */ 187/* Return the spec vector of CODING_SYSTEM_SYMBOL. */
188 188
189#define CODING_SYSTEM_SPEC(coding_system_symbol) \ 189#define CODING_SYSTEM_SPEC(coding_system_symbol) \
190 (Fgethash (coding_system_symbol, Vcoding_system_hash_table, Qnil)) 190 Fgethash (coding_system_symbol, Vcoding_system_hash_table, Qnil)
191 191
192 192
193/* Return the ID of CODING_SYSTEM_SYMBOL. */ 193/* Return the ID of CODING_SYSTEM_SYMBOL. */
@@ -209,7 +209,7 @@ enum coding_attr_index
209 do { \ 209 do { \
210 if (CODING_SYSTEM_ID (x) < 0 \ 210 if (CODING_SYSTEM_ID (x) < 0 \
211 && NILP (Fcheck_coding_system (x))) \ 211 && NILP (Fcheck_coding_system (x))) \
212 wrong_type_argument (Qcoding_system_p, (x)); \ 212 wrong_type_argument (Qcoding_system_p, x); \
213 } while (false) 213 } while (false)
214 214
215 215
@@ -225,7 +225,7 @@ enum coding_attr_index
225 spec = CODING_SYSTEM_SPEC (x); \ 225 spec = CODING_SYSTEM_SPEC (x); \
226 } \ 226 } \
227 if (NILP (spec)) \ 227 if (NILP (spec)) \
228 wrong_type_argument (Qcoding_system_p, (x)); \ 228 wrong_type_argument (Qcoding_system_p, x); \
229 } while (false) 229 } while (false)
230 230
231 231
@@ -242,7 +242,7 @@ enum coding_attr_index
242 id = CODING_SYSTEM_ID (x); \ 242 id = CODING_SYSTEM_ID (x); \
243 } \ 243 } \
244 if (id < 0) \ 244 if (id < 0) \
245 wrong_type_argument (Qcoding_system_p, (x)); \ 245 wrong_type_argument (Qcoding_system_p, x); \
246 } while (false) 246 } while (false)
247 247
248 248
@@ -745,10 +745,9 @@ extern Lisp_Object from_unicode_buffer (const wchar_t *wstr);
745 745
746#define decode_coding_c_string(coding, src, bytes, dst_object) \ 746#define decode_coding_c_string(coding, src, bytes, dst_object) \
747 do { \ 747 do { \
748 (coding)->source = (src); \ 748 (coding)->source = src; \
749 (coding)->src_chars = (coding)->src_bytes = (bytes); \ 749 (coding)->src_chars = (coding)->src_bytes = bytes; \
750 decode_coding_object ((coding), Qnil, 0, 0, (bytes), (bytes), \ 750 decode_coding_object (coding, Qnil, 0, 0, bytes, bytes, dst_object); \
751 (dst_object)); \
752 } while (false) 751 } while (false)
753 752
754 753
diff --git a/src/comp.c b/src/comp.c
index 2872c28a2b1..3f9e738d9a7 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -522,7 +522,7 @@ load_gccjit_if_necessary (bool mandatory)
522 522
523#define DECL_BLOCK(name, func) \ 523#define DECL_BLOCK(name, func) \
524 gcc_jit_block *(name) = \ 524 gcc_jit_block *(name) = \
525 gcc_jit_function_new_block ((func), STR (name)) 525 gcc_jit_function_new_block (func, STR (name))
526 526
527#ifndef WINDOWSNT 527#ifndef WINDOWSNT
528# ifdef HAVE__SETJMP 528# ifdef HAVE__SETJMP
diff --git a/src/composite.h b/src/composite.h
index 4fe49b764e4..37f494d69e0 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -260,8 +260,8 @@ composition_valid_p (ptrdiff_t start, ptrdiff_t end, Lisp_Object prop)
260#define LGSTRING_CHAR(lgs, i) AREF (LGSTRING_HEADER (lgs), (i) + 1) 260#define LGSTRING_CHAR(lgs, i) AREF (LGSTRING_HEADER (lgs), (i) + 1)
261#define LGSTRING_CHAR_LEN(lgs) (ASIZE (LGSTRING_HEADER (lgs)) - 1) 261#define LGSTRING_CHAR_LEN(lgs) (ASIZE (LGSTRING_HEADER (lgs)) - 1)
262 262
263#define LGSTRING_SET_FONT(lgs, val) ASET (LGSTRING_HEADER (lgs), 0, (val)) 263#define LGSTRING_SET_FONT(lgs, val) ASET (LGSTRING_HEADER (lgs), 0, val)
264#define LGSTRING_SET_CHAR(lgs, i, c) ASET (LGSTRING_HEADER (lgs), (i) + 1, (c)) 264#define LGSTRING_SET_CHAR(lgs, i, c) ASET (LGSTRING_HEADER (lgs), (i) + 1, c)
265 265
266#define LGSTRING_ID(lgs) AREF (lgs, 1) 266#define LGSTRING_ID(lgs) AREF (lgs, 1)
267#define LGSTRING_SET_ID(lgs, id) ASET (lgs, 1, id) 267#define LGSTRING_SET_ID(lgs, id) ASET (lgs, 1, id)
@@ -270,9 +270,9 @@ composition_valid_p (ptrdiff_t start, ptrdiff_t end, Lisp_Object prop)
270 LGSTRING can hold. This is NOT the actual number of valid LGLYPHs; 270 LGSTRING can hold. This is NOT the actual number of valid LGLYPHs;
271 to find the latter, walk the glyphs returned by LGSTRING_GLYPH 271 to find the latter, walk the glyphs returned by LGSTRING_GLYPH
272 until the first one that is nil. */ 272 until the first one that is nil. */
273#define LGSTRING_GLYPH_LEN(lgs) (ASIZE ((lgs)) - 2) 273#define LGSTRING_GLYPH_LEN(lgs) (ASIZE (lgs) - 2)
274#define LGSTRING_GLYPH(lgs, idx) AREF ((lgs), (idx) + 2) 274#define LGSTRING_GLYPH(lgs, idx) AREF (lgs, (idx) + 2)
275#define LGSTRING_SET_GLYPH(lgs, idx, val) ASET ((lgs), (idx) + 2, (val)) 275#define LGSTRING_SET_GLYPH(lgs, idx, val) ASET (lgs, (idx) + 2, val)
276INLINE Lisp_Object * 276INLINE Lisp_Object *
277lgstring_glyph_addr (Lisp_Object lgs, ptrdiff_t idx) 277lgstring_glyph_addr (Lisp_Object lgs, ptrdiff_t idx)
278{ 278{
@@ -298,33 +298,33 @@ enum lglyph_indices
298 contributed to the glyph (since there isn't a 1:1 correspondence 298 contributed to the glyph (since there isn't a 1:1 correspondence
299 between composed characters and the font glyphs). */ 299 between composed characters and the font glyphs). */
300#define LGLYPH_NEW() make_nil_vector (LGLYPH_SIZE) 300#define LGLYPH_NEW() make_nil_vector (LGLYPH_SIZE)
301#define LGLYPH_FROM(g) XFIXNUM (AREF ((g), LGLYPH_IX_FROM)) 301#define LGLYPH_FROM(g) XFIXNUM (AREF (g, LGLYPH_IX_FROM))
302#define LGLYPH_TO(g) XFIXNUM (AREF ((g), LGLYPH_IX_TO)) 302#define LGLYPH_TO(g) XFIXNUM (AREF (g, LGLYPH_IX_TO))
303#define LGLYPH_CHAR(g) XFIXNUM (AREF ((g), LGLYPH_IX_CHAR)) 303#define LGLYPH_CHAR(g) XFIXNUM (AREF (g, LGLYPH_IX_CHAR))
304#define LGLYPH_CODE(g) \ 304#define LGLYPH_CODE(g) \
305 (NILP (AREF ((g), LGLYPH_IX_CODE)) \ 305 (NILP (AREF (g, LGLYPH_IX_CODE)) \
306 ? FONT_INVALID_CODE \ 306 ? FONT_INVALID_CODE \
307 : cons_to_unsigned (AREF (g, LGLYPH_IX_CODE), TYPE_MAXIMUM (unsigned))) 307 : cons_to_unsigned (AREF (g, LGLYPH_IX_CODE), TYPE_MAXIMUM (unsigned)))
308#define LGLYPH_WIDTH(g) XFIXNUM (AREF ((g), LGLYPH_IX_WIDTH)) 308#define LGLYPH_WIDTH(g) XFIXNUM (AREF (g, LGLYPH_IX_WIDTH))
309#define LGLYPH_LBEARING(g) XFIXNUM (AREF ((g), LGLYPH_IX_LBEARING)) 309#define LGLYPH_LBEARING(g) XFIXNUM (AREF (g, LGLYPH_IX_LBEARING))
310#define LGLYPH_RBEARING(g) XFIXNUM (AREF ((g), LGLYPH_IX_RBEARING)) 310#define LGLYPH_RBEARING(g) XFIXNUM (AREF (g, LGLYPH_IX_RBEARING))
311#define LGLYPH_ASCENT(g) XFIXNUM (AREF ((g), LGLYPH_IX_ASCENT)) 311#define LGLYPH_ASCENT(g) XFIXNUM (AREF (g, LGLYPH_IX_ASCENT))
312#define LGLYPH_DESCENT(g) XFIXNUM (AREF ((g), LGLYPH_IX_DESCENT)) 312#define LGLYPH_DESCENT(g) XFIXNUM (AREF (g, LGLYPH_IX_DESCENT))
313#define LGLYPH_ADJUSTMENT(g) AREF ((g), LGLYPH_IX_ADJUSTMENT) 313#define LGLYPH_ADJUSTMENT(g) AREF (g, LGLYPH_IX_ADJUSTMENT)
314#define LGLYPH_SET_FROM(g, val) ASET ((g), LGLYPH_IX_FROM, make_fixnum (val)) 314#define LGLYPH_SET_FROM(g, val) ASET (g, LGLYPH_IX_FROM, make_fixnum (val))
315#define LGLYPH_SET_TO(g, val) ASET ((g), LGLYPH_IX_TO, make_fixnum (val)) 315#define LGLYPH_SET_TO(g, val) ASET (g, LGLYPH_IX_TO, make_fixnum (val))
316#define LGLYPH_SET_CHAR(g, val) ASET ((g), LGLYPH_IX_CHAR, make_fixnum (val)) 316#define LGLYPH_SET_CHAR(g, val) ASET (g, LGLYPH_IX_CHAR, make_fixnum (val))
317/* Callers must assure that VAL is not negative! */ 317/* Callers must assure that VAL is not negative! */
318#define LGLYPH_SET_CODE(g, val) \ 318#define LGLYPH_SET_CODE(g, val) \
319 ASET (g, LGLYPH_IX_CODE, \ 319 ASET (g, LGLYPH_IX_CODE, \
320 val == FONT_INVALID_CODE ? Qnil : INT_TO_INTEGER (val)) 320 val == FONT_INVALID_CODE ? Qnil : INT_TO_INTEGER (val))
321 321
322#define LGLYPH_SET_WIDTH(g, val) ASET ((g), LGLYPH_IX_WIDTH, make_fixnum (val)) 322#define LGLYPH_SET_WIDTH(g, val) ASET (g, LGLYPH_IX_WIDTH, make_fixnum (val))
323#define LGLYPH_SET_LBEARING(g, val) ASET ((g), LGLYPH_IX_LBEARING, make_fixnum (val)) 323#define LGLYPH_SET_LBEARING(g, val) ASET (g, LGLYPH_IX_LBEARING, make_fixnum (val))
324#define LGLYPH_SET_RBEARING(g, val) ASET ((g), LGLYPH_IX_RBEARING, make_fixnum (val)) 324#define LGLYPH_SET_RBEARING(g, val) ASET (g, LGLYPH_IX_RBEARING, make_fixnum (val))
325#define LGLYPH_SET_ASCENT(g, val) ASET ((g), LGLYPH_IX_ASCENT, make_fixnum (val)) 325#define LGLYPH_SET_ASCENT(g, val) ASET (g, LGLYPH_IX_ASCENT, make_fixnum (val))
326#define LGLYPH_SET_DESCENT(g, val) ASET ((g), LGLYPH_IX_DESCENT, make_fixnum (val)) 326#define LGLYPH_SET_DESCENT(g, val) ASET (g, LGLYPH_IX_DESCENT, make_fixnum (val))
327#define LGLYPH_SET_ADJUSTMENT(g, val) ASET ((g), LGLYPH_IX_ADJUSTMENT, (val)) 327#define LGLYPH_SET_ADJUSTMENT(g, val) ASET (g, LGLYPH_IX_ADJUSTMENT, val)
328 328
329#define LGLYPH_XOFF(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \ 329#define LGLYPH_XOFF(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \
330 ? XFIXNUM (AREF (LGLYPH_ADJUSTMENT (g), 0)) : 0) 330 ? XFIXNUM (AREF (LGLYPH_ADJUSTMENT (g), 0)) : 0)
diff --git a/src/conf_post.h b/src/conf_post.h
index 7701bcf40b2..83a0dd1b09b 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -178,8 +178,8 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
178 178
179/* Things that lib/reg* wants. */ 179/* Things that lib/reg* wants. */
180 180
181#define mbrtowc(pwc, s, n, ps) mbtowc ((pwc), (s), (n)) 181#define mbrtowc(pwc, s, n, ps) mbtowc (pwc, s, n)
182#define wcrtomb(s, wc, ps) wctomb ((s), (wc)) 182#define wcrtomb(s, wc, ps) wctomb (s, wc)
183#define btowc(b) ((wchar_t) (b)) 183#define btowc(b) ((wchar_t) (b))
184#define towupper(chr) toupper (chr) 184#define towupper(chr) toupper (chr)
185#define towlower(chr) tolower (chr) 185#define towlower(chr) tolower (chr)
@@ -317,7 +317,7 @@ extern int emacs_setenv_TZ (char const *);
317 type _GL_ATTRIBUTE_MAY_ALIAS *name = (type *) (addr) 317 type _GL_ATTRIBUTE_MAY_ALIAS *name = (type *) (addr)
318 318
319#if 3 <= __GNUC__ 319#if 3 <= __GNUC__
320# define ATTRIBUTE_SECTION(name) __attribute__((section (name))) 320# define ATTRIBUTE_SECTION(name) __attribute__ ((section (name)))
321#else 321#else
322# define ATTRIBUTE_SECTION(name) 322# define ATTRIBUTE_SECTION(name)
323#endif 323#endif
diff --git a/src/dispextern.h b/src/dispextern.h
index 6cab3ff243e..84b9dadc184 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -315,7 +315,7 @@ struct text_pos
315/* Set marker MARKER from text position POS. */ 315/* Set marker MARKER from text position POS. */
316 316
317#define SET_MARKER_FROM_TEXT_POS(MARKER, POS) \ 317#define SET_MARKER_FROM_TEXT_POS(MARKER, POS) \
318 set_marker_both ((MARKER), Qnil, CHARPOS ((POS)), BYTEPOS ((POS))) 318 set_marker_both (MARKER, Qnil, CHARPOS (POS), BYTEPOS (POS))
319 319
320/* Value is non-zero if character and byte positions of POS1 and POS2 320/* Value is non-zero if character and byte positions of POS1 and POS2
321 are equal. */ 321 are equal. */
@@ -399,7 +399,7 @@ GLYPH_CODE_FACE (Lisp_Object gc)
399 SET_GLYPH (glyph, XFIXNUM (XCAR (gc)), XFIXNUM (XCDR (gc))); \ 399 SET_GLYPH (glyph, XFIXNUM (XCAR (gc)), XFIXNUM (XCDR (gc))); \
400 else \ 400 else \
401 SET_GLYPH (glyph, (XFIXNUM (gc) & ((1 << CHARACTERBITS)-1)), \ 401 SET_GLYPH (glyph, (XFIXNUM (gc) & ((1 << CHARACTERBITS)-1)), \
402 (XFIXNUM (gc) >> CHARACTERBITS)); \ 402 XFIXNUM (gc) >> CHARACTERBITS); \
403 } \ 403 } \
404 while (false) 404 while (false)
405 405
@@ -676,9 +676,9 @@ struct glyph
676 defined in lisp.h. */ 676 defined in lisp.h. */
677 677
678#define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM) \ 678#define SET_CHAR_GLYPH_FROM_GLYPH(GLYPH, FROM) \
679 SET_CHAR_GLYPH ((GLYPH), \ 679 SET_CHAR_GLYPH (GLYPH, \
680 GLYPH_CHAR ((FROM)), \ 680 GLYPH_CHAR (FROM), \
681 GLYPH_FACE ((FROM)), \ 681 GLYPH_FACE (FROM), \
682 false) 682 false)
683 683
684/* Construct a glyph code from a character glyph GLYPH. If the 684/* Construct a glyph code from a character glyph GLYPH. If the
@@ -689,9 +689,9 @@ struct glyph
689 do \ 689 do \
690 { \ 690 { \
691 if ((GLYPH).u.ch < 256) \ 691 if ((GLYPH).u.ch < 256) \
692 SET_GLYPH ((G), (GLYPH).u.ch, ((GLYPH).face_id)); \ 692 SET_GLYPH (G, (GLYPH).u.ch, (GLYPH).face_id); \
693 else \ 693 else \
694 SET_GLYPH ((G), -1, 0); \ 694 SET_GLYPH (G, -1, 0); \
695 } \ 695 } \
696 while (false) 696 while (false)
697 697
@@ -837,7 +837,7 @@ struct glyph_matrix
837 837
838#ifdef GLYPH_DEBUG 838#ifdef GLYPH_DEBUG
839void check_matrix_pointer_lossage (struct glyph_matrix *); 839void check_matrix_pointer_lossage (struct glyph_matrix *);
840#define CHECK_MATRIX(MATRIX) check_matrix_pointer_lossage ((MATRIX)) 840#define CHECK_MATRIX(MATRIX) check_matrix_pointer_lossage (MATRIX)
841#else 841#else
842#define CHECK_MATRIX(MATRIX) ((void) 0) 842#define CHECK_MATRIX(MATRIX) ((void) 0)
843#endif 843#endif
@@ -1130,7 +1130,7 @@ struct glyph_row
1130 1130
1131#ifdef GLYPH_DEBUG 1131#ifdef GLYPH_DEBUG
1132struct glyph_row *matrix_row (struct glyph_matrix *, int); 1132struct glyph_row *matrix_row (struct glyph_matrix *, int);
1133#define MATRIX_ROW(MATRIX, ROW) matrix_row ((MATRIX), (ROW)) 1133#define MATRIX_ROW(MATRIX, ROW) matrix_row (MATRIX, ROW)
1134#else 1134#else
1135#define MATRIX_ROW(MATRIX, ROW) ((MATRIX)->rows + (ROW)) 1135#define MATRIX_ROW(MATRIX, ROW) ((MATRIX)->rows + (ROW))
1136#endif 1136#endif
@@ -1166,12 +1166,12 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1166 MATRIX. */ 1166 MATRIX. */
1167 1167
1168#define MATRIX_ROW_GLYPH_START(MATRIX, ROW) \ 1168#define MATRIX_ROW_GLYPH_START(MATRIX, ROW) \
1169 (MATRIX_ROW ((MATRIX), (ROW))->glyphs[TEXT_AREA]) 1169 (MATRIX_ROW (MATRIX, ROW)->glyphs[TEXT_AREA])
1170 1170
1171/* Return the number of used glyphs in the text area of a row. */ 1171/* Return the number of used glyphs in the text area of a row. */
1172 1172
1173#define MATRIX_ROW_USED(MATRIX, ROW) \ 1173#define MATRIX_ROW_USED(MATRIX, ROW) \
1174 (MATRIX_ROW ((MATRIX), (ROW))->used[TEXT_AREA]) 1174 (MATRIX_ROW (MATRIX, ROW)->used[TEXT_AREA])
1175 1175
1176/* Return the character/ byte position at which the display of ROW 1176/* Return the character/ byte position at which the display of ROW
1177 starts. BIDI Note: this is the smallest character/byte position 1177 starts. BIDI Note: this is the smallest character/byte position
@@ -1201,7 +1201,7 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1201#define MATRIX_BOTTOM_TEXT_ROW(MATRIX, W) \ 1201#define MATRIX_BOTTOM_TEXT_ROW(MATRIX, W) \
1202 ((MATRIX)->rows \ 1202 ((MATRIX)->rows \
1203 + (MATRIX)->nrows \ 1203 + (MATRIX)->nrows \
1204 - (window_wants_mode_line ((W)) ? 1 : 0)) 1204 - (window_wants_mode_line (W) ? 1 : 0))
1205 1205
1206/* Non-zero if the face of the last glyph in ROW's text area has 1206/* Non-zero if the face of the last glyph in ROW's text area has
1207 to be drawn to the end of the text area. */ 1207 to be drawn to the end of the text area. */
@@ -1211,7 +1211,7 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1211/* Set and query the enabled_p flag of glyph row ROW in MATRIX. */ 1211/* Set and query the enabled_p flag of glyph row ROW in MATRIX. */
1212 1212
1213#define SET_MATRIX_ROW_ENABLED_P(MATRIX, ROW, VALUE) \ 1213#define SET_MATRIX_ROW_ENABLED_P(MATRIX, ROW, VALUE) \
1214 (MATRIX_ROW (MATRIX, ROW)->enabled_p = (VALUE)) 1214 (MATRIX_ROW (MATRIX, ROW)->enabled_p = VALUE)
1215 1215
1216#define MATRIX_ROW_ENABLED_P(MATRIX, ROW) \ 1216#define MATRIX_ROW_ENABLED_P(MATRIX, ROW) \
1217 (MATRIX_ROW (MATRIX, ROW)->enabled_p) 1217 (MATRIX_ROW (MATRIX, ROW)->enabled_p)
@@ -1232,28 +1232,28 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1232 1232
1233#define MR_PARTIALLY_VISIBLE_AT_BOTTOM(W, ROW) \ 1233#define MR_PARTIALLY_VISIBLE_AT_BOTTOM(W, ROW) \
1234 (((ROW)->y + (ROW)->height - (ROW)->extra_line_spacing) \ 1234 (((ROW)->y + (ROW)->height - (ROW)->extra_line_spacing) \
1235 > WINDOW_BOX_HEIGHT_NO_MODE_LINE ((W))) 1235 > WINDOW_BOX_HEIGHT_NO_MODE_LINE (W))
1236 1236
1237/* Non-zero if ROW is not completely visible in window W. */ 1237/* Non-zero if ROW is not completely visible in window W. */
1238 1238
1239#define MATRIX_ROW_PARTIALLY_VISIBLE_P(W, ROW) \ 1239#define MATRIX_ROW_PARTIALLY_VISIBLE_P(W, ROW) \
1240 (MR_PARTIALLY_VISIBLE ((ROW)) \ 1240 (MR_PARTIALLY_VISIBLE (ROW) \
1241 && (MR_PARTIALLY_VISIBLE_AT_TOP ((W), (ROW)) \ 1241 && (MR_PARTIALLY_VISIBLE_AT_TOP (W, ROW) \
1242 || MR_PARTIALLY_VISIBLE_AT_BOTTOM ((W), (ROW)))) 1242 || MR_PARTIALLY_VISIBLE_AT_BOTTOM (W, ROW)))
1243 1243
1244 1244
1245 1245
1246/* Non-zero if ROW is partially visible at the top of window W. */ 1246/* Non-zero if ROW is partially visible at the top of window W. */
1247 1247
1248#define MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P(W, ROW) \ 1248#define MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P(W, ROW) \
1249 (MR_PARTIALLY_VISIBLE ((ROW)) \ 1249 (MR_PARTIALLY_VISIBLE (ROW) \
1250 && MR_PARTIALLY_VISIBLE_AT_TOP ((W), (ROW))) 1250 && MR_PARTIALLY_VISIBLE_AT_TOP (W, ROW))
1251 1251
1252/* Non-zero if ROW is partially visible at the bottom of window W. */ 1252/* Non-zero if ROW is partially visible at the bottom of window W. */
1253 1253
1254#define MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P(W, ROW) \ 1254#define MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P(W, ROW) \
1255 (MR_PARTIALLY_VISIBLE ((ROW)) \ 1255 (MR_PARTIALLY_VISIBLE (ROW) \
1256 && MR_PARTIALLY_VISIBLE_AT_BOTTOM ((W), (ROW))) 1256 && MR_PARTIALLY_VISIBLE_AT_BOTTOM (W, ROW))
1257 1257
1258/* Return the bottom Y + 1 of ROW. */ 1258/* Return the bottom Y + 1 of ROW. */
1259 1259
@@ -1263,7 +1263,7 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1263 iterator structure pointed to by IT?. */ 1263 iterator structure pointed to by IT?. */
1264 1264
1265#define MATRIX_ROW_LAST_VISIBLE_P(ROW, IT) \ 1265#define MATRIX_ROW_LAST_VISIBLE_P(ROW, IT) \
1266 (MATRIX_ROW_BOTTOM_Y ((ROW)) >= (IT)->last_visible_y) 1266 (MATRIX_ROW_BOTTOM_Y (ROW) >= (IT)->last_visible_y)
1267 1267
1268/* Non-zero if ROW displays a continuation line. */ 1268/* Non-zero if ROW displays a continuation line. */
1269 1269
@@ -1537,9 +1537,9 @@ struct glyph_string
1537/* Return the desired face id for the mode line of window W. */ 1537/* Return the desired face id for the mode line of window W. */
1538 1538
1539#define CURRENT_MODE_LINE_ACTIVE_FACE_ID(W) \ 1539#define CURRENT_MODE_LINE_ACTIVE_FACE_ID(W) \
1540 (CURRENT_MODE_LINE_ACTIVE_FACE_ID_3((W), \ 1540 CURRENT_MODE_LINE_ACTIVE_FACE_ID_3(W, \
1541 XWINDOW (selected_window), \ 1541 XWINDOW (selected_window), \
1542 (W))) 1542 W)
1543 1543
1544/* Return the current height of the mode line of window W. If not known 1544/* Return the current height of the mode line of window W. If not known
1545 from W->mode_line_height, look at W's current glyph matrix, or return 1545 from W->mode_line_height, look at W's current glyph matrix, or return
@@ -1625,8 +1625,8 @@ struct glyph_string
1625 1625
1626#define VCENTER_BASELINE_OFFSET(FONT, F) \ 1626#define VCENTER_BASELINE_OFFSET(FONT, F) \
1627 (FONT_DESCENT (FONT) \ 1627 (FONT_DESCENT (FONT) \
1628 + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT)) \ 1628 + (FRAME_LINE_HEIGHT (F) - FONT_HEIGHT (FONT) \
1629 + (FRAME_LINE_HEIGHT ((F)) > FONT_HEIGHT ((FONT)))) / 2 \ 1629 + (FRAME_LINE_HEIGHT (F) > FONT_HEIGHT (FONT))) / 2 \
1630 - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F))) 1630 - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F)))
1631 1631
1632/* A heuristic test for fonts that claim they need a preposterously 1632/* A heuristic test for fonts that claim they need a preposterously
@@ -2858,12 +2858,12 @@ struct it
2858 if ((IT)->glyph_row != NULL && (IT)->bidi_p) \ 2858 if ((IT)->glyph_row != NULL && (IT)->bidi_p) \
2859 (IT)->glyph_row->reversed_p = (IT)->bidi_it.paragraph_dir == R2L; \ 2859 (IT)->glyph_row->reversed_p = (IT)->bidi_it.paragraph_dir == R2L; \
2860 if (FRAME_RIF ((IT)->f) != NULL) \ 2860 if (FRAME_RIF ((IT)->f) != NULL) \
2861 FRAME_RIF ((IT)->f)->produce_glyphs ((IT)); \ 2861 FRAME_RIF ((IT)->f)->produce_glyphs (IT); \
2862 else \ 2862 else \
2863 produce_glyphs ((IT)); \ 2863 produce_glyphs (IT); \
2864 if ((IT)->glyph_row != NULL) \ 2864 if ((IT)->glyph_row != NULL) \
2865 inhibit_free_realized_faces =true; \ 2865 inhibit_free_realized_faces =true; \
2866 reset_box_start_end_flags ((IT)); \ 2866 reset_box_start_end_flags (IT); \
2867 } while (false) 2867 } while (false)
2868 2868
2869/* Bit-flags indicating what operation move_it_to should perform. */ 2869/* Bit-flags indicating what operation move_it_to should perform. */
diff --git a/src/dispnew.c b/src/dispnew.c
index d0f259eef6c..c204a9dbf1b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -134,8 +134,8 @@ static struct frame *frame_matrix_frame;
134 134
135static int window_to_frame_vpos (struct window *, int); 135static int window_to_frame_vpos (struct window *, int);
136static int window_to_frame_hpos (struct window *, int); 136static int window_to_frame_hpos (struct window *, int);
137#define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) 137#define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos (W, VPOS)
138#define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) 138#define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos (W, HPOS)
139 139
140/* One element of the ring buffer containing redisplay history 140/* One element of the ring buffer containing redisplay history
141 information. */ 141 information. */
@@ -5240,7 +5240,7 @@ count_match (struct glyph *str1, struct glyph *end1, struct glyph *str2, struct
5240/* Char insertion/deletion cost vector, from term.c */ 5240/* Char insertion/deletion cost vector, from term.c */
5241 5241
5242#ifndef HAVE_ANDROID 5242#ifndef HAVE_ANDROID
5243#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS ((f))]) 5243#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS (f)])
5244#endif 5244#endif
5245 5245
5246 5246
diff --git a/src/disptab.h b/src/disptab.h
index d63d19ae754..2080181610a 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -39,13 +39,13 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
39extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int); 39extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int);
40 40
41#define DISP_CHAR_VECTOR(dp, c) \ 41#define DISP_CHAR_VECTOR(dp, c) \
42 (ASCII_CHAR_P(c) \ 42 (ASCII_CHAR_P (c) \
43 ? (NILP ((dp)->ascii) \ 43 ? (NILP ((dp)->ascii) \
44 ? (dp)->defalt \ 44 ? (dp)->defalt \
45 : (SUB_CHAR_TABLE_P ((dp)->ascii) \ 45 : (SUB_CHAR_TABLE_P ((dp)->ascii) \
46 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \ 46 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \
47 : (dp)->ascii)) \ 47 : (dp)->ascii)) \
48 : disp_char_vector ((dp), (c))) 48 : disp_char_vector (dp, c))
49 49
50/* Defined in window.c. */ 50/* Defined in window.c. */
51extern struct Lisp_Char_Table *window_display_table (struct window *); 51extern struct Lisp_Char_Table *window_display_table (struct window *);
@@ -78,8 +78,8 @@ extern struct Lisp_Char_Table *buffer_display_table (void);
78 LENGTH), and set G to the final glyph. */ 78 LENGTH), and set G to the final glyph. */
79#define GLYPH_FOLLOW_ALIASES(base, length, g) \ 79#define GLYPH_FOLLOW_ALIASES(base, length, g) \
80 do { \ 80 do { \
81 while (GLYPH_ALIAS_P ((base), (length), (g))) \ 81 while (GLYPH_ALIAS_P (base, length, g)) \
82 SET_GLYPH_CHAR ((g), XFIXNUM ((base)[GLYPH_CHAR (g)])); \ 82 SET_GLYPH_CHAR (g, XFIXNUM ((base)[GLYPH_CHAR (g)])); \
83 if (!GLYPH_CHAR_VALID_P (g)) \ 83 if (!GLYPH_CHAR_VALID_P (g)) \
84 SET_GLYPH_CHAR (g, ' '); \ 84 SET_GLYPH_CHAR (g, ' '); \
85 } while (false) 85 } while (false)
diff --git a/src/editfns.c b/src/editfns.c
index 7b84f71f4a8..0cecd81c07f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1908,7 +1908,7 @@ determines whether case is significant or ignored. */)
1908#define USE_HEURISTIC 1908#define USE_HEURISTIC
1909 1909
1910#define XVECREF_YVECREF_EQUAL(ctx, xoff, yoff) \ 1910#define XVECREF_YVECREF_EQUAL(ctx, xoff, yoff) \
1911 buffer_chars_equal ((ctx), (xoff), (yoff)) 1911 buffer_chars_equal (ctx, xoff, yoff)
1912 1912
1913#define OFFSET ptrdiff_t 1913#define OFFSET ptrdiff_t
1914 1914
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 9fa9ef79278..2db78fd00b5 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -28,8 +28,8 @@ struct frame;
28G_BEGIN_DECLS 28G_BEGIN_DECLS
29 29
30#ifdef HAVE_PGTK 30#ifdef HAVE_PGTK
31#define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) 31#define EMACS_TYPE_FIXED emacs_fixed_get_type ()
32#define EMACS_IS_FIXED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED)) 32#define EMACS_IS_FIXED(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, EMACS_TYPE_FIXED)
33#endif 33#endif
34 34
35struct frame; 35struct frame;
diff --git a/src/font.h b/src/font.h
index ad92f9f4739..8ee1940be0a 100644
--- a/src/font.h
+++ b/src/font.h
@@ -191,16 +191,16 @@ enum font_property_index
191 191
192/* Return the numeric weight value of FONT. */ 192/* Return the numeric weight value of FONT. */
193#define FONT_WEIGHT_NUMERIC(font) \ 193#define FONT_WEIGHT_NUMERIC(font) \
194 (FIXNUMP (AREF ((font), FONT_WEIGHT_INDEX)) \ 194 (FIXNUMP (AREF (font, FONT_WEIGHT_INDEX)) \
195 ? (XFIXNUM (AREF ((font), FONT_WEIGHT_INDEX)) >> 8) : -1) 195 ? (XFIXNUM (AREF (font, FONT_WEIGHT_INDEX)) >> 8) : -1)
196/* Return the numeric slant value of FONT. */ 196/* Return the numeric slant value of FONT. */
197#define FONT_SLANT_NUMERIC(font) \ 197#define FONT_SLANT_NUMERIC(font) \
198 (FIXNUMP (AREF ((font), FONT_SLANT_INDEX)) \ 198 (FIXNUMP (AREF (font, FONT_SLANT_INDEX)) \
199 ? (XFIXNUM (AREF ((font), FONT_SLANT_INDEX)) >> 8) : -1) 199 ? (XFIXNUM (AREF (font, FONT_SLANT_INDEX)) >> 8) : -1)
200/* Return the numeric width value of FONT. */ 200/* Return the numeric width value of FONT. */
201#define FONT_WIDTH_NUMERIC(font) \ 201#define FONT_WIDTH_NUMERIC(font) \
202 (FIXNUMP (AREF ((font), FONT_WIDTH_INDEX)) \ 202 (FIXNUMP (AREF (font, FONT_WIDTH_INDEX)) \
203 ? (XFIXNUM (AREF ((font), FONT_WIDTH_INDEX)) >> 8) : -1) 203 ? (XFIXNUM (AREF (font, FONT_WIDTH_INDEX)) >> 8) : -1)
204/* Return the symbolic weight value of FONT. */ 204/* Return the symbolic weight value of FONT. */
205#define FONT_WEIGHT_SYMBOLIC(font) \ 205#define FONT_WEIGHT_SYMBOLIC(font) \
206 font_style_symbolic (font, FONT_WEIGHT_INDEX, false) 206 font_style_symbolic (font, FONT_WEIGHT_INDEX, false)
@@ -222,19 +222,19 @@ enum font_property_index
222 222
223/* Return the numeric weight value corresponding to the symbol NAME. */ 223/* Return the numeric weight value corresponding to the symbol NAME. */
224#define FONT_WEIGHT_NAME_NUMERIC(name) \ 224#define FONT_WEIGHT_NAME_NUMERIC(name) \
225 (font_style_to_value (FONT_WEIGHT_INDEX, (name), false) >> 8) 225 (font_style_to_value (FONT_WEIGHT_INDEX, name, false) >> 8)
226/* Return the numeric slant value corresponding to the symbol NAME. */ 226/* Return the numeric slant value corresponding to the symbol NAME. */
227#define FONT_SLANT_NAME_NUMERIC(name) \ 227#define FONT_SLANT_NAME_NUMERIC(name) \
228 (font_style_to_value (FONT_SLANT_INDEX, (name), false) >> 8) 228 (font_style_to_value (FONT_SLANT_INDEX, name, false) >> 8)
229/* Return the numeric width value corresponding to the symbol NAME. */ 229/* Return the numeric width value corresponding to the symbol NAME. */
230#define FONT_WIDTH_NAME_NUMERIC(name) \ 230#define FONT_WIDTH_NAME_NUMERIC(name) \
231 (font_style_to_value (FONT_WIDTH_INDEX, (name), false) >> 8) 231 (font_style_to_value (FONT_WIDTH_INDEX, name, false) >> 8)
232 232
233/* Set the font property PROP of FONT to VAL. PROP is one of 233/* Set the font property PROP of FONT to VAL. PROP is one of
234 style-related font property index (FONT_WEIGHT/SLANT/WIDTH_INDEX). 234 style-related font property index (FONT_WEIGHT/SLANT/WIDTH_INDEX).
235 VAL (integer or symbol) is the numeric or symbolic style value. */ 235 VAL (integer or symbol) is the numeric or symbolic style value. */
236#define FONT_SET_STYLE(font, prop, val) \ 236#define FONT_SET_STYLE(font, prop, val) \
237 ASET ((font), prop, make_fixnum (font_style_to_value (prop, val, true))) 237 ASET (font, prop, make_fixnum (font_style_to_value (prop, val, true)))
238 238
239#ifndef MSDOS 239#ifndef MSDOS
240#define FONT_WIDTH(f) ((f)->max_width) 240#define FONT_WIDTH(f) ((f)->max_width)
@@ -549,7 +549,7 @@ GC_XFONT_OBJECT (Lisp_Object p)
549 return XUNTAG (p, Lisp_Vectorlike, struct font); 549 return XUNTAG (p, Lisp_Vectorlike, struct font);
550} 550}
551 551
552#define XSETFONT(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_FONT)) 552#define XSETFONT(a, b) XSETPSEUDOVECTOR (a, b, PVEC_FONT)
553 553
554INLINE struct font * 554INLINE struct font *
555CHECK_FONT_GET_OBJECT (Lisp_Object x) 555CHECK_FONT_GET_OBJECT (Lisp_Object x)
@@ -1004,13 +1004,13 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object);
1004#define FONT_ADD_LOG(ACTION, ARG, RESULT) \ 1004#define FONT_ADD_LOG(ACTION, ARG, RESULT) \
1005 do { \ 1005 do { \
1006 if (! EQ (Vfont_log, Qt)) \ 1006 if (! EQ (Vfont_log, Qt)) \
1007 font_add_log ((ACTION), (ARG), (RESULT)); \ 1007 font_add_log (ACTION, ARG, RESULT); \
1008 } while (false) 1008 } while (false)
1009 1009
1010#define FONT_DEFERRED_LOG(ACTION, ARG, RESULT) \ 1010#define FONT_DEFERRED_LOG(ACTION, ARG, RESULT) \
1011 do { \ 1011 do { \
1012 if (! EQ (Vfont_log, Qt)) \ 1012 if (! EQ (Vfont_log, Qt)) \
1013 font_deferred_log ((ACTION), (ARG), (RESULT)); \ 1013 font_deferred_log (ACTION, ARG, RESULT); \
1014 } while (false) 1014 } while (false)
1015 1015
1016/* FIXME: This is for use in functions that can be called while 1016/* FIXME: This is for use in functions that can be called while
diff --git a/src/fontset.c b/src/fontset.c
index 005d0a98d2a..d27fa22015e 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -266,19 +266,19 @@ font_def_new (Lisp_Object font_spec, Lisp_Object encoding,
266 266
267#define RFONT_DEF_FACE(rfont_def) AREF (rfont_def, 0) 267#define RFONT_DEF_FACE(rfont_def) AREF (rfont_def, 0)
268#define RFONT_DEF_SET_FACE(rfont_def, face_id) \ 268#define RFONT_DEF_SET_FACE(rfont_def, face_id) \
269 ASET ((rfont_def), 0, make_fixnum (face_id)) 269 ASET (rfont_def, 0, make_fixnum (face_id))
270#define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1) 270#define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1)
271#define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1)) 271#define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1))
272#define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2) 272#define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2)
273#define RFONT_DEF_SET_OBJECT(rfont_def, object) \ 273#define RFONT_DEF_SET_OBJECT(rfont_def, object) \
274 ASET ((rfont_def), 2, (object)) 274 ASET (rfont_def, 2, object)
275/* Score of RFONT_DEF is an integer value; the lowest 8 bits represent 275/* Score of RFONT_DEF is an integer value; the lowest 8 bits represent
276 the order of listing by font backends, the higher bits represents 276 the order of listing by font backends, the higher bits represents
277 the order given by charset priority list. The smaller value is 277 the order given by charset priority list. The smaller value is
278 preferable. */ 278 preferable. */
279#define RFONT_DEF_SCORE(rfont_def) XFIXNUM (AREF (rfont_def, 3)) 279#define RFONT_DEF_SCORE(rfont_def) XFIXNUM (AREF (rfont_def, 3))
280#define RFONT_DEF_SET_SCORE(rfont_def, score) \ 280#define RFONT_DEF_SET_SCORE(rfont_def, score) \
281 ASET ((rfont_def), 3, make_fixnum (score)) 281 ASET (rfont_def, 3, make_fixnum (score))
282#define RFONT_DEF_NEW(rfont_def, font_def) \ 282#define RFONT_DEF_NEW(rfont_def, font_def) \
283 do { \ 283 do { \
284 (rfont_def) = make_nil_vector (4); \ 284 (rfont_def) = make_nil_vector (4); \
@@ -295,7 +295,7 @@ font_def_new (Lisp_Object font_spec, Lisp_Object encoding,
295#define FONTSET_REF(fontset, c) \ 295#define FONTSET_REF(fontset, c) \
296 (EQ (fontset, Vdefault_fontset) \ 296 (EQ (fontset, Vdefault_fontset) \
297 ? CHAR_TABLE_REF (fontset, c) \ 297 ? CHAR_TABLE_REF (fontset, c) \
298 : fontset_ref ((fontset), (c))) 298 : fontset_ref (fontset, c))
299 299
300static Lisp_Object 300static Lisp_Object
301fontset_ref (Lisp_Object fontset, int c) 301fontset_ref (Lisp_Object fontset, int c)
@@ -315,7 +315,7 @@ fontset_ref (Lisp_Object fontset, int c)
315 specifying a range. */ 315 specifying a range. */
316 316
317#define FONTSET_SET(fontset, range, elt) \ 317#define FONTSET_SET(fontset, range, elt) \
318 Fset_char_table_range ((fontset), (range), (elt)) 318 Fset_char_table_range (fontset, range, elt)
319 319
320 320
321/* Modify the elements of FONTSET for characters in RANGE by replacing 321/* Modify the elements of FONTSET for characters in RANGE by replacing
@@ -329,7 +329,7 @@ fontset_ref (Lisp_Object fontset, int c)
329 ? (NILP (range) \ 329 ? (NILP (range) \
330 ? set_fontset_fallback (fontset, make_vector (1, elt)) \ 330 ? set_fontset_fallback (fontset, make_vector (1, elt)) \
331 : (void) Fset_char_table_range (fontset, range, make_vector (1, elt))) \ 331 : (void) Fset_char_table_range (fontset, range, make_vector (1, elt))) \
332 : fontset_add ((fontset), (range), (elt), (add))) 332 : fontset_add (fontset, range, elt, add))
333 333
334static void 334static void
335fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) 335fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add)
diff --git a/src/frame.h b/src/frame.h
index d574fe93a57..e03362361a7 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -909,7 +909,7 @@ default_pixels_per_inch_y (void)
909 909
910#define XFRAME(p) \ 910#define XFRAME(p) \
911 (eassert (FRAMEP (p)), XUNTAG (p, Lisp_Vectorlike, struct frame)) 911 (eassert (FRAMEP (p)), XUNTAG (p, Lisp_Vectorlike, struct frame))
912#define XSETFRAME(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_FRAME)) 912#define XSETFRAME(a, b) XSETPSEUDOVECTOR (a, b, PVEC_FRAME)
913 913
914/* Given a window, return its frame as a Lisp_Object. */ 914/* Given a window, return its frame as a Lisp_Object. */
915#define WINDOW_FRAME(w) ((w)->frame) 915#define WINDOW_FRAME(w) ((w)->frame)
@@ -992,7 +992,7 @@ default_pixels_per_inch_y (void)
992 FRAME_DISPLAY_INFO (f)->font_resolution) 992 FRAME_DISPLAY_INFO (f)->font_resolution)
993 993
994#else /* !HAVE_ANDROID */ 994#else /* !HAVE_ANDROID */
995#define FRAME_RES(f) (FRAME_RES_Y (f)) 995#define FRAME_RES(f) FRAME_RES_Y (f)
996#endif /* HAVE_ANDROID */ 996#endif /* HAVE_ANDROID */
997 997
998#else /* !HAVE_WINDOW_SYSTEM */ 998#else /* !HAVE_WINDOW_SYSTEM */
@@ -1130,12 +1130,12 @@ default_pixels_per_inch_y (void)
1130/* Height of F's bottom margin in frame lines. */ 1130/* Height of F's bottom margin in frame lines. */
1131 1131
1132#define FRAME_BOTTOM_MARGIN(f) \ 1132#define FRAME_BOTTOM_MARGIN(f) \
1133 (FRAME_TOOL_BAR_BOTTOM_LINES (f)) 1133 FRAME_TOOL_BAR_BOTTOM_LINES (f)
1134 1134
1135/* Pixel height of frame F's bottom margin. */ 1135/* Pixel height of frame F's bottom margin. */
1136 1136
1137#define FRAME_BOTTOM_MARGIN_HEIGHT(f) \ 1137#define FRAME_BOTTOM_MARGIN_HEIGHT(f) \
1138 (FRAME_TOOL_BAR_BOTTOM_HEIGHT (f)) 1138 FRAME_TOOL_BAR_BOTTOM_HEIGHT (f)
1139 1139
1140/* Size of both vertical margins combined. */ 1140/* Size of both vertical margins combined. */
1141 1141
@@ -1159,7 +1159,7 @@ default_pixels_per_inch_y (void)
1159 visible by the X server. */ 1159 visible by the X server. */
1160 1160
1161#ifndef HAVE_X_WINDOWS 1161#ifndef HAVE_X_WINDOWS
1162#define FRAME_REDISPLAY_P(f) (FRAME_VISIBLE_P (f)) 1162#define FRAME_REDISPLAY_P(f) FRAME_VISIBLE_P (f)
1163#else 1163#else
1164#define FRAME_REDISPLAY_P(f) (FRAME_VISIBLE_P (f) \ 1164#define FRAME_REDISPLAY_P(f) (FRAME_VISIBLE_P (f) \
1165 || (FRAME_X_P (f) \ 1165 || (FRAME_X_P (f) \
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6cfb4034ed9..c067f7b53ac 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -117,10 +117,10 @@ static void xg_widget_style_updated (GtkWidget *, gpointer);
117 117
118#define gtk_box_new(ori, spacing) \ 118#define gtk_box_new(ori, spacing) \
119 ((ori) == GTK_ORIENTATION_HORIZONTAL \ 119 ((ori) == GTK_ORIENTATION_HORIZONTAL \
120 ? gtk_hbox_new (FALSE, (spacing)) : gtk_vbox_new (FALSE, (spacing))) 120 ? gtk_hbox_new (FALSE, spacing) : gtk_vbox_new (FALSE, spacing))
121#define gtk_scrollbar_new(ori, spacing) \ 121#define gtk_scrollbar_new(ori, spacing) \
122 ((ori) == GTK_ORIENTATION_HORIZONTAL \ 122 ((ori) == GTK_ORIENTATION_HORIZONTAL \
123 ? gtk_hscrollbar_new ((spacing)) : gtk_vscrollbar_new ((spacing))) 123 ? gtk_hscrollbar_new (spacing) : gtk_vscrollbar_new (spacing))
124#endif /* HAVE_GTK3 */ 124#endif /* HAVE_GTK3 */
125 125
126#define XG_BIN_CHILD(x) gtk_bin_get_child (GTK_BIN (x)) 126#define XG_BIN_CHILD(x) gtk_bin_get_child (GTK_BIN (x))
diff --git a/src/image.c b/src/image.c
index 66838adbb2a..41d72964631 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4875,7 +4875,7 @@ xbm_read_bitmap_data (struct frame *f, char *contents, char *end,
4875 while (0) 4875 while (0)
4876 4876
4877#define expect_ident(IDENT) \ 4877#define expect_ident(IDENT) \
4878 if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \ 4878 if (LA1 == XBM_TK_IDENT && strcmp (buffer, IDENT) == 0) \
4879 match (); \ 4879 match (); \
4880 else \ 4880 else \
4881 goto failure 4881 goto failure
@@ -6154,7 +6154,7 @@ xpm_load_image (struct frame *f,
6154 6154
6155#define expect_ident(IDENT) \ 6155#define expect_ident(IDENT) \
6156 if (LA1 == XPM_TK_IDENT \ 6156 if (LA1 == XPM_TK_IDENT \
6157 && strlen ((IDENT)) == len && memcmp ((IDENT), beg, len) == 0) \ 6157 && strlen (IDENT) == len && memcmp (IDENT, beg, len) == 0) \
6158 match (); \ 6158 match (); \
6159 else \ 6159 else \
6160 goto failure 6160 goto failure
diff --git a/src/keyboard.c b/src/keyboard.c
index e1d738dd6ef..1f7253a7da1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -9082,7 +9082,7 @@ process_tab_bar_item (Lisp_Object key, Lisp_Object def, Lisp_Object data, void *
9082} 9082}
9083 9083
9084/* Access slot with index IDX of vector tab_bar_item_properties. */ 9084/* Access slot with index IDX of vector tab_bar_item_properties. */
9085#define PROP(IDX) AREF (tab_bar_item_properties, (IDX)) 9085#define PROP(IDX) AREF (tab_bar_item_properties, IDX)
9086static void 9086static void
9087set_prop_tab_bar (ptrdiff_t idx, Lisp_Object val) 9087set_prop_tab_bar (ptrdiff_t idx, Lisp_Object val)
9088{ 9088{
@@ -9466,7 +9466,7 @@ process_tool_bar_item (Lisp_Object key, Lisp_Object def, Lisp_Object data, void
9466} 9466}
9467 9467
9468/* Access slot with index IDX of vector tool_bar_item_properties. */ 9468/* Access slot with index IDX of vector tool_bar_item_properties. */
9469#define PROP(IDX) AREF (tool_bar_item_properties, (IDX)) 9469#define PROP(IDX) AREF (tool_bar_item_properties, IDX)
9470static void 9470static void
9471set_prop (ptrdiff_t idx, Lisp_Object val) 9471set_prop (ptrdiff_t idx, Lisp_Object val)
9472{ 9472{
diff --git a/src/keyboard.h b/src/keyboard.h
index 05245f366f5..68e68bc2ae3 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -396,7 +396,7 @@ extern void unuse_menu_items (void);
396/* Macros for dealing with lispy events. */ 396/* Macros for dealing with lispy events. */
397 397
398/* True if EVENT has data fields describing it (i.e. a mouse click). */ 398/* True if EVENT has data fields describing it (i.e. a mouse click). */
399#define EVENT_HAS_PARAMETERS(event) (CONSP (event)) 399#define EVENT_HAS_PARAMETERS(event) CONSP (event)
400 400
401/* Extract the head from an event. 401/* Extract the head from an event.
402 This works on composite and simple events. */ 402 This works on composite and simple events. */
@@ -414,32 +414,32 @@ extern void unuse_menu_items (void);
414 : CAR_SAFE (CDR_SAFE (event))) 414 : CAR_SAFE (CDR_SAFE (event)))
415 415
416/* This does not handle touchscreen events. */ 416/* This does not handle touchscreen events. */
417#define EVENT_END(event) (CAR_SAFE (CDR_SAFE (CDR_SAFE (event)))) 417#define EVENT_END(event) CAR_SAFE (CDR_SAFE (CDR_SAFE (event)))
418 418
419/* Extract the click count from a multi-click event. */ 419/* Extract the click count from a multi-click event. */
420#define EVENT_CLICK_COUNT(event) (Fnth (make_fixnum (2), (event))) 420#define EVENT_CLICK_COUNT(event) Fnth (make_fixnum (2), event)
421 421
422/* Extract the fields of a position. */ 422/* Extract the fields of a position. */
423#define POSN_WINDOW(posn) (CAR_SAFE (posn)) 423#define POSN_WINDOW(posn) CAR_SAFE (posn)
424#define POSN_POSN(posn) (CAR_SAFE (CDR_SAFE (posn))) 424#define POSN_POSN(posn) CAR_SAFE (CDR_SAFE (posn))
425#define POSN_SET_POSN(posn,x) (XSETCAR (XCDR (posn), (x))) 425#define POSN_SET_POSN(posn,x) XSETCAR (XCDR (posn), x)
426#define POSN_WINDOW_POSN(posn) (CAR_SAFE (CDR_SAFE (CDR_SAFE (posn)))) 426#define POSN_WINDOW_POSN(posn) CAR_SAFE (CDR_SAFE (CDR_SAFE (posn)))
427#define POSN_TIMESTAMP(posn) (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (posn))))) 427#define POSN_TIMESTAMP(posn) CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (posn))))
428#define POSN_SCROLLBAR_PART(posn) (Fnth (make_fixnum (4), (posn))) 428#define POSN_SCROLLBAR_PART(posn) Fnth (make_fixnum (4), posn)
429 429
430/* A cons (STRING . STRING-CHARPOS), or nil in mouse-click events. 430/* A cons (STRING . STRING-CHARPOS), or nil in mouse-click events.
431 It's a cons if the click is over a string in the mode line. */ 431 It's a cons if the click is over a string in the mode line. */
432 432
433#define POSN_STRING(posn) (Fnth (make_fixnum (4), (posn))) 433#define POSN_STRING(posn) Fnth (make_fixnum (4), posn)
434 434
435/* If POSN_STRING is nil, event refers to buffer location. */ 435/* If POSN_STRING is nil, event refers to buffer location. */
436 436
437#define POSN_INBUFFER_P(posn) (NILP (POSN_STRING (posn))) 437#define POSN_INBUFFER_P(posn) NILP (POSN_STRING (posn))
438#define POSN_BUFFER_POSN(posn) (Fnth (make_fixnum (5), (posn))) 438#define POSN_BUFFER_POSN(posn) Fnth (make_fixnum (5), posn)
439 439
440/* Getting the kind of an event head. */ 440/* Getting the kind of an event head. */
441#define EVENT_HEAD_KIND(event_head) \ 441#define EVENT_HEAD_KIND(event_head) \
442 (Fget ((event_head), Qevent_kind)) 442 Fget (event_head, Qevent_kind)
443 443
444/* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt 444/* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt
445 happens. */ 445 happens. */
diff --git a/src/lisp.h b/src/lisp.h
index e25d990e1e9..20b28e93c8d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -369,11 +369,11 @@ typedef EMACS_INT Lisp_Word;
369# define lisp_h_Qnil {0} 369# define lisp_h_Qnil {0}
370#endif 370#endif
371 371
372#define lisp_h_PSEUDOVECTORP(a,code) \ 372#define lisp_h_PSEUDOVECTORP(a,code) \
373 (lisp_h_VECTORLIKEP((a)) && \ 373 (lisp_h_VECTORLIKEP (a) \
374 ((XUNTAG ((a), Lisp_Vectorlike, union vectorlike_header)->size \ 374 && ((XUNTAG (a, Lisp_Vectorlike, union vectorlike_header)->size \
375 & (PSEUDOVECTOR_FLAG | PVEC_TYPE_MASK)) \ 375 & (PSEUDOVECTOR_FLAG | PVEC_TYPE_MASK)) \
376 == (PSEUDOVECTOR_FLAG | ((code) << PSEUDOVECTOR_AREA_BITS)))) 376 == (PSEUDOVECTOR_FLAG | ((code) << PSEUDOVECTOR_AREA_BITS))))
377 377
378#define lisp_h_CHECK_FIXNUM(x) CHECK_TYPE (FIXNUMP (x), Qfixnump, x) 378#define lisp_h_CHECK_FIXNUM(x) CHECK_TYPE (FIXNUMP (x), Qfixnump, x)
379#define lisp_h_CHECK_SYMBOL(x) CHECK_TYPE (SYMBOLP (x), Qsymbolp, x) 379#define lisp_h_CHECK_SYMBOL(x) CHECK_TYPE (SYMBOLP (x), Qsymbolp, x)
@@ -391,17 +391,17 @@ typedef EMACS_INT Lisp_Word;
391 * What about keeping the part after `symbols_with_pos_enabled` in 391 * What about keeping the part after `symbols_with_pos_enabled` in
392 * a separate function? */ 392 * a separate function? */
393#define lisp_h_EQ(x, y) \ 393#define lisp_h_EQ(x, y) \
394 ((XLI ((x)) == XLI ((y))) \ 394 (XLI (x) == XLI (y) \
395 || (symbols_with_pos_enabled \ 395 || (symbols_with_pos_enabled \
396 && (SYMBOL_WITH_POS_P ((x)) \ 396 && (SYMBOL_WITH_POS_P (x) \
397 ? (BARE_SYMBOL_P ((y)) \ 397 ? (BARE_SYMBOL_P (y) \
398 ? XLI (XSYMBOL_WITH_POS((x))->sym) == XLI (y) \ 398 ? XLI (XSYMBOL_WITH_POS (x)->sym) == XLI (y) \
399 : SYMBOL_WITH_POS_P((y)) \ 399 : (SYMBOL_WITH_POS_P (y) \
400 && (XLI (XSYMBOL_WITH_POS((x))->sym) \ 400 && (XLI (XSYMBOL_WITH_POS (x)->sym) \
401 == XLI (XSYMBOL_WITH_POS((y))->sym))) \ 401 == XLI (XSYMBOL_WITH_POS (y)->sym)))) \
402 : (SYMBOL_WITH_POS_P ((y)) \ 402 : (SYMBOL_WITH_POS_P (y) \
403 && BARE_SYMBOL_P ((x)) \ 403 && BARE_SYMBOL_P (x) \
404 && (XLI (x) == XLI ((XSYMBOL_WITH_POS ((y)))->sym)))))) 404 && (XLI (x) == XLI (XSYMBOL_WITH_POS (y)->sym))))))
405 405
406#define lisp_h_FIXNUMP(x) \ 406#define lisp_h_FIXNUMP(x) \
407 (! (((unsigned) (XLI (x) >> (USE_LSB_TAG ? 0 : FIXNUM_BITS)) \ 407 (! (((unsigned) (XLI (x) >> (USE_LSB_TAG ? 0 : FIXNUM_BITS)) \
@@ -417,10 +417,10 @@ typedef EMACS_INT Lisp_Word;
417#define lisp_h_SYMBOL_TRAPPED_WRITE_P(sym) (XSYMBOL (sym)->u.s.trapped_write) 417#define lisp_h_SYMBOL_TRAPPED_WRITE_P(sym) (XSYMBOL (sym)->u.s.trapped_write)
418#define lisp_h_SYMBOL_VAL(sym) \ 418#define lisp_h_SYMBOL_VAL(sym) \
419 (eassert ((sym)->u.s.redirect == SYMBOL_PLAINVAL), (sym)->u.s.val.value) 419 (eassert ((sym)->u.s.redirect == SYMBOL_PLAINVAL), (sym)->u.s.val.value)
420#define lisp_h_SYMBOL_WITH_POS_P(x) PSEUDOVECTORP ((x), PVEC_SYMBOL_WITH_POS) 420#define lisp_h_SYMBOL_WITH_POS_P(x) PSEUDOVECTORP (x, PVEC_SYMBOL_WITH_POS)
421#define lisp_h_BARE_SYMBOL_P(x) TAGGEDP ((x), Lisp_Symbol) 421#define lisp_h_BARE_SYMBOL_P(x) TAGGEDP (x, Lisp_Symbol)
422#define lisp_h_SYMBOLP(x) ((BARE_SYMBOL_P ((x)) || \ 422#define lisp_h_SYMBOLP(x) \
423 (symbols_with_pos_enabled && (SYMBOL_WITH_POS_P ((x)))))) 423 (BARE_SYMBOL_P (x) || (symbols_with_pos_enabled && SYMBOL_WITH_POS_P (x)))
424#define lisp_h_TAGGEDP(a, tag) \ 424#define lisp_h_TAGGEDP(a, tag) \
425 (! (((unsigned) (XLI (a) >> (USE_LSB_TAG ? 0 : VALBITS)) \ 425 (! (((unsigned) (XLI (a) >> (USE_LSB_TAG ? 0 : VALBITS)) \
426 - (unsigned) (tag)) \ 426 - (unsigned) (tag)) \
@@ -1156,7 +1156,7 @@ XBARE_SYMBOL (Lisp_Object a)
1156INLINE struct Lisp_Symbol * ATTRIBUTE_NO_SANITIZE_UNDEFINED 1156INLINE struct Lisp_Symbol * ATTRIBUTE_NO_SANITIZE_UNDEFINED
1157XSYMBOL (Lisp_Object a) 1157XSYMBOL (Lisp_Object a)
1158{ 1158{
1159 eassert (SYMBOLP ((a))); 1159 eassert (SYMBOLP (a));
1160 if (!symbols_with_pos_enabled || BARE_SYMBOL_P (a)) 1160 if (!symbols_with_pos_enabled || BARE_SYMBOL_P (a))
1161 return XBARE_SYMBOL (a); 1161 return XBARE_SYMBOL (a);
1162 return XBARE_SYMBOL (XSYMBOL_WITH_POS (a)->sym); 1162 return XBARE_SYMBOL (XSYMBOL_WITH_POS (a)->sym);
@@ -1407,19 +1407,19 @@ dead_object (void)
1407 == (PSEUDOVECTOR_FLAG | (code << PSEUDOVECTOR_AREA_BITS)))) 1407 == (PSEUDOVECTOR_FLAG | (code << PSEUDOVECTOR_AREA_BITS))))
1408 1408
1409#define XSETWINDOW_CONFIGURATION(a, b) \ 1409#define XSETWINDOW_CONFIGURATION(a, b) \
1410 (XSETPSEUDOVECTOR (a, b, PVEC_WINDOW_CONFIGURATION)) 1410 XSETPSEUDOVECTOR (a, b, PVEC_WINDOW_CONFIGURATION)
1411#define XSETPROCESS(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_PROCESS)) 1411#define XSETPROCESS(a, b) XSETPSEUDOVECTOR (a, b, PVEC_PROCESS)
1412#define XSETWINDOW(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_WINDOW)) 1412#define XSETWINDOW(a, b) XSETPSEUDOVECTOR (a, b, PVEC_WINDOW)
1413#define XSETTERMINAL(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_TERMINAL)) 1413#define XSETTERMINAL(a, b) XSETPSEUDOVECTOR (a, b, PVEC_TERMINAL)
1414#define XSETSUBR(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_SUBR)) 1414#define XSETSUBR(a, b) XSETPSEUDOVECTOR (a, b, PVEC_SUBR)
1415#define XSETBUFFER(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_BUFFER)) 1415#define XSETBUFFER(a, b) XSETPSEUDOVECTOR (a, b, PVEC_BUFFER)
1416#define XSETCHAR_TABLE(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_CHAR_TABLE)) 1416#define XSETCHAR_TABLE(a, b) XSETPSEUDOVECTOR (a, b, PVEC_CHAR_TABLE)
1417#define XSETBOOL_VECTOR(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_BOOL_VECTOR)) 1417#define XSETBOOL_VECTOR(a, b) XSETPSEUDOVECTOR (a, b, PVEC_BOOL_VECTOR)
1418#define XSETSUB_CHAR_TABLE(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_SUB_CHAR_TABLE)) 1418#define XSETSUB_CHAR_TABLE(a, b) XSETPSEUDOVECTOR (a, b, PVEC_SUB_CHAR_TABLE)
1419#define XSETTHREAD(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_THREAD)) 1419#define XSETTHREAD(a, b) XSETPSEUDOVECTOR (a, b, PVEC_THREAD)
1420#define XSETMUTEX(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_MUTEX)) 1420#define XSETMUTEX(a, b) XSETPSEUDOVECTOR (a, b, PVEC_MUTEX)
1421#define XSETCONDVAR(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_CONDVAR)) 1421#define XSETCONDVAR(a, b) XSETPSEUDOVECTOR (a, b, PVEC_CONDVAR)
1422#define XSETNATIVE_COMP_UNIT(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_NATIVE_COMP_UNIT)) 1422#define XSETNATIVE_COMP_UNIT(a, b) XSETPSEUDOVECTOR (a, b, PVEC_NATIVE_COMP_UNIT)
1423 1423
1424/* Efficiently convert a pointer to a Lisp object and back. The 1424/* Efficiently convert a pointer to a Lisp object and back. The
1425 pointer is represented as a fixnum, so the garbage collector 1425 pointer is represented as a fixnum, so the garbage collector
@@ -2542,7 +2542,7 @@ XHASH_TABLE (Lisp_Object a)
2542} 2542}
2543 2543
2544#define XSET_HASH_TABLE(VAR, PTR) \ 2544#define XSET_HASH_TABLE(VAR, PTR) \
2545 (XSETPSEUDOVECTOR (VAR, PTR, PVEC_HASH_TABLE)) 2545 XSETPSEUDOVECTOR (VAR, PTR, PVEC_HASH_TABLE)
2546 2546
2547/* Value is the key part of entry IDX in hash table H. */ 2547/* Value is the key part of entry IDX in hash table H. */
2548INLINE Lisp_Object 2548INLINE Lisp_Object
diff --git a/src/lread.c b/src/lread.c
index 2c6a444ec56..929f86ef283 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -124,7 +124,7 @@ static struct android_fd_or_asset invalid_file_stream =
124 124
125#define file_stream struct android_fd_or_asset 125#define file_stream struct android_fd_or_asset
126#define file_offset off_t 126#define file_offset off_t
127#define file_tell(n) (android_asset_lseek ((n), 0, SEEK_CUR)) 127#define file_tell(n) android_asset_lseek (n, 0, SEEK_CUR)
128#define file_seek android_asset_lseek 128#define file_seek android_asset_lseek
129#define file_stream_valid_p(p) ((p).asset || (p).fd >= 0) 129#define file_stream_valid_p(p) ((p).asset || (p).fd >= 0)
130#define file_stream_close android_close_asset 130#define file_stream_close android_close_asset
diff --git a/src/macfont.h b/src/macfont.h
index 77426f6f198..45cb1eaa7e4 100644
--- a/src/macfont.h
+++ b/src/macfont.h
@@ -75,7 +75,7 @@ enum {
75#define kCTVersionNumber10_9 0x00060000 75#define kCTVersionNumber10_9 0x00060000
76#endif 76#endif
77#define MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE \ 77#define MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE \
78 (CFSTR ("MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE")) 78 CFSTR ("MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE")
79 79
80typedef const struct _EmacsScreenFont *ScreenFontRef; /* opaque */ 80typedef const struct _EmacsScreenFont *ScreenFontRef; /* opaque */
81 81
@@ -85,4 +85,4 @@ extern void macfont_update_antialias_threshold (void);
85 85
86/* This is an undocumented function. */ 86/* This is an undocumented function. */
87extern void CGContextSetFontSmoothingStyle(CGContextRef, int) 87extern void CGContextSetFontSmoothingStyle(CGContextRef, int)
88 __attribute__((weak_import)); 88 __attribute__ ((weak_import));
diff --git a/src/msdos.c b/src/msdos.c
index 1f82d4029d7..7e78c35027e 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2865,7 +2865,7 @@ IT_menu_calc_size (XMenu *menu, int *width, int *height)
2865 do \ 2865 do \
2866 { \ 2866 { \
2867 (GLYPH).type = CHAR_GLYPH; \ 2867 (GLYPH).type = CHAR_GLYPH; \
2868 SET_CHAR_GLYPH ((GLYPH), CODE, FACE_ID, PADDING_P); \ 2868 SET_CHAR_GLYPH (GLYPH, CODE, FACE_ID, PADDING_P); \
2869 (GLYPH).charpos = -1; \ 2869 (GLYPH).charpos = -1; \
2870 } \ 2870 } \
2871 while (0) 2871 while (0)
diff --git a/src/nsfont.m b/src/nsfont.m
index 2679a42e1e1..4e1d85a5c4a 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -601,7 +601,7 @@ static NSString
601{ 601{
602 Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist); 602 Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist);
603 return CONSP (script) 603 return CONSP (script)
604 ? [NSString stringWithLispString: SYMBOL_NAME (XCDR ((script)))] 604 ? [NSString stringWithLispString: SYMBOL_NAME (XCDR (script))]
605 : @""; 605 : @"";
606} 606}
607 607
diff --git a/src/nsterm.h b/src/nsterm.h
index faa839dc1af..ae940ec5b4f 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -278,9 +278,9 @@ char const * nstrace_fullscreen_type_name (int);
278 278
279 279
280#define NSTRACE_WHEN(cond, ...) \ 280#define NSTRACE_WHEN(cond, ...) \
281 __attribute__((cleanup(nstrace_restore_global_trace_state))) \ 281 __attribute__ ((cleanup (nstrace_restore_global_trace_state))) \
282 int nstrace_saved_enabled_global = nstrace_enabled_global; \ 282 int nstrace_saved_enabled_global = nstrace_enabled_global; \
283 __attribute__((cleanup(nstrace_leave))) \ 283 __attribute__ ((cleanup (nstrace_leave))) \
284 int nstrace_enabled = nstrace_enabled_global && (cond); \ 284 int nstrace_enabled = nstrace_enabled_global && (cond); \
285 if (nstrace_enabled) { ++nstrace_depth; } \ 285 if (nstrace_enabled) { ++nstrace_depth; } \
286 else { nstrace_enabled_global = 0; } \ 286 else { nstrace_enabled_global = 0; } \
@@ -1290,7 +1290,7 @@ extern char gnustep_base_version[]; /* version tracking */
1290/* Little utility macros */ 1290/* Little utility macros */
1291#define IN_BOUND(min, x, max) (((x) < (min)) \ 1291#define IN_BOUND(min, x, max) (((x) < (min)) \
1292 ? (min) : (((x)>(max)) ? (max) : (x))) 1292 ? (min) : (((x)>(max)) ? (max) : (x)))
1293#define SCREENMAXBOUND(x) (IN_BOUND (-SCREENMAX, x, SCREENMAX)) 1293#define SCREENMAXBOUND(x) IN_BOUND (-SCREENMAX, x, SCREENMAX)
1294 1294
1295 1295
1296#ifdef NS_IMPL_COCOA 1296#ifdef NS_IMPL_COCOA
diff --git a/src/pdumper.h b/src/pdumper.h
index 726805efdac..0d5e4c2d45f 100644
--- a/src/pdumper.h
+++ b/src/pdumper.h
@@ -128,7 +128,7 @@ pdumper_do_now_and_after_late_load (pdumper_hook hook)
128 if (dumped_with_pdumper_p ()) \ 128 if (dumped_with_pdumper_p ()) \
129 (variable) = (value); \ 129 (variable) = (value); \
130 else \ 130 else \
131 eassert (EQ ((variable), (value))); \ 131 eassert (EQ (variable, value)); \
132 } while (0) 132 } while (0)
133 133
134/* Actually load a dump. */ 134/* Actually load a dump. */
diff --git a/src/pgtkterm.h b/src/pgtkterm.h
index e8c54dff4d9..8072d963691 100644
--- a/src/pgtkterm.h
+++ b/src/pgtkterm.h
@@ -462,7 +462,7 @@ enum
462#define FRAME_X_WINDOW(f) FRAME_GTK_OUTER_WIDGET (f) 462#define FRAME_X_WINDOW(f) FRAME_GTK_OUTER_WIDGET (f)
463#define FRAME_NATIVE_WINDOW(f) GTK_WINDOW (FRAME_X_WINDOW (f)) 463#define FRAME_NATIVE_WINDOW(f) GTK_WINDOW (FRAME_X_WINDOW (f))
464#define FRAME_GDK_WINDOW(f) \ 464#define FRAME_GDK_WINDOW(f) \
465 (gtk_widget_get_window (FRAME_GTK_WIDGET (f))) 465 gtk_widget_get_window (FRAME_GTK_WIDGET (f))
466 466
467#define FRAME_X_DISPLAY(f) (FRAME_DISPLAY_INFO (f)->gdpy) 467#define FRAME_X_DISPLAY(f) (FRAME_DISPLAY_INFO (f)->gdpy)
468 468
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 6aa6f4f9b34..dfc6c1fd691 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -99,7 +99,7 @@
99#define IS_REAL_ASCII(c) ((c) < 0200) 99#define IS_REAL_ASCII(c) ((c) < 0200)
100 100
101/* 1 if C is a unibyte character. */ 101/* 1 if C is a unibyte character. */
102#define ISUNIBYTE(c) (SINGLE_BYTE_CHAR_P ((c))) 102#define ISUNIBYTE(c) SINGLE_BYTE_CHAR_P (c)
103 103
104/* The Emacs definitions should not be directly affected by locales. */ 104/* The Emacs definitions should not be directly affected by locales. */
105 105
@@ -1345,7 +1345,7 @@ struct range_table_work_area
1345/* Set a range (RANGE_START, RANGE_END) to WORK_AREA. */ 1345/* Set a range (RANGE_START, RANGE_END) to WORK_AREA. */
1346#define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \ 1346#define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \
1347 do { \ 1347 do { \
1348 EXTEND_RANGE_TABLE ((work_area), 2); \ 1348 EXTEND_RANGE_TABLE (work_area, 2); \
1349 (work_area).table[(work_area).used++] = (range_start); \ 1349 (work_area).table[(work_area).used++] = (range_start); \
1350 (work_area).table[(work_area).used++] = (range_end); \ 1350 (work_area).table[(work_area).used++] = (range_end); \
1351 } while (false) 1351 } while (false)
@@ -1380,7 +1380,7 @@ struct range_table_work_area
1380 1380
1381 1381
1382/* Set the bit for character C in a list. */ 1382/* Set the bit for character C in a list. */
1383#define SET_LIST_BIT(c) (b[((c)) / BYTEWIDTH] |= 1 << ((c) % BYTEWIDTH)) 1383#define SET_LIST_BIT(c) (b[(c) / BYTEWIDTH] |= 1 << ((c) % BYTEWIDTH))
1384 1384
1385 1385
1386/* Store characters in the range FROM to TO in the bitmap at B (for 1386/* Store characters in the range FROM to TO in the bitmap at B (for
@@ -1403,7 +1403,7 @@ struct range_table_work_area
1403 C1 = TRANSLATE (C0); \ 1403 C1 = TRANSLATE (C0); \
1404 if (! ASCII_CHAR_P (C1)) \ 1404 if (! ASCII_CHAR_P (C1)) \
1405 { \ 1405 { \
1406 SET_RANGE_TABLE_WORK_AREA ((work_area), C1, C1); \ 1406 SET_RANGE_TABLE_WORK_AREA (work_area, C1, C1); \
1407 if ((C1 = RE_CHAR_TO_UNIBYTE (C1)) < 0) \ 1407 if ((C1 = RE_CHAR_TO_UNIBYTE (C1)) < 0) \
1408 C1 = C0; \ 1408 C1 = C0; \
1409 } \ 1409 } \
@@ -1446,7 +1446,7 @@ struct range_table_work_area
1446 } \ 1446 } \
1447 } \ 1447 } \
1448 if (I < USED) \ 1448 if (I < USED) \
1449 SET_RANGE_TABLE_WORK_AREA ((work_area), C2, C2); \ 1449 SET_RANGE_TABLE_WORK_AREA (work_area, C2, C2); \
1450 } \ 1450 } \
1451 } \ 1451 } \
1452 } while (false) 1452 } while (false)
@@ -1458,7 +1458,7 @@ struct range_table_work_area
1458 do { \ 1458 do { \
1459 int C0, C1, C2, I, USED = RANGE_TABLE_WORK_USED (work_area); \ 1459 int C0, C1, C2, I, USED = RANGE_TABLE_WORK_USED (work_area); \
1460 \ 1460 \
1461 SET_RANGE_TABLE_WORK_AREA ((work_area), (FROM), (TO)); \ 1461 SET_RANGE_TABLE_WORK_AREA (work_area, FROM, TO); \
1462 for (C0 = (FROM); C0 <= (TO); C0++) \ 1462 for (C0 = (FROM); C0 <= (TO); C0++) \
1463 { \ 1463 { \
1464 C1 = TRANSLATE (C0); \ 1464 C1 = TRANSLATE (C0); \
@@ -1482,7 +1482,7 @@ struct range_table_work_area
1482 } \ 1482 } \
1483 } \ 1483 } \
1484 if (I < USED) \ 1484 if (I < USED) \
1485 SET_RANGE_TABLE_WORK_AREA ((work_area), C1, C1); \ 1485 SET_RANGE_TABLE_WORK_AREA (work_area, C1, C1); \
1486 } \ 1486 } \
1487 } while (false) 1487 } while (false)
1488 1488
@@ -3755,7 +3755,7 @@ execute_charset (re_char **pp, int c, int corig, bool unibyte,
3755 int count; 3755 int count;
3756 rtp = CHARSET_RANGE_TABLE (p); 3756 rtp = CHARSET_RANGE_TABLE (p);
3757 EXTRACT_NUMBER_AND_INCR (count, rtp); 3757 EXTRACT_NUMBER_AND_INCR (count, rtp);
3758 *pp = CHARSET_RANGE_TABLE_END ((rtp), (count)); 3758 *pp = CHARSET_RANGE_TABLE_END (rtp, count);
3759 } 3759 }
3760 else 3760 else
3761 *pp += 2 + CHARSET_BITMAP_SIZE (p); 3761 *pp += 2 + CHARSET_BITMAP_SIZE (p);
diff --git a/src/sfnt.c b/src/sfnt.c
index 88826e1b2c1..a70994fbe67 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -6860,7 +6860,7 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter,
6860 (interpreter->SP - interpreter->stack) 6860 (interpreter->SP - interpreter->stack)
6861 6861
6862#define TRAP(why) \ 6862#define TRAP(why) \
6863 sfnt_interpret_trap (interpreter, (why)) 6863 sfnt_interpret_trap (interpreter, why)
6864 6864
6865#define MOVE(a, b, n) \ 6865#define MOVE(a, b, n) \
6866 memmove (a, b, (n) * sizeof (uint32_t)) 6866 memmove (a, b, (n) * sizeof (uint32_t))
diff --git a/src/term.c b/src/term.c
index d3c858c6bf2..447876d288a 100644
--- a/src/term.c
+++ b/src/term.c
@@ -86,12 +86,12 @@ static AVOID vfatal (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0);
86#ifndef HAVE_ANDROID 86#ifndef HAVE_ANDROID
87 87
88#define OUTPUT(tty, a) \ 88#define OUTPUT(tty, a) \
89 emacs_tputs ((tty), a, \ 89 emacs_tputs (tty, a, \
90 FRAME_TOTAL_LINES (XFRAME (selected_frame)) - curY (tty), \ 90 FRAME_TOTAL_LINES (XFRAME (selected_frame)) - curY (tty), \
91 cmputc) 91 cmputc)
92 92
93#define OUTPUT1(tty, a) emacs_tputs ((tty), a, 1, cmputc) 93#define OUTPUT1(tty, a) emacs_tputs (tty, a, 1, cmputc)
94#define OUTPUTL(tty, a, lines) emacs_tputs ((tty), a, lines, cmputc) 94#define OUTPUTL(tty, a, lines) emacs_tputs (tty, a, lines, cmputc)
95 95
96#define OUTPUT_IF(tty, a) \ 96#define OUTPUT_IF(tty, a) \
97 do { \ 97 do { \
@@ -99,7 +99,8 @@ static AVOID vfatal (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0);
99 OUTPUT (tty, a); \ 99 OUTPUT (tty, a); \
100 } while (0) 100 } while (0)
101 101
102#define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0) 102#define OUTPUT1_IF(tty, a) \
103 do { if (a) emacs_tputs (tty, a, 1, cmputc); } while (0)
103 104
104#endif 105#endif
105 106
@@ -1117,7 +1118,7 @@ per_line_cost (const char *str)
1117 1118
1118int *char_ins_del_vector; 1119int *char_ins_del_vector;
1119 1120
1120#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))]) 1121#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS (f)])
1121 1122
1122static void 1123static void
1123calculate_ins_del_char_costs (struct frame *f) 1124calculate_ins_del_char_costs (struct frame *f)
diff --git a/src/w32font.c b/src/w32font.c
index c4718053a34..56061c0d9ce 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2265,14 +2265,14 @@ font_supported_scripts (FONTSIGNATURE * sig)
2265 /* Match a single subrange. SYM is set if bit N is set in subranges. */ 2265 /* Match a single subrange. SYM is set if bit N is set in subranges. */
2266#define SUBRANGE(n,sym) \ 2266#define SUBRANGE(n,sym) \
2267 if (subranges[(n) / 32] & (1U << ((n) % 32))) \ 2267 if (subranges[(n) / 32] & (1U << ((n) % 32))) \
2268 supported = Fcons ((sym), supported) 2268 supported = Fcons (sym, supported)
2269 2269
2270 /* Match multiple subranges. SYM is set if any MASK bit is set in 2270 /* Match multiple subranges. SYM is set if any MASK bit is set in
2271 subranges[0 - 3]. */ 2271 subranges[0 - 3]. */
2272#define MASK_ANY(mask0,mask1,mask2,mask3,sym) \ 2272#define MASK_ANY(mask0,mask1,mask2,mask3,sym) \
2273 if ((subranges[0] & (mask0)) || (subranges[1] & (mask1)) \ 2273 if ((subranges[0] & (mask0)) || (subranges[1] & (mask1)) \
2274 || (subranges[2] & (mask2)) || (subranges[3] & (mask3))) \ 2274 || (subranges[2] & (mask2)) || (subranges[3] & (mask3))) \
2275 supported = Fcons ((sym), supported) 2275 supported = Fcons (sym, supported)
2276 2276
2277 /* 0: ASCII (a.k.a. "Basic Latin"), 2277 /* 0: ASCII (a.k.a. "Basic Latin"),
2278 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B, 2278 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B,
diff --git a/src/window.h b/src/window.h
index 31fcbbd5541..19283725931 100644
--- a/src/window.h
+++ b/src/window.h
@@ -595,11 +595,11 @@ wset_next_buffers (struct window *w, Lisp_Object val)
595 595
596/* Non-nil if window W is leaf window (has a buffer). */ 596/* Non-nil if window W is leaf window (has a buffer). */
597#define WINDOW_LEAF_P(W) \ 597#define WINDOW_LEAF_P(W) \
598 (BUFFERP ((W)->contents)) 598 BUFFERP ((W)->contents)
599 599
600/* Non-nil if window W is internal (is a parent window). */ 600/* Non-nil if window W is internal (is a parent window). */
601#define WINDOW_INTERNAL_P(W) \ 601#define WINDOW_INTERNAL_P(W) \
602 (WINDOWP ((W)->contents)) 602 WINDOWP ((W)->contents)
603 603
604/* True if window W is a horizontal combination of windows. */ 604/* True if window W is a horizontal combination of windows. */
605#define WINDOW_HORIZONTAL_COMBINATION_P(W) \ 605#define WINDOW_HORIZONTAL_COMBINATION_P(W) \
@@ -610,7 +610,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
610 (WINDOW_INTERNAL_P (W) && !(W)->horizontal) 610 (WINDOW_INTERNAL_P (W) && !(W)->horizontal)
611 611
612/* Window W's XFRAME. */ 612/* Window W's XFRAME. */
613#define WINDOW_XFRAME(W) (XFRAME (WINDOW_FRAME ((W)))) 613#define WINDOW_XFRAME(W) XFRAME (WINDOW_FRAME (W))
614 614
615/* Whether window W is a pseudo window. */ 615/* Whether window W is a pseudo window. */
616#define WINDOW_PSEUDO_P(W) ((W)->pseudo_window_p) 616#define WINDOW_PSEUDO_P(W) ((W)->pseudo_window_p)
@@ -630,11 +630,11 @@ wset_next_buffers (struct window *w, Lisp_Object val)
630 630
631/* Return the canonical column width of the frame of window W. */ 631/* Return the canonical column width of the frame of window W. */
632#define WINDOW_FRAME_COLUMN_WIDTH(W) \ 632#define WINDOW_FRAME_COLUMN_WIDTH(W) \
633 (FRAME_COLUMN_WIDTH (WINDOW_XFRAME ((W)))) 633 FRAME_COLUMN_WIDTH (WINDOW_XFRAME (W))
634 634
635/* Return the canonical line height of the frame of window W. */ 635/* Return the canonical line height of the frame of window W. */
636#define WINDOW_FRAME_LINE_HEIGHT(W) \ 636#define WINDOW_FRAME_LINE_HEIGHT(W) \
637 (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W)))) 637 FRAME_LINE_HEIGHT (WINDOW_XFRAME (W))
638 638
639/* Return the pixel width of window W. This includes dividers, scroll 639/* Return the pixel width of window W. This includes dividers, scroll
640 bars, fringes and margins, if any. */ 640 bars, fringes and margins, if any. */
@@ -666,7 +666,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
666#define MIN_SAFE_WINDOW_HEIGHT (1) 666#define MIN_SAFE_WINDOW_HEIGHT (1)
667 667
668#define MIN_SAFE_WINDOW_PIXEL_HEIGHT(W) \ 668#define MIN_SAFE_WINDOW_PIXEL_HEIGHT(W) \
669 (WINDOW_FRAME_LINE_HEIGHT (W)) 669 WINDOW_FRAME_LINE_HEIGHT (W)
670 670
671/* True if window W has no other windows to its left on its frame. */ 671/* True if window W has no other windows to its left on its frame. */
672#define WINDOW_LEFTMOST_P(W) \ 672#define WINDOW_LEFTMOST_P(W) \
@@ -1011,7 +1011,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
1011/* Height in pixels of the mode line. 1011/* Height in pixels of the mode line.
1012 May be zero if W doesn't have a mode line. */ 1012 May be zero if W doesn't have a mode line. */
1013#define WINDOW_MODE_LINE_HEIGHT(W) \ 1013#define WINDOW_MODE_LINE_HEIGHT(W) \
1014 (window_wants_mode_line ((W)) \ 1014 (window_wants_mode_line (W) \
1015 ? CURRENT_MODE_LINE_HEIGHT (W) \ 1015 ? CURRENT_MODE_LINE_HEIGHT (W) \
1016 : 0) 1016 : 0)
1017 1017
@@ -1049,7 +1049,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
1049/* Pixel height of window W without mode and header/tab line and bottom 1049/* Pixel height of window W without mode and header/tab line and bottom
1050 divider. */ 1050 divider. */
1051#define WINDOW_BOX_TEXT_HEIGHT(W) \ 1051#define WINDOW_BOX_TEXT_HEIGHT(W) \
1052 (WINDOW_PIXEL_HEIGHT ((W)) \ 1052 (WINDOW_PIXEL_HEIGHT (W) \
1053 - WINDOW_BOTTOM_DIVIDER_WIDTH (W) \ 1053 - WINDOW_BOTTOM_DIVIDER_WIDTH (W) \
1054 - WINDOW_SCROLL_BAR_AREA_HEIGHT (W) \ 1054 - WINDOW_SCROLL_BAR_AREA_HEIGHT (W) \
1055 - WINDOW_MODE_LINE_HEIGHT (W) \ 1055 - WINDOW_MODE_LINE_HEIGHT (W) \
@@ -1065,7 +1065,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
1065 1065
1066/* Convert window W relative pixel X to frame pixel coordinates. */ 1066/* Convert window W relative pixel X to frame pixel coordinates. */
1067#define WINDOW_TO_FRAME_PIXEL_X(W, X) \ 1067#define WINDOW_TO_FRAME_PIXEL_X(W, X) \
1068 ((X) + WINDOW_BOX_LEFT_EDGE_X ((W))) 1068 ((X) + WINDOW_BOX_LEFT_EDGE_X (W))
1069 1069
1070/* Convert window W relative pixel Y to frame pixel coordinates. */ 1070/* Convert window W relative pixel Y to frame pixel coordinates. */
1071#define WINDOW_TO_FRAME_PIXEL_Y(W, Y) \ 1071#define WINDOW_TO_FRAME_PIXEL_Y(W, Y) \
@@ -1073,7 +1073,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
1073 1073
1074/* Convert frame relative pixel X to window relative pixel X. */ 1074/* Convert frame relative pixel X to window relative pixel X. */
1075#define FRAME_TO_WINDOW_PIXEL_X(W, X) \ 1075#define FRAME_TO_WINDOW_PIXEL_X(W, X) \
1076 ((X) - WINDOW_BOX_LEFT_EDGE_X ((W))) 1076 ((X) - WINDOW_BOX_LEFT_EDGE_X (W))
1077 1077
1078/* Convert frame relative pixel Y to window relative pixel Y. */ 1078/* Convert frame relative pixel Y to window relative pixel Y. */
1079#define FRAME_TO_WINDOW_PIXEL_Y(W, Y) \ 1079#define FRAME_TO_WINDOW_PIXEL_Y(W, Y) \
@@ -1082,7 +1082,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
1082/* Convert a text area relative x-position in window W to frame X 1082/* Convert a text area relative x-position in window W to frame X
1083 pixel coordinates. */ 1083 pixel coordinates. */
1084#define WINDOW_TEXT_TO_FRAME_PIXEL_X(W, X) \ 1084#define WINDOW_TEXT_TO_FRAME_PIXEL_X(W, X) \
1085 (window_box_left ((W), TEXT_AREA) + (X)) 1085 window_box_left (W, TEXT_AREA) + (X)
1086 1086
1087/* This is the window in which the terminal's cursor should be left when 1087/* This is the window in which the terminal's cursor should be left when
1088 nothing is being done with it. This must always be a leaf window, and its 1088 nothing is being done with it. This must always be a leaf window, and its
diff --git a/src/xdisp.c b/src/xdisp.c
index 14cf030ca4e..e69336d5abe 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3084,9 +3084,9 @@ funcall_with_backtraces (ptrdiff_t nargs, Lisp_Object *args)
3084} 3084}
3085 3085
3086#define SAFE_CALLMANY(inhibit_quit, f, array) \ 3086#define SAFE_CALLMANY(inhibit_quit, f, array) \
3087 dsafe__call ((inhibit_quit), f, ARRAYELTS (array), array) 3087 dsafe__call (inhibit_quit, f, ARRAYELTS (array), array)
3088#define dsafe_calln(inhibit_quit, ...) \ 3088#define dsafe_calln(inhibit_quit, ...) \
3089 SAFE_CALLMANY ((inhibit_quit), \ 3089 SAFE_CALLMANY (inhibit_quit, \
3090 backtrace_on_redisplay_error \ 3090 backtrace_on_redisplay_error \
3091 ? funcall_with_backtraces : Ffuncall, \ 3091 ? funcall_with_backtraces : Ffuncall, \
3092 ((Lisp_Object []) {__VA_ARGS__})) 3092 ((Lisp_Object []) {__VA_ARGS__}))
@@ -6775,7 +6775,7 @@ load_overlay_strings (struct it *it, ptrdiff_t charpos)
6775 \ 6775 \
6776 entries[n].string = (STRING); \ 6776 entries[n].string = (STRING); \
6777 entries[n].overlay = (OVERLAY); \ 6777 entries[n].overlay = (OVERLAY); \
6778 priority = Foverlay_get ((OVERLAY), Qpriority); \ 6778 priority = Foverlay_get (OVERLAY, Qpriority); \
6779 entries[n].priority = FIXNUMP (priority) ? XFIXNUM (priority) : 0; \ 6779 entries[n].priority = FIXNUMP (priority) ? XFIXNUM (priority) : 0; \
6780 entries[n].after_string_p = (AFTER_P); \ 6780 entries[n].after_string_p = (AFTER_P); \
6781 ++n; \ 6781 ++n; \
@@ -29523,9 +29523,9 @@ dump_glyph_string (struct glyph_string *s)
29523# define ALLOCATE_HDC(hdc, f) \ 29523# define ALLOCATE_HDC(hdc, f) \
29524 Lisp_Object prev_quit = Vinhibit_quit; \ 29524 Lisp_Object prev_quit = Vinhibit_quit; \
29525 Vinhibit_quit = Qt; \ 29525 Vinhibit_quit = Qt; \
29526 HDC hdc = get_frame_dc ((f)) 29526 HDC hdc = get_frame_dc (f)
29527# define RELEASE_HDC(hdc, f) \ 29527# define RELEASE_HDC(hdc, f) \
29528 release_frame_dc ((f), (hdc)); \ 29528 release_frame_dc (f, hdc); \
29529 Vinhibit_quit = prev_quit 29529 Vinhibit_quit = prev_quit
29530#else 29530#else
29531# define ALLOCATE_HDC(hdc, f) 29531# define ALLOCATE_HDC(hdc, f)
diff --git a/src/xfaces.c b/src/xfaces.c
index 2ca2c30636c..b9a78328661 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -293,15 +293,15 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
293 293
294/* True if face attribute ATTR is unspecified. */ 294/* True if face attribute ATTR is unspecified. */
295 295
296#define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) 296#define UNSPECIFIEDP(ATTR) EQ (ATTR, Qunspecified)
297 297
298/* True if face attribute ATTR is `ignore-defface'. */ 298/* True if face attribute ATTR is `ignore-defface'. */
299 299
300#define IGNORE_DEFFACE_P(ATTR) EQ ((ATTR), QCignore_defface) 300#define IGNORE_DEFFACE_P(ATTR) EQ (ATTR, QCignore_defface)
301 301
302/* True if face attribute ATTR is `reset'. */ 302/* True if face attribute ATTR is `reset'. */
303 303
304#define RESET_P(ATTR) EQ ((ATTR), Qreset) 304#define RESET_P(ATTR) EQ (ATTR, Qreset)
305 305
306/* Size of hash table of realized faces in face caches (should be a 306/* Size of hash table of realized faces in face caches (should be a
307 prime number). */ 307 prime number). */
@@ -1756,26 +1756,26 @@ the WIDTH times as wide as FACE on FRAME. */)
1756 1756
1757/* Access face attributes of face LFACE, a Lisp vector. */ 1757/* Access face attributes of face LFACE, a Lisp vector. */
1758 1758
1759#define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) 1759#define LFACE_FAMILY(LFACE) AREF (LFACE, LFACE_FAMILY_INDEX)
1760#define LFACE_FOUNDRY(LFACE) AREF ((LFACE), LFACE_FOUNDRY_INDEX) 1760#define LFACE_FOUNDRY(LFACE) AREF (LFACE, LFACE_FOUNDRY_INDEX)
1761#define LFACE_HEIGHT(LFACE) AREF ((LFACE), LFACE_HEIGHT_INDEX) 1761#define LFACE_HEIGHT(LFACE) AREF (LFACE, LFACE_HEIGHT_INDEX)
1762#define LFACE_WEIGHT(LFACE) AREF ((LFACE), LFACE_WEIGHT_INDEX) 1762#define LFACE_WEIGHT(LFACE) AREF (LFACE, LFACE_WEIGHT_INDEX)
1763#define LFACE_SLANT(LFACE) AREF ((LFACE), LFACE_SLANT_INDEX) 1763#define LFACE_SLANT(LFACE) AREF (LFACE, LFACE_SLANT_INDEX)
1764#define LFACE_UNDERLINE(LFACE) AREF ((LFACE), LFACE_UNDERLINE_INDEX) 1764#define LFACE_UNDERLINE(LFACE) AREF (LFACE, LFACE_UNDERLINE_INDEX)
1765#define LFACE_INVERSE(LFACE) AREF ((LFACE), LFACE_INVERSE_INDEX) 1765#define LFACE_INVERSE(LFACE) AREF (LFACE, LFACE_INVERSE_INDEX)
1766#define LFACE_FOREGROUND(LFACE) AREF ((LFACE), LFACE_FOREGROUND_INDEX) 1766#define LFACE_FOREGROUND(LFACE) AREF (LFACE, LFACE_FOREGROUND_INDEX)
1767#define LFACE_BACKGROUND(LFACE) AREF ((LFACE), LFACE_BACKGROUND_INDEX) 1767#define LFACE_BACKGROUND(LFACE) AREF (LFACE, LFACE_BACKGROUND_INDEX)
1768#define LFACE_STIPPLE(LFACE) AREF ((LFACE), LFACE_STIPPLE_INDEX) 1768#define LFACE_STIPPLE(LFACE) AREF (LFACE, LFACE_STIPPLE_INDEX)
1769#define LFACE_SWIDTH(LFACE) AREF ((LFACE), LFACE_SWIDTH_INDEX) 1769#define LFACE_SWIDTH(LFACE) AREF (LFACE, LFACE_SWIDTH_INDEX)
1770#define LFACE_OVERLINE(LFACE) AREF ((LFACE), LFACE_OVERLINE_INDEX) 1770#define LFACE_OVERLINE(LFACE) AREF (LFACE, LFACE_OVERLINE_INDEX)
1771#define LFACE_STRIKE_THROUGH(LFACE) AREF ((LFACE), LFACE_STRIKE_THROUGH_INDEX) 1771#define LFACE_STRIKE_THROUGH(LFACE) AREF (LFACE, LFACE_STRIKE_THROUGH_INDEX)
1772#define LFACE_BOX(LFACE) AREF ((LFACE), LFACE_BOX_INDEX) 1772#define LFACE_BOX(LFACE) AREF (LFACE, LFACE_BOX_INDEX)
1773#define LFACE_FONT(LFACE) AREF ((LFACE), LFACE_FONT_INDEX) 1773#define LFACE_FONT(LFACE) AREF (LFACE, LFACE_FONT_INDEX)
1774#define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) 1774#define LFACE_INHERIT(LFACE) AREF (LFACE, LFACE_INHERIT_INDEX)
1775#define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) 1775#define LFACE_FONTSET(LFACE) AREF (LFACE, LFACE_FONTSET_INDEX)
1776#define LFACE_EXTEND(LFACE) AREF ((LFACE), LFACE_EXTEND_INDEX) 1776#define LFACE_EXTEND(LFACE) AREF (LFACE, LFACE_EXTEND_INDEX)
1777#define LFACE_DISTANT_FOREGROUND(LFACE) \ 1777#define LFACE_DISTANT_FOREGROUND(LFACE) \
1778 AREF ((LFACE), LFACE_DISTANT_FOREGROUND_INDEX) 1778 AREF (LFACE, LFACE_DISTANT_FOREGROUND_INDEX)
1779 1779
1780/* True if LFACE is a Lisp face. A Lisp face is a vector of size 1780/* True if LFACE is a Lisp face. A Lisp face is a vector of size
1781 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ 1781 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */
diff --git a/src/xterm.h b/src/xterm.h
index 3c128148270..2c00b1e7bec 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -84,7 +84,7 @@ typedef GtkWidget *xt_or_gtk_widget;
84#undef XSync 84#undef XSync
85/* gdk_window_process_all_updates is deprecated in GDK 3.22. */ 85/* gdk_window_process_all_updates is deprecated in GDK 3.22. */
86#if GTK_CHECK_VERSION (3, 22, 0) 86#if GTK_CHECK_VERSION (3, 22, 0)
87#define XSync(d, b) do { XSync ((d), (b)); } while (false) 87#define XSync(d, b) do { XSync (d, b); } while (false)
88#else 88#else
89#define XSync(d, b) do { gdk_window_process_all_updates (); \ 89#define XSync(d, b) do { gdk_window_process_all_updates (); \
90 XSync (d, b); } while (false) 90 XSync (d, b); } while (false)
@@ -1402,7 +1402,7 @@ extern void x_mark_frame_dirty (struct frame *f);
1402 code after any drawing command, but we can run code whenever 1402 code after any drawing command, but we can run code whenever
1403 someone asks for the handle necessary to draw. */ 1403 someone asks for the handle necessary to draw. */
1404#define FRAME_X_DRAWABLE(f) \ 1404#define FRAME_X_DRAWABLE(f) \
1405 (x_mark_frame_dirty ((f)), FRAME_X_RAW_DRAWABLE ((f))) 1405 (x_mark_frame_dirty (f), FRAME_X_RAW_DRAWABLE (f))
1406 1406
1407#ifdef HAVE_XDBE 1407#ifdef HAVE_XDBE
1408#define FRAME_X_DOUBLE_BUFFERED_P(f) \ 1408#define FRAME_X_DOUBLE_BUFFERED_P(f) \
@@ -1447,7 +1447,7 @@ extern void x_mark_frame_dirty (struct frame *f);
1447 FRAME_X_WINDOW (f)) 1447 FRAME_X_WINDOW (f))
1448 1448
1449#else /* !USE_GTK */ 1449#else /* !USE_GTK */
1450#define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f)) 1450#define FRAME_OUTER_WINDOW(f) FRAME_X_WINDOW (f)
1451#endif /* !USE_GTK */ 1451#endif /* !USE_GTK */
1452#endif 1452#endif
1453 1453
diff --git a/test/src/emacs-module-resources/mod-test.c b/test/src/emacs-module-resources/mod-test.c
index 06049364b1e..3aafae1b896 100644
--- a/test/src/emacs-module-resources/mod-test.c
+++ b/test/src/emacs-module-resources/mod-test.c
@@ -33,9 +33,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
33#ifdef WINDOWSNT 33#ifdef WINDOWSNT
34/* Cannot include <process.h> because of the local header by the same 34/* Cannot include <process.h> because of the local header by the same
35 name, sigh. */ 35 name, sigh. */
36uintptr_t _beginthread (void (__cdecl *)(void *), unsigned, void *); 36uintptr_t _beginthread (void (__cdecl *) (void *), unsigned, void *);
37# if !defined __x86_64__ 37# if !defined __x86_64__
38# define ALIGN_STACK __attribute__((force_align_arg_pointer)) 38# define ALIGN_STACK __attribute__ ((force_align_arg_pointer))
39# endif 39# endif
40# include <windows.h> /* for Sleep */ 40# include <windows.h> /* for Sleep */
41#else /* !WINDOWSNT */ 41#else /* !WINDOWSNT */
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-12 15:35:31 +0000