diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /src/frame.h | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
| download | emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.gz | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/frame.h b/src/frame.h index 81d3477121e..838b61bb703 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,5 +1,6 @@ /* Define frame-object for GNU Emacs. - Copyright (C) 1993, 1994, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -443,6 +444,10 @@ struct frame realized. Reset to zero whenever the default face changes. Used to see the difference between a font change and face change. */ unsigned default_face_done_p : 1; + + /* Set to non-zero if this frame has already been hscrolled during + current redisplay. */ + unsigned already_hscrolled_p : 1; }; #ifdef MULTI_KBOARD @@ -808,13 +813,13 @@ extern Lisp_Object selected_frame; Display-related Macros ***********************************************************************/ -/* Canonical y-unit on frame F. +/* Canonical y-unit on frame F. This value currently equals the line height of the frame (which is the height of the default font of F). */ #define FRAME_LINE_HEIGHT(F) ((F)->line_height) -/* Canonical x-unit on frame F. +/* Canonical x-unit on frame F. This value currently equals the average width of the default font of F. */ #define FRAME_COLUMN_WIDTH(F) ((F)->column_width) |