commit 2efffbe7731ba979540df851819af0ef15b94c62 (HEAD, refs/remotes/origin/master)
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 21 22:25:48 2025 -0800

    Don’t silently truncate connection-lost diagnostic
    
    * src/xterm.c (x_io_error_quitter): Do not silently truncate
    the diagnostic when a connection is lost to an X server.

diff --git a/src/xterm.c b/src/xterm.c
index b16f4ddfccf..21968b38e78 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -27123,11 +27123,13 @@ x_error_quitter (Display *display, XErrorEvent *event)
 static int NO_INLINE
 x_io_error_quitter (Display *display)
 {
-  char buf[256];
-
-  snprintf (buf, sizeof buf, "Connection lost to X server '%s'",
-	    DisplayString (display));
+  char const *server = DisplayString (display);
+  static char const fmt[] = "Connection lost to X server '%s'";
+  USE_SAFE_ALLOCA;
+  char *buf = SAFE_ALLOCA (sizeof fmt - sizeof "%s" + strlen (server) + 1);
+  sprintf (buf, fmt, server);
   x_connection_closed (display, buf, true);
+  SAFE_FREE ();
 
   return 0;
 }

commit db9ea9b77a0d03342bfe2a976b3943de5e5a4518
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 21 22:19:08 2025 -0800

    Check for snprintf truncation in pgtkterm
    
    * src/pgtkterm.c (pgtk_enumerate_devices):
    Abort if snprintf truncated.

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 413cbd86c0d..30679353c1b 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -183,9 +183,10 @@ pgtk_enumerate_devices (struct pgtk_display_info *dpyinfo,
 	  rec->seat = g_object_ref (seat);
 	  rec->device = GDK_DEVICE (t1->data);
 
-	  snprintf (printbuf, 1026, "%u:%s",
-		    gdk_device_get_source (rec->device),
-		    gdk_device_get_name (rec->device));
+	  int len = snprintf (printbuf, sizeof printbuf, "%u:%s",
+			      gdk_device_get_source (rec->device),
+			      gdk_device_get_name (rec->device));
+	  eassert (len < sizeof printbuf);
 
 	  rec->name = build_string (printbuf);
 	  rec->next = dpyinfo->devices;

commit 4a25ed300fec579f8fc75a53edbd9a6f74e2d44f
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 21 22:18:17 2025 -0800

    Port pdumper to unlikely long sprintf output
    
    * src/pdumper.c (dump_ptr_referrer): Port to platforms
    where sprintf %p generates absurdly long output.
    (dump_vectorlike): Port to hypothetical platforms
    where %d generates absurdly long output.

diff --git a/src/pdumper.c b/src/pdumper.c
index e83c7bcf9a1..174dfdb47ef 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -677,8 +677,8 @@ static Lisp_Object
 dump_ptr_referrer (const char *label, void const *address)
 {
   char buf[128];
-  buf[0] = '\0';
-  sprintf (buf, "%s @ %p", label, address);
+  if (sizeof buf <= snprintf (buf, sizeof buf, "%s @ %p", label, address))
+    strcpy (buf + sizeof buf - 4, "...");
   return build_string (buf);
 }
 
@@ -3145,8 +3145,10 @@ dump_vectorlike (struct dump_context *ctx,
     case PVEC_TS_NODE:
       break;
     }
-  char msg[60];
-  snprintf (msg, sizeof msg, "pseudovector type %d", (int) ptype);
+  int iptype = ptype;
+  static char const fmt[] = "pseudovector type %d";
+  char msg[sizeof fmt - sizeof "%d" + INT_STRLEN_BOUND (iptype) + 1];
+  sprintf (msg, fmt, iptype);
   error_unsupported_dump_object (ctx, lv, msg);
 }
 

commit 8ff7338fdd05fe6d21765711327a99c87cfd7613
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 21 22:16:22 2025 -0800

    When debugging image.c, abort if silent truncation
    
    * src/image.c (image_build_heuristic_mask, png_load_body):
    Abort if snprintf truncated.  (If truncation is not possible
    here we should use sprintf instead, as that simplifies
    automatic runtime checking.)

diff --git a/src/image.c b/src/image.c
index 2b898e12805..1db2df736a5 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7386,8 +7386,9 @@ image_build_heuristic_mask (struct frame *f, struct image *img,
 	{
 #ifndef USE_CAIRO
 	  char color_name[30];
-	  snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
-		    rgb[0] + 0u, rgb[1] + 0u, rgb[2] + 0u);
+	  int len = snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
+			      rgb[0] + 0u, rgb[1] + 0u, rgb[2] + 0u);
+	  eassert (len < sizeof color_name);
 	  bg = (
 #ifdef HAVE_NTGUI
 		0x00ffffff & /* Filter out palette info.  */
@@ -8537,8 +8538,9 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
 	  img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue);
 #else  /* USE_CAIRO */
 	  char color_name[30];
-	  snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
-		    bg->red, bg->green, bg->blue);
+	  int len = snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
+			      bg->red, bg->green, bg->blue);
+	  eassert (len < sizeof color_name);
 	  img->background
 	    = image_alloc_image_color (f, img, build_string (color_name), 0);
 #endif /* USE_CAIRO */

commit 6ea1e03fe7f9e49387789c86b8f91f6333de679c
Author: Pip Cet <pipcet@protonmail.com>
Date:   Wed Jan 22 00:51:33 2025 +0000

    Destroy GTK tool bar widget if it was never attached (bug#75636)
    
    * src/gtkutil.c (xg_free_frame_widgets): Call gtk_widget_destroy on an
    unpacked toolbar widget.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 171ffee1bd0..a1a2c6cbd20 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1884,6 +1884,12 @@ xg_free_frame_widgets (struct frame *f)
       if (tbinfo)
         xfree (tbinfo);
 
+      if (x->toolbar_widget && !x->toolbar_is_packed)
+	{
+	  gtk_widget_destroy (x->toolbar_widget);
+	  x->toolbar_widget = NULL;
+	}
+
       /* x_free_frame_resources should have taken care of it */
 #ifndef HAVE_PGTK
 #ifdef HAVE_XDBE

commit cdcfffd50a61058b135ddca1f748a5a20a7da32e
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Wed Jan 22 00:47:02 2025 +0100

    Prefer snprintf to sprintf in image.c
    
    * src/image.c (image_background, image_build_heuristic_mask)
    (png_load_body): Prefer snprintf to sprintf.

diff --git a/src/image.c b/src/image.c
index 7ab6289bb2a..2b898e12805 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1995,10 +1995,10 @@ image_background (struct image *img, struct frame *f, Emacs_Pix_Context pimg)
 #ifdef USE_CAIRO
       {
 	char color_name[30];
-	sprintf (color_name, "#%04x%04x%04x",
-		 (unsigned int) RED16_FROM_ULONG (bg),
-		 (unsigned int) GREEN16_FROM_ULONG (bg),
-		 (unsigned int) BLUE16_FROM_ULONG (bg));
+	snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
+		  (unsigned int) RED16_FROM_ULONG (bg),
+		  (unsigned int) GREEN16_FROM_ULONG (bg),
+		  (unsigned int) BLUE16_FROM_ULONG (bg));
 	bg = image_alloc_image_color (f, img, build_string (color_name), 0);
       }
 #endif
@@ -7386,8 +7386,8 @@ image_build_heuristic_mask (struct frame *f, struct image *img,
 	{
 #ifndef USE_CAIRO
 	  char color_name[30];
-	  sprintf (color_name, "#%04x%04x%04x",
-		   rgb[0] + 0u, rgb[1] + 0u, rgb[2] + 0u);
+	  snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
+		    rgb[0] + 0u, rgb[1] + 0u, rgb[2] + 0u);
 	  bg = (
 #ifdef HAVE_NTGUI
 		0x00ffffff & /* Filter out palette info.  */
@@ -8537,7 +8537,8 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
 	  img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue);
 #else  /* USE_CAIRO */
 	  char color_name[30];
-	  sprintf (color_name, "#%04x%04x%04x", bg->red, bg->green, bg->blue);
+	  snprintf (color_name, sizeof color_name, "#%04x%04x%04x",
+		    bg->red, bg->green, bg->blue);
 	  img->background
 	    = image_alloc_image_color (f, img, build_string (color_name), 0);
 #endif /* USE_CAIRO */

commit 5f108cb663a9488c587507e4f723fe1e12732945
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Jan 21 20:49:38 2025 +0100

    Delete some duplicate face attributes
    
    * etc/themes/leuven-dark-theme.el:
    * etc/themes/leuven-theme.el:
    * etc/themes/manoj-dark-theme.el: Delete duplicate face attributes.

diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el
index 017cc08110c..29aa7b224f3 100644
--- a/etc/themes/leuven-dark-theme.el
+++ b/etc/themes/leuven-dark-theme.el
@@ -278,7 +278,7 @@ more..."
    `(gnus-picon-xbm ((,class (:foreground "#0601ff" :background "#25202a"))))
    `(gnus-server-closed ((,class (:slant italic :foreground "#ffff0b" :background "#25202a"))))
    `(gnus-server-denied ((,class (:weight bold :foreground "#06ffff" :background "#25202a"))))
-   `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "#25202a" :foreground "#bd9432"))))
+   `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "#bd9432"))))
    `(gnus-signature ((,class (:slant italic :foreground "#787279"))))
    `(gnus-splash ((,class (:foreground "#0673ff"))))
    `(gnus-summary-cancelled ((,class ,cancel)))
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 5d38c7071f1..f5bf9c5179e 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -285,7 +285,7 @@ more..."
    `(gnus-picon-xbm ((,class (:foreground "yellow" :background "white"))))
    `(gnus-server-closed ((,class (:slant italic :foreground "blue" :background "white"))))
    `(gnus-server-denied ((,class (:weight bold :foreground "red" :background "white"))))
-   `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "white" :foreground "#466BD7"))))
+   `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "#466BD7"))))
    `(gnus-signature ((,class (:slant italic :foreground "#8B8D8E"))))
    `(gnus-splash ((,class (:foreground "#FF8C00"))))
    `(gnus-summary-cancelled ((,class ,cancel)))
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index d9442653afc..5612a4de3fa 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -87,9 +87,9 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(font-lock-function-name-face ((t ( :foreground "mediumspringgreen"
                                       :weight bold))))
  '(font-lock-string-face        ((t (:foreground "RosyBrown1"))))
- '(font-lock-comment-face       ((t (:slant italic :slant oblique :foreground "chocolate1"))))
+ '(font-lock-comment-face       ((t (:slant oblique :foreground "chocolate1"))))
  '(font-lock-comment-delimiter-face ((t (:foreground "Salmon"))))
- '(font-lock-doc-face           ((t (:slant italic :slant oblique :foreground "LightCoral"))))
+ '(font-lock-doc-face           ((t (:slant oblique :foreground "LightCoral"))))
  '(font-lock-warning-face ((t (:foreground "Pink" :weight bold))))
 
  '(cperl-array-face ((t (:foreground "LawnGreen" :background "Black" :weight bold))))
@@ -173,12 +173,12 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(gnus-user-agent-unknown-face ((t (:background "black" :foreground "orange" :weight bold))))
  '(gnus-x-face ((t (:background "white" :foreground "black"))))
 
- '(gnus-group-mail-1 ((t (:weight bold :foreground "#3BFF00" :weight normal))))
- '(gnus-group-mail-1-face ((t (:weight bold :foreground "#3BFF00" :weight normal))))
- '(gnus-group-mail-2 ((t (:weight bold :foreground "#5EFF00" :weight normal))))
- '(gnus-group-mail-2-face ((t (:weight bold :foreground "#5EFF00" :weight normal))))
- '(gnus-group-mail-3 ((t (:weight bold :foreground "#80FF00" :weight normal))))
- '(gnus-group-mail-3-face ((t (:weight bold :foreground "#A1FF00" :weight normal))))
+ '(gnus-group-mail-1 ((t (:foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-1-face ((t (:foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-2 ((t (:foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-2-face ((t (:foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-3 ((t (:foreground "#80FF00" :weight normal))))
+ '(gnus-group-mail-3-face ((t (:foreground "#A1FF00" :weight normal))))
 
 
  '(gnus-group-mail-1-empty ((t (:foreground "#249900"))))
@@ -383,9 +383,9 @@ jarring angry fruit salad look to reduce eye fatigue."
                 :foreground "black" :background "grey"
                 :weight bold ))))
  '(calendar-today-face ((t (:underline t :weight bold :foreground "cornsilk"))))
- '(change-log-acknowledgment ((t (:slant italic :slant oblique :foreground "AntiqueWhite3"))))
+ '(change-log-acknowledgment ((t (:slant oblique :foreground "AntiqueWhite3"))))
  '(change-log-conditionals-face ((t (:foreground "Aquamarine"))))
- '(change-log-date-face ((t (:slant italic :slant oblique :foreground "BurlyWood"))))
+ '(change-log-date-face ((t (:slant oblique :foreground "BurlyWood"))))
  '(change-log-email-face ((t (:foreground "Aquamarine"))))
  '(change-log-file-face ((t (:weight bold :foreground "LightSkyBlue" :height 0.9))))
  '(change-log-function-face ((t (:foreground "Aquamarine"))))
@@ -533,7 +533,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(holiday-face ((t (:background "chocolate4"))))
 
  '(ibuffer-dired-buffer-face ((t (:foreground "mediumspringgreen" :weight bold :height 1.1))))
- '(ibuffer-help-buffer-face  ((t (:slant italic :slant oblique :foreground "chocolate1"))))
+ '(ibuffer-help-buffer-face  ((t (:slant oblique :foreground "chocolate1"))))
  '(ibuffer-hidden-buffer-face  ((t (:foreground "Pink" :weight bold))))
  '(ibuffer-occur-match-face ((t (:foreground "Pink" :weight bold))))
  '(ibuffer-read-only-buffer-face ((t (:foreground "SteelBlue1"))))

