summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2003-06-06 01:32:33 +0000
committerMiles Bader <miles@gnu.org>2003-06-06 01:32:33 +0000
commit9328929244e2f71ca0737b741be27f08fc345023 (patch)
tree8d105f17b2b19d5d5be93b4c86e683ed123f0e28 /lisp/frame.el
parentd18c4f98bdbedcf61972463910f33aa8ea253807 (diff)
downloademacs-9328929244e2f71ca0737b741be27f08fc345023.tar.gz
(set-frame-font): Default to frame's current default font.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 2934153eb98..8ed5776550e 100644
--- 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