aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-08-02 08:12:35 +0000
committerJuanma Barranquero2005-08-02 08:12:35 +0000
commit31b7cc74d3a91fdd30c95a4e8d7a30c27726cecb (patch)
treebb22adc2b0c60f171489f57c736968e21105ca30
parentafea040a3d16a892ca86589c33ea4b0e30f7a320 (diff)
downloademacs-31b7cc74d3a91fdd30c95a4e8d7a30c27726cecb.tar.gz
emacs-31b7cc74d3a91fdd30c95a4e8d7a30c27726cecb.zip
(Fframe_char_width): Doc fix.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d4df7540583..6d8608dde22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-08-02 Richard M. Stallman <rms@gnu.org>
2
3 * frame.c (Fframe_char_width): Doc fix.
4
12005-07-30 Juanma Barranquero <lekktu@gmail.com> 52005-07-30 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>: 7 * xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
diff --git a/src/frame.c b/src/frame.c
index b23fbe9cd12..84920a97b8c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2353,8 +2353,7 @@ DEFUN ("frame-char-width", Fframe_char_width, Sframe_char_width,
2353 0, 1, 0, 2353 0, 1, 0,
2354 doc: /* Width in pixels of characters in the font in frame FRAME. 2354 doc: /* Width in pixels of characters in the font in frame FRAME.
2355If FRAME is omitted, the selected frame is used. 2355If FRAME is omitted, the selected frame is used.
2356The width is the same for all characters, because 2356On a graphical screen, the width is the standard width of the default font.
2357currently Emacs supports only fixed-width fonts.
2358For a terminal screen, the value is always 1. */) 2357For a terminal screen, the value is always 1. */)
2359 (frame) 2358 (frame)
2360 Lisp_Object frame; 2359 Lisp_Object frame;