commit d30f40868bf260692c7702e43b439d592b830e16
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Jan 21 20:40:19 2025 +0100

    Improve copying current glyphs when building frame matrix
    
    * src/dispnew.c (build_frame_matrix_from_leaf_window): Don't make space
    glyphs. More comments.

diff --git a/src/dispnew.c b/src/dispnew.c
index 302f7db8815..23ef5ff699b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2627,22 +2627,27 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
 	  current_row_p = 1;
 	}
 
+      /* If someone asks why we are copying current glyphs here, and
+	 maybe never enable the desired frame row we copy to:
+
+	 - there might be a window to the right of this one that has a
+	   corresponding desired window row.
+	 - we need the complete frame row for scrolling.  */
       if (current_row_p)
 	{
-	  /* If the desired glyphs for this row haven't been built,
-	     copy from the corresponding current row, but only if it
-	     is enabled, because ottherwise its contents are invalid.  */
+	  /* If the desired glyphs for this row haven't been built, copy
+	     from the corresponding current row. If that row is not
+	     enabled, its contents might be invalid.  Make sure that
+	     glyphs have valid frames set in that case.  This is closer
+	     to what we did before child frames were added, and seems to
+	     be something tty redisplay implicitly relies on.  */
 	  struct glyph *to = frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x;
 	  struct glyph *from = window_row->glyphs[0];
 	  for (int i = 0; i < window_matrix->matrix_w; ++i)
 	    {
-	      if (window_row->enabled_p)
-		to[i] = from[i];
-	      else
-		{
-		  to[i] = space_glyph;
-		  to[i].frame = f;
-		}
+	      to[i] = from[i];
+	      if (!window_row->enabled_p)
+		to[i].frame = f;
 	    }
 	}
       else

commit 1f02677500211a163dd22b1263edec0d7be0fd16
Author: Pip Cet <pipcet@protonmail.com>
Date:   Tue Jan 21 19:13:24 2025 +0000

    ; * src/gtkutil.c (free_frame_tool_bar): Remove redundant assignment.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 60899bd90e4..171ffee1bd0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -6116,8 +6116,7 @@ free_frame_tool_bar (struct frame *f)
       else
         gtk_widget_destroy (x->toolbar_widget);
 
-      x->toolbar_widget = 0;
-      x->toolbar_widget = 0;
+      x->toolbar_widget = NULL;
       x->toolbar_is_packed = false;
       FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0;
       FRAME_TOOLBAR_LEFT_WIDTH (f) = FRAME_TOOLBAR_RIGHT_WIDTH (f) = 0;

commit d7bdaa4170cd6115a6e3b4d872d8a428397fb2d8
Author: Pip Cet <pipcet@protonmail.com>
Date:   Tue Jan 21 18:55:01 2025 +0000

    Handle unknown units provided by the rsvg library (bug#75712)
    
    * src/image.c (svg_css_length_to_pixels): Restructure so GCC warns
    about new enum members.  Add case for RSVG_UNIT_CH.  Warn about
    unknown units discovered at runtime.

diff --git a/src/image.c b/src/image.c
index b8405d81111..7ab6289bb2a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -11965,34 +11965,27 @@ svg_css_length_to_pixels (RsvgLength length, double dpi, int font_size)
     {
     case RSVG_UNIT_PX:
       /* Already a pixel value.  */
-      break;
+      return value;
     case RSVG_UNIT_CM:
       /* 2.54 cm in an inch.  */
-      value = dpi * value / 2.54;
-      break;
+      return dpi * value / 2.54;
     case RSVG_UNIT_MM:
       /* 25.4 mm in an inch.  */
-      value = dpi * value / 25.4;
-      break;
+      return dpi * value / 25.4;
     case RSVG_UNIT_PT:
       /* 72 points in an inch.  */
-      value = dpi * value / 72;
-      break;
+      return dpi * value / 72;
     case RSVG_UNIT_PC:
       /* 6 picas in an inch.  */
-      value = dpi * value / 6;
-      break;
+      return dpi * value / 6;
     case RSVG_UNIT_IN:
-      value *= dpi;
-      break;
+      return value * dpi;
     case RSVG_UNIT_EM:
-      value *= font_size;
-      break;
+      return value * font_size;
     case RSVG_UNIT_EX:
       /* librsvg uses an ex height of half the em height, so we match
 	 that here.  */
-      value = value * font_size / 2.0;
-      break;
+      return value * font_size / 2.0;
     case RSVG_UNIT_PERCENT:
       /* Percent is a ratio of the containing "viewport".  We don't
 	 have a viewport, as such, as we try to draw the image to it's
@@ -12006,14 +11999,27 @@ svg_css_length_to_pixels (RsvgLength length, double dpi, int font_size)
 	 spec, this will work out correctly as librsvg will still
 	 honor the percentage sizes in its final rendering no matter
 	 what size we make the image.  */
-      value = 0;
-      break;
-    default:
-      /* We should never reach this.  */
-      value = 0;
-    }
-
-  return value;
+      return 0;
+#if LIBRSVG_CHECK_VERSION (2, 58, 0)
+    case RSVG_UNIT_CH:
+      /* FIXME: With CSS 3, "the ch unit falls back to 0.5em in the
+	 general case, and to 1em when it would be typeset upright".
+	 However, I could not find a way to easily get the relevant CSS
+	 attributes using librsvg.  Thus, we simply wrongly assume the
+	 general case is always true here.  See Bug#75712.  */
+      return value * font_size / 2.0;
+#endif
+    }
+
+  /* The rsvg header files say that more values may be added to this
+     enum, but there doesn't appear to be a way to get a string
+     representation of the new enum value.  The unfortunate
+     consequence is that the only thing we can do is to report the
+     numeric value.  */
+  image_error ("Unknown RSVG unit, code: %s", make_fixnum ((int) length.unit));
+  /* Return 0; this special value indicates that another method of
+     obtaining the image size must be used.  */
+  return 0;
 }
 #endif
 

commit 0fd5b2d146e3578820446aa69b30d93958d9b1a5
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Tue Jan 21 18:31:10 2025 +0100

    Don't use a redisplay optimization in a certain case on ttys
    
    * src/dispnew.c (is_tty_root_frame_with_visible_child): New function.
    * src/dispextern.h: Declare it.
    * src/xdisp.c (redisplay_internal): Don't use optimization 1 for tty root
    frames with a visible child frame.

diff --git a/src/dispextern.h b/src/dispextern.h
index 9284d3a99ee..ccf0aebd7c6 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3953,6 +3953,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
 bool is_tty_frame (struct frame *f);
 bool is_tty_child_frame (struct frame *f);
 bool is_tty_root_frame (struct frame *f);
+bool is_tty_root_frame_with_visible_child (struct frame *f);
 void combine_updates (Lisp_Object root_frames);
 void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
 void tty_raise_lower_frame (struct frame *f, bool raise);
diff --git a/src/dispnew.c b/src/dispnew.c
index cb57edcec0f..302f7db8815 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3479,6 +3479,18 @@ is_tty_root_frame (struct frame *f)
   return !FRAME_PARENT_FRAME (f) && is_tty_frame (f);
 }
 
+/* Return true if frame F is a tty root frame that has a visible child
+   frame..  */
+
+bool
+is_tty_root_frame_with_visible_child (struct frame *f)
+{
+  if (!is_tty_root_frame (f))
+    return false;
+  Lisp_Object z_order = frames_in_reverse_z_order (f, true);
+  return CONSP (XCDR (z_order));
+}
+
 /* Return the index of the first enabled row in MATRIX, or -1 if there
    is none.  */
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 0b39402218a..ba8ba1b72e3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17279,7 +17279,11 @@ redisplay_internal (void)
 		 line and this line is the current one, because
 		 display_line above is not informed about the
 		 current-line's vpos, and cannot DTRT in that case.  */
-	      && !hscrolling_current_line_p (w))
+	      && !hscrolling_current_line_p (w)
+	      /* A root frame may have visible children displayed in its
+		 current matrix, so that we can't do the below with its
+		 current matrix.  */
+	      && !is_tty_root_frame_with_visible_child (it.f))
 	    {
  	      /* If this is not the window's last line, we must adjust
  		 the charstarts of the lines below.  */

commit eaa79e25a6b34f5f3dca5961233498afbacaec58
Author: Gerd Möllmann <gerd@gnu.org>
Date:   Mon Jan 20 18:11:58 2025 +0100

    Remove a false #ifdef HAVE_WINDOW_SYSTEM
    
    * src/xdiso.c (update_tab_bar)_ Don't use #ifdef HAVE_WINDOW_SYSTEM for
    setting the selected frame. That only makes a build without window
    system misbehave.

diff --git a/src/xdisp.c b/src/xdisp.c
index 53364e83eba..0b39402218a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14338,13 +14338,12 @@ update_tab_bar (struct frame *f, bool save_match_data)
 		       /* Since we only explicitly preserve selected_frame,
 			  check that selected_window would be redundant.  */
 		       XFRAME (selected_frame)->selected_window));
-#ifdef HAVE_WINDOW_SYSTEM
+
 	  Lisp_Object frame;
 	  record_unwind_protect (restore_selected_window, selected_window);
 	  XSETFRAME (frame, f);
 	  selected_frame = frame;
 	  selected_window = FRAME_SELECTED_WINDOW (f);
-#endif
 
 	  /* Build desired tab-bar items from keymaps.  */
           new_tab_bar

commit 14e686e6cca83054afceb353ad7a1e24ebdb0133
Author: Robert Pluim <rpluim@gmail.com>
Date:   Mon Jan 20 18:43:00 2025 +0100

    Signal error when keyword/arg list is malformed
    
    * src/data.c (syms_of_data): Add Qmalformed_keyword_arg_list
    error symbol.
    
    * src/process.c (Fmake_process, Fmake_pipe_process)
    (Fserial_process_configure, Fmake_serial_process)
    (Fmake_network_process): Signal Qmalformed_keyword_arg_list when
    the argument list length is odd.
    * src/sound.c (parse_sound): Also here..
    * src/w32fns.c (Fw32_notification_notify): ..and here.
    
    (Bug#75584)

diff --git a/src/data.c b/src/data.c
index 077719c4062..dcaa5756ebe 100644
--- a/src/data.c
+++ b/src/data.c
@@ -4020,6 +4020,7 @@ syms_of_data (void)
 
   DEFSYM (Qinvalid_function, "invalid-function");
   DEFSYM (Qwrong_number_of_arguments, "wrong-number-of-arguments");
+  DEFSYM (Qmalformed_keyword_arg_list, "malformed-keyword-arg-list");
   DEFSYM (Qno_catch, "no-catch");
   DEFSYM (Qend_of_file, "end-of-file");
   DEFSYM (Qarith_error, "arith-error");
@@ -4119,6 +4120,8 @@ syms_of_data (void)
   PUT_ERROR (Qinvalid_function, error_tail, "Invalid function");
   PUT_ERROR (Qwrong_number_of_arguments, error_tail,
 	     "Wrong number of arguments");
+  PUT_ERROR (Qmalformed_keyword_arg_list, error_tail,
+	     "Keyword lacks a corresponding value");
   PUT_ERROR (Qno_catch, error_tail, "No catch for tag");
   PUT_ERROR (Qend_of_file, error_tail, "End of file during parsing");
 
diff --git a/src/lisp.h b/src/lisp.h
index 8b870119315..28fa4c8037e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4911,6 +4911,15 @@ extern Lisp_Object safe_funcall (ptrdiff_t, Lisp_Object*);
 #define safe_calln(...) \
   CALLMANY (safe_funcall, ((Lisp_Object []) {__VA_ARGS__}))
 
+INLINE void
+CHECK_KEYWORD_ARGS (ptrdiff_t nargs)
+{
+  /* Used to check if a list of keyword/value pairs is missing a
+     value.  */
+  if (nargs & 1)
+    xsignal0 (Qmalformed_keyword_arg_list);
+}
+
 extern void init_eval (void);
 extern void syms_of_eval (void);
 extern void prog_ignore (Lisp_Object);
diff --git a/src/process.c b/src/process.c
index cd1149ae8b0..275e86f31d0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1822,6 +1822,7 @@ usage: (make-process &rest ARGS)  */)
 
   if (nargs == 0)
     return Qnil;
+  CHECK_KEYWORD_ARGS (nargs);
 
   /* Save arguments for process-contact and clone-process.  */
   contact = Flist (nargs, args);
@@ -2431,6 +2432,7 @@ usage:  (make-pipe-process &rest ARGS)  */)
 
   if (nargs == 0)
     return Qnil;
+  CHECK_KEYWORD_ARGS (nargs);
 
   contact = Flist (nargs, args);
 
@@ -3066,6 +3068,8 @@ usage: (serial-process-configure &rest ARGS)  */)
   Lisp_Object contact = Qnil;
   Lisp_Object proc = Qnil;
 
+  CHECK_KEYWORD_ARGS (nargs);
+
   contact = Flist (nargs, args);
 
   proc = plist_get (contact, QCprocess);
@@ -3170,6 +3174,7 @@ usage:  (make-serial-process &rest ARGS)  */)
 
   if (nargs == 0)
     return Qnil;
+  CHECK_KEYWORD_ARGS (nargs);
 
   contact = Flist (nargs, args);
 
@@ -3971,6 +3976,7 @@ usage: (make-network-process &rest ARGS)  */)
 
   if (nargs == 0)
     return Qnil;
+  CHECK_KEYWORD_ARGS (nargs);
 
   /* Save arguments for process-contact and clone-process.  */
   contact = Flist (nargs, args);
