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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 173a4e2..7ae84fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/lisp/frame.el b/lisp/frame.el
index 2934153..8ed5776 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,6 +1,6 @@
 ;;; 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