From 375befcacc8e7c37ec490145aa6ff9737ad102a1 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Tue, 21 Jan 2025 09:23:03 +0100
Subject: [PATCH] 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.
---
 etc/themes/adwaita-theme.el    | 48 ++++++++++++++---------------
 etc/themes/manoj-dark-theme.el | 56 +++++++++++++++++-----------------
 etc/themes/modus-themes.el     |  2 +-
 lisp/faces.el                  |  8 ++---
 lisp/gnus/gnus-art.el          | 12 ++++----
 lisp/gnus/gnus-srvr.el         | 30 +++++++++---------
 lisp/gnus/gnus.el              | 34 ++++++++++-----------
 lisp/gnus/message.el           | 40 ++++++++++++------------
 lisp/mh-e/mh-e.el              | 44 +++++++++++++-------------
 lisp/net/dictionary.el         |  2 +-
 lisp/org/org-faces.el          | 44 +++++++++++++-------------
 lisp/proced.el                 | 12 ++++----
 lisp/progmodes/erts-mode.el    |  4 +--
 lisp/progmodes/prolog.el       | 12 ++++----
 lisp/progmodes/verilog-mode.el | 12 ++++----
 lisp/progmodes/vhdl-mode.el    | 20 ++++++------
 16 files changed, 190 insertions(+), 190 deletions(-)

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)