diff --git a/src/sound.c b/src/sound.c
index 67a1e99e31c..5e6acdb4743 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -359,9 +359,11 @@ sound_warning (const char *msg)
 static bool
 parse_sound (Lisp_Object sound, Lisp_Object *attrs)
 {
-  /* SOUND must be a list starting with the symbol `sound'.  */
+  /* SOUND must be a list starting with the symbol `sound' followed by a
+     number of keyword/value argument pairs.  */
   if (!CONSP (sound) || !EQ (XCAR (sound), Qsound))
     return 0;
+  CHECK_KEYWORD_ARGS (list_length (sound) - 1);
 
   sound = XCDR (sound);
   attrs[SOUND_FILE] = plist_get (sound, QCfile);
diff --git a/src/w32fns.c b/src/w32fns.c
index c2551ea2378..225a3a0999e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10655,6 +10655,7 @@ usage: (w32-notification-notify &rest PARAMS)  */)
 
   if (nargs == 0 || !pfnShell_NotifyIconW)
     return Qnil;
+  CHECK_KEYWORD_ARGS (nargs);
 
   arg_plist = Flist (nargs, args);
 

commit 64d314e0f6495de6fcf4f4c51e710b597a237e4f
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Jan 21 09:56:59 2025 +0100

    Prefer defface's ':slant italic' to obsolete alias ':italic t'
    
    * etc/themes/manoj-dark-theme.el (manoj-dark):
    * etc/themes/modus-themes.el (modus-themes-faces):
    * etc/themes/manoj-dark-theme.el (manoj-dark):
    * etc/themes/modus-themes.el (modus-themes-faces):
    * lisp/emacs-lisp/eieio-custom.el (eieio-custom-slot-tag-face):
    * lisp/gnus/gnus-art.el (gnus-emphasis-italic)
    (gnus-emphasis-underline-italic, gnus-emphasis-bold-italic)
    (gnus-emphasis-underline-bold-italic, gnus-signature)
    (gnus-header-from, gnus-header-subject, gnus-header-newsgroups)
    (gnus-header-content):
    * lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1)
    (gnus-cite-2, gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
    (gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10, gnus-cite-11):
    * lisp/gnus/gnus-srvr.el (gnus-server-cloud-host)
    (gnus-server-closed):
    * lisp/gnus/gnus.el (gnus-group-mail-1-empty)
    (gnus-group-mail-2-empty, gnus-summary-low-ticked)
    (gnus-summary-low-ancient, gnus-summary-low-undownloaded)
    (gnus-summary-low-unread, gnus-summary-low-read):
    * lisp/gnus/message.el (message-header-to)
    (message-header-newsgroups, message-header-other):
    * lisp/gnus/mm-decode.el (mm-command-output):
    * lisp/mh-e/mh-e.el (mh-face-data, mh-folder-body):
    * lisp/net/dictionary.el (dictionary-word-entry-face):
    * lisp/org/org-faces.el (org-formula, org-agenda-date-today)
    (org-scheduled, org-scheduled-today):
    * lisp/proced.el (proced-interruptible-sleep-status-code):
    * lisp/progmodes/prolog.el (prolog-font-lock-keywords):
    * lisp/progmodes/verilog-mode.el (verilog-font-lock-translate-off-face)
    (verilog-font-lock-p1800-face, verilog-font-lock-ams-face)
    (verilog-font-lock-grouping-keywords-face):
    * lisp/progmodes/vhdl-mode.el (vhdl-font-lock-attribute-face)
    (vhdl-font-lock-enumvalue-face, vhdl-font-lock-function-face)
    (vhdl-font-lock-directive-face):
    * lisp/transient.el (transient-inapt-suffix):
    * lisp/vc/ediff-init.el (ediff-even-diff-A, ediff-even-diff-B)
    (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
    (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
    Prefer defface attribute ':slant italic' to its obsolete alias
    ':italic t'.  See also Bug#73552.

diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 5dbc7d7e715..d9442653afc 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -78,7 +78,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  ;; Font lock faces
  '(font-lock-builtin-face       ((t (:foreground "LightSteelBlue"))))
  '(font-lock-constant-face      ((t (:foreground "LightSlateBlue" :weight bold))))
- '(font-lock-preprocessor-face  ((t (:foreground "CornFlowerBlue" :italic t))))
+ '(font-lock-preprocessor-face  ((t (:foreground "CornFlowerBlue" :slant italic))))
  '(font-lock-keyword-face       ((t (:foreground "cyan1"))))
  '(font-lock-type-face          ((t (:foreground "SteelBlue1"))))
  '(font-lock-regexp-grouping-backslash ((t (:weight bold))))
@@ -87,17 +87,17 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(font-lock-function-name-face ((t ( :foreground "mediumspringgreen"
                                       :weight bold))))
  '(font-lock-string-face        ((t (:foreground "RosyBrown1"))))
- '(font-lock-comment-face       ((t (:italic t :slant oblique :foreground "chocolate1"))))
+ '(font-lock-comment-face       ((t (:slant italic :slant oblique :foreground "chocolate1"))))
  '(font-lock-comment-delimiter-face ((t (:foreground "Salmon"))))
- '(font-lock-doc-face           ((t (:italic t :slant oblique :foreground "LightCoral"))))
+ '(font-lock-doc-face           ((t (:slant italic :slant oblique :foreground "LightCoral"))))
  '(font-lock-warning-face ((t (:foreground "Pink" :weight bold))))
 
  '(cperl-array-face ((t (:foreground "LawnGreen" :background "Black" :weight bold))))
- '(cperl-hash-face ((t (:foreground "SpringGreen" :background "Black" :weight bold :italic t))))
+ '(cperl-hash-face ((t (:foreground "SpringGreen" :background "Black" :weight bold :slant italic))))
  '(cperl-nonoverridable-face ((t (:foreground "chartreuse3"))))
 
  '(gnus-button ((t (:weight bold :background "#191932" :box (:line-width 2 :style released-button)))))
- '(gnus-cite-attribution-face ((t (:italic t))))
+ '(gnus-cite-attribution-face ((t (:slant italic))))
  '(gnus-cite-face-1  ((t (:foreground "CornflowerBlue"))))
  '(gnus-cite-face-2  ((t (:foreground "PaleGreen"))))
  '(gnus-cite-face-3  ((t (:foreground "LightGoldenrod"))))
@@ -383,9 +383,9 @@ jarring angry fruit salad look to reduce eye fatigue."
                 :foreground "black" :background "grey"
                 :weight bold ))))
  '(calendar-today-face ((t (:underline t :weight bold :foreground "cornsilk"))))
- '(change-log-acknowledgment ((t (:italic t :slant oblique :foreground "AntiqueWhite3"))))
+ '(change-log-acknowledgment ((t (:slant italic :slant oblique :foreground "AntiqueWhite3"))))
  '(change-log-conditionals-face ((t (:foreground "Aquamarine"))))
- '(change-log-date-face ((t (:italic t :slant oblique :foreground "BurlyWood"))))
+ '(change-log-date-face ((t (:slant italic :slant oblique :foreground "BurlyWood"))))
  '(change-log-email-face ((t (:foreground "Aquamarine"))))
  '(change-log-file-face ((t (:weight bold :foreground "LightSkyBlue" :height 0.9))))
  '(change-log-function-face ((t (:foreground "Aquamarine"))))
@@ -505,7 +505,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(eshell-test-failed-face ((t (:foreground "OrangeRed" :weight bold))))
  '(eshell-test-ok-face ((t (:foreground "Green" :weight bold))))
 
- '(excerpt ((t (:italic t))))
+ '(excerpt ((t (:slant italic))))
  '(file-name-shadow ((t (:foreground "grey70"))))
  '(fixed ((t (:weight bold))))
  '(flyspell-duplicate-face ((t (:foreground "IndianRed" :weight bold :underline t))))
@@ -533,7 +533,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(holiday-face ((t (:background "chocolate4"))))
 
  '(ibuffer-dired-buffer-face ((t (:foreground "mediumspringgreen" :weight bold :height 1.1))))
- '(ibuffer-help-buffer-face  ((t (:italic t :slant oblique :foreground "chocolate1"))))
+ '(ibuffer-help-buffer-face  ((t (:slant italic :slant oblique :foreground "chocolate1"))))
  '(ibuffer-hidden-buffer-face  ((t (:foreground "Pink" :weight bold))))
  '(ibuffer-occur-match-face ((t (:foreground "Pink" :weight bold))))
  '(ibuffer-read-only-buffer-face ((t (:foreground "SteelBlue1"))))
@@ -545,7 +545,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(ido-only-match ((t (:foreground "ForestGreen"))))
  '(ido-subdir ((t (:foreground "red1"))))
  '(info-menu-header ((t (:weight bold))))
- '(info-node ((t (:weight bold :italic t :foreground "yellow"))))
+ '(info-node ((t (:weight bold :slant italic :foreground "yellow"))))
  '(info-node ((t (:foreground "white" :slant italic :weight bold))))
  '(info-xref ((t (:weight bold :foreground "DodgerBlue1"))))
  '(info-xref ((t (:foreground "cyan" :weight bold))))
@@ -553,7 +553,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(isearch-fail ((t (:background "red4"))))
  '(isearch-lazy-highlight-face ((t (:background "paleturquoise4"))))
  '(isearch-secondary ((t (:foreground "red3"))))
- '(italic ((t (:italic t))))
+ '(italic ((t (:slant italic))))
 
  '(js2-builtin-face ((t (:foreground "sandy brown"))))
  '(js2-comment-face ((t (:foreground "dark orchid"))))
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index 227b22f0bbb..655d7a830e6 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -2811,11 +2811,11 @@ FG and BG are the main colors."
 ;;;;; jabber
     `(jabber-activity-face ((,c :foreground ,modeline-info)))
     `(jabber-roster-user-away ((,c :foreground ,red-faint)))
-    `(jabber-roster-user-xa ((,c :foreground ,magenta :italic t)))
+    `(jabber-roster-user-xa ((,c :foreground ,magenta :slant italic)))
     `(jabber-roster-user-dnd ((,c :foreground ,red :weight bold)))
     `(jabber-roster-user-chatty ((,c :foreground ,cyan-intense)))
     `(jabber-roster-user-error ((,c :inherit error)))
-    `(jabber-roster-user-offline ((,c :foreground ,fg-dim :italic t)))
+    `(jabber-roster-user-offline ((,c :foreground ,fg-dim :slant italic)))
     `(jabber-roster-user-online ((,c :foreground ,cyan :weight bold)))
     `(jabber-chat-prompt-foreign ((,c :foreground ,red :weight bold)))
     `(jabber-chat-prompt-system ((,c :foreground ,green)))
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 60ec854bb69..3f5291d0dee 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -75,7 +75,7 @@ of these.")
 				      (((class color)
 					(background light))
 				       (:foreground "blue"))
-				      (t (:italic t)))
+				      (t (:slant italic)))
   "Face used for unpushable variable tags."
   :group 'custom-faces)
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 6ea794840ab..89982f0b1ca 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -457,7 +457,7 @@ and the latter avoids underlining any whitespace at all."
   "Face used for displaying strong emphasized text (*word*)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-italic '((t (:italic t)))
+(defface gnus-emphasis-italic '((t (:slant italic)))
   "Face used for displaying italic emphasized text (/word/)."
   :group 'gnus-article-emphasis)
 
@@ -469,16 +469,16 @@ and the latter avoids underlining any whitespace at all."
   "Face used for displaying underlined bold emphasized text (_*word*_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-underline-italic '((t (:italic t :underline t)))
+(defface gnus-emphasis-underline-italic '((t (:slant italic :underline t)))
   "Face used for displaying underlined italic emphasized text (_/word/_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-bold-italic '((t (:weight bold :italic t)))
+(defface gnus-emphasis-bold-italic '((t (:weight bold :slant italic)))
   "Face used for displaying bold italic emphasized text (/*word*/)."
   :group 'gnus-article-emphasis)
 
 (defface gnus-emphasis-underline-bold-italic
-  '((t (:weight bold :italic t :underline t)))
+  '((t (:weight bold :slant italic :underline t)))
   "Face used for displaying underlined bold italic emphasized text.
 Example: (_/*word*/_)."
   :group 'gnus-article-emphasis)
@@ -762,7 +762,7 @@ Obsolete; use the face `gnus-signature' for customizations instead."
 
 (defface gnus-signature
   '((t
-     (:italic t)))
+     (:slant italic)))
   "Face used for highlighting a signature in the article buffer."
   :group 'gnus-article-highlight
   :group 'gnus-article-signature)
@@ -783,7 +783,7 @@ All the other `gnus-header-' faces inherit from this face."
       (background light))
      (:foreground "red3" :inherit gnus-header))
     (t
-     (:italic t :inherit gnus-header)))
+     (:slant italic :inherit gnus-header)))
   "Face used for displaying from headers."
   :version "29.1"
   :group 'gnus-article-headers
@@ -797,7 +797,7 @@ All the other `gnus-header-' faces inherit from this face."
       (background light))
      (:foreground "red4" :inherit gnus-header))
     (t
-     (:weight bold :italic t :inherit gnus-header)))
+     (:weight bold :slant italic :inherit gnus-header)))
   "Face used for displaying subject headers."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -805,12 +805,12 @@ All the other `gnus-header-' faces inherit from this face."
 (defface gnus-header-newsgroups
   '((((class color)
       (background dark))
-     (:foreground "yellow" :italic t :inherit gnus-header))
+     (:foreground "yellow" :slant italic :inherit gnus-header))
     (((class color)
       (background light))
-     (:foreground "MidnightBlue" :italic t))
+     (:foreground "MidnightBlue" :slant italic))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for displaying newsgroups headers.
 In the default setup this face is only used for crossposted
 articles."
@@ -833,12 +833,12 @@ articles."
 (defface gnus-header-content
   '((((class color)
       (background dark))
-     (:foreground "SpringGreen1" :italic t :inherit gnus-header))
+     (:foreground "SpringGreen1" :slant italic :inherit gnus-header))
     (((class color)
       (background light))
-     (:foreground "indianred4" :italic t :inherit gnus-header))
+     (:foreground "indianred4" :slant italic :inherit gnus-header))
     (t
-     (:italic t :inherit gnus-header)))
+     (:slant italic :inherit gnus-header)))
   "Face used for displaying header content."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index e6b5b5442aa..df69b294b5f 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -119,7 +119,7 @@ the envelope From line."
   :version "22.1"
   :type 'boolean)
 
