diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-02-28 04:52:40 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-02-28 04:52:40 +0000 |
| commit | 057a9ab495a5fd334f9bd3c7704176502e5219c4 (patch) | |
| tree | a833e67f7903c9e091282644c54e1fa6a0abff3c /src/lisp.h | |
| parent | ed62242d19b79fd8c14cd614ec6029e09d6e4618 (diff) | |
| parent | a874691c6cd8d74d0b51fae607b74543f1ffa1ca (diff) | |
| download | emacs-057a9ab495a5fd334f9bd3c7704176502e5219c4.tar.gz emacs-057a9ab495a5fd334f9bd3c7704176502e5219c4.tar.bz2 emacs-057a9ab495a5fd334f9bd3c7704176502e5219c4.zip | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-118
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-120
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-107
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 8affbc76126..371bd0d729d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2380,7 +2380,6 @@ extern void redisplay P_ ((void)); extern int check_point_in_composition P_ ((struct buffer *, int, struct buffer *, int)); extern void redisplay_preserve_echo_area P_ ((int)); -extern void mark_window_display_accurate P_ ((Lisp_Object, int)); extern void prepare_menu_bars P_ ((void)); void set_frame_cursor_types P_ ((struct frame *, Lisp_Object)); |