Merge branch 'master' into feature/igc3feature/igc3

1 files changed, 10 insertions, 0 deletions

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index a269cae0c9b..c5ae2a15557 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -390,6 +390,16 @@ which can be the value of the `face' text property."
          (list (list "x-color" (cadr face))))
         ((and (listp face) (eq (car face) :background))
          (list (list "x-bg-color" (cadr face))))
+        ((and (listp face) (eq (car face) :underline))
+         (list (list "underline")))
+        ((and (listp face)
+              (eq (car face) :weight)
+              (eq (cadr face) 'bold))
+         (list (list "bold")))
+        ((and (listp face)
+              (eq (car face) :slant)
+              (memq (cadr face) '(italic oblique)))
+         (list (list "italic")))
         ((listp face)
          (apply #'append (mapcar #'enriched-face-ans face)))
         ((let* ((fg (face-attribute face :foreground))