-(defface gnus-cite-attribution '((t (:italic t)))
+(defface gnus-cite-attribution '((t (:slant italic)))
   "Face used for attribution lines.")
 
 (defcustom gnus-cite-attribution-face 'gnus-cite-attribution
@@ -135,7 +135,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "MidnightBlue"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-2 '((((class color)
@@ -145,7 +145,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "firebrick"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-3 '((((class color)
@@ -155,7 +155,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "dark green"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-4 '((((class color)
@@ -165,7 +165,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "OrangeRed"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-5 '((((class color)
@@ -175,7 +175,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "dark khaki"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-6 '((((class color)
@@ -185,7 +185,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "dark violet"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-7 '((((class color)
@@ -195,7 +195,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "SteelBlue4"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-8 '((((class color)
@@ -205,7 +205,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "magenta"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-9 '((((class color)
@@ -215,7 +215,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			 (background light))
 			(:foreground "violet"))
 		       (t
-			(:italic t)))
+			(:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-10 '((((class color)
@@ -225,7 +225,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			  (background light))
 			 (:foreground "medium purple"))
 			(t
-			 (:italic t)))
+			 (:slant italic)))
   "Citation face.")
 
 (defface gnus-cite-11 '((((class color)
@@ -235,7 +235,7 @@ It is merged with the face for the cited text belonging to the attribution."
 			  (background light))
 			 (:foreground "turquoise"))
 			(t
-			 (:italic t)))
+			 (:slant italic)))
   "Citation face.")
 
 (defcustom gnus-cite-face-list
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 9dbc444a05c..fb96a1ab61f 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -196,9 +196,9 @@ If nil, a faster, but more primitive, buffer is used instead."
   :group 'gnus-server-visual)
 
 (defface gnus-server-cloud-host
-  '((((class color) (background light)) (:foreground "ForestGreen" :inverse-video t :italic t))
-    (((class color) (background dark)) (:foreground "PaleGreen" :inverse-video t :italic t))
-    (t (:inverse-video t :italic t)))
+  '((((class color) (background light)) (:foreground "ForestGreen" :inverse-video t :slant italic))
+    (((class color) (background dark)) (:foreground "PaleGreen" :inverse-video t :slant italic))
+    (t (:inverse-video t :slant italic)))
   "Face used for displaying the Cloud Host."
   :group 'gnus-server-visual)
 
@@ -210,10 +210,10 @@ If nil, a faster, but more primitive, buffer is used instead."
   :group 'gnus-server-visual)
 
 (defface gnus-server-closed
-  '((((class color) (background light)) (:foreground "Steel Blue" :italic t))
+  '((((class color) (background light)) (:foreground "Steel Blue" :slant italic))
     (((class color) (background dark))
-     (:foreground "LightBlue" :italic t))
-    (t (:italic t)))
+     (:foreground "LightBlue" :slant italic))
+    (t (:slant italic)))
   "Face used for displaying CLOSED servers."
   :group 'gnus-server-visual)
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index cbf49810bec..3099f95ebd3 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -483,7 +483,7 @@ If nil, there will be no Gnus logo in the mode-line."
       (background light))
      (:foreground "DeepPink3"))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Level 1 empty mailgroup face."
   :group 'gnus-group)
 
@@ -500,7 +500,7 @@ If nil, there will be no Gnus logo in the mode-line."
       (background light))
      (:foreground "HotPink3"))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Level 2 empty mailgroup face."
   :group 'gnus-group)
 
@@ -574,7 +574,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-low-ticked
-  '((t (:inherit gnus-summary-normal-ticked :italic t)))
+  '((t (:inherit gnus-summary-normal-ticked :slant italic)))
   "Face used for low interest ticked articles."
   :group 'gnus-summary)
 
@@ -596,7 +596,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-low-ancient
-  '((t (:inherit gnus-summary-normal-ancient :italic t)))
+  '((t (:inherit gnus-summary-normal-ancient :slant italic)))
   "Face used for low interest ancient articles."
   :group 'gnus-summary)
 
@@ -616,7 +616,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-low-undownloaded
-  '((t (:inherit gnus-summary-normal-undownloaded :italic t)))
+  '((t (:inherit gnus-summary-normal-undownloaded :slant italic)))
   "Face used for low interest uncached articles."
   :group 'gnus-summary)
 
@@ -632,7 +632,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-low-unread
-  '((t (:inherit gnus-summary-normal-unread :italic t)))
+  '((t (:inherit gnus-summary-normal-unread :slant italic)))
   "Face used for low interest unread articles."
   :group 'gnus-summary)
 
@@ -654,7 +654,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-low-read
-  '((t (:inherit gnus-summary-normal-read :italic t)))
+  '((t (:inherit gnus-summary-normal-read :slant italic)))
   "Face used for low interest read articles."
   :group 'gnus-summary)
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6269eda8423..b552b211eb8 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1525,7 +1525,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "MidnightBlue" :weight bold)
     (t
-     :weight bold :italic t))
+     :weight bold :slant italic))
   "Face used for displaying To headers."
   :group 'message-faces)
 
@@ -1556,12 +1556,12 @@ starting with `not' and followed by regexps."
 (defface message-header-newsgroups
   '((((class color)
       (background dark))
-     :foreground "yellow" :weight bold :italic t)
+     :foreground "yellow" :weight bold :slant italic)
     (((class color)
       (background light))
-     :foreground "blue4" :weight bold :italic t)
+     :foreground "blue4" :weight bold :slant italic)
     (t
-     :weight bold :italic t))
+     :weight bold :slant italic))
   "Face used for displaying Newsgroups headers."
   :group 'message-faces)
 
@@ -1573,7 +1573,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "steel blue")
     (t
-     :weight bold :italic t))
+     :weight bold :slant italic))
   "Face used for displaying other headers."
   :group 'message-faces)
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 6aab997b892..8273c48ff97 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -66,7 +66,7 @@
       (background light))
      (:foreground "red3"))
     (t
-     (:italic t)))
+     (:slant italic)))
   "Face used for displaying output from commands."
   :group 'mime-display)
 
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 8f1fb01818d..107b91f8355 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -3336,11 +3336,11 @@ sequence."
       (((class color))
        (:foreground "yellow" :weight light))
       (((class grayscale) (background light))
-       (:foreground "Gray90" :weight bold :italic t))
+       (:foreground "Gray90" :weight bold :slant italic))
       (((class grayscale) (background dark))
-       (:foreground "DimGray" :weight bold :italic t))
+       (:foreground "DimGray" :weight bold :slant italic))
       (t
-       (:weight bold :italic t))))
+       (:weight bold :slant italic))))
     (mh-folder-subject
      ((((class color) (background light))
        (:foreground "blue4"))
@@ -3363,11 +3363,11 @@ sequence."
       (((class color))
        (:foreground "green"))
       (((class grayscale) (background light))
-       (:foreground "DimGray" :italic t))
+       (:foreground "DimGray" :slant italic))
       (((class grayscale) (background dark))
-       (:foreground "LightGray" :italic t))
+       (:foreground "LightGray" :slant italic))
       (t
-       (:italic t))))
+       (:slant italic))))
     (mh-letter-header-field
      ((((class color) (background light))
        (:background "gray90"))
@@ -3390,11 +3390,11 @@ sequence."
       (((class color))
        (:foreground "yellow" :weight light))
       (((class grayscale) (background light))
-       (:foreground "Gray90" :weight bold :italic t))
+       (:foreground "Gray90" :weight bold :slant italic))
       (((class grayscale) (background dark))
-       (:foreground "DimGray" :weight bold :italic t))
+       (:foreground "DimGray" :weight bold :slant italic))
       (t
-       (:weight bold :italic t))))
+       (:weight bold :slant italic))))
     (mh-show-date
      ((((class color) (min-colors 64) (background light))
        (:foreground "ForestGreen"))
@@ -3423,15 +3423,15 @@ sequence."
       (((class color))
        (:foreground "green"))
       (((class grayscale) (background light))
-       (:foreground "DimGray" :italic t))
+       (:foreground "DimGray" :slant italic))
       (((class grayscale) (background dark))
-       (:foreground "LightGray" :italic t))
+       (:foreground "LightGray" :slant italic))
       (t
-       (:italic t))))
+       (:slant italic))))
     (mh-show-pgg-bad ((t (:weight bold :foreground "DeepPink1"))))
     (mh-show-pgg-good ((t (:weight bold :foreground "LimeGreen"))))
     (mh-show-pgg-unknown ((t (:weight bold :foreground "DarkGoldenrod2"))))
-    (mh-show-signature ((t (:italic t))))
+    (mh-show-signature ((t (:slant italic))))
     (mh-show-to
      ((((class color) (background light))
        (:foreground "SaddleBrown"))
@@ -3501,7 +3501,7 @@ not added to the returned spec."
                 '((((class color))
                    (:inherit mh-folder-msg-number))
                   (t
-                   (:inherit mh-folder-msg-number :italic t))))
+                   (:inherit mh-folder-msg-number :slant italic))))
   "Body text face."
   :group 'mh-faces
   :group 'mh-folder
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 6d051e321a7..2df48f9a836 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -337,7 +337,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
 
 (defface dictionary-word-entry-face
   '((((type x))
-     (:italic t))
+     (:slant italic))
     (((type tty) (class color))
      (:foreground "green"))
     (t
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 1f206b91143..7fb04bb9fd7 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -404,7 +404,7 @@ changes."
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
     (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
-    (t (:weight bold :italic t)))
+    (t (:weight bold :slant italic)))
   "Face for formulas."
   :group 'org-faces)
 
@@ -529,7 +529,7 @@ it (e.g. if that is assigned a different font height or family)."
   :group 'org-faces)
 
 (defface org-agenda-date-today
-  '((t (:inherit org-agenda-date :weight bold :italic t)))
+  '((t (:inherit org-agenda-date :weight bold :slant italic)))
   "Face used in agenda for today."
   :group 'org-faces)
 
@@ -552,7 +552,7 @@ which days belong to the weekend."
   '((((class color) (min-colors 88) (background light)) (:foreground "DarkGreen"))
     (((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen"))
     (((class color) (min-colors 8)) (:foreground "green"))
-    (t (:weight bold :italic t)))
+    (t (:weight bold :slant italic)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 
@@ -560,7 +560,7 @@ which days belong to the weekend."
   '((((class color) (min-colors 88) (background light)) (:foreground "DarkGreen"))
     (((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen"))
     (((class color) (min-colors 8)) (:foreground "green"))
-    (t (:weight bold :italic t)))
+    (t (:weight bold :slant italic)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 
diff --git a/lisp/proced.el b/lisp/proced.el
index 6d47ff98a97..7bc6b44eee4 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -457,7 +457,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
 
 (defface proced-interruptible-sleep-status-code
   '((((class color) (min-colors 88)) (:foreground "DimGrey"))
-    (t (:italic t)))
+    (t (:slant italic)))
   "Face used in Proced buffers for interruptible sleep status code character \"S\"."
   :version "29.1")
 
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 5898cced17f..321aaa77693 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1868,9 +1868,9 @@ Argument BOUND is a buffer position limiting searching."
 
   ;; Define Prolog faces
   (defface prolog-redo-face
-    '((((class grayscale)) (:italic t))
+    '((((class grayscale)) (:slant italic))
       (((class color)) (:foreground "darkorchid"))
-      (t (:italic t)))
+      (t (:slant italic)))
     "Prolog mode face for highlighting redo trace lines."
     :group 'prolog-faces)
   (defface prolog-exit-face
@@ -1881,9 +1881,9 @@ Argument BOUND is a buffer position limiting searching."
     "Prolog mode face for highlighting exit trace lines."
     :group 'prolog-faces)
   (defface prolog-exception-face
-    '((((class grayscale)) (:weight bold :italic t :underline t))
+    '((((class grayscale)) (:weight bold :slant italic :underline t))
       (((class color)) (:weight bold :foreground "black" :background "Khaki"))
-      (t (:weight bold :italic t :underline t)))
+      (t (:weight bold :slant italic :underline t)))
     "Prolog mode face for highlighting exception trace lines."
     :group 'prolog-faces)
   (defface prolog-warning-face
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index bb86e90c428..2f5525786e1 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -3269,15 +3269,15 @@ See also `verilog-font-lock-extra-types'.")
 (defface verilog-font-lock-translate-off-face
   '((((class color)
       (background light))
-     (:background "gray90" :italic t ))
+     (:background "gray90" :slant italic ))
     (((class color)
       (background dark))
-     (:background "gray10" :italic t ))
+     (:background "gray10" :slant italic ))
     (((class grayscale) (background light))
-     (:foreground "DimGray" :italic t))
+     (:foreground "DimGray" :slant italic))
     (((class grayscale) (background dark))
-     (:foreground "LightGray" :italic t))
-    (t (:italic t)))
+     (:foreground "LightGray" :slant italic))
+    (t (:slant italic)))
   "Font lock mode face used to background highlight translate-off regions."
   :group 'font-lock-highlighting-faces)
 
@@ -3291,7 +3291,7 @@ See also `verilog-font-lock-extra-types'.")
     (((class color)
       (background dark))
      (:foreground "orange1" :weight bold ))
-    (t (:italic t)))
+    (t (:slant italic)))
   "Font lock mode face used to highlight P1800 keywords."
   :group 'font-lock-highlighting-faces)
 (make-obsolete-variable 'verilog-font-lock-p1800-face nil "27.1")
@@ -3306,7 +3306,7 @@ See also `verilog-font-lock-extra-types'.")
     (((class color)
       (background dark))
      (:foreground "orange1" :weight bold ))
-    (t (:italic t)))
+    (t (:slant italic)))
   "Font lock mode face used to highlight AMS keywords."
   :group 'font-lock-highlighting-faces)
 
