aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2001-12-01 12:40:42 +0000
committerJason Rumney2001-12-01 12:40:42 +0000
commit90647b0788ca9abaf3962046226ae6be8940e5a3 (patch)
tree157e13c99c478c5359fdff6b28db15ecdcbe1149 /src
parenta81bf19bffa1e7fe981f653faf565bbbee348417 (diff)
downloademacs-90647b0788ca9abaf3962046226ae6be8940e5a3.tar.gz
emacs-90647b0788ca9abaf3962046226ae6be8940e5a3.zip
(Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c7
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ac7a87f554a..e98f29ed9d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12001-12-01 Jason Rumney <jasonr@gnu.org> 12001-12-01 Jason Rumney <jasonr@gnu.org>
2 2
3 * window.c (Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
4
5 * w32term.h (WM_MOUSELEAVE, TME_LEAVE, TRACKMOUSEEVENT)
6 [!WM_MOUSELEAVE]: Define.
7
3 * w32menu.c (current_popup_menu, get_menu_item_info): 8 * w32menu.c (current_popup_menu, get_menu_item_info):
4 (set_menu_item_info): New vars. 9 (set_menu_item_info): New vars.
5 (set_frame_menubar): Doc fix clarifying GC interaction with menus. 10 (set_frame_menubar): Doc fix clarifying GC interaction with menus.
diff --git a/src/window.c b/src/window.c
index 1c75478111f..7d0a1eec6cd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -63,7 +63,7 @@ enum window_part
63 63
64 64
65Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; 65Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
66Lisp_Object Qwindow_size_fixed, Qleft_fringe, Qright_fringe; 66Lisp_Object Qwindow_size_fixed;
67extern Lisp_Object Qheight, Qwidth; 67extern Lisp_Object Qheight, Qwidth;
68 68
69static int displayed_window_lines P_ ((struct window *)); 69static int displayed_window_lines P_ ((struct window *));
@@ -5673,11 +5673,6 @@ init_window ()
5673void 5673void
5674syms_of_window () 5674syms_of_window ()
5675{ 5675{
5676 Qleft_fringe = intern ("left-fringe");
5677 staticpro (&Qleft_fringe);
5678 Qright_fringe = intern ("right-fringe");
5679 staticpro (&Qright_fringe);
5680
5681 Qwindow_size_fixed = intern ("window-size-fixed"); 5676 Qwindow_size_fixed = intern ("window-size-fixed");
5682 staticpro (&Qwindow_size_fixed); 5677 staticpro (&Qwindow_size_fixed);
5683 5678