(recover-session): Add leading space on added text lines.

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index b1b269c084fb17100d8c99dd970320ed0993aef3..4a7d951aeacf2350e501b2cbc05cc3d6a9ca90ab 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1138,7 +1138,8 @@ selected frame."
            (while (not (eobp))
              (insert "                          ")
              (forward-line 1))))
-       (goto-char (point-min))))
+       (goto-char (point-min)))
+      (print-help-return-message))
     ;; If the *Faces* buffer appears in a different frame,
     ;; copy all the face definitions from FRAME,
     ;; so that the display will reflect the frame that was selected.
@@ -1168,7 +1169,8 @@ selected frame."
     (let ((doc (face-documentation face)))
       (if doc
          (princ doc)
-       (princ "not documented as a face.")))))
+       (princ "not documented as a face.")))
+    (print-help-return-message)))
 \f
 ;;; Setting a face based on a SPEC.
 
@@ -1345,6 +1347,19 @@ If FRAME is nil, the current FRAME is used."
          ;; Put the geometry parameters at the end.
          ;; Copy default-frame-alist so that they go after it.
          (setq parameters (append parameters default-frame-alist parsed)))))
+
+  (if default-enable-multibyte-characters
+      ;; If an ASCII font is specified in PARAMETERS, we try to create
+      ;; a fontset from it, and use it for the new frame.
+      (condition-case nil
+         (let ((font (cdr (assq 'font parameters))))
+           (if (and font
+                    (not (query-fontset font)))
+               (setq parameters
+                     (cons (cons 'font (create-fontset-from-ascii-font font))
+                           parameters))))
+       (error nil)))
+
   (let (frame)
     (if (null global-face-data)
        (progn