@@ -3320,7 +3320,7 @@ See also `verilog-font-lock-extra-types'.")
     (((class color)
       (background dark))
      (:foreground "orange1" :weight bold ))
-    (t (:italic t)))
+    (t (:slant italic)))
   "Font lock mode face used to highlight verilog grouping keywords."
   :group 'font-lock-highlighting-faces)
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index a7fa25950ea..593a83ceffa 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -13595,28 +13595,28 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-attribute-face
   '((((class color) (background light)) (:foreground "Orchid"))
     (((class color) (background dark)) (:foreground "LightSteelBlue"))
-    (t (:italic t :weight bold)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized attributes."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-enumvalue-face
   '((((class color) (background light)) (:foreground "SaddleBrown"))
     (((class color) (background dark)) (:foreground "BurlyWood"))
-    (t (:italic t :weight bold)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized enumeration values."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-function-face
   '((((class color) (background light)) (:foreground "Cyan4"))
     (((class color) (background dark)) (:foreground "Orchid1"))
-    (t (:italic t :weight bold)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight standardized functions and packages."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-directive-face
   '((((class color) (background light)) (:foreground "CadetBlue"))
     (((class color) (background dark)) (:foreground "Aquamarine"))
-    (t (:italic t :weight bold)))
+    (t (:slant italic :weight bold)))
   "Font lock mode face used to highlight directives."
   :group 'vhdl-highlight-faces)
 
diff --git a/lisp/transient.el b/lisp/transient.el
index bf64dd94e19..24ab56e830b 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -502,7 +502,7 @@ give you as many additional suffixes as you hoped.)"
   "Face used for suffixes unreachable from the current prefix sequence."
   :group 'transient-faces)
 
-(defface transient-inapt-suffix '((t :inherit shadow :italic t))
+(defface transient-inapt-suffix '((t :inherit shadow :slant italic))
   "Face used for suffixes that are inapt at this time."
   :group 'transient-faces)
 
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index d67785d96fa..12b94e81489 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -958,7 +958,7 @@ this variable represents.")
     (((class color))
      (:foreground "red3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap :extend t)))
+    (t (:slant italic :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -978,7 +978,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "blue3" :background "Grey" :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap :extend t)))
+    (t (:slant italic :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1001,7 +1001,7 @@ this variable represents.")
     (((class color))
      (:foreground "yellow3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap :extend t)))
+    (t (:slant italic :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1024,7 +1024,7 @@ this variable represents.")
     (((class color))
      (:foreground "cyan3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap :extend t)))
+    (t (:slant italic :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in ancestor buffer."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1053,7 +1053,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "red3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1" :extend t)))
+    (t (:slant italic :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1075,7 +1075,7 @@ this variable represents.")
      (:foreground "Black" :background "light grey" :extend t))
     (((class color))
      (:foreground "cyan3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1" :extend t)))
+    (t (:slant italic :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1097,7 +1097,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "yellow3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1" :extend t)))
+    (t (:slant italic :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1115,7 +1115,7 @@ this variable represents.")
      (:foreground "cyan3" :background "gray40" :extend t))
     (((class color))
      (:foreground "green3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1" :extend t)))
+    (t (:slant italic :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in ancestor buffer."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,

commit 375befcacc8e7c37ec490145aa6ff9737ad102a1
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Jan 21 09:23:03 2025 +0100

    Prefer defface's ':weight bold' to obsolete alias ':bold t'
    
    * etc/themes/adwaita-theme.el (adwaita):
    * etc/themes/manoj-dark-theme.el (manoj-dark):
    * etc/themes/modus-themes.el (modus-themes-faces):
    * lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
    (gnus-server-opened, gnus-server-denied, gnus-server-offline):
    * lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-2)
    (gnus-group-news-3, gnus-group-news-4, gnus-group-news-5)
    (gnus-group-news-6, gnus-group-news-low, gnus-group-mail-1)
    (gnus-group-mail-2, gnus-group-mail-3, gnus-group-mail-low-empty)
    (gnus-group-mail-low, gnus-summary-high-ticked)
    (gnus-summary-high-ancient, gnus-summary-high-undownloaded)
    (gnus-summary-high-unread, gnus-summary-high-read):
    * lisp/gnus/message.el (message-header-to, message-header-cc)
    (message-header-subject, message-header-newsgroups)
    (message-header-other, message-header-name, message-header-xheader)
    (message-separator, message-cited-text-1, message-cited-text-2)
    (message-cited-text-3, message-cited-text-4, message-mml)
    (message-signature-separator):
    * lisp/mh-e/mh-e.el (mh-face-data, mh-folder-cur-msg-number)
    (mh-speedbar-folder-with-unseen-messages)
    (mh-speedbar-selected-folder-with-unseen-messages):
    * lisp/net/dictionary.el (dictionary-button-face):
    * lisp/org/org-faces.el (org-drawer, org-tag, org-list-dt, org-todo)
    (org-done, org-headline-todo, org-formula, org-agenda-structure)
    (org-scheduled, org-scheduled-today, org-scheduled-previously)
    (org-upcoming-deadline):
    * lisp/proced.el (proced-uninterruptible-sleep-status-code)
    (proced-executable, proced-cpu, proced-user, proced-time-colon):
    * lisp/progmodes/erts-mode.el (erts-mode-specification-name)
    (erts-mode-specification-value):
    * lisp/progmodes/prolog.el (prolog-font-lock-keywords):
    * lisp/progmodes/verilog-mode.el (verilog-font-lock-p1800-face)
    (verilog-font-lock-ams-face)
    (verilog-font-lock-grouping-keywords-face):
    * lisp/progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
    (vhdl-font-lock-attribute-face, vhdl-font-lock-enumvalue-face)
    (vhdl-font-lock-function-face, vhdl-font-lock-directive-face)
    (vhdl-font-lock-reserved-words-face): Prefer defface attribute
    ':weight bold' to its obsolete alias ':bold t'.  See also Bug#73552.

diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
index e2a95ebc96a..f7e032ee5be 100644
--- a/etc/themes/adwaita-theme.el
+++ b/etc/themes/adwaita-theme.el
@@ -41,24 +41,24 @@ default look of the Gnome 3 desktop."
    `(mode-line-inactive ((,class (:foreground "#C6C6C6" :background ,"white"))))
    `(header-line ((,class (:foreground "#CCCCCC" :background "black"))))
 
-   `(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t))))
+   `(minibuffer-prompt ((,class (:foreground "#0084C8" :weight bold))))
    `(region ((,class (:foreground unspecified :background "#C2D5E9"))))
-   `(dired-header ((,class (:bold t :foreground "#0084C8"))))
-   `(widget-button ((,class (:bold t :foreground "#0084C8"))))
+   `(dired-header ((,class (:weight bold :foreground "#0084C8"))))
+   `(widget-button ((,class (:weight bold :foreground "#0084C8"))))
 
-   `(success ((,class (:bold t :foreground "#4E9A06"))))
+   `(success ((,class (:weight bold :foreground "#4E9A06"))))
    `(warning ((,class (:foreground "#CE5C00"))))
    `(error ((,class (:foreground "#B50000"))))
 
    `(font-lock-builtin-face ((,class (:foreground "#A020F0"))))
    `(font-lock-constant-face ((,class (:foreground "#F5666D"))))
    `(font-lock-comment-face ((,class (:foreground "#204A87"))))
-   `(font-lock-function-name-face ((,class (:foreground "#00578E" :bold t))))
-   `(font-lock-keyword-face ((,class (:bold t :foreground "#A52A2A"))))
+   `(font-lock-function-name-face ((,class (:foreground "#00578E" :weight bold))))
+   `(font-lock-keyword-face ((,class (:weight bold :foreground "#A52A2A"))))
    `(font-lock-string-face ((,class (:foreground "#4E9A06"))))
-   `(font-lock-type-face ((,class (:foreground "#2F8B58" :bold t))))
-   `(font-lock-variable-name-face ((,class (:foreground "#0084C8" :bold t))))
-   `(font-lock-warning-face ((,class (:foreground "#F5666D" :bold t))))
+   `(font-lock-type-face ((,class (:foreground "#2F8B58" :weight bold))))
+   `(font-lock-variable-name-face ((,class (:foreground "#0084C8" :weight bold))))
+   `(font-lock-warning-face ((,class (:foreground "#F5666D" :weight bold))))
 
    `(link ((,class (:underline t :foreground "#0066CC"))))
    `(link-visited ((,class (:underline t :foreground "#6799CC"))))
@@ -67,12 +67,12 @@ default look of the Gnome 3 desktop."
 
    `(erc-action-face ((,class (:foreground "#F5666D"))))
    `(erc-button ((,class (:foreground "#A8799C"))))
-   `(erc-current-nick-face ((,class (:bold t :foreground "#FF7092"))))
-   `(erc-error-face ((,class (:foreground "#F5666D" :bold t))))
+   `(erc-current-nick-face ((,class (:weight bold :foreground "#FF7092"))))
+   `(erc-error-face ((,class (:foreground "#F5666D" :weight bold))))
    `(erc-input-face ((,class (:foreground "black"))))
    `(erc-keyword-face ((,class (:foreground "#F5666D"))))
-   `(erc-my-nick-face ((,class (:bold t :foreground "#FF8CA7"))))
-   `(erc-nick-default-face ((,class (:bold t :foreground "#0084C8"))))
+   `(erc-my-nick-face ((,class (:weight bold :foreground "#FF8CA7"))))
+   `(erc-nick-default-face ((,class (:weight bold :foreground "#0084C8"))))
    `(erc-notice-face ((,class (:foreground "#0084C8"))))
    `(erc-prompt-face ((,class (:foreground "black"))))
    `(erc-timestamp-face ((,class (:foreground ,"#4CB64A"))))
@@ -80,29 +80,29 @@ default look of the Gnome 3 desktop."
    `(magit-log-sha1 ((,class (:foreground "#FF7092"))))
    `(magit-log-head-label-local ((,class (:foreground "#4F78B5"))))
    `(magit-log-head-label-remote ((,class (:foreground ,"#4CB64A"))))
