(set-frame-font): Default to frame's current default font.

93289292 · Miles Bader · d18c4f98 · 93289292 · 93289292
Commit 93289292 authored Jun 06, 2003 by Miles Bader
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/frame.el lisp/frame.el +4 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2003-06-06  Miles Bader  <miles@gnu.org>
+
+	* frame.el (set-frame-font): Default to frame's current default font.
+
 2003-06-06  Kim F. Storm  <storm@cua.dk>
  
 	* info.el (Info-fontify-node): Don't refill over lines ending in a

--- a/lisp/frame.el
+++ b/lisp/frame.el
 ;;; frame.el --- multi-frame management independent of window systems

-;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001
+;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003
 ;;   Free Software Foundation, Inc.

 ;; Maintainer: FSF
@@ -816,7 +816,9 @@ pixels) is kept by adjusting the numbers of the lines and columns."
 			 (mapcar #'list
 				 ;; x-list-fonts will fail with an error
 				 ;; if this frame doesn't support fonts.
-				 (x-list-fonts "*" nil (selected-frame))))))
+				 (x-list-fonts "*" nil (selected-frame)))
+			 nil nil nil nil
+			 (frame-parameter nil 'font))))
     (list font current-prefix-arg)))
  (let (fht fwd)
    (if keep-size