diff options
| author | Karoly Lorentey <[email protected]> | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /src/frame.c | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* [email protected]/emacs--cvs-trunk--0--base-0
tag of [email protected]/emacs--cvs-trunk--0--patch-474
* [email protected]/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* [email protected]/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-393
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 864ec625c2..ecbae7f593 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003, 2004, 2005 - Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2582,8 +2582,7 @@ DEFUN ("frame-char-width", Fframe_char_width, Sframe_char_width, 0, 1, 0, doc: /* Width in pixels of characters in the font in frame FRAME. If FRAME is omitted, the selected frame is used. -The width is the same for all characters, because -currently Emacs supports only fixed-width fonts. +On a graphical screen, the width is the standard width of the default font. For a terminal screen, the value is always 1. */) (frame) Lisp_Object frame; |