-   `(magit-branch ((,class (:bold t :foreground "#0084C8"))))
-   `(magit-section-title ((,class (:bold t :foreground "#00578E"))))
+   `(magit-branch ((,class (:weight bold :foreground "#0084C8"))))
+   `(magit-section-title ((,class (:weight bold :foreground "#00578E"))))
    `(magit-item-highlight ((,class (:background "#FEFFBF"))))
-   `(magit-diff-add ((,class (:bold t :foreground "#4CB64A"))))
+   `(magit-diff-add ((,class (:weight bold :foreground "#4CB64A"))))
    `(magit-diff-del ((,class (:bold nil :foreground "#F5666D"))))
 
    `(gnus-group-mail-1-empty ((,class (:foreground "#00578E"))))
-   `(gnus-group-mail-1 ((,class (:bold t :foreground "#4F78B5"))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#4F78B5"))))
    `(gnus-group-mail-3-empty ((,class (:foreground "#00578E"))))
-   `(gnus-group-mail-3 ((,class (:bold t :foreground "#9CBB43"))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground "#9CBB43"))))
    `(gnus-group-news-3-empty ((,class (:foreground "#00578E"))))
-   `(gnus-group-news-3 ((,class (:bold t :foreground "#9CBB43"))))
-   `(gnus-header-name ((,class (:bold t :foreground "#0084C8"))))
-   `(gnus-header-subject ((,class (:bold t :foreground "#FF7092"))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground "#9CBB43"))))
+   `(gnus-header-name ((,class (:weight bold :foreground "#0084C8"))))
+   `(gnus-header-subject ((,class (:weight bold :foreground "#FF7092"))))
    `(gnus-header-content ((,class (:foreground "#FF7092"))))
-   `(gnus-button ((,class (:bold t :foreground "#00578E"))))
+   `(gnus-button ((,class (:weight bold :foreground "#00578E"))))
    `(gnus-cite-1 ((,class (:foreground "#00578E"))))
    `(gnus-cite-2 ((,class (:foreground "#0084C8"))))
 
    `(image-dired-thumb-mark ((,class (:background "#CE5C00"))))
    `(image-dired-thumb-flagged ((,class (:background "#B50000"))))
 
-   `(diff-added ((,class (:bold t :foreground "#4E9A06"))))
-   `(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
+   `(diff-added ((,class (:weight bold :foreground "#4E9A06"))))
+   `(diff-removed ((,class (:weight bold :foreground "#F5666D"))))))
 
 ;;; adwaita-theme.el ends here
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 1d3783ed112..5dbc7d7e715 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -77,7 +77,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(default ((t (:background "black" :foreground "WhiteSmoke"))))
  ;; Font lock faces
  '(font-lock-builtin-face       ((t (:foreground "LightSteelBlue"))))
- '(font-lock-constant-face      ((t (:foreground "LightSlateBlue" :bold t))))
+ '(font-lock-constant-face      ((t (:foreground "LightSlateBlue" :weight bold))))
  '(font-lock-preprocessor-face  ((t (:foreground "CornFlowerBlue" :italic t))))
  '(font-lock-keyword-face       ((t (:foreground "cyan1"))))
  '(font-lock-type-face          ((t (:foreground "SteelBlue1"))))
@@ -92,8 +92,8 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(font-lock-doc-face           ((t (:italic t :slant oblique :foreground "LightCoral"))))
  '(font-lock-warning-face ((t (:foreground "Pink" :weight bold))))
 
- '(cperl-array-face ((t (:foreground "LawnGreen" :background "Black" :bold t))))
- '(cperl-hash-face ((t (:foreground "SpringGreen" :background "Black" :bold t :italic t))))
+ '(cperl-array-face ((t (:foreground "LawnGreen" :background "Black" :weight bold))))
+ '(cperl-hash-face ((t (:foreground "SpringGreen" :background "Black" :weight bold :italic t))))
  '(cperl-nonoverridable-face ((t (:foreground "chartreuse3"))))
 
  '(gnus-button ((t (:weight bold :background "#191932" :box (:line-width 2 :style released-button)))))
@@ -173,12 +173,12 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(gnus-user-agent-unknown-face ((t (:background "black" :foreground "orange" :weight bold))))
  '(gnus-x-face ((t (:background "white" :foreground "black"))))
 
- '(gnus-group-mail-1 ((t (:bold t :foreground "#3BFF00" :weight normal))))
- '(gnus-group-mail-1-face ((t (:bold t :foreground "#3BFF00" :weight normal))))
- '(gnus-group-mail-2 ((t (:bold t :foreground "#5EFF00" :weight normal))))
- '(gnus-group-mail-2-face ((t (:bold t :foreground "#5EFF00" :weight normal))))
- '(gnus-group-mail-3 ((t (:bold t :foreground "#80FF00" :weight normal))))
- '(gnus-group-mail-3-face ((t (:bold t :foreground "#A1FF00" :weight normal))))
+ '(gnus-group-mail-1 ((t (:weight bold :foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-1-face ((t (:weight bold :foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-2 ((t (:weight bold :foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-2-face ((t (:weight bold :foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-3 ((t (:weight bold :foreground "#80FF00" :weight normal))))
+ '(gnus-group-mail-3-face ((t (:weight bold :foreground "#A1FF00" :weight normal))))
 
 
  '(gnus-group-mail-1-empty ((t (:foreground "#249900"))))
@@ -382,7 +382,7 @@ jarring angry fruit salad look to reduce eye fatigue."
                                     :style released-button)
                 :foreground "black" :background "grey"
                 :weight bold ))))
- '(calendar-today-face ((t (:underline t :bold t :foreground "cornsilk"))))
+ '(calendar-today-face ((t (:underline t :weight bold :foreground "cornsilk"))))
  '(change-log-acknowledgment ((t (:italic t :slant oblique :foreground "AntiqueWhite3"))))
  '(change-log-conditionals-face ((t (:foreground "Aquamarine"))))
  '(change-log-date-face ((t (:italic t :slant oblique :foreground "BurlyWood"))))
@@ -488,28 +488,28 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(escape-glyph ((t (:foreground "cyan"))))
  '(homoglyph ((t (:foreground "cyan"))))
 
- '(eshell-ls-archive-face ((t (:bold t :foreground "IndianRed"))))
+ '(eshell-ls-archive-face ((t (:weight bold :foreground "IndianRed"))))
  '(eshell-ls-backup-face ((t (:foreground "Grey"))))
  '(eshell-ls-clutter-face ((t (:foreground "DimGray"))))
- '(eshell-ls-directory-face ((t (:bold t :foreground "MediumSlateBlue"))))
+ '(eshell-ls-directory-face ((t (:weight bold :foreground "MediumSlateBlue"))))
  '(eshell-ls-executable-face ((t (:foreground "Coral"))))
  '(eshell-ls-missing-face ((t (:foreground "black"))))
  '(eshell-ls-picture-face ((t (:foreground "Violet"))))
  '(eshell-ls-product-face ((t (:foreground "sandybrown"))))
  '(eshell-ls-readonly-face ((t (:foreground "Aquamarine"))))
  '(eshell-ls-special-face ((t (:foreground "Gold"))))
- '(eshell-ls-symlink-face ((t (:foreground "DarkCyan" :bold t))))
+ '(eshell-ls-symlink-face ((t (:foreground "DarkCyan" :weight bold))))
  '(eshell-ls-symlink-face ((t (:foreground "White"))))
  '(eshell-ls-unreadable-face ((t (:foreground "DimGray"))))
  '(eshell-prompt-face ((t (:foreground "MediumAquamarine"))))
- '(eshell-test-failed-face ((t (:foreground "OrangeRed" :bold t))))
- '(eshell-test-ok-face ((t (:foreground "Green" :bold t))))
+ '(eshell-test-failed-face ((t (:foreground "OrangeRed" :weight bold))))
+ '(eshell-test-ok-face ((t (:foreground "Green" :weight bold))))
 
  '(excerpt ((t (:italic t))))
  '(file-name-shadow ((t (:foreground "grey70"))))
- '(fixed ((t (:bold t))))
- '(flyspell-duplicate-face ((t (:foreground "IndianRed" :bold t :underline t))))
- '(flyspell-incorrect-face ((t (:foreground "Pink" :bold t :underline t))))
+ '(fixed ((t (:weight bold))))
+ '(flyspell-duplicate-face ((t (:foreground "IndianRed" :weight bold :underline t))))
+ '(flyspell-incorrect-face ((t (:foreground "Pink" :weight bold :underline t))))
 
  '(fringe ((t (:background "grey30" :foreground "Wheat"))))
  '(header-line ((t (:box (:line-width -1 :color "grey20" :style released-button) :background "grey20" :foreground "grey90"  :height 0.9))))
@@ -545,9 +545,9 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(ido-only-match ((t (:foreground "ForestGreen"))))
  '(ido-subdir ((t (:foreground "red1"))))
  '(info-menu-header ((t (:weight bold))))
- '(info-node ((t (:bold t :italic t :foreground "yellow"))))
+ '(info-node ((t (:weight bold :italic t :foreground "yellow"))))
  '(info-node ((t (:foreground "white" :slant italic :weight bold))))
- '(info-xref ((t (:bold t :foreground "DodgerBlue1"))))
+ '(info-xref ((t (:weight bold :foreground "DodgerBlue1"))))
  '(info-xref ((t (:foreground "cyan" :weight bold))))
  '(isearch ((t (:background "palevioletred2" :foreground "brown4"))))
  '(isearch-fail ((t (:background "red4"))))
@@ -558,7 +558,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(js2-builtin-face ((t (:foreground "sandy brown"))))
  '(js2-comment-face ((t (:foreground "dark orchid"))))
  '(js2-constant-face ((t (:foreground "pale violet red"))))
- '(js2-error-face ((t (:background "indian red" :foreground "green" :bold t))))
+ '(js2-error-face ((t (:background "indian red" :foreground "green" :weight bold))))
  '(js2-function-name-face ((t (:foreground "cadet blue"))))
  '(js2-function-param-face ((t (:foreground "IndianRed1"))))
  '(js2-instance-member-face ((t (:foreground "IndianRed1"))))
@@ -579,8 +579,8 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(link-visited ((t (:underline t :foreground "violet"))))
 
  '(makefile-space ((t (:background "hotpink"))))
- '(man-bold ((t (:bold t))))
- '(man-heading ((t (:bold t))))
+ '(man-bold ((t (:weight bold))))
+ '(man-heading ((t (:weight bold))))
  '(man-italic ((t (:foreground "yellow"))))
  '(man-xref ((t (:underline t))))
  '(match ((t (:background "RoyalBlue3"))))
@@ -602,8 +602,8 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(next-error ((t (:background "blue3"))))
  '(nobreak-space ((t (:foreground "cyan" :underline t))))
  '(paren-blink-off ((t (:foreground "black"))))
- '(paren-mismatch-face ((t (:bold t :background "white" :foreground "red"))))
- '(paren-no-match-face ((t (:bold t :background "white" :foreground "red"))))
+ '(paren-mismatch-face ((t (:weight bold :background "white" :foreground "red"))))
+ '(paren-no-match-face ((t (:weight bold :background "white" :foreground "red"))))
  '(query-replace ((t (:foreground "brown4" :background "palevioletred2"))))
  '(region ((t (:background "blue3"))))
  '(realgud-overlay-arrow1        ((t (:foreground "medium sea green"))))
@@ -659,8 +659,8 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(vhdl-font-lock-directive-face ((t (:foreground "CadetBlue"))))
  '(vhdl-font-lock-enumvalue-face ((t (:foreground "Gold4"))))
  '(vhdl-font-lock-function-face ((t (:foreground "Orchid4"))))
- '(vhdl-font-lock-prompt-face ((t (:foreground "Red" :bold t))))
- '(vhdl-font-lock-reserved-words-face ((t (:foreground "Orange" :bold t))))
+ '(vhdl-font-lock-prompt-face ((t (:foreground "Red" :weight bold))))
+ '(vhdl-font-lock-reserved-words-face ((t (:foreground "Orange" :weight bold))))
  '(vhdl-font-lock-translate-off-face ((t (:background "LightGray"))))
  '(vhdl-speedbar-architecture-face ((t (:foreground "Blue"))))
  '(vhdl-speedbar-architecture-selected-face ((t (:foreground "Blue" :underline t))))
@@ -698,7 +698,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(widget-inactive-face ((t (:foreground "grey70"))))
  '(widget-single-line-field ((t (:background "dim gray"))))
  '(widget-single-line-field-face ((t (:background "dim gray"))))
- '(woman-bold-face ((t (:bold t))))
+ '(woman-bold-face ((t (:weight bold))))
  '(woman-italic-face ((t (:foreground "beige"))))
  '(woman-unknown-face ((t (:foreground "LightSalmon")))))
 
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index dff4a52b33a..227b22f0bbb 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -2812,7 +2812,7 @@ FG and BG are the main colors."
     `(jabber-activity-face ((,c :foreground ,modeline-info)))
     `(jabber-roster-user-away ((,c :foreground ,red-faint)))
     `(jabber-roster-user-xa ((,c :foreground ,magenta :italic t)))
-    `(jabber-roster-user-dnd ((,c :foreground ,red :bold t)))
+    `(jabber-roster-user-dnd ((,c :foreground ,red :weight bold)))
     `(jabber-roster-user-chatty ((,c :foreground ,cyan-intense)))
     `(jabber-roster-user-error ((,c :inherit error)))
     `(jabber-roster-user-offline ((,c :foreground ,fg-dim :italic t)))
diff --git a/lisp/faces.el b/lisp/faces.el
index a1e2175dbd9..145af31a3d4 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2625,9 +2625,9 @@ unwanted effects."
 
 (defface line-number-major-tick
   '((((class color grayscale) (background light))
-     :background "grey85" :bold t)
+     :background "grey85" :weight bold)
     (((class color grayscale) (background dark))
-     :background "grey75" :bold t)
+     :background "grey75" :weight bold)
     (t :inherit line-number))
   "Face for highlighting \"major ticks\" (as in a ruler).
 When `display-line-numbers-major-tick' is positive, highlight
@@ -2646,9 +2646,9 @@ unwanted effects."
 
 (defface line-number-minor-tick
   '((((class color grayscale) (background light))
-     :background "grey95" :bold t)
+     :background "grey95" :weight bold)
     (((class color grayscale) (background dark))
-     :background "grey55" :bold t)
+     :background "grey55" :weight bold)
     (t :inherit line-number))
   "Face for highlighting \"minor ticks\" (as in a ruler).
 When `display-line-numbers-minor-tick' is positive, highlight
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 47499262b37..6ea794840ab 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -453,7 +453,7 @@ and the latter avoids underlining any whitespace at all."
   :group 'gnus-article-emphasis
   :type 'regexp)
 
-(defface gnus-emphasis-bold '((t (:bold t)))
+(defface gnus-emphasis-bold '((t (:weight bold)))
   "Face used for displaying strong emphasized text (*word*)."
   :group 'gnus-article-emphasis)
 
@@ -465,7 +465,7 @@ and the latter avoids underlining any whitespace at all."
   "Face used for displaying underlined emphasized text (_word_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-underline-bold '((t (:bold t :underline t)))
+(defface gnus-emphasis-underline-bold '((t (:weight bold :underline t)))
   "Face used for displaying underlined bold emphasized text (_*word*_)."
   :group 'gnus-article-emphasis)
 
@@ -473,12 +473,12 @@ and the latter avoids underlining any whitespace at all."
   "Face used for displaying underlined italic emphasized text (_/word/_)."
   :group 'gnus-article-emphasis)
 
-(defface gnus-emphasis-bold-italic '((t (:bold t :italic t)))
+(defface gnus-emphasis-bold-italic '((t (:weight bold :italic t)))
   "Face used for displaying bold italic emphasized text (/*word*/)."
   :group 'gnus-article-emphasis)
 
 (defface gnus-emphasis-underline-bold-italic
-  '((t (:bold t :italic t :underline t)))
+  '((t (:weight bold :italic t :underline t)))
   "Face used for displaying underlined bold italic emphasized text.
 Example: (_/*word*/_)."
   :group 'gnus-article-emphasis)
@@ -797,7 +797,7 @@ All the other `gnus-header-' faces inherit from this face."
       (background light))
      (:foreground "red4" :inherit gnus-header))
     (t
-     (:bold t :italic t :inherit gnus-header)))
+     (:weight bold :italic t :inherit gnus-header)))
   "Face used for displaying subject headers."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
@@ -825,7 +825,7 @@ articles."
       (background light))
      (:foreground "maroon" :inherit gnus-header))
     (t
-     (:bold t :inherit gnus-header)))
+     (:weight bold :inherit gnus-header)))
   "Face used for displaying header names."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 1353f653600..9dbc444a05c 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -182,16 +182,16 @@ If nil, a faster, but more primitive, buffer is used instead."
     (gnus-run-hooks 'gnus-server-menu-hook)))
 
 (defface gnus-server-agent
-  '((((class color) (background light)) (:foreground "PaleTurquoise" :bold t))
-    (((class color) (background dark)) (:foreground "PaleTurquoise" :bold t))
-    (t (:bold t)))
+  '((((class color) (background light)) (:foreground "PaleTurquoise" :weight bold))
+    (((class color) (background dark)) (:foreground "PaleTurquoise" :weight bold))
+    (t (:weight bold)))
   "Face used for displaying AGENTIZED servers."
   :group 'gnus-server-visual)
 
 (defface gnus-server-cloud
-  '((((class color) (background light)) (:foreground "ForestGreen" :bold t))
-    (((class color) (background dark)) (:foreground "PaleGreen" :bold t))
-    (t (:bold t)))
+  '((((class color) (background light)) (:foreground "ForestGreen" :weight bold))
+    (((class color) (background dark)) (:foreground "PaleGreen" :weight bold))
+    (t (:weight bold)))
   "Face used for displaying Cloud-synced servers."
   :group 'gnus-server-visual)
 
@@ -203,9 +203,9 @@ If nil, a faster, but more primitive, buffer is used instead."
   :group 'gnus-server-visual)
 
 (defface gnus-server-opened
-  '((((class color) (background light)) (:foreground "Green3" :bold t))
-    (((class color) (background dark)) (:foreground "Green1" :bold t))
-    (t (:bold t)))
+  '((((class color) (background light)) (:foreground "Green3" :weight bold))
+    (((class color) (background dark)) (:foreground "Green1" :weight bold))
+    (t (:weight bold)))
   "Face used for displaying OPENED servers."
   :group 'gnus-server-visual)
 
@@ -218,16 +218,16 @@ If nil, a faster, but more primitive, buffer is used instead."
   :group 'gnus-server-visual)
 
 (defface gnus-server-denied
-  '((((class color) (background light)) (:foreground "Red" :bold t))
-    (((class color) (background dark)) (:foreground "Pink" :bold t))
-    (t (:inverse-video t :bold t)))
+  '((((class color) (background light)) (:foreground "Red" :weight bold))
+    (((class color) (background dark)) (:foreground "Pink" :weight bold))
+    (t (:inverse-video t :weight bold)))
   "Face used for displaying DENIED servers."
   :group 'gnus-server-visual)
 
 (defface gnus-server-offline
-  '((((class color) (background light)) (:foreground "Orange" :bold t))
-    (((class color) (background dark)) (:foreground "Yellow" :bold t))
-    (t (:inverse-video t :bold t)))
+  '((((class color) (background light)) (:foreground "Orange" :weight bold))
+    (((class color) (background dark)) (:foreground "Yellow" :weight bold))
+    (t (:inverse-video t :weight bold)))
   "Face used for displaying OFFLINE servers."
   :group 'gnus-server-visual)
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 672c6b9a8a2..cbf49810bec 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -369,7 +369,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-1
-  '((t (:inherit gnus-group-news-1-empty :bold t)))
+  '((t (:inherit gnus-group-news-1-empty :weight bold)))
   "Level 1 newsgroup face."
   :group 'gnus-group)
 
@@ -386,7 +386,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-2
-  '((t (:inherit gnus-group-news-2-empty :bold t)))
+  '((t (:inherit gnus-group-news-2-empty :weight bold)))
   "Level 2 newsgroup face."
   :group 'gnus-group)
 
@@ -403,7 +403,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-3
-  '((t (:inherit gnus-group-news-3-empty :bold t)))
+  '((t (:inherit gnus-group-news-3-empty :weight bold)))
   "Level 3 newsgroup face."
   :group 'gnus-group)
 
@@ -420,7 +420,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-4
-  '((t (:inherit gnus-group-news-4-empty :bold t)))
+  '((t (:inherit gnus-group-news-4-empty :weight bold)))
   "Level 4 newsgroup face."
   :group 'gnus-group)
 
@@ -437,7 +437,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-5
-  '((t (:inherit gnus-group-news-5-empty :bold t)))
+  '((t (:inherit gnus-group-news-5-empty :weight bold)))
   "Level 5 newsgroup face."
   :group 'gnus-group)
 
@@ -454,7 +454,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-6
-  '((t (:inherit gnus-group-news-6-empty :bold t)))
+  '((t (:inherit gnus-group-news-6-empty :weight bold)))
   "Level 6 newsgroup face."
   :group 'gnus-group)
 
@@ -471,7 +471,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-news-low
-  '((t (:inherit gnus-group-news-low-empty :bold t)))
+  '((t (:inherit gnus-group-news-low-empty :weight bold)))
   "Low level newsgroup face."
   :group 'gnus-group)
 
@@ -488,7 +488,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-mail-1
-  '((t (:inherit gnus-group-mail-1-empty :bold t)))
+  '((t (:inherit gnus-group-mail-1-empty :weight bold)))
   "Level 1 mailgroup face."
   :group 'gnus-group)
 
@@ -505,7 +505,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-mail-2
-  '((t (:inherit gnus-group-mail-2-empty :bold t)))
+  '((t (:inherit gnus-group-mail-2-empty :weight bold)))
   "Level 2 mailgroup face."
   :group 'gnus-group)
 
@@ -522,7 +522,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-group)
 
 (defface gnus-group-mail-3
-  '((t (:inherit gnus-group-mail-3-empty :bold t)))
+  '((t (:inherit gnus-group-mail-3-empty :weight bold)))
   "Level 3 mailgroup face."
   :group 'gnus-group)
 
@@ -534,12 +534,12 @@ If nil, there will be no Gnus logo in the mode-line."
       (background light))
      (:foreground "DeepPink4"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Low level empty mailgroup face."
   :group 'gnus-group)
 
 (defface gnus-group-mail-low
-  '((t (:inherit gnus-group-mail-low-empty :bold t)))
+  '((t (:inherit gnus-group-mail-low-empty :weight bold)))
   "Low level mailgroup face."
   :group 'gnus-group)
 
@@ -569,7 +569,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-high-ticked
-  '((t (:inherit gnus-summary-normal-ticked :bold t)))
+  '((t (:inherit gnus-summary-normal-ticked :weight bold)))
   "Face used for high interest ticked articles."
   :group 'gnus-summary)
 
@@ -591,7 +591,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-high-ancient
-  '((t (:inherit gnus-summary-normal-ancient :bold t)))
+  '((t (:inherit gnus-summary-normal-ancient :weight bold)))
   "Face used for high interest ancient articles."
   :group 'gnus-summary)
 
@@ -611,7 +611,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-high-undownloaded
-  '((t (:inherit gnus-summary-normal-undownloaded :bold t)))
+  '((t (:inherit gnus-summary-normal-undownloaded :weight bold)))
   "Face used for high interest uncached articles."
   :group 'gnus-summary)
 
@@ -627,7 +627,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-high-unread
-  '((t (:inherit gnus-summary-normal-unread :bold t)))
+  '((t (:inherit gnus-summary-normal-unread :weight bold)))
   "Face used for high interest unread articles."
   :group 'gnus-summary)
 
@@ -649,7 +649,7 @@ If nil, there will be no Gnus logo in the mode-line."
   :group 'gnus-summary)
 
 (defface gnus-summary-high-read
-  '((t (:inherit gnus-summary-normal-read :bold t)))
+  '((t (:inherit gnus-summary-normal-read :weight bold)))
   "Face used for high interest read articles."
   :group 'gnus-summary)
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 35338877371..6269eda8423 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1520,24 +1520,24 @@ starting with `not' and followed by regexps."
 (defface message-header-to
   '((((class color)
       (background dark))
-     :foreground "DarkOliveGreen1" :bold t)
+     :foreground "DarkOliveGreen1" :weight bold)
     (((class color)
       (background light))
-     :foreground "MidnightBlue" :bold t)
+     :foreground "MidnightBlue" :weight bold)
     (t
-     :bold t :italic t))
+     :weight bold :italic t))
   "Face used for displaying To headers."
   :group 'message-faces)
 
 (defface message-header-cc
   '((((class color)
       (background dark))
-     :foreground "chartreuse1" :bold t)
+     :foreground "chartreuse1" :weight bold)
     (((class color)
       (background light))
      :foreground "MidnightBlue")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying Cc headers."
   :group 'message-faces)
 
@@ -1547,21 +1547,21 @@ starting with `not' and followed by regexps."
      :foreground "OliveDrab1")
     (((class color)
       (background light))
-     :foreground "navy blue" :bold t)
+     :foreground "navy blue" :weight bold)
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying Subject headers."
   :group 'message-faces)
 
 (defface message-header-newsgroups
   '((((class color)
       (background dark))
-     :foreground "yellow" :bold t :italic t)
+     :foreground "yellow" :weight bold :italic t)
     (((class color)
       (background light))
-     :foreground "blue4" :bold t :italic t)
+     :foreground "blue4" :weight bold :italic t)
     (t
-     :bold t :italic t))
+     :weight bold :italic t))
   "Face used for displaying Newsgroups headers."
   :group 'message-faces)
 
@@ -1573,7 +1573,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "steel blue")
     (t
-     :bold t :italic t))
+     :weight bold :italic t))
   "Face used for displaying other headers."
   :group 'message-faces)
 
@@ -1585,7 +1585,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "cornflower blue")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying header names."
   :group 'message-faces)
 
@@ -1597,7 +1597,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "blue")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying X-Header headers."
   :group 'message-faces)
 
@@ -1609,7 +1609,7 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "brown")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying the separator."
   :group 'message-faces)
 
@@ -1621,7 +1621,7 @@ starting with `not' and followed by regexps."
       (background light))
      (:foreground "red1"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying 1st-level cited text."
   :group 'message-faces)
 
@@ -1633,7 +1633,7 @@ starting with `not' and followed by regexps."
       (background light))
      (:foreground "red4"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying 2nd-level cited text."
   :group 'message-faces)
 
@@ -1645,7 +1645,7 @@ starting with `not' and followed by regexps."
       (background light))
      (:foreground "OliveDrab4"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying 3rd-level cited text."
   :group 'message-faces)
 
@@ -1657,7 +1657,7 @@ starting with `not' and followed by regexps."
       (background light))
      (:foreground "SteelBlue4"))
     (t
-     (:bold t)))
+     (:weight bold)))
   "Face used for displaying 4th-level cited text."
   :group 'message-faces)
 
@@ -1673,11 +1673,11 @@ starting with `not' and followed by regexps."
       (background light))
      :foreground "ForestGreen")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying MML."
   :group 'message-faces)
 
-(defface message-signature-separator '((t :bold t))
+(defface message-signature-separator '((t :weight bold))
   "Face used for displaying the signature separator."
   :group 'message-faces
   :version "28.1")
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 808b82320cc..8f1fb01818d 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -3318,7 +3318,7 @@ sequence."
       (((class color) (background dark))
        (:foreground "LightGoldenRod"))
       (t
-       (:bold t))))
+       (:weight bold))))
     (mh-folder-msg-number
      ((((class color) (min-colors 64) (background light))
        (:foreground "snow4"))
@@ -3336,18 +3336,18 @@ sequence."
       (((class color))
        (:foreground "yellow" :weight light))
       (((class grayscale) (background light))
-       (:foreground "Gray90" :bold t :italic t))
+       (:foreground "Gray90" :weight bold :italic t))
       (((class grayscale) (background dark))
-       (:foreground "DimGray" :bold t :italic t))
+       (:foreground "DimGray" :weight bold :italic t))
       (t
-       (:bold t :italic t))))
+       (:weight bold :italic t))))
     (mh-folder-subject
      ((((class color) (background light))
        (:foreground "blue4"))
       (((class color) (background dark))
        (:foreground "yellow"))
       (t
-       (:bold t))))
+       (:weight bold))))
     (mh-folder-tick
      ((((class color) (background light))
        (:background "#dddf7e"))
@@ -3374,14 +3374,14 @@ sequence."
       (((class color) (background dark))
        (:background "gray10"))
       (t
-       (:bold t))))
+       (:weight bold))))
     (mh-search-folder
      ((((class color) (background light))
-       (:foreground "dark green" :bold t))
+       (:foreground "dark green" :weight bold))
       (((class color) (background dark))
-       (:foreground "indian red" :bold t))
+       (:foreground "indian red" :weight bold))
       (t
-       (:bold t))))
+       (:weight bold))))
     (mh-show-cc
      ((((class color) (min-colors 64) (background light))
        (:foreground "DarkGoldenrod"))
@@ -3390,11 +3390,11 @@ sequence."
       (((class color))
        (:foreground "yellow" :weight light))
       (((class grayscale) (background light))
-       (:foreground "Gray90" :bold t :italic t))
+       (:foreground "Gray90" :weight bold :italic t))
       (((class grayscale) (background dark))
-       (:foreground "DimGray" :bold t :italic t))
+       (:foreground "DimGray" :weight bold :italic t))
       (t
-       (:bold t :italic t))))
+       (:weight bold :italic t))))
     (mh-show-date
      ((((class color) (min-colors 64) (background light))
        (:foreground "ForestGreen"))
@@ -3403,18 +3403,18 @@ sequence."
       (((class color))
        (:foreground "green"))
       (((class grayscale) (background light))
-       (:foreground "Gray90" :bold t))
+       (:foreground "Gray90" :weight bold))
       (((class grayscale) (background dark))
-       (:foreground "DimGray" :bold t))
+       (:foreground "DimGray" :weight bold))
       (t
-       (:bold t :underline t))))
+       (:weight bold :underline t))))
     (mh-show-from
      ((((class color) (background light))
        (:foreground "red3"))
       (((class color) (background dark))
        (:foreground "cyan"))
       (t
-       (:bold t))))
+       (:weight bold))))
     (mh-show-header
      ((((class color) (min-colors 64) (background light))
        (:foreground "RosyBrown"))
@@ -3428,9 +3428,9 @@ sequence."
        (:foreground "LightGray" :italic t))
       (t
        (:italic t))))
-    (mh-show-pgg-bad ((t (:bold t :foreground "DeepPink1"))))
-    (mh-show-pgg-good ((t (:bold t :foreground "LimeGreen"))))
-    (mh-show-pgg-unknown ((t (:bold t :foreground "DarkGoldenrod2"))))
+    (mh-show-pgg-bad ((t (:weight bold :foreground "DeepPink1"))))
+    (mh-show-pgg-good ((t (:weight bold :foreground "LimeGreen"))))
+    (mh-show-pgg-unknown ((t (:weight bold :foreground "DarkGoldenrod2"))))
     (mh-show-signature ((t (:italic t))))
     (mh-show-to
      ((((class color) (background light))
@@ -3509,7 +3509,7 @@ not added to the returned spec."
 
 (defface mh-folder-cur-msg-number
   (mh-face-data 'mh-folder-msg-number
-                '((t (:inherit mh-folder-msg-number :bold t))))
+                '((t (:inherit mh-folder-msg-number :weight bold))))
   "Current message number face."
   :group 'mh-faces
   :group 'mh-folder
@@ -3681,7 +3681,7 @@ The background and foreground are used in the image."
 
 (defface mh-speedbar-folder-with-unseen-messages
   (mh-face-data 'mh-speedbar-folder
-                '((t (:inherit mh-speedbar-folder :bold t))))
+                '((t (:inherit mh-speedbar-folder :weight bold))))
   "Folder face when folder contains unread messages."
   :group 'mh-faces
   :group 'mh-speedbar
@@ -3696,7 +3696,7 @@ The background and foreground are used in the image."
 
 (defface mh-speedbar-selected-folder-with-unseen-messages
   (mh-face-data 'mh-speedbar-selected-folder
-                '((t (:inherit mh-speedbar-selected-folder :bold t))))
+                '((t (:inherit mh-speedbar-selected-folder :weight bold))))
   "Selected folder face when folder contains unread messages."
   :group 'mh-faces
   :group 'mh-speedbar
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 7716c27b13a..6d051e321a7 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -348,7 +348,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
 
 (defface dictionary-button-face
   '((t
-     (:bold t)))
+     (:weight bold)))
   "The face that is used for displaying buttons."
   :group 'dictionary
   :version "28.1")
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index f3a484ee551..1f206b91143 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -103,8 +103,8 @@ color of the frame."
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
     (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
-    (((class color) (min-colors 8)) (:foreground "blue" :bold t))
-    (t (:bold t)))
+    (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
+    (t (:weight bold)))
   "Face used for drawers."
   :group 'org-faces)
 
@@ -228,30 +228,30 @@ calendar."
   "Face for diary-like sexp date specifications."
   :group 'org-faces)
 
-(defface org-tag '((t (:bold t)))
+(defface org-tag '((t (:weight bold)))
   "Default face for tags.
 Note that the variable `org-tag-faces' can be used to overrule this face for
 specific tags."
   :group 'org-faces)
 
-(defface org-list-dt '((t (:bold t)))
+(defface org-list-dt '((t (:weight bold)))
   "Default face for definition terms in lists."
   :group 'org-faces)
 
 (defface org-todo		 ;Copied from `font-lock-warning-face'
-  '((((class color) (min-colors 16) (background light)) (:foreground "Red1" :bold t))
-    (((class color) (min-colors 16) (background dark))  (:foreground "Pink" :bold t))
-    (((class color) (min-colors 8)  (background light)) (:foreground "red"  :bold t))
-    (((class color) (min-colors 8)  (background dark))  (:foreground "red"  :bold t))
-    (t (:inverse-video t :bold t)))
+  '((((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
+    (((class color) (min-colors 16) (background dark))  (:foreground "Pink" :weight bold))
+    (((class color) (min-colors 8)  (background light)) (:foreground "red"  :weight bold))
+    (((class color) (min-colors 8)  (background dark))  (:foreground "red"  :weight bold))
+    (t (:inverse-video t :weight bold)))
   "Face for TODO keywords."
   :group 'org-faces)
 
 (defface org-done		    ;Copied from `font-lock-type-face'
-  '((((class color) (min-colors 16) (background light)) (:foreground "ForestGreen" :bold t))
-    (((class color) (min-colors 16) (background dark)) (:foreground "PaleGreen" :bold t))
+  '((((class color) (min-colors 16) (background light)) (:foreground "ForestGreen" :weight bold))
+    (((class color) (min-colors 16) (background dark)) (:foreground "PaleGreen" :weight bold))
     (((class color) (min-colors 8)) (:foreground "green"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face used for todo keywords that indicate DONE items."
   :group 'org-faces)
 
@@ -271,7 +271,7 @@ of the frame, for example."
 (defface org-headline-todo	  ;Copied from `font-lock-string-face'
   '((((class color) (min-colors 16) (background light)) (:foreground "Red4"))
     (((class color) (min-colors 16) (background dark)) (:foreground "Pink2"))
-    (((class color) (min-colors 8)  (background light)) (:bold t)))
+    (((class color) (min-colors 8)  (background light)) (:weight bold)))
   "Face used to indicate that a headline is marked as TODO.
 This face is only used if `org-fontify-todo-headline' is set.  If applies
 to the part of the headline after the TODO keyword."
@@ -404,7 +404,7 @@ changes."
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
     (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
-    (t (:bold t :italic t)))
+    (t (:weight bold :italic t)))
   "Face for formulas."
   :group 'org-faces)
 
@@ -509,8 +509,8 @@ content of these blocks will still be treated as Org syntax."
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
     (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
-    (((class color) (min-colors 8)) (:foreground "blue" :bold t))
-    (t (:bold t)))
+    (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
+    (t (:weight bold)))
   "Face used in agenda for captions and dates."
   :group 'org-faces)
 
@@ -552,7 +552,7 @@ which days belong to the weekend."
   '((((class color) (min-colors 88) (background light)) (:foreground "DarkGreen"))
     (((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen"))
     (((class color) (min-colors 8)) (:foreground "green"))
-    (t (:bold t :italic t)))
+    (t (:weight bold :italic t)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 
@@ -560,7 +560,7 @@ which days belong to the weekend."
   '((((class color) (min-colors 88) (background light)) (:foreground "DarkGreen"))
     (((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen"))
     (((class color) (min-colors 8)) (:foreground "green"))
-    (t (:bold t :italic t)))
+    (t (:weight bold :italic t)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 
@@ -574,8 +574,8 @@ which days belong to the weekend."
   '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
-    (((class color) (min-colors 8)  (background dark)) (:foreground "red" :bold t))
-    (t (:bold t)))
+    (((class color) (min-colors 8)  (background dark)) (:foreground "red" :weight bold))
+    (t (:weight bold)))
   "Face for items scheduled previously, and not yet done."
   :group 'org-faces)
 
@@ -588,8 +588,8 @@ See also `org-agenda-deadline-faces'."
   '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
-    (((class color) (min-colors 8)  (background dark)) (:foreground "red" :bold t))
-    (t (:bold t)))
+    (((class color) (min-colors 8)  (background dark)) (:foreground "red" :weight bold))
+    (t (:weight bold)))
   "Face for items scheduled previously, and not yet done.
 See also `org-agenda-deadline-faces'."
   :group 'org-faces)
diff --git a/lisp/proced.el b/lisp/proced.el
index 1f1bedc5e42..6d47ff98a97 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -463,7 +463,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
 
 (defface proced-uninterruptible-sleep-status-code
   '((((class color)) (:foreground "red"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face used in Proced buffers for uninterruptible sleep status code character \"D\"."
   :version "29.1")
 
@@ -471,7 +471,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
   '((((class color) (min-colors 88) (background dark)) (:foreground "DeepSkyBlue"))
     (((class color) (background dark)) (:foreground "cyan"))
     (((class color) (background light)) (:foreground "blue"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face used in Proced buffers for executable names.
 The first word in the process arguments attribute is assumed to
 be the executable that runs in the process."
@@ -536,8 +536,8 @@ be the executable that runs in the process."
   :version "29.1")
 
 (defface proced-cpu
-  '((((class color) (min-colors 88)) (:foreground "#6d5cc3" :bold t))
-    (t (:bold t)))
+  '((((class color) (min-colors 88)) (:foreground "#6d5cc3" :weight bold))
+    (t (:weight bold)))
   "Face used in Proced buffers for process CPU utilization."
   :version "29.1")
 
@@ -548,13 +548,13 @@ be the executable that runs in the process."
   :version "29.1")
 
 (defface proced-user
-  '((t (:bold t)))
+  '((t (:weight bold)))
   "Face used in Proced buffers for the user owning the process."
   :version "29.1")
 
 (defface proced-time-colon
   '((((class color) (min-colors 88)) (:foreground "DarkMagenta"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face used in Proced buffers for the colon in time strings."
   :version "29.1")
 
diff --git a/lisp/progmodes/erts-mode.el b/lisp/progmodes/erts-mode.el
index 604b0373b11..8d4b20b668f 100644
--- a/lisp/progmodes/erts-mode.el
+++ b/lisp/progmodes/erts-mode.el
@@ -38,7 +38,7 @@
       (background light))
      :foreground "cornflower blue")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying specification names."
   :group 'erts-mode)
 
@@ -50,7 +50,7 @@
       (background light))
      :foreground "blue")
     (t
-     :bold t))
+     :weight bold))
   "Face used for displaying specification values."
   :group 'erts-mode)
 
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 23767406b96..5898cced17f 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1881,9 +1881,9 @@ Argument BOUND is a buffer position limiting searching."
     "Prolog mode face for highlighting exit trace lines."
     :group 'prolog-faces)
   (defface prolog-exception-face
-    '((((class grayscale)) (:bold t :italic t :underline t))
-      (((class color)) (:bold t :foreground "black" :background "Khaki"))
-      (t (:bold t :italic t :underline t)))
+    '((((class grayscale)) (:weight bold :italic t :underline t))
+      (((class color)) (:weight bold :foreground "black" :background "Khaki"))
+      (t (:weight bold :italic t :underline t)))
     "Prolog mode face for highlighting exception trace lines."
     :group 'prolog-faces)
   (defface prolog-warning-face
@@ -1899,9 +1899,9 @@ Argument BOUND is a buffer position limiting searching."
     '((((class color) (background light)) (:foreground "Purple"))
       (((class color) (background dark)) (:foreground "Cyan"))
       (((class grayscale) (background light))
-       :foreground "LightGray" :bold t)
-      (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
-      (t (:bold t)))
+       :foreground "LightGray" :weight bold)
+      (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
+      (t (:weight bold)))
     "Face name to use for compiler warnings."
     :group 'prolog-faces)
   (define-obsolete-face-alias 'prolog-builtin-face
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index e75721cb729..bb86e90c428 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -3287,10 +3287,10 @@ See also `verilog-font-lock-extra-types'.")
 (defface verilog-font-lock-p1800-face
   '((((class color)
       (background light))
-     (:foreground "DarkOrange3" :bold t ))
+     (:foreground "DarkOrange3" :weight bold ))
     (((class color)
       (background dark))
-     (:foreground "orange1" :bold t ))
+     (:foreground "orange1" :weight bold ))
     (t (:italic t)))
   "Font lock mode face used to highlight P1800 keywords."
   :group 'font-lock-highlighting-faces)
@@ -3302,10 +3302,10 @@ See also `verilog-font-lock-extra-types'.")
 (defface verilog-font-lock-ams-face
   '((((class color)
       (background light))
-     (:foreground "Purple" :bold t ))
+     (:foreground "Purple" :weight bold ))
     (((class color)
       (background dark))
-     (:foreground "orange1" :bold t ))
+     (:foreground "orange1" :weight bold ))
     (t (:italic t)))
   "Font lock mode face used to highlight AMS keywords."
   :group 'font-lock-highlighting-faces)
@@ -3316,10 +3316,10 @@ See also `verilog-font-lock-extra-types'.")
 (defface verilog-font-lock-grouping-keywords-face
   '((((class color)
       (background light))
-     (:foreground "Purple" :bold t ))
+     (:foreground "Purple" :weight bold ))
     (((class color)
       (background dark))
-     (:foreground "orange1" :bold t ))
+     (:foreground "orange1" :weight bold ))
     (t (:italic t)))
   "Font lock mode face used to highlight verilog grouping keywords."
   :group 'font-lock-highlighting-faces)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 675c6085071..a7fa25950ea 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -13585,9 +13585,9 @@ This does background highlighting of translate-off regions.")
 
 (defface vhdl-font-lock-prompt-face
   '((((min-colors 88) (class color) (background light))
-     (:foreground "Red1" :bold t))
-    (((class color) (background light)) (:foreground "Red" :bold t))
-    (((class color) (background dark)) (:foreground "Pink" :bold t))
+     (:foreground "Red1" :weight bold))
+    (((class color) (background light)) (:foreground "Red" :weight bold))
+    (((class color) (background dark)) (:foreground "Pink" :weight bold))
     (t (:inverse-video t)))
   "Font lock mode face used to highlight prompts."
   :group 'vhdl-highlight-faces)
@@ -13595,36 +13595,36 @@ This does background highlighting of translate-off regions.")
 (defface vhdl-font-lock-attribute-face
   '((((class color) (background light)) (:foreground "Orchid"))
     (((class color) (background dark)) (:foreground "LightSteelBlue"))
-    (t (:italic t :bold t)))
+    (t (:italic t :weight bold)))
   "Font lock mode face used to highlight standardized attributes."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-enumvalue-face
   '((((class color) (background light)) (:foreground "SaddleBrown"))
     (((class color) (background dark)) (:foreground "BurlyWood"))
-    (t (:italic t :bold t)))
+    (t (:italic t :weight bold)))
   "Font lock mode face used to highlight standardized enumeration values."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-function-face
   '((((class color) (background light)) (:foreground "Cyan4"))
     (((class color) (background dark)) (:foreground "Orchid1"))
-    (t (:italic t :bold t)))
+    (t (:italic t :weight bold)))
   "Font lock mode face used to highlight standardized functions and packages."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-directive-face
   '((((class color) (background light)) (:foreground "CadetBlue"))
     (((class color) (background dark)) (:foreground "Aquamarine"))
-    (t (:italic t :bold t)))
+    (t (:italic t :weight bold)))
   "Font lock mode face used to highlight directives."
   :group 'vhdl-highlight-faces)
 
 (defface vhdl-font-lock-reserved-words-face
-  '((((class color) (background light)) (:foreground "Orange" :bold t))
+  '((((class color) (background light)) (:foreground "Orange" :weight bold))
     (((min-colors 88) (class color) (background dark))
-     (:foreground "Yellow1" :bold t))
-    (((class color) (background dark)) (:foreground "Yellow" :bold t))
+     (:foreground "Yellow1" :weight bold))
+    (((class color) (background dark)) (:foreground "Yellow" :weight bold))
     (t ()))
   "Font lock mode face used to highlight additional reserved words."
   :group 'vhdl-highlight-faces)