aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-06-30 01:23:11 +0200
committerJoakim Verona2011-06-30 01:23:11 +0200
commit0349bc31b8abcd5c1a49c3f800e052b8581ef1d0 (patch)
tree517e5037e0dbfa5c82dd1dd4189498759f72afa9 /src
parent9333b6a4d92243ebeee9c5fc3ae3f1ec1a47abc3 (diff)
parentada35ec18a3429c0389fe1b77d7ae82b8a5715d6 (diff)
downloademacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.tar.gz
emacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.zip
merge from upstream
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog66
-rw-r--r--src/bidi.c4
-rw-r--r--src/buffer.c23
-rw-r--r--src/emacsgtkfixed.c101
-rw-r--r--src/emacsgtkfixed.h8
-rw-r--r--src/gnutls.c1
-rw-r--r--src/gtkutil.c16
-rw-r--r--src/makefile.w32-in1679
-rw-r--r--src/process.c12
-rw-r--r--src/window.c114
10 files changed, 953 insertions, 1071 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e21412187c7..1e537f3872e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,67 @@
12011-06-28 Paul Eggert <eggert@cs.ucla.edu>
2
3 * gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.
4
52011-06-27 Juanma Barranquero <lekktu@gmail.com>
6
7 * makefile.w32-in: Redesign dependencies so they reflect more
8 clearly which files are directly included by each source file,
9 and not through other includes.
10
112011-06-27 Martin Rudalics <rudalics@gmx.at>
12
13 * buffer.c (Qclone_number): Declare static and DEFSYM it.
14 (sort_overlays, overlay_strings): When an overlay's clone number
15 matches the window's clone number process the overlay even if
16 the overlay's window property doesn't match the current window.
17
18 * window.c (Fwindow_vchild): Rename to Fwindow_top_child.
19 (Fwindow_hchild): Rename to Fwindow_left_child.
20 (Fwindow_next): Rename to Fwindow_next_sibling.
21 (Fwindow_prev): Rename to Fwindow_prev_sibling.
22 (resize_window_check): Rename to window_resize_check.
23 (resize_window_apply): Rename to window_resize_apply.
24 (Fresize_window_apply): Rename to Fwindow_resize_apply.
25 (Fdelete_other_windows_internal, resize_frame_windows)
26 (Fsplit_window_internal, Fdelete_window_internal)
27 (grow_mini_window, shrink_mini_window)
28 (Fresize_mini_window_internal): Fix callers accordingly.
29
302011-06-26 Jan Djärv <jan.h.d@swipnet.se>
31
32 * emacsgtkfixed.h: State that this is only used with Gtk+3.
33 (emacs_fixed_set_min_size): Remove.
34 (emacs_fixed_new): Take frame as argument.
35
36 * emacsgtkfixed.c: State that this is only used with Gtk+3.
37 (_EmacsFixedPrivate): Remove minwidth/height.
38 Add struct frame *f.
39 (emacs_fixed_init): Initialize priv->f.
40 (get_parent_class, emacs_fixed_set_min_size): Remove.
41 (emacs_fixed_new): Set priv->f to argument.
42 (emacs_fixed_get_preferred_width)
43 (emacs_fixed_get_preferred_height): Use min_width/height from
44 frames size_hint to set minimum and natural (Bug#8919).
45 (XSetWMSizeHints, XSetWMNormalHints): Override these functions
46 and use min_width/height from frames size_hint to set
47 min_width/height (Bug#8919).
48
49 * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
50 (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix
51 indentation.
52
532011-06-26 Eli Zaretskii <eliz@gnu.org>
54
55 * bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
56 bidi_at_paragraph_end, since fast_looking_at doesn't like to be
57 called at ZV.
58
592011-06-26 Chong Yidong <cyd@stupidchicken.com>
60
61 * process.c (wait_reading_process_output): Bypass select if
62 waiting for a cell while ignoring keyboard input, and input is
63 pending. Suggested by Jan Djärv (Bug#8869).
64
12011-06-25 Paul Eggert <eggert@cs.ucla.edu> 652011-06-25 Paul Eggert <eggert@cs.ucla.edu>
2 66
3 Use gnulib's dup2 module instead of rolling our own. 67 Use gnulib's dup2 module instead of rolling our own.
@@ -351,7 +415,7 @@
351 415
3522011-06-22 Jim Meyering <meyering@redhat.com> 4162011-06-22 Jim Meyering <meyering@redhat.com>
353 417
354 don't leak an XBM-image-sized buffer 418 Don't leak an XBM-image-sized buffer
355 * image.c (xbm_load): Free the image buffer after using it. 419 * image.c (xbm_load): Free the image buffer after using it.
356 420
3572011-06-21 Paul Eggert <eggert@cs.ucla.edu> 4212011-06-21 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/src/bidi.c b/src/bidi.c
index 1f3b196d5a4..469afdb3819 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -744,8 +744,6 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
744 || type == LRE || type == LRO)); 744 || type == LRE || type == LRO));
745 type = bidi_get_type (ch, NEUTRAL_DIR)) 745 type = bidi_get_type (ch, NEUTRAL_DIR))
746 { 746 {
747 if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
748 break;
749 if (bytepos >= ZV_BYTE) 747 if (bytepos >= ZV_BYTE)
750 { 748 {
751 /* Pretend there's a paragraph separator at end of 749 /* Pretend there's a paragraph separator at end of
@@ -753,6 +751,8 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
753 type = NEUTRAL_B; 751 type = NEUTRAL_B;
754 break; 752 break;
755 } 753 }
754 if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
755 break;
756 /* Fetch next character and advance to get past it. */ 756 /* Fetch next character and advance to get past it. */
757 ch = bidi_fetch_char (bytepos, pos, &disp_pos, 757 ch = bidi_fetch_char (bytepos, pos, &disp_pos,
758 bidi_it->frame_window_p, &ch_len, &nchars); 758 bidi_it->frame_window_p, &ch_len, &nchars);
diff --git a/src/buffer.c b/src/buffer.c
index 006153b0424..328963be78c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -146,7 +146,7 @@ static Lisp_Object Qoverlayp;
146 146
147Lisp_Object Qpriority, Qbefore_string, Qafter_string; 147Lisp_Object Qpriority, Qbefore_string, Qafter_string;
148 148
149static Lisp_Object Qevaporate; 149static Lisp_Object Qclone_number, Qevaporate;
150 150
151Lisp_Object Qmodification_hooks; 151Lisp_Object Qmodification_hooks;
152Lisp_Object Qinsert_in_front_hooks; 152Lisp_Object Qinsert_in_front_hooks;
@@ -2900,10 +2900,13 @@ sort_overlays (Lisp_Object *overlay_vec, ptrdiff_t noverlays, struct window *w)
2900 overlays that are limited to some other window. */ 2900 overlays that are limited to some other window. */
2901 if (w) 2901 if (w)
2902 { 2902 {
2903 Lisp_Object window; 2903 Lisp_Object window, clone_number;
2904 2904
2905 window = Foverlay_get (overlay, Qwindow); 2905 window = Foverlay_get (overlay, Qwindow);
2906 if (WINDOWP (window) && XWINDOW (window) != w) 2906 clone_number = Foverlay_get (overlay, Qclone_number);
2907 if (WINDOWP (window) && XWINDOW (window) != w
2908 && (! NUMBERP (clone_number)
2909 || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
2907 continue; 2910 continue;
2908 } 2911 }
2909 2912
@@ -3032,7 +3035,7 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str,
3032EMACS_INT 3035EMACS_INT
3033overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr) 3036overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
3034{ 3037{
3035 Lisp_Object overlay, window, str; 3038 Lisp_Object overlay, window, clone_number, str;
3036 struct Lisp_Overlay *ov; 3039 struct Lisp_Overlay *ov;
3037 EMACS_INT startpos, endpos; 3040 EMACS_INT startpos, endpos;
3038 int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); 3041 int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
@@ -3051,8 +3054,12 @@ overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
3051 if (endpos != pos && startpos != pos) 3054 if (endpos != pos && startpos != pos)
3052 continue; 3055 continue;
3053 window = Foverlay_get (overlay, Qwindow); 3056 window = Foverlay_get (overlay, Qwindow);
3054 if (WINDOWP (window) && XWINDOW (window) != w) 3057 clone_number = Foverlay_get (overlay, Qclone_number);
3058 if (WINDOWP (window) && XWINDOW (window) != w
3059 && (! NUMBERP (clone_number)
3060 || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
3055 continue; 3061 continue;
3062
3056 if (startpos == pos 3063 if (startpos == pos
3057 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) 3064 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
3058 record_overlay_string (&overlay_heads, str, 3065 record_overlay_string (&overlay_heads, str,
@@ -3079,7 +3086,10 @@ overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
3079 if (endpos != pos && startpos != pos) 3086 if (endpos != pos && startpos != pos)
3080 continue; 3087 continue;
3081 window = Foverlay_get (overlay, Qwindow); 3088 window = Foverlay_get (overlay, Qwindow);
3082 if (WINDOWP (window) && XWINDOW (window) != w) 3089 clone_number = Foverlay_get (overlay, Qclone_number);
3090 if (WINDOWP (window) && XWINDOW (window) != w
3091 && (! NUMBERP (clone_number)
3092 || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
3083 continue; 3093 continue;
3084 if (startpos == pos 3094 if (startpos == pos
3085 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) 3095 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
@@ -5219,6 +5229,7 @@ syms_of_buffer (void)
5219 DEFSYM (Qinsert_behind_hooks, "insert-behind-hooks"); 5229 DEFSYM (Qinsert_behind_hooks, "insert-behind-hooks");
5220 DEFSYM (Qget_file_buffer, "get-file-buffer"); 5230 DEFSYM (Qget_file_buffer, "get-file-buffer");
5221 DEFSYM (Qpriority, "priority"); 5231 DEFSYM (Qpriority, "priority");
5232 DEFSYM (Qclone_number, "clone-number");
5222 DEFSYM (Qbefore_string, "before-string"); 5233 DEFSYM (Qbefore_string, "before-string");
5223 DEFSYM (Qafter_string, "after-string"); 5234 DEFSYM (Qafter_string, "after-string");
5224 DEFSYM (Qfirst_change_hook, "first-change-hook"); 5235 DEFSYM (Qfirst_change_hook, "first-change-hook");
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index fe3514bce93..0b57e2cdf36 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,4 +1,5 @@
1/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 1/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
2This file is only use when compiling with Gtk+ 3.
2 3
3Copyright (C) 2011 Free Software Foundation, Inc. 4Copyright (C) 2011 Free Software Foundation, Inc.
4 5
@@ -17,12 +18,19 @@ GNU General Public License for more details.
17You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19 20
20#include "emacsgtkfixed.h" 21#include <config.h>
21 22
23#include "emacsgtkfixed.h"
24#include <signal.h>
25#include <stdio.h>
26#include <setjmp.h>
27#include "lisp.h"
28#include "frame.h"
29#include "xterm.h"
22 30
23struct _EmacsFixedPrivate 31struct _EmacsFixedPrivate
24{ 32{
25 int minwidth, minheight; 33 struct frame *f;
26}; 34};
27 35
28 36
@@ -59,7 +67,7 @@ emacs_fixed_init (EmacsFixed *fixed)
59{ 67{
60 fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed, EMACS_TYPE_FIXED, 68 fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed, EMACS_TYPE_FIXED,
61 EmacsFixedPrivate); 69 EmacsFixedPrivate);
62 fixed->priv->minwidth = fixed->priv->minheight = 0; 70 fixed->priv->f = 0;
63} 71}
64 72
65/** 73/**
@@ -70,17 +78,12 @@ emacs_fixed_init (EmacsFixed *fixed)
70 * Returns: a new #EmacsFixed. 78 * Returns: a new #EmacsFixed.
71 */ 79 */
72GtkWidget* 80GtkWidget*
73emacs_fixed_new (void) 81emacs_fixed_new (struct frame *f)
74{
75 return g_object_new (EMACS_TYPE_FIXED, NULL);
76}
77
78static GtkWidgetClass *
79get_parent_class (EmacsFixed *fixed)
80{ 82{
81 EmacsFixedClass *klass = EMACS_FIXED_GET_CLASS (fixed); 83 EmacsFixed *fixed = g_object_new (EMACS_TYPE_FIXED, NULL);
82 GtkFixedClass *parent_class = g_type_class_peek_parent (klass); 84 EmacsFixedPrivate *priv = fixed->priv;
83 return (GtkWidgetClass*) parent_class; 85 priv->f = f;
86 return GTK_WIDGET (fixed);
84} 87}
85 88
86static void 89static void
@@ -90,9 +93,9 @@ emacs_fixed_get_preferred_width (GtkWidget *widget,
90{ 93{
91 EmacsFixed *fixed = EMACS_FIXED (widget); 94 EmacsFixed *fixed = EMACS_FIXED (widget);
92 EmacsFixedPrivate *priv = fixed->priv; 95 EmacsFixedPrivate *priv = fixed->priv;
93 GtkWidgetClass *widget_class = get_parent_class (fixed); 96 int w = priv->f->output_data.x->size_hints.min_width;
94 widget_class->get_preferred_width (widget, minimum, natural); 97 if (minimum) *minimum = w;
95 if (minimum) *minimum = priv->minwidth; 98 if (natural) *natural = w;
96} 99}
97 100
98static void 101static void
@@ -102,22 +105,62 @@ emacs_fixed_get_preferred_height (GtkWidget *widget,
102{ 105{
103 EmacsFixed *fixed = EMACS_FIXED (widget); 106 EmacsFixed *fixed = EMACS_FIXED (widget);
104 EmacsFixedPrivate *priv = fixed->priv; 107 EmacsFixedPrivate *priv = fixed->priv;
105 GtkWidgetClass *widget_class = get_parent_class (fixed); 108 int h = priv->f->output_data.x->size_hints.min_height;
106 widget_class->get_preferred_height (widget, minimum, natural); 109 if (minimum) *minimum = h;
107 if (minimum) *minimum = priv->minheight; 110 if (natural) *natural = h;
108} 111}
109 112
113
114/* Override the X function so we can intercept Gtk+ 3 calls.
115 Use our values for min_width/height so that KDE don't freak out
116 (Bug#8919), and so users can resize our frames as they wish. */
117
110void 118void
111emacs_fixed_set_min_size (EmacsFixed *widget, int width, int height) 119XSetWMSizeHints(Display* d,
120 Window w,
121 XSizeHints* hints,
122 Atom prop)
112{ 123{
113 EmacsFixedPrivate *priv = widget->priv; 124 struct x_display_info *dpyinfo = x_display_info_for_display (d);
114 GtkWidgetClass *widget_class = get_parent_class (widget); 125 struct frame *f = x_top_window_to_frame (dpyinfo, w);
115 int mw, nw, mh, nh; 126 long data[18];
116 127 data[0] = hints->flags;
117 widget_class->get_preferred_height (GTK_WIDGET (widget), &mh, &nh); 128 data[1] = hints->x;
118 widget_class->get_preferred_width (GTK_WIDGET (widget), &mw, &nw); 129 data[2] = hints->y;
130 data[3] = hints->width;
131 data[4] = hints->height;
132 data[5] = hints->min_width;
133 data[6] = hints->min_height;
134 data[7] = hints->max_width;
135 data[8] = hints->max_height;
136 data[9] = hints->width_inc;
137 data[10] = hints->height_inc;
138 data[11] = hints->min_aspect.x;
139 data[12] = hints->min_aspect.y;
140 data[13] = hints->max_aspect.x;
141 data[14] = hints->max_aspect.y;
142 data[15] = hints->base_width;
143 data[16] = hints->base_height;
144 data[17] = hints->win_gravity;
145
146 if ((hints->flags & PMinSize) && f)
147 {
148 int w = f->output_data.x->size_hints.min_width;
149 int h = f->output_data.x->size_hints.min_height;
150 data[5] = w;
151 data[6] = h;
152 }
153
154 XChangeProperty (d, w, prop, XA_WM_SIZE_HINTS, 32, PropModeReplace,
155 (unsigned char *) data, 18);
156}
119 157
120 /* Gtk complains if min size is less than natural size. */ 158/* Override this X11 function.
121 if (width <= nw) priv->minwidth = width; 159 This function is in the same X11 file as the one above. So we must
122 if (height <= nh) priv->minheight = height; 160 provide it also. */
161
162void
163XSetWMNormalHints (Display *d, Window w, XSizeHints *hints)
164{
165 XSetWMSizeHints (d, w, hints, XA_WM_NORMAL_HINTS);
123} 166}
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 405374373ec..dbac136bd7f 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -1,4 +1,5 @@
1/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 1/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
2This file is only use when compiling with Gtk+ 3.
2 3
3Copyright (C) 2011 Free Software Foundation, Inc. 4Copyright (C) 2011 Free Software Foundation, Inc.
4 5
@@ -24,6 +25,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24 25
25G_BEGIN_DECLS 26G_BEGIN_DECLS
26 27
28struct frame;
29
27#define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) 30#define EMACS_TYPE_FIXED (emacs_fixed_get_type ())
28#define EMACS_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed)) 31#define EMACS_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed))
29#define EMACS_FIXED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass)) 32#define EMACS_FIXED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass))
@@ -49,8 +52,7 @@ struct _EmacsFixedClass
49 GtkFixedClass parent_class; 52 GtkFixedClass parent_class;
50}; 53};
51 54
52extern GtkWidget *emacs_fixed_new (void); 55extern GtkWidget *emacs_fixed_new (struct frame *f);
53extern void emacs_fixed_set_min_size (EmacsFixed *widget, int width, int height);
54extern GType emacs_fixed_get_type (void); 56extern GType emacs_fixed_get_type (void);
55 57
56G_END_DECLS 58G_END_DECLS
diff --git a/src/gnutls.c b/src/gnutls.c
index b59d0b265f2..2a055ac40f0 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -51,7 +51,6 @@ static Lisp_Object Qgnutls_bootprop_callbacks;
51static Lisp_Object Qgnutls_bootprop_loglevel; 51static Lisp_Object Qgnutls_bootprop_loglevel;
52static Lisp_Object Qgnutls_bootprop_hostname; 52static Lisp_Object Qgnutls_bootprop_hostname;
53static Lisp_Object Qgnutls_bootprop_verify_flags; 53static Lisp_Object Qgnutls_bootprop_verify_flags;
54static Lisp_Object Qgnutls_bootprop_verify_error;
55static Lisp_Object Qgnutls_bootprop_verify_hostname_error; 54static Lisp_Object Qgnutls_bootprop_verify_hostname_error;
56 55
57/* Callback keys for `gnutls-boot'. Unused currently. */ 56/* Callback keys for `gnutls-boot'. Unused currently. */
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7712966b0f4..48571bef275 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1090,7 +1090,7 @@ xg_create_frame_widgets (FRAME_PTR f)
1090 whbox = gtk_hbox_new (FALSE, 0); 1090 whbox = gtk_hbox_new (FALSE, 0);
1091 1091
1092#ifdef HAVE_GTK3 1092#ifdef HAVE_GTK3
1093 f->gwfixed = wfixed = emacs_fixed_new (); 1093 f->gwfixed = wfixed = emacs_fixed_new (f);
1094#else 1094#else
1095 f->gwfixed = wfixed = gtk_fixed_new (); 1095 f->gwfixed = wfixed = gtk_fixed_new ();
1096#endif 1096#endif
@@ -1290,18 +1290,6 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
1290 size_hints.min_width = base_width + min_cols * size_hints.width_inc; 1290 size_hints.min_width = base_width + min_cols * size_hints.width_inc;
1291 size_hints.min_height = base_height + min_rows * size_hints.height_inc; 1291 size_hints.min_height = base_height + min_rows * size_hints.height_inc;
1292 1292
1293#ifdef HAVE_GTK3
1294 /* Gtk3 ignores min width/height and overwrites them with its own idea
1295 of min width/height. Put out min values to the widget so Gtk
1296 gets the same value we want it to be. Without this, a user can't
1297 shrink an Emacs frame.
1298 */
1299 if (FRAME_GTK_WIDGET (f))
1300 emacs_fixed_set_min_size (EMACS_FIXED (FRAME_GTK_WIDGET (f)),
1301 size_hints.min_width,
1302 size_hints.min_height);
1303#endif
1304
1305 /* These currently have a one to one mapping with the X values, but I 1293 /* These currently have a one to one mapping with the X values, but I
1306 don't think we should rely on that. */ 1294 don't think we should rely on that. */
1307 hint_flags |= GDK_HINT_WIN_GRAVITY; 1295 hint_flags |= GDK_HINT_WIN_GRAVITY;
@@ -1340,7 +1328,7 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
1340 { 1328 {
1341 BLOCK_INPUT; 1329 BLOCK_INPUT;
1342 gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), 1330 gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
1343 NULL, &size_hints, hint_flags); 1331 NULL, &size_hints, hint_flags);
1344 f->output_data.x->size_hints = size_hints; 1332 f->output_data.x->size_hints = size_hints;
1345 f->output_data.x->hint_flags = hint_flags; 1333 f->output_data.x->hint_flags = hint_flags;
1346 UNBLOCK_INPUT; 1334 UNBLOCK_INPUT;
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 173fc673955..88b53554925 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -382,471 +382,452 @@ full-tags: TAGS TAGS-LISP ../nt/TAGS
382### DEPENDENCIES ### 382### DEPENDENCIES ###
383 383
384EMACS_ROOT = .. 384EMACS_ROOT = ..
385CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \ 385GNU_LIB = $(EMACS_ROOT)/lib
386 $(EMACS_ROOT)/src/m/intel386.h \ 386NT_INC = $(EMACS_ROOT)/nt/inc
387 $(EMACS_ROOT)/src/config.h \ 387
388 $(EMACS_ROOT)/nt/inc/sys/stat.h 388SYSTIME_H = $(SRC)/systime.h \
389LISP_H = $(SRC)/lisp.h \ 389 $(NT_INC)/sys/time.h
390 $(SRC)/globals.h \ 390ATIMER_H = $(SRC)/atimer.h \
391 $(EMACS_ROOT)/lib/intprops.h \ 391 $(SYSTIME_H)
392 $(EMACS_ROOT)/nt/inc/inttypes.h \ 392BLOCKINPUT_H = $(SRC)/blockinput.h \
393 $(EMACS_ROOT)/nt/inc/stdint.h 393 $(ATIMER_H)
394PROCESS_H = $(SRC)/process.h \ 394CAREADLINKAT_H = $(GNU_LIB)/careadlinkat.h \
395 $(EMACS_ROOT)/nt/inc/unistd.h \ 395 $(NT_INC)/unistd.h
396 $(SRC)/gnutls.h 396CHARACTER_H = $(SRC)/character.h \
397 $(GNU_LIB)/verify.h
398CHARSET_H = $(SRC)/charset.h \
399 $(GNU_LIB)/verify.h
400CODING_H = $(SRC)/coding.h \
401 $(SRC)/composite.h
402MS_W32_H = $(SRC)/s/ms-w32.h \
403 $(NT_INC)/sys/stat.h
404CONFIG_H = $(SRC)/config.h \
405 $(SRC)/m/intel386.h \
406 $(MS_W32_H)
407DIR_H = $(NT_INC)/sys/dir.h \
408 $(SRC)/ndir.h
409W32GUI_H = $(SRC)/w32gui.h \
410 $(SYSTIME_H)
411DISPEXTERN_H = $(SRC)/dispextern.h \
412 $(W32GUI_H)
413FILEMODE_H = $(GNU_LIB)/filemode.h \
414 $(NT_INC)/sys/stat.h
415FONT_H = $(SRC)/font.h \
416 $(SRC)/ccl.h
417FRAME_H = $(SRC)/frame.h \
418 $(DISPEXTERN_H)
419FTOASTR_H = $(GNU_LIB)/ftoastr.h \
420 $(GNU_LIB)/intprops.h
421GRP_H = $(NT_INC)/grp.h \
422 $(NT_INC)/pwd.h
423INTERVALS_H = $(SRC)/intervals.h \
424 $(SRC)/composite.h \
425 $(DISPEXTERN_H)
426INTTYPES_H = $(NT_INC)/inttypes.h \
427 $(NT_INC)/stdint.h
428KEYBOARD_H = $(SRC)/keyboard.h \
429 $(CODING_H) \
430 $(SYSTIME_H)
431LANGINFO_H = $(NT_INC)/langinfo.h \
432 $(NT_INC)/nl_types.h
433LISP_H = $(SRC)/lisp.h \
434 $(SRC)/globals.h \
435 $(GNU_LIB)/intprops.h \
436 $(INTTYPES_H)
437MD5_H = $(GNU_LIB)/md5.h \
438 $(NT_INC)/stdint.h
439MENU_H = $(SRC)/menu.h \
440 $(SYSTIME_H)
441PROCESS_H = $(SRC)/process.h \
442 $(SRC)/gnutls.h \
443 $(NT_INC)/unistd.h
444SHA1_H = $(GNU_LIB)/sha1.h \
445 $(NT_INC)/stdint.h
446SHA256_H = $(GNU_LIB)/sha256.h \
447 $(NT_INC)/stdint.h
448U64_H = $(GNU_LIB)/u64.h \
449 $(NT_INC)/stdint.h
450SHA512_H = $(GNU_LIB)/sha512.h \
451 $(U64_H)
452SOCKET_H = $(NT_INC)/sys/socket.h \
453 $(SRC)/w32.h
454SYSTTY_H = $(SRC)/systty.h \
455 $(NT_INC)/sys/ioctl.h \
456 $(NT_INC)/unistd.h
457TERMHOOKS_H = $(SRC)/termhooks.h \
458 $(SYSTIME_H)
459W32TERM_H = $(SRC)/w32term.h \
460 $(W32GUI_H)
461WINDOW_H = $(SRC)/window.h \
462 $(DISPEXTERN_H)
397 463
398$(BLD)/alloc.$(O) : \ 464$(BLD)/alloc.$(O) : \
399 $(SRC)/alloc.c \ 465 $(SRC)/alloc.c \
400 $(CONFIG_H) \
401 $(EMACS_ROOT)/nt/inc/unistd.h \
402 $(EMACS_ROOT)/nt/inc/sys/time.h \
403 $(LISP_H) \
404 $(PROCESS_H) \
405 $(SRC)/atimer.h \
406 $(SRC)/blockinput.h \
407 $(SRC)/buffer.h \ 466 $(SRC)/buffer.h \
408 $(SRC)/character.h \
409 $(SRC)/coding.h \
410 $(SRC)/composite.h \
411 $(SRC)/dispextern.h \
412 $(SRC)/frame.h \
413 $(SRC)/intervals.h \
414 $(SRC)/keyboard.h \
415 $(SRC)/puresize.h \ 467 $(SRC)/puresize.h \
416 $(SRC)/syssignal.h \ 468 $(SRC)/syssignal.h \
417 $(SRC)/systime.h \
418 $(SRC)/termhooks.h \
419 $(SRC)/w32.h \ 469 $(SRC)/w32.h \
420 $(SRC)/w32gui.h \ 470 $(NT_INC)/unistd.h \
421 $(SRC)/window.h 471 $(BLOCKINPUT_H) \
472 $(CHARACTER_H) \
473 $(CONFIG_H) \
474 $(FRAME_H) \
475 $(INTERVALS_H) \
476 $(KEYBOARD_H) \
477 $(LISP_H) \
478 $(PROCESS_H) \
479 $(TERMHOOKS_H) \
480 $(WINDOW_H)
422 481
423$(BLD)/atimer.$(O) : \ 482$(BLD)/atimer.$(O) : \
424 $(SRC)/atimer.c \ 483 $(SRC)/atimer.c \
484 $(SRC)/syssignal.h \
485 $(NT_INC)/sys/time.h \
486 $(NT_INC)/unistd.h \
487 $(ATIMER_H) \
488 $(BLOCKINPUT_H) \
425 $(CONFIG_H) \ 489 $(CONFIG_H) \
426 $(EMACS_ROOT)/nt/inc/unistd.h \
427 $(EMACS_ROOT)/nt/inc/sys/time.h \
428 $(LISP_H) \ 490 $(LISP_H) \
429 $(SRC)/atimer.h \ 491 $(SYSTIME_H)
430 $(SRC)/blockinput.h \
431 $(SRC)/syssignal.h \
432 $(SRC)/systime.h
433 492
434$(BLD)/bidi.$(O) : \ 493$(BLD)/bidi.$(O) : \
435 $(SRC)/bidi.c \ 494 $(SRC)/bidi.c \
436 $(CONFIG_H) \
437 $(EMACS_ROOT)/nt/inc/sys/time.h \
438 $(LISP_H) \
439 $(SRC)/bidimirror.h \ 495 $(SRC)/bidimirror.h \
440 $(SRC)/biditype.h \ 496 $(SRC)/biditype.h \
441 $(SRC)/buffer.h \ 497 $(SRC)/buffer.h \
442 $(SRC)/character.h \ 498 $(CHARACTER_H) \
443 $(SRC)/dispextern.h \ 499 $(CONFIG_H) \
444 $(SRC)/systime.h \ 500 $(DISPEXTERN_H) \
445 $(SRC)/w32gui.h 501 $(LISP_H)
446 502
447$(BLD)/buffer.$(O) : \ 503$(BLD)/buffer.$(O) : \
448 $(SRC)/buffer.c \ 504 $(SRC)/buffer.c \
449 $(CONFIG_H) \
450 $(EMACS_ROOT)/nt/inc/unistd.h \
451 $(EMACS_ROOT)/nt/inc/sys/param.h \
452 $(EMACS_ROOT)/nt/inc/sys/time.h \
453 $(LISP_H) \
454 $(SRC)/atimer.h \
455 $(SRC)/blockinput.h \
456 $(SRC)/buffer.h \ 505 $(SRC)/buffer.h \
457 $(SRC)/character.h \
458 $(SRC)/coding.h \
459 $(SRC)/commands.h \ 506 $(SRC)/commands.h \
460 $(SRC)/composite.h \
461 $(SRC)/dispextern.h \
462 $(SRC)/frame.h \
463 $(SRC)/indent.h \ 507 $(SRC)/indent.h \
464 $(SRC)/intervals.h \
465 $(SRC)/keyboard.h \
466 $(SRC)/keymap.h \ 508 $(SRC)/keymap.h \
467 $(SRC)/region-cache.h \ 509 $(SRC)/region-cache.h \
468 $(SRC)/systime.h \ 510 $(NT_INC)/sys/param.h \
469 $(SRC)/w32gui.h \ 511 $(NT_INC)/sys/stat.h \
470 $(SRC)/window.h 512 $(NT_INC)/unistd.h \
513 $(GNU_LIB)/verify.h \
514 $(BLOCKINPUT_H) \
515 $(CHARACTER_H) \
516 $(CONFIG_H) \
517 $(FRAME_H) \
518 $(INTERVALS_H) \
519 $(KEYBOARD_H) \
520 $(LISP_H) \
521 $(WINDOW_H)
471 522
472$(BLD)/bytecode.$(O) : \ 523$(BLD)/bytecode.$(O) : \
473 $(SRC)/bytecode.c \ 524 $(SRC)/bytecode.c \
474 $(CONFIG_H) \
475 $(EMACS_ROOT)/nt/inc/sys/time.h \
476 $(LISP_H) \
477 $(SRC)/buffer.h \ 525 $(SRC)/buffer.h \
478 $(SRC)/character.h \
479 $(SRC)/dispextern.h \
480 $(SRC)/syntax.h \ 526 $(SRC)/syntax.h \
481 $(SRC)/systime.h \ 527 $(CHARACTER_H) \
482 $(SRC)/w32gui.h \ 528 $(CONFIG_H) \
483 $(SRC)/window.h 529 $(LISP_H) \
530 $(WINDOW_H)
484 531
485$(BLD)/callint.$(O) : \ 532$(BLD)/callint.$(O) : \
486 $(SRC)/callint.c \ 533 $(SRC)/callint.c \
487 $(CONFIG_H) \
488 $(EMACS_ROOT)/nt/inc/sys/time.h \
489 $(LISP_H) \
490 $(SRC)/buffer.h \ 534 $(SRC)/buffer.h \
491 $(SRC)/character.h \
492 $(SRC)/coding.h \
493 $(SRC)/commands.h \ 535 $(SRC)/commands.h \
494 $(SRC)/composite.h \
495 $(SRC)/dispextern.h \
496 $(SRC)/keyboard.h \
497 $(SRC)/keymap.h \ 536 $(SRC)/keymap.h \
498 $(SRC)/systime.h \ 537 $(CHARACTER_H) \
499 $(SRC)/w32gui.h \ 538 $(CONFIG_H) \
500 $(SRC)/window.h 539 $(KEYBOARD_H) \
540 $(LISP_H) \
541 $(WINDOW_H)
501 542
502$(BLD)/callproc.$(O) : \ 543$(BLD)/callproc.$(O) : \
503 $(SRC)/callproc.c \ 544 $(SRC)/callproc.c \
504 $(CONFIG_H) \
505 $(EMACS_ROOT)/nt/inc/unistd.h \
506 $(EMACS_ROOT)/nt/inc/sys/file.h \
507 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
508 $(EMACS_ROOT)/nt/inc/sys/time.h \
509 $(LISP_H) \
510 $(PROCESS_H) \
511 $(SRC)/atimer.h \
512 $(SRC)/blockinput.h \
513 $(SRC)/buffer.h \ 545 $(SRC)/buffer.h \
514 $(SRC)/ccl.h \ 546 $(SRC)/ccl.h \
515 $(SRC)/character.h \
516 $(SRC)/coding.h \
517 $(SRC)/commands.h \ 547 $(SRC)/commands.h \
518 $(SRC)/composite.h \ 548 $(SRC)/composite.h \
519 $(SRC)/dispextern.h \
520 $(SRC)/epaths.h \ 549 $(SRC)/epaths.h \
521 $(SRC)/frame.h \
522 $(SRC)/syssignal.h \ 550 $(SRC)/syssignal.h \
523 $(SRC)/systime.h \
524 $(SRC)/systty.h \
525 $(SRC)/termhooks.h \
526 $(SRC)/w32.h \ 551 $(SRC)/w32.h \
527 $(SRC)/w32gui.h 552 $(NT_INC)/sys/file.h \
553 $(NT_INC)/unistd.h \
554 $(BLOCKINPUT_H) \
555 $(CHARACTER_H) \
556 $(CODING_H) \
557 $(CONFIG_H) \
558 $(FRAME_H) \
559 $(LISP_H) \
560 $(PROCESS_H) \
561 $(SYSTTY_H) \
562 $(TERMHOOKS_H)
528 563
529$(BLD)/casefiddle.$(O) : \ 564$(BLD)/casefiddle.$(O) : \
530 $(SRC)/casefiddle.c \ 565 $(SRC)/casefiddle.c \
531 $(CONFIG_H) \
532 $(LISP_H) \
533 $(SRC)/buffer.h \ 566 $(SRC)/buffer.h \
534 $(SRC)/character.h \
535 $(SRC)/commands.h \ 567 $(SRC)/commands.h \
536 $(SRC)/composite.h \ 568 $(SRC)/composite.h \
537 $(SRC)/keymap.h \ 569 $(SRC)/keymap.h \
538 $(SRC)/syntax.h 570 $(SRC)/syntax.h \
571 $(CHARACTER_H) \
572 $(CONFIG_H) \
573 $(LISP_H)
539 574
540$(BLD)/casetab.$(O) : \ 575$(BLD)/casetab.$(O) : \
541 $(SRC)/casetab.c \ 576 $(SRC)/casetab.c \
542 $(CONFIG_H) \
543 $(LISP_H) \
544 $(SRC)/buffer.h \ 577 $(SRC)/buffer.h \
545 $(SRC)/character.h 578 $(CHARACTER_H) \
579 $(CONFIG_H) \
580 $(LISP_H)
546 581
547$(BLD)/category.$(O) : \ 582$(BLD)/category.$(O) : \
548 $(SRC)/category.c \ 583 $(SRC)/category.c \
549 $(CONFIG_H) \
550 $(LISP_H) \
551 $(SRC)/buffer.h \ 584 $(SRC)/buffer.h \
552 $(SRC)/category.h \ 585 $(SRC)/category.h \
553 $(SRC)/character.h \ 586 $(SRC)/keymap.h \
554 $(SRC)/charset.h \ 587 $(CHARACTER_H) \
555 $(SRC)/keymap.h 588 $(CHARSET_H) \
589 $(CONFIG_H) \
590 $(LISP_H)
556 591
557$(BLD)/ccl.$(O) : \ 592$(BLD)/ccl.$(O) : \
558 $(SRC)/ccl.c \ 593 $(SRC)/ccl.c \
559 $(CONFIG_H) \
560 $(LISP_H) \
561 $(SRC)/ccl.h \ 594 $(SRC)/ccl.h \
562 $(SRC)/character.h \ 595 $(CHARACTER_H) \
563 $(SRC)/charset.h \ 596 $(CHARSET_H) \
564 $(SRC)/coding.h \ 597 $(CODING_H) \
565 $(SRC)/composite.h 598 $(CONFIG_H) \
599 $(LISP_H)
566 600
567$(BLD)/character.$(O) : \ 601$(BLD)/character.$(O) : \
568 $(SRC)/character.c \ 602 $(SRC)/character.c \
569 $(CONFIG_H) \
570 $(LISP_H) \
571 $(SRC)/buffer.h \ 603 $(SRC)/buffer.h \
572 $(SRC)/character.h \
573 $(SRC)/charset.h \
574 $(SRC)/composite.h \ 604 $(SRC)/composite.h \
575 $(SRC)/disptab.h 605 $(SRC)/disptab.h \
606 $(GNU_LIB)/intprops.h \
607 $(CHARACTER_H) \
608 $(CHARSET_H) \
609 $(CONFIG_H) \
610 $(LISP_H)
576 611
577$(BLD)/charset.$(O) : \ 612$(BLD)/charset.$(O) : \
578 $(SRC)/charset.c \ 613 $(SRC)/charset.c \
579 $(CONFIG_H) \
580 $(EMACS_ROOT)/nt/inc/unistd.h \
581 $(LISP_H) \
582 $(SRC)/buffer.h \ 614 $(SRC)/buffer.h \
583 $(SRC)/character.h \ 615 $(SRC)/disptab.h \
584 $(SRC)/charset.h \ 616 $(NT_INC)/unistd.h \
585 $(SRC)/coding.h \ 617 $(CHARACTER_H) \
586 $(SRC)/composite.h \ 618 $(CHARSET_H) \
587 $(SRC)/disptab.h 619 $(CODING_H) \
620 $(CONFIG_H) \
621 $(LISP_H)
588 622
589$(BLD)/chartab.$(O) : \ 623$(BLD)/chartab.$(O) : \
590 $(SRC)/chartab.c \ 624 $(SRC)/chartab.c \
591 $(CONFIG_H) \
592 $(LISP_H) \
593 $(SRC)/ccl.h \ 625 $(SRC)/ccl.h \
594 $(SRC)/character.h \ 626 $(CHARACTER_H) \
595 $(SRC)/charset.h 627 $(CHARSET_H) \
628 $(CONFIG_H) \
629 $(LISP_H)
596 630
597$(BLD)/cmds.$(O) : \ 631$(BLD)/cmds.$(O) : \
598 $(SRC)/cmds.c \ 632 $(SRC)/cmds.c \
599 $(CONFIG_H) \
600 $(EMACS_ROOT)/nt/inc/sys/time.h \
601 $(LISP_H) \
602 $(SRC)/buffer.h \ 633 $(SRC)/buffer.h \
603 $(SRC)/character.h \
604 $(SRC)/coding.h \
605 $(SRC)/commands.h \ 634 $(SRC)/commands.h \
606 $(SRC)/composite.h \
607 $(SRC)/dispextern.h \
608 $(SRC)/frame.h \
609 $(SRC)/keyboard.h \
610 $(SRC)/keymap.h \ 635 $(SRC)/keymap.h \
611 $(SRC)/syntax.h \ 636 $(SRC)/syntax.h \
612 $(SRC)/systime.h \ 637 $(CHARACTER_H) \
613 $(SRC)/w32gui.h \ 638 $(CONFIG_H) \
614 $(SRC)/window.h 639 $(DISPEXTERN_H) \
640 $(FRAME_H) \
641 $(KEYBOARD_H) \
642 $(LISP_H) \
643 $(WINDOW_H)
615 644
616$(BLD)/coding.$(O) : \ 645$(BLD)/coding.$(O) : \
617 $(SRC)/coding.c \ 646 $(SRC)/coding.c \
618 $(CONFIG_H) \
619 $(EMACS_ROOT)/nt/inc/sys/time.h \
620 $(LISP_H) \
621 $(SRC)/buffer.h \ 647 $(SRC)/buffer.h \
622 $(SRC)/ccl.h \ 648 $(SRC)/ccl.h \
623 $(SRC)/character.h \
624 $(SRC)/charset.h \
625 $(SRC)/coding.h \
626 $(SRC)/composite.h \ 649 $(SRC)/composite.h \
627 $(SRC)/dispextern.h \ 650 $(CHARACTER_H) \
628 $(SRC)/frame.h \ 651 $(CHARSET_H) \
629 $(SRC)/systime.h \ 652 $(CODING_H) \
630 $(SRC)/termhooks.h \ 653 $(CONFIG_H) \
631 $(SRC)/w32gui.h \ 654 $(FRAME_H) \
632 $(SRC)/window.h 655 $(LISP_H) \
656 $(TERMHOOKS_H) \
657 $(WINDOW_H)
633 658
634$(BLD)/composite.$(O) : \ 659$(BLD)/composite.$(O) : \
635 $(SRC)/composite.c \ 660 $(SRC)/composite.c \
661 $(SRC)/buffer.h \
662 $(CHARACTER_H) \
663 $(CODING_H) \
636 $(CONFIG_H) \ 664 $(CONFIG_H) \
637 $(EMACS_ROOT)/nt/inc/sys/time.h \ 665 $(DISPEXTERN_H) \
666 $(FONT_H) \
667 $(FRAME_H) \
668 $(INTERVALS_H) \
638 $(LISP_H) \ 669 $(LISP_H) \
639 $(SRC)/buffer.h \ 670 $(TERMHOOKS_H) \
640 $(SRC)/ccl.h \ 671 $(WINDOW_H)
641 $(SRC)/character.h \
642 $(SRC)/coding.h \
643 $(SRC)/composite.h \
644 $(SRC)/dispextern.h \
645 $(SRC)/font.h \
646 $(SRC)/frame.h \
647 $(SRC)/intervals.h \
648 $(SRC)/systime.h \
649 $(SRC)/termhooks.h \
650 $(SRC)/w32gui.h \
651 $(SRC)/window.h
652 672
653$(BLD)/data.$(O) : \ 673$(BLD)/data.$(O) : \
654 $(SRC)/data.c \ 674 $(SRC)/data.c \
655 $(CONFIG_H) \
656 $(EMACS_ROOT)/nt/inc/sys/time.h \
657 $(LISP_H) \
658 $(SRC)/buffer.h \ 675 $(SRC)/buffer.h \
659 $(SRC)/ccl.h \
660 $(SRC)/character.h \
661 $(SRC)/coding.h \
662 $(SRC)/composite.h \
663 $(SRC)/dispextern.h \
664 $(SRC)/font.h \
665 $(SRC)/frame.h \
666 $(SRC)/keyboard.h \
667 $(SRC)/puresize.h \ 676 $(SRC)/puresize.h \
668 $(SRC)/syssignal.h \ 677 $(SRC)/syssignal.h \
669 $(SRC)/systime.h \ 678 $(GNU_LIB)/intprops.h \
670 $(SRC)/termhooks.h \ 679 $(CHARACTER_H) \
671 $(SRC)/w32gui.h 680 $(CONFIG_H) \
681 $(FONT_H) \
682 $(FRAME_H) \
683 $(KEYBOARD_H) \
684 $(LISP_H) \
685 $(TERMHOOKS_H)
672 686
673$(BLD)/dired.$(O) : \ 687$(BLD)/dired.$(O) : \
674 $(SRC)/dired.c \ 688 $(SRC)/dired.c \
675 $(CONFIG_H) \
676 $(EMACS_ROOT)/nt/inc/grp.h \
677 $(EMACS_ROOT)/nt/inc/pwd.h \
678 $(EMACS_ROOT)/nt/inc/unistd.h \
679 $(EMACS_ROOT)/nt/inc/sys/dir.h \
680 $(EMACS_ROOT)/nt/inc/sys/time.h \
681 $(EMACS_ROOT)/lib/filemode.h \
682 $(LISP_H) \
683 $(SRC)/atimer.h \
684 $(SRC)/blockinput.h \
685 $(SRC)/buffer.h \ 689 $(SRC)/buffer.h \
686 $(SRC)/character.h \
687 $(SRC)/charset.h \
688 $(SRC)/coding.h \
689 $(SRC)/commands.h \ 690 $(SRC)/commands.h \
690 $(SRC)/composite.h \
691 $(SRC)/ndir.h \
692 $(SRC)/regex.h \ 691 $(SRC)/regex.h \
693 $(SRC)/systime.h 692 $(NT_INC)/pwd.h \
693 $(NT_INC)/sys/stat.h \
694 $(NT_INC)/unistd.h \
695 $(BLOCKINPUT_H) \
696 $(CHARACTER_H) \
697 $(CHARSET_H) \
698 $(CODING_H) \
699 $(CONFIG_H) \
700 $(DIR_H) \
701 $(FILEMODE_H) \
702 $(GRP_H) \
703 $(LISP_H) \
704 $(SYSTIME_H)
694 705
695$(BLD)/dispnew.$(O) : \ 706$(BLD)/dispnew.$(O) : \
696 $(SRC)/dispnew.c \ 707 $(SRC)/dispnew.c \
697 $(CONFIG_H) \
698 $(EMACS_ROOT)/nt/inc/unistd.h \
699 $(EMACS_ROOT)/nt/inc/sys/time.h \
700 $(LISP_H) \
701 $(PROCESS_H) \
702 $(SRC)/atimer.h \
703 $(SRC)/blockinput.h \
704 $(SRC)/buffer.h \ 708 $(SRC)/buffer.h \
705 $(SRC)/character.h \
706 $(SRC)/cm.h \ 709 $(SRC)/cm.h \
707 $(SRC)/coding.h \
708 $(SRC)/commands.h \ 710 $(SRC)/commands.h \
709 $(SRC)/composite.h \
710 $(SRC)/dispextern.h \
711 $(SRC)/disptab.h \ 711 $(SRC)/disptab.h \
712 $(SRC)/frame.h \
713 $(SRC)/indent.h \ 712 $(SRC)/indent.h \
714 $(SRC)/intervals.h \
715 $(SRC)/keyboard.h \
716 $(SRC)/syssignal.h \ 713 $(SRC)/syssignal.h \
717 $(SRC)/systime.h \
718 $(SRC)/termchar.h \ 714 $(SRC)/termchar.h \
719 $(SRC)/termhooks.h \
720 $(SRC)/termopts.h \ 715 $(SRC)/termopts.h \
721 $(SRC)/w32gui.h \ 716 $(NT_INC)/unistd.h \
722 $(SRC)/w32term.h \ 717 $(BLOCKINPUT_H) \
723 $(SRC)/window.h 718 $(CHARACTER_H) \
719 $(CONFIG_H) \
720 $(DISPEXTERN_H) \
721 $(FRAME_H) \
722 $(INTERVALS_H) \
723 $(KEYBOARD_H) \
724 $(LISP_H) \
725 $(PROCESS_H) \
726 $(SYSTIME_H) \
727 $(TERMHOOKS_H) \
728 $(W32TERM_H) \
729 $(WINDOW_H)
724 730
725$(BLD)/doc.$(O) : \ 731$(BLD)/doc.$(O) : \
726 $(SRC)/doc.c \ 732 $(SRC)/doc.c \
727 $(CONFIG_H) \
728 buildobj.h \
729 $(EMACS_ROOT)/nt/inc/unistd.h \
730 $(EMACS_ROOT)/nt/inc/sys/file.h \
731 $(EMACS_ROOT)/nt/inc/sys/time.h \
732 $(LISP_H) \
733 $(SRC)/buffer.h \ 733 $(SRC)/buffer.h \
734 $(SRC)/character.h \ 734 $(SRC)/buildobj.h \
735 $(SRC)/coding.h \
736 $(SRC)/composite.h \
737 $(SRC)/keyboard.h \
738 $(SRC)/keymap.h \ 735 $(SRC)/keymap.h \
739 $(SRC)/systime.h 736 $(NT_INC)/sys/file.h \
737 $(NT_INC)/unistd.h \
738 $(CHARACTER_H) \
739 $(CONFIG_H) \
740 $(KEYBOARD_H) \
741 $(LISP_H)
740 742
741$(BLD)/doprnt.$(O) : \ 743$(BLD)/doprnt.$(O) : \
742 $(SRC)/doprnt.c \ 744 $(SRC)/doprnt.c \
745 $(NT_INC)/unistd.h \
746 $(CHARACTER_H) \
743 $(CONFIG_H) \ 747 $(CONFIG_H) \
744 $(EMACS_ROOT)/nt/inc/unistd.h \ 748 $(LISP_H)
745 $(LISP_H) \
746 $(SRC)/character.h
747 749
748$(BLD)/editfns.$(O) : \ 750$(BLD)/editfns.$(O) : \
749 $(SRC)/editfns.c \ 751 $(SRC)/editfns.c \
752 $(SRC)/buffer.h \
753 $(NT_INC)/pwd.h \
754 $(NT_INC)/unistd.h \
755 $(GNU_LIB)/intprops.h \
756 $(GNU_LIB)/strftime.h \
757 $(GNU_LIB)/verify.h \
758 $(BLOCKINPUT_H) \
759 $(CHARACTER_H) \
760 $(CODING_H) \
750 $(CONFIG_H) \ 761 $(CONFIG_H) \
751 $(EMACS_ROOT)/nt/inc/pwd.h \ 762 $(FRAME_H) \
752 $(EMACS_ROOT)/nt/inc/unistd.h \ 763 $(INTERVALS_H) \
753 $(EMACS_ROOT)/nt/inc/sys/time.h \
754 $(EMACS_ROOT)/lib/strftime.h \
755 $(EMACS_ROOT)/lib/verify.h \
756 $(LISP_H) \ 764 $(LISP_H) \
757 $(SRC)/atimer.h \ 765 $(SYSTIME_H) \
758 $(SRC)/blockinput.h \ 766 $(WINDOW_H)
759 $(SRC)/buffer.h \
760 $(SRC)/character.h \
761 $(SRC)/coding.h \
762 $(SRC)/composite.h \
763 $(SRC)/dispextern.h \
764 $(SRC)/frame.h \
765 $(SRC)/intervals.h \
766 $(SRC)/systime.h \
767 $(SRC)/w32gui.h \
768 $(SRC)/window.h
769 767
770$(BLD)/emacs.$(O) : \ 768$(BLD)/emacs.$(O) : \
771 $(SRC)/emacs.c \ 769 $(SRC)/emacs.c \
772 $(CONFIG_H) \
773 $(EMACS_ROOT)/nt/inc/unistd.h \
774 $(EMACS_ROOT)/nt/inc/sys/file.h \
775 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
776 $(EMACS_ROOT)/nt/inc/sys/time.h \
777 $(LISP_H) \
778 $(PROCESS_H) \
779 $(SRC)/atimer.h \
780 $(SRC)/blockinput.h \
781 $(SRC)/buffer.h \ 770 $(SRC)/buffer.h \
782 $(SRC)/coding.h \
783 $(SRC)/commands.h \ 771 $(SRC)/commands.h \
784 $(SRC)/composite.h \ 772 $(SRC)/gnutls.h \
785 $(SRC)/dispextern.h \
786 $(SRC)/frame.h \
787 $(SRC)/intervals.h \
788 $(SRC)/keyboard.h \
789 $(SRC)/keymap.h \ 773 $(SRC)/keymap.h \
790 $(SRC)/syssignal.h \ 774 $(SRC)/syssignal.h \
791 $(SRC)/systime.h \
792 $(SRC)/systty.h \
793 $(SRC)/termhooks.h \
794 $(SRC)/unexec.h \ 775 $(SRC)/unexec.h \
795 $(SRC)/w32.h \ 776 $(SRC)/w32.h \
796 $(SRC)/w32gui.h \
797 $(SRC)/w32heap.h \ 777 $(SRC)/w32heap.h \
798 $(SRC)/window.h 778 $(NT_INC)/sys/file.h \
779 $(NT_INC)/unistd.h \
780 $(BLOCKINPUT_H) \
781 $(CONFIG_H) \
782 $(FRAME_H) \
783 $(INTERVALS_H) \
784 $(KEYBOARD_H) \
785 $(LISP_H) \
786 $(PROCESS_H) \
787 $(SYSTTY_H) \
788 $(TERMHOOKS_H) \
789 $(WINDOW_H)
799 790
800$(BLD)/eval.$(O) : \ 791$(BLD)/eval.$(O) : \
801 $(SRC)/eval.c \ 792 $(SRC)/eval.c \
802 $(CONFIG_H) \
803 $(EMACS_ROOT)/nt/inc/sys/time.h \
804 $(LISP_H) \
805 $(SRC)/atimer.h \
806 $(SRC)/blockinput.h \
807 $(SRC)/coding.h \
808 $(SRC)/commands.h \ 793 $(SRC)/commands.h \
809 $(SRC)/composite.h \ 794 $(BLOCKINPUT_H) \
810 $(SRC)/dispextern.h \ 795 $(CONFIG_H) \
811 $(SRC)/frame.h \ 796 $(DISPEXTERN_H) \
812 $(SRC)/keyboard.h \ 797 $(FRAME_H) \
813 $(SRC)/systime.h \ 798 $(KEYBOARD_H) \
814 $(SRC)/w32gui.h 799 $(LISP_H)
815 800
816$(BLD)/fileio.$(O) : \ 801$(BLD)/fileio.$(O) : \
817 $(SRC)/fileio.c \ 802 $(SRC)/fileio.c \
818 $(CONFIG_H) \
819 $(EMACS_ROOT)/nt/inc/pwd.h \
820 $(EMACS_ROOT)/nt/inc/unistd.h \
821 $(EMACS_ROOT)/nt/inc/sys/time.h \
822 $(LISP_H) \
823 $(SRC)/atimer.h \
824 $(SRC)/blockinput.h \
825 $(SRC)/buffer.h \ 803 $(SRC)/buffer.h \
826 $(SRC)/character.h \
827 $(SRC)/coding.h \
828 $(SRC)/commands.h \ 804 $(SRC)/commands.h \
829 $(SRC)/composite.h \ 805 $(NT_INC)/pwd.h \
830 $(SRC)/dispextern.h \ 806 $(NT_INC)/sys/stat.h \
831 $(SRC)/frame.h \ 807 $(NT_INC)/unistd.h \
832 $(SRC)/intervals.h \ 808 $(BLOCKINPUT_H) \
833 $(SRC)/systime.h \ 809 $(CHARACTER_H) \
834 $(SRC)/w32gui.h \ 810 $(CODING_H) \
835 $(SRC)/window.h 811 $(CONFIG_H) \
812 $(DISPEXTERN_H) \
813 $(FRAME_H) \
814 $(INTERVALS_H) \
815 $(LISP_H) \
816 $(SYSTIME_H) \
817 $(WINDOW_H)
836 818
837$(BLD)/filelock.$(O) : \ 819$(BLD)/filelock.$(O) : \
838 $(SRC)/filelock.c \ 820 $(SRC)/filelock.c \
821 $(SRC)/buffer.h \
822 $(NT_INC)/pwd.h \
823 $(NT_INC)/sys/file.h \
824 $(NT_INC)/sys/stat.h \
825 $(NT_INC)/unistd.h \
826 $(CHARACTER_H) \
827 $(CODING_H) \
839 $(CONFIG_H) \ 828 $(CONFIG_H) \
840 $(EMACS_ROOT)/nt/inc/pwd.h \
841 $(EMACS_ROOT)/nt/inc/unistd.h \
842 $(EMACS_ROOT)/nt/inc/sys/file.h \
843 $(EMACS_ROOT)/nt/inc/sys/time.h \
844 $(LISP_H) \ 829 $(LISP_H) \
845 $(SRC)/buffer.h \ 830 $(SYSTIME_H)
846 $(SRC)/character.h \
847 $(SRC)/coding.h \
848 $(SRC)/composite.h \
849 $(SRC)/systime.h
850 831
851$(BLD)/firstfile.$(O) : \ 832$(BLD)/firstfile.$(O) : \
852 $(SRC)/firstfile.c \ 833 $(SRC)/firstfile.c \
@@ -854,271 +835,213 @@ $(BLD)/firstfile.$(O) : \
854 835
855$(BLD)/floatfns.$(O) : \ 836$(BLD)/floatfns.$(O) : \
856 $(SRC)/floatfns.c \ 837 $(SRC)/floatfns.c \
838 $(SRC)/syssignal.h \
857 $(CONFIG_H) \ 839 $(CONFIG_H) \
858 $(LISP_H) \ 840 $(LISP_H)
859 $(SRC)/syssignal.h
860 841
861$(BLD)/fns.$(O) : \ 842$(BLD)/fns.$(O) : \
862 $(SRC)/fns.c \ 843 $(SRC)/fns.c \
863 $(CONFIG_H) \
864 $(EMACS_ROOT)/nt/inc/langinfo.h \
865 $(EMACS_ROOT)/nt/inc/nl_types.h \
866 $(EMACS_ROOT)/nt/inc/unistd.h \
867 $(EMACS_ROOT)/nt/inc/sys/time.h \
868 $(EMACS_ROOT)/lib/md5.h \
869 $(EMACS_ROOT)/lib/sha1.h \
870 $(EMACS_ROOT)/lib/sha256.h \
871 $(EMACS_ROOT)/lib/sha512.h \
872 $(LISP_H) \
873 $(SRC)/atimer.h \
874 $(SRC)/blockinput.h \
875 $(SRC)/buffer.h \ 844 $(SRC)/buffer.h \
876 $(SRC)/character.h \
877 $(SRC)/coding.h \
878 $(SRC)/commands.h \ 845 $(SRC)/commands.h \
879 $(SRC)/composite.h \
880 $(SRC)/dispextern.h \
881 $(SRC)/frame.h \
882 $(SRC)/intervals.h \
883 $(SRC)/keyboard.h \
884 $(SRC)/keymap.h \ 846 $(SRC)/keymap.h \
885 $(SRC)/systime.h \ 847 $(NT_INC)/unistd.h \
886 $(SRC)/w32gui.h \ 848 $(GNU_LIB)/intprops.h \
887 $(SRC)/window.h 849 $(BLOCKINPUT_H) \
850 $(CHARACTER_H) \
851 $(CODING_H) \
852 $(CONFIG_H) \
853 $(FRAME_H) \
854 $(INTERVALS_H) \
855 $(KEYBOARD_H) \
856 $(LANGINFO_H) \
857 $(LISP_H) \
858 $(MD5_H) \
859 $(SHA1_H) \
860 $(SHA256_H) \
861 $(SHA512_H) \
862 $(WINDOW_H)
888 863
889$(BLD)/font.$(O) : \ 864$(BLD)/font.$(O) : \
890 $(SRC)/font.c \ 865 $(SRC)/font.c \
891 $(CONFIG_H) \
892 $(EMACS_ROOT)/nt/inc/sys/time.h \
893 $(LISP_H) \
894 $(SRC)/buffer.h \ 866 $(SRC)/buffer.h \
895 $(SRC)/ccl.h \
896 $(SRC)/character.h \
897 $(SRC)/charset.h \
898 $(SRC)/composite.h \ 867 $(SRC)/composite.h \
899 $(SRC)/dispextern.h \
900 $(SRC)/font.h \
901 $(SRC)/fontset.h \ 868 $(SRC)/fontset.h \
902 $(SRC)/frame.h \ 869 $(CHARACTER_H) \
903 $(SRC)/systime.h \ 870 $(CHARSET_H) \
904 $(SRC)/w32gui.h \ 871 $(CONFIG_H) \
905 $(SRC)/w32term.h \ 872 $(DISPEXTERN_H) \
906 $(SRC)/window.h 873 $(FONT_H) \
874 $(FRAME_H) \
875 $(LISP_H) \
876 $(W32TERM_H) \
877 $(WINDOW_H)
907 878
908$(BLD)/fontset.$(O) : \ 879$(BLD)/fontset.$(O) : \
909 $(SRC)/fontset.c \ 880 $(SRC)/fontset.c \
910 $(CONFIG_H) \
911 $(EMACS_ROOT)/nt/inc/sys/time.h \
912 $(LISP_H) \
913 $(SRC)/atimer.h \
914 $(SRC)/blockinput.h \
915 $(SRC)/buffer.h \ 881 $(SRC)/buffer.h \
916 $(SRC)/ccl.h \ 882 $(SRC)/ccl.h \
917 $(SRC)/character.h \
918 $(SRC)/charset.h \
919 $(SRC)/coding.h \
920 $(SRC)/composite.h \
921 $(SRC)/dispextern.h \
922 $(SRC)/font.h \
923 $(SRC)/fontset.h \ 883 $(SRC)/fontset.h \
924 $(SRC)/frame.h \ 884 $(BLOCKINPUT_H) \
925 $(SRC)/intervals.h \ 885 $(CHARACTER_H) \
926 $(SRC)/keyboard.h \ 886 $(CHARSET_H) \
927 $(SRC)/systime.h \ 887 $(CONFIG_H) \
928 $(SRC)/termhooks.h \ 888 $(DISPEXTERN_H) \
929 $(SRC)/w32gui.h \ 889 $(FONT_H) \
930 $(SRC)/w32term.h \ 890 $(FRAME_H) \
931 $(SRC)/window.h 891 $(INTERVALS_H) \
892 $(KEYBOARD_H) \
893 $(LISP_H) \
894 $(TERMHOOKS_H) \
895 $(W32TERM_H) \
896 $(WINDOW_H)
932 897
933$(BLD)/frame.$(O) : \ 898$(BLD)/frame.$(O) : \
934 $(SRC)/frame.c \ 899 $(SRC)/frame.c \
935 $(CONFIG_H) \
936 $(EMACS_ROOT)/nt/inc/sys/time.h \
937 $(LISP_H) \
938 $(SRC)/atimer.h \
939 $(SRC)/blockinput.h \
940 $(SRC)/buffer.h \ 900 $(SRC)/buffer.h \
941 $(SRC)/ccl.h \
942 $(SRC)/character.h \
943 $(SRC)/coding.h \
944 $(SRC)/commands.h \ 901 $(SRC)/commands.h \
945 $(SRC)/composite.h \
946 $(SRC)/dispextern.h \
947 $(SRC)/font.h \
948 $(SRC)/fontset.h \ 902 $(SRC)/fontset.h \
949 $(SRC)/frame.h \
950 $(SRC)/keyboard.h \
951 $(SRC)/systime.h \
952 $(SRC)/termchar.h \ 903 $(SRC)/termchar.h \
953 $(SRC)/termhooks.h \ 904 $(BLOCKINPUT_H) \
954 $(SRC)/w32gui.h \ 905 $(CHARACTER_H) \
955 $(SRC)/w32term.h \ 906 $(CONFIG_H) \
956 $(SRC)/window.h 907 $(DISPEXTERN_H) \
908 $(FONT_H) \
909 $(FRAME_H) \
910 $(KEYBOARD_H) \
911 $(LISP_H) \
912 $(TERMHOOKS_H) \
913 $(W32TERM_H) \
914 $(WINDOW_H)
957 915
958$(BLD)/fringe.$(O) : \ 916$(BLD)/fringe.$(O) : \
959 $(SRC)/fringe.c \ 917 $(SRC)/fringe.c \
918 $(SRC)/buffer.h \
919 $(BLOCKINPUT_H) \
960 $(CONFIG_H) \ 920 $(CONFIG_H) \
961 $(EMACS_ROOT)/nt/inc/sys/time.h \ 921 $(DISPEXTERN_H) \
922 $(FRAME_H) \
962 $(LISP_H) \ 923 $(LISP_H) \
963 $(SRC)/atimer.h \ 924 $(TERMHOOKS_H) \
964 $(SRC)/blockinput.h \ 925 $(WINDOW_H)
965 $(SRC)/buffer.h \
966 $(SRC)/dispextern.h \
967 $(SRC)/frame.h \
968 $(SRC)/systime.h \
969 $(SRC)/termhooks.h \
970 $(SRC)/w32gui.h \
971 $(SRC)/window.h
972 926
973$(BLD)/gmalloc.$(O) : \ 927$(BLD)/gmalloc.$(O) : \
974 $(SRC)/gmalloc.c \ 928 $(SRC)/gmalloc.c \
975 $(CONFIG_H) \ 929 $(SRC)/getpagesize.h \
976 $(EMACS_ROOT)/nt/inc/unistd.h \ 930 $(NT_INC)/unistd.h \
977 $(SRC)/getpagesize.h 931 $(CONFIG_H)
978 932
979$(BLD)/gnutls.$(O) : \ 933$(BLD)/gnutls.$(O) : \
980 $(SRC)/gnutls.c \ 934 $(SRC)/gnutls.c \
935 $(SRC)/w32.h \
981 $(CONFIG_H) \ 936 $(CONFIG_H) \
982 $(EMACS_ROOT)/nt/inc/unistd.h \
983 $(LISP_H) \ 937 $(LISP_H) \
984 $(PROCESS_H) \ 938 $(PROCESS_H)
985 $(SRC)/w32.h
986 939
987$(BLD)/image.$(O) : \ 940$(BLD)/image.$(O) : \
988 $(SRC)/image.c \ 941 $(SRC)/image.c \
989 $(CONFIG_H) \
990 $(EMACS_ROOT)/nt/inc/unistd.h \
991 $(EMACS_ROOT)/nt/inc/sys/time.h \
992 $(LISP_H) \
993 $(SRC)/atimer.h \
994 $(SRC)/blockinput.h \
995 $(SRC)/ccl.h \
996 $(SRC)/character.h \
997 $(SRC)/coding.h \
998 $(SRC)/composite.h \
999 $(SRC)/dispextern.h \
1000 $(SRC)/epaths.h \ 942 $(SRC)/epaths.h \
1001 $(SRC)/font.h \
1002 $(SRC)/frame.h \
1003 $(SRC)/systime.h \
1004 $(SRC)/termhooks.h \
1005 $(SRC)/w32.h \ 943 $(SRC)/w32.h \
1006 $(SRC)/w32gui.h \ 944 $(NT_INC)/unistd.h \
1007 $(SRC)/w32term.h \ 945 $(BLOCKINPUT_H) \
1008 $(SRC)/window.h 946 $(CHARACTER_H) \
947 $(CODING_H) \
948 $(CONFIG_H) \
949 $(DISPEXTERN_H) \
950 $(FONT_H) \
951 $(FRAME_H) \
952 $(LISP_H) \
953 $(SYSTIME_H) \
954 $(TERMHOOKS_H) \
955 $(W32TERM_H) \
956 $(WINDOW_H)
1009 957
1010$(BLD)/indent.$(O) : \ 958$(BLD)/indent.$(O) : \
1011 $(SRC)/indent.c \ 959 $(SRC)/indent.c \
1012 $(CONFIG_H) \
1013 $(EMACS_ROOT)/nt/inc/sys/time.h \
1014 $(LISP_H) \
1015 $(SRC)/buffer.h \ 960 $(SRC)/buffer.h \
1016 $(SRC)/category.h \ 961 $(SRC)/category.h \
1017 $(SRC)/character.h \
1018 $(SRC)/coding.h \
1019 $(SRC)/composite.h \ 962 $(SRC)/composite.h \
1020 $(SRC)/dispextern.h \
1021 $(SRC)/disptab.h \ 963 $(SRC)/disptab.h \
1022 $(SRC)/frame.h \
1023 $(SRC)/indent.h \ 964 $(SRC)/indent.h \
1024 $(SRC)/intervals.h \
1025 $(SRC)/keyboard.h \
1026 $(SRC)/region-cache.h \ 965 $(SRC)/region-cache.h \
1027 $(SRC)/systime.h \
1028 $(SRC)/termchar.h \ 966 $(SRC)/termchar.h \
1029 $(SRC)/termopts.h \ 967 $(SRC)/termopts.h \
1030 $(SRC)/w32gui.h \ 968 $(CHARACTER_H) \
1031 $(SRC)/window.h 969 $(CONFIG_H) \
970 $(DISPEXTERN_H) \
971 $(FRAME_H) \
972 $(INTERVALS_H) \
973 $(KEYBOARD_H) \
974 $(LISP_H) \
975 $(WINDOW_H)
1032 976
1033$(BLD)/insdel.$(O) : \ 977$(BLD)/insdel.$(O) : \
1034 $(SRC)/insdel.c \ 978 $(SRC)/insdel.c \
1035 $(CONFIG_H) \
1036 $(EMACS_ROOT)/nt/inc/sys/time.h \
1037 $(LISP_H) \
1038 $(SRC)/atimer.h \
1039 $(SRC)/blockinput.h \
1040 $(SRC)/buffer.h \ 979 $(SRC)/buffer.h \
1041 $(SRC)/character.h \
1042 $(SRC)/composite.h \
1043 $(SRC)/dispextern.h \
1044 $(SRC)/intervals.h \
1045 $(SRC)/region-cache.h \ 980 $(SRC)/region-cache.h \
1046 $(SRC)/systime.h \ 981 $(GNU_LIB)/intprops.h \
1047 $(SRC)/w32gui.h \ 982 $(BLOCKINPUT_H) \
1048 $(SRC)/window.h 983 $(CHARACTER_H) \
984 $(CONFIG_H) \
985 $(INTERVALS_H) \
986 $(LISP_H) \
987 $(WINDOW_H)
1049 988
1050$(BLD)/intervals.$(O) : \ 989$(BLD)/intervals.$(O) : \
1051 $(SRC)/intervals.c \ 990 $(SRC)/intervals.c \
1052 $(CONFIG_H) \
1053 $(EMACS_ROOT)/nt/inc/sys/time.h \
1054 $(LISP_H) \
1055 $(SRC)/buffer.h \ 991 $(SRC)/buffer.h \
1056 $(SRC)/coding.h \
1057 $(SRC)/composite.h \
1058 $(SRC)/dispextern.h \
1059 $(SRC)/intervals.h \
1060 $(SRC)/keyboard.h \
1061 $(SRC)/keymap.h \ 992 $(SRC)/keymap.h \
1062 $(SRC)/puresize.h \ 993 $(SRC)/puresize.h \
1063 $(SRC)/systime.h \ 994 $(GNU_LIB)/intprops.h \
1064 $(SRC)/w32gui.h 995 $(CONFIG_H) \
996 $(INTERVALS_H) \
997 $(KEYBOARD_H) \
998 $(LISP_H)
1065 999
1066$(BLD)/keyboard.$(O) : \ 1000$(BLD)/keyboard.$(O) : \
1067 $(SRC)/keyboard.c \ 1001 $(SRC)/keyboard.c \
1068 $(CONFIG_H) \
1069 $(EMACS_ROOT)/nt/inc/unistd.h \
1070 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
1071 $(EMACS_ROOT)/nt/inc/sys/time.h \
1072 $(LISP_H) \
1073 $(PROCESS_H) \
1074 $(SRC)/atimer.h \
1075 $(SRC)/blockinput.h \
1076 $(SRC)/buffer.h \ 1002 $(SRC)/buffer.h \
1077 $(SRC)/character.h \
1078 $(SRC)/coding.h \
1079 $(SRC)/commands.h \ 1003 $(SRC)/commands.h \
1080 $(SRC)/composite.h \
1081 $(SRC)/dispextern.h \
1082 $(SRC)/disptab.h \ 1004 $(SRC)/disptab.h \
1083 $(SRC)/frame.h \
1084 $(SRC)/intervals.h \
1085 $(SRC)/keyboard.h \
1086 $(SRC)/keymap.h \ 1005 $(SRC)/keymap.h \
1087 $(SRC)/macros.h \ 1006 $(SRC)/macros.h \
1088 $(SRC)/puresize.h \ 1007 $(SRC)/puresize.h \
1089 $(SRC)/syntax.h \ 1008 $(SRC)/syntax.h \
1090 $(SRC)/syssignal.h \ 1009 $(SRC)/syssignal.h \
1091 $(SRC)/systime.h \
1092 $(SRC)/termchar.h \ 1010 $(SRC)/termchar.h \
1093 $(SRC)/termhooks.h \
1094 $(SRC)/termopts.h \ 1011 $(SRC)/termopts.h \
1095 $(SRC)/w32gui.h \ 1012 $(NT_INC)/sys/ioctl.h \
1096 $(SRC)/w32term.h \ 1013 $(NT_INC)/unistd.h \
1097 $(SRC)/window.h 1014 $(ATIMER_H) \
1015 $(BLOCKINPUT_H) \
1016 $(CHARACTER_H) \
1017 $(CONFIG_H) \
1018 $(DISPEXTERN_H) \
1019 $(FRAME_H) \
1020 $(INTERVALS_H) \
1021 $(KEYBOARD_H) \
1022 $(LISP_H) \
1023 $(PROCESS_H) \
1024 $(SYSTIME_H) \
1025 $(TERMHOOKS_H) \
1026 $(W32TERM_H) \
1027 $(WINDOW_H)
1098 1028
1099$(BLD)/keymap.$(O) : \ 1029$(BLD)/keymap.$(O) : \
1100 $(SRC)/keymap.c \ 1030 $(SRC)/keymap.c \
1101 $(CONFIG_H) \
1102 $(EMACS_ROOT)/nt/inc/sys/time.h \
1103 $(LISP_H) \
1104 $(SRC)/atimer.h \
1105 $(SRC)/blockinput.h \
1106 $(SRC)/buffer.h \ 1031 $(SRC)/buffer.h \
1107 $(SRC)/character.h \
1108 $(SRC)/charset.h \
1109 $(SRC)/coding.h \
1110 $(SRC)/commands.h \ 1032 $(SRC)/commands.h \
1111 $(SRC)/composite.h \
1112 $(SRC)/dispextern.h \
1113 $(SRC)/frame.h \
1114 $(SRC)/intervals.h \
1115 $(SRC)/keyboard.h \
1116 $(SRC)/keymap.h \ 1033 $(SRC)/keymap.h \
1117 $(SRC)/puresize.h \ 1034 $(SRC)/puresize.h \
1118 $(SRC)/systime.h \ 1035 $(BLOCKINPUT_H) \
1119 $(SRC)/termhooks.h \ 1036 $(CHARACTER_H) \
1120 $(SRC)/w32gui.h \ 1037 $(CHARSET_H) \
1121 $(SRC)/window.h 1038 $(CONFIG_H) \
1039 $(FRAME_H) \
1040 $(INTERVALS_H) \
1041 $(KEYBOARD_H) \
1042 $(LISP_H) \
1043 $(TERMHOOKS_H) \
1044 $(WINDOW_H)
1122 1045
1123$(BLD)/lastfile.$(O) : \ 1046$(BLD)/lastfile.$(O) : \
1124 $(SRC)/lastfile.c \ 1047 $(SRC)/lastfile.c \
@@ -1126,714 +1049,560 @@ $(BLD)/lastfile.$(O) : \
1126 1049
1127$(BLD)/lread.$(O) : \ 1050$(BLD)/lread.$(O) : \
1128 $(SRC)/lread.c \ 1051 $(SRC)/lread.c \
1129 $(CONFIG_H) \
1130 $(EMACS_ROOT)/nt/inc/unistd.h \
1131 $(EMACS_ROOT)/nt/inc/sys/file.h \
1132 $(EMACS_ROOT)/nt/inc/sys/time.h \
1133 $(LISP_H) \
1134 $(SRC)/atimer.h \
1135 $(SRC)/blockinput.h \
1136 $(SRC)/buffer.h \ 1052 $(SRC)/buffer.h \
1137 $(SRC)/character.h \
1138 $(SRC)/charset.h \
1139 $(SRC)/coding.h \
1140 $(SRC)/commands.h \ 1053 $(SRC)/commands.h \
1141 $(SRC)/composite.h \
1142 $(SRC)/dispextern.h \
1143 $(SRC)/epaths.h \ 1054 $(SRC)/epaths.h \
1144 $(SRC)/frame.h \ 1055 $(NT_INC)/sys/file.h \
1145 $(SRC)/intervals.h \ 1056 $(NT_INC)/sys/stat.h \
1146 $(SRC)/keyboard.h \ 1057 $(NT_INC)/unistd.h \
1147 $(SRC)/systime.h \ 1058 $(BLOCKINPUT_H) \
1148 $(SRC)/termhooks.h \ 1059 $(CHARACTER_H) \
1149 $(SRC)/w32gui.h 1060 $(CHARSET_H) \
1061 $(CODING_H) \
1062 $(CONFIG_H) \
1063 $(FRAME_H) \
1064 $(INTERVALS_H) \
1065 $(KEYBOARD_H) \
1066 $(LISP_H) \
1067 $(TERMHOOKS_H)
1150 1068
1151$(BLD)/macros.$(O) : \ 1069$(BLD)/macros.$(O) : \
1152 $(SRC)/macros.c \ 1070 $(SRC)/macros.c \
1153 $(CONFIG_H) \
1154 $(EMACS_ROOT)/nt/inc/sys/time.h \
1155 $(LISP_H) \
1156 $(SRC)/buffer.h \ 1071 $(SRC)/buffer.h \
1157 $(SRC)/coding.h \
1158 $(SRC)/commands.h \ 1072 $(SRC)/commands.h \
1159 $(SRC)/composite.h \
1160 $(SRC)/dispextern.h \
1161 $(SRC)/keyboard.h \
1162 $(SRC)/macros.h \ 1073 $(SRC)/macros.h \
1163 $(SRC)/systime.h \ 1074 $(CONFIG_H) \
1164 $(SRC)/w32gui.h \ 1075 $(KEYBOARD_H) \
1165 $(SRC)/window.h 1076 $(LISP_H) \
1077 $(WINDOW_H)
1166 1078
1167$(BLD)/marker.$(O) : \ 1079$(BLD)/marker.$(O) : \
1168 $(SRC)/marker.c \ 1080 $(SRC)/marker.c \
1169 $(CONFIG_H) \
1170 $(LISP_H) \
1171 $(SRC)/buffer.h \ 1081 $(SRC)/buffer.h \
1172 $(SRC)/character.h 1082 $(CHARACTER_H) \
1083 $(CONFIG_H) \
1084 $(LISP_H)
1173 1085
1174$(BLD)/menu.$(O) : \ 1086$(BLD)/menu.$(O) : \
1175 $(SRC)/menu.c \ 1087 $(SRC)/menu.c \
1088 $(SRC)/keymap.h \
1089 $(BLOCKINPUT_H) \
1176 $(CONFIG_H) \ 1090 $(CONFIG_H) \
1177 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1091 $(DISPEXTERN_H) \
1092 $(FRAME_H) \
1093 $(KEYBOARD_H) \
1178 $(LISP_H) \ 1094 $(LISP_H) \
1179 $(SRC)/atimer.h \ 1095 $(MENU_H) \
1180 $(SRC)/blockinput.h \ 1096 $(TERMHOOKS_H) \
1181 $(SRC)/coding.h \ 1097 $(W32TERM_H) \
1182 $(SRC)/composite.h \ 1098 $(WINDOW_H)
1183 $(SRC)/dispextern.h \
1184 $(SRC)/frame.h \
1185 $(SRC)/keyboard.h \
1186 $(SRC)/keymap.h \
1187 $(SRC)/menu.h \
1188 $(SRC)/systime.h \
1189 $(SRC)/termhooks.h \
1190 $(SRC)/w32gui.h \
1191 $(SRC)/w32term.h \
1192 $(SRC)/window.h
1193 1099
1194$(BLD)/minibuf.$(O) : \ 1100$(BLD)/minibuf.$(O) : \
1195 $(SRC)/minibuf.c \ 1101 $(SRC)/minibuf.c \
1196 $(CONFIG_H) \
1197 $(EMACS_ROOT)/nt/inc/sys/time.h \
1198 $(LISP_H) \
1199 $(SRC)/buffer.h \ 1102 $(SRC)/buffer.h \
1200 $(SRC)/character.h \
1201 $(SRC)/coding.h \
1202 $(SRC)/commands.h \ 1103 $(SRC)/commands.h \
1203 $(SRC)/composite.h \
1204 $(SRC)/dispextern.h \
1205 $(SRC)/frame.h \
1206 $(SRC)/intervals.h \
1207 $(SRC)/keyboard.h \
1208 $(SRC)/keymap.h \ 1104 $(SRC)/keymap.h \
1209 $(SRC)/syntax.h \ 1105 $(SRC)/syntax.h \
1210 $(SRC)/systime.h \ 1106 $(CONFIG_H) \
1211 $(SRC)/termhooks.h \ 1107 $(DISPEXTERN_H) \
1212 $(SRC)/w32gui.h \ 1108 $(FRAME_H) \
1213 $(SRC)/window.h 1109 $(INTERVALS_H) \
1110 $(KEYBOARD_H) \
1111 $(LISP_H) \
1112 $(TERMHOOKS_H) \
1113 $(WINDOW_H)
1214 1114
1215$(BLD)/w32.$(O) : \ 1115$(BLD)/w32.$(O) : \
1216 $(SRC)/w32.c \ 1116 $(SRC)/w32.c \
1117 $(SRC)/ndir.h \
1118 $(SRC)/w32.h \
1119 $(SRC)/w32heap.h \
1120 $(NT_INC)/pwd.h \
1121 $(NT_INC)/sys/file.h \
1122 $(NT_INC)/sys/time.h \
1123 $(GNU_LIB)/allocator.h \
1124 $(CAREADLINKAT_H) \
1125 $(CODING_H) \
1217 $(CONFIG_H) \ 1126 $(CONFIG_H) \
1218 $(EMACS_ROOT)/nt/inc/grp.h \ 1127 $(DISPEXTERN_H) \
1219 $(EMACS_ROOT)/nt/inc/pwd.h \ 1128 $(GRP_H) \
1220 $(EMACS_ROOT)/nt/inc/unistd.h \
1221 $(EMACS_ROOT)/nt/inc/sys/file.h \
1222 $(EMACS_ROOT)/nt/inc/sys/socket.h \
1223 $(EMACS_ROOT)/nt/inc/sys/time.h \
1224 $(EMACS_ROOT)/lib/allocator.h \
1225 $(EMACS_ROOT)/lib/careadlinkat.h \
1226 $(LISP_H) \ 1129 $(LISP_H) \
1227 $(PROCESS_H) \ 1130 $(PROCESS_H) \
1228 $(SRC)/coding.h \ 1131 $(SOCKET_H) \
1229 $(SRC)/composite.h \ 1132 $(SYSTIME_H)
1230 $(SRC)/dispextern.h \
1231 $(SRC)/ndir.h \
1232 $(SRC)/systime.h \
1233 $(SRC)/w32.h \
1234 $(SRC)/w32gui.h \
1235 $(SRC)/w32heap.h
1236 1133
1237$(BLD)/w32heap.$(O) : \ 1134$(BLD)/w32heap.$(O) : \
1238 $(SRC)/w32heap.c \ 1135 $(SRC)/w32heap.c \
1136 $(SRC)/w32heap.h \
1239 $(CONFIG_H) \ 1137 $(CONFIG_H) \
1240 $(LISP_H) \ 1138 $(LISP_H)
1241 $(SRC)/w32heap.h
1242 1139
1243$(BLD)/w32inevt.$(O) : \ 1140$(BLD)/w32inevt.$(O) : \
1244 $(SRC)/w32inevt.c \ 1141 $(SRC)/w32inevt.c \
1142 $(SRC)/w32heap.h \
1143 $(BLOCKINPUT_H) \
1245 $(CONFIG_H) \ 1144 $(CONFIG_H) \
1246 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1145 $(DISPEXTERN_H) \
1146 $(FRAME_H) \
1147 $(KEYBOARD_H) \
1247 $(LISP_H) \ 1148 $(LISP_H) \
1248 $(SRC)/atimer.h \ 1149 $(TERMHOOKS_H) \
1249 $(SRC)/blockinput.h \ 1150 $(W32TERM_H)
1250 $(SRC)/coding.h \
1251 $(SRC)/composite.h \
1252 $(SRC)/dispextern.h \
1253 $(SRC)/frame.h \
1254 $(SRC)/keyboard.h \
1255 $(SRC)/systime.h \
1256 $(SRC)/termhooks.h \
1257 $(SRC)/w32gui.h \
1258 $(SRC)/w32heap.h \
1259 $(SRC)/w32term.h
1260 1151
1261$(BLD)/w32proc.$(O) : \ 1152$(BLD)/w32proc.$(O) : \
1262 $(SRC)/w32proc.c \ 1153 $(SRC)/w32proc.c \
1263 $(CONFIG_H) \
1264 $(EMACS_ROOT)/nt/inc/langinfo.h \
1265 $(EMACS_ROOT)/nt/inc/nl_types.h \
1266 $(EMACS_ROOT)/nt/inc/unistd.h \
1267 $(EMACS_ROOT)/nt/inc/sys/file.h \
1268 $(EMACS_ROOT)/nt/inc/sys/time.h \
1269 $(LISP_H) \
1270 $(PROCESS_H) \
1271 $(SRC)/character.h \
1272 $(SRC)/coding.h \
1273 $(SRC)/composite.h \
1274 $(SRC)/dispextern.h \
1275 $(SRC)/syssignal.h \ 1154 $(SRC)/syssignal.h \
1276 $(SRC)/systime.h \
1277 $(SRC)/syswait.h \ 1155 $(SRC)/syswait.h \
1278 $(SRC)/w32.h \ 1156 $(SRC)/w32.h \
1279 $(SRC)/w32gui.h \
1280 $(SRC)/w32heap.h \ 1157 $(SRC)/w32heap.h \
1281 $(SRC)/w32term.h 1158 $(NT_INC)/nl_types.h \
1159 $(NT_INC)/sys/file.h \
1160 $(CODING_H) \
1161 $(CONFIG_H) \
1162 $(DISPEXTERN_H) \
1163 $(LANGINFO_H) \
1164 $(LISP_H) \
1165 $(PROCESS_H) \
1166 $(SYSTIME_H) \
1167 $(W32TERM_H)
1282 1168
1283$(BLD)/w32console.$(O) : \ 1169$(BLD)/w32console.$(O) : \
1284 $(SRC)/w32console.c \ 1170 $(SRC)/w32console.c \
1285 $(CONFIG_H) \
1286 $(EMACS_ROOT)/nt/inc/sys/time.h \
1287 $(LISP_H) \
1288 $(SRC)/character.h \
1289 $(SRC)/coding.h \
1290 $(SRC)/composite.h \
1291 $(SRC)/dispextern.h \
1292 $(SRC)/disptab.h \ 1171 $(SRC)/disptab.h \
1293 $(SRC)/frame.h \
1294 $(SRC)/systime.h \
1295 $(SRC)/termchar.h \ 1172 $(SRC)/termchar.h \
1296 $(SRC)/termhooks.h \ 1173 $(SRC)/w32inevt.h \
1297 $(SRC)/w32gui.h \ 1174 $(CHARACTER_H) \
1298 $(SRC)/w32inevt.h 1175 $(CODING_H) \
1176 $(CONFIG_H) \
1177 $(DISPEXTERN_H) \
1178 $(FRAME_H) \
1179 $(LISP_H) \
1180 $(TERMHOOKS_H)
1299 1181
1300$(BLD)/print.$(O) : \ 1182$(BLD)/print.$(O) : \
1301 $(SRC)/print.c \ 1183 $(SRC)/print.c \
1184 $(SRC)/buffer.h \
1185 $(SRC)/termchar.h \
1186 $(BLOCKINPUT_H) \
1187 $(CHARACTER_H) \
1188 $(CHARSET_H) \
1302 $(CONFIG_H) \ 1189 $(CONFIG_H) \
1303 $(EMACS_ROOT)/nt/inc/unistd.h \ 1190 $(DISPEXTERN_H) \
1304 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1191 $(FONT_H) \
1305 $(EMACS_ROOT)/lib/ftoastr.h \ 1192 $(FRAME_H) \
1193 $(FTOASTR_H) \
1194 $(INTERVALS_H) \
1195 $(KEYBOARD_H) \
1306 $(LISP_H) \ 1196 $(LISP_H) \
1307 $(PROCESS_H) \ 1197 $(PROCESS_H) \
1308 $(SRC)/atimer.h \ 1198 $(TERMHOOKS_H) \
1309 $(SRC)/blockinput.h \ 1199 $(WINDOW_H)
1310 $(SRC)/buffer.h \
1311 $(SRC)/ccl.h \
1312 $(SRC)/character.h \
1313 $(SRC)/charset.h \
1314 $(SRC)/coding.h \
1315 $(SRC)/composite.h \
1316 $(SRC)/dispextern.h \
1317 $(SRC)/font.h \
1318 $(SRC)/frame.h \
1319 $(SRC)/intervals.h \
1320 $(SRC)/keyboard.h \
1321 $(SRC)/systime.h \
1322 $(SRC)/termchar.h \
1323 $(SRC)/termhooks.h \
1324 $(SRC)/w32gui.h \
1325 $(SRC)/window.h
1326 1200
1327$(BLD)/process.$(O) : \ 1201$(BLD)/process.$(O) : \
1328 $(SRC)/process.c \ 1202 $(SRC)/process.c \
1329 $(CONFIG_H) \
1330 $(EMACS_ROOT)/nt/inc/netdb.h \
1331 $(EMACS_ROOT)/nt/inc/unistd.h \
1332 $(EMACS_ROOT)/nt/inc/arpa/inet.h \
1333 $(EMACS_ROOT)/nt/inc/netinet/in.h \
1334 $(EMACS_ROOT)/nt/inc/sys/file.h \
1335 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
1336 $(EMACS_ROOT)/nt/inc/sys/socket.h \
1337 $(EMACS_ROOT)/nt/inc/sys/time.h \
1338 $(LISP_H) \
1339 $(PROCESS_H) \
1340 $(SRC)/atimer.h \
1341 $(SRC)/blockinput.h \
1342 $(SRC)/buffer.h \ 1203 $(SRC)/buffer.h \
1343 $(SRC)/character.h \
1344 $(SRC)/coding.h \
1345 $(SRC)/commands.h \ 1204 $(SRC)/commands.h \
1346 $(SRC)/composite.h \ 1205 $(SRC)/composite.h \
1347 $(SRC)/dispextern.h \ 1206 $(SRC)/gnutls.h \
1348 $(SRC)/frame.h \
1349 $(SRC)/keyboard.h \
1350 $(SRC)/sysselect.h \ 1207 $(SRC)/sysselect.h \
1351 $(SRC)/syssignal.h \ 1208 $(SRC)/syssignal.h \
1352 $(SRC)/systime.h \
1353 $(SRC)/systty.h \
1354 $(SRC)/syswait.h \ 1209 $(SRC)/syswait.h \
1355 $(SRC)/termhooks.h \
1356 $(SRC)/termopts.h \ 1210 $(SRC)/termopts.h \
1357 $(SRC)/w32.h \ 1211 $(NT_INC)/arpa/inet.h \
1358 $(SRC)/w32gui.h \ 1212 $(NT_INC)/netdb.h \
1359 $(SRC)/window.h 1213 $(NT_INC)/netinet/in.h \
1214 $(NT_INC)/sys/file.h \
1215 $(NT_INC)/sys/ioctl.h \
1216 $(NT_INC)/sys/stat.h \
1217 $(NT_INC)/unistd.h \
1218 $(ATIMER_H) \
1219 $(BLOCKINPUT_H) \
1220 $(CHARACTER_H) \
1221 $(CODING_H) \
1222 $(CONFIG_H) \
1223 $(DISPEXTERN_H) \
1224 $(FRAME_H) \
1225 $(KEYBOARD_H) \
1226 $(LISP_H) \
1227 $(PROCESS_H) \
1228 $(SOCKET_H) \
1229 $(SYSTIME_H) \
1230 $(SYSTTY_H) \
1231 $(TERMHOOKS_H) \
1232 $(WINDOW_H)
1360 1233
1361$(BLD)/ralloc.$(O) : \ 1234$(BLD)/ralloc.$(O) : \
1362 $(SRC)/ralloc.c \ 1235 $(SRC)/ralloc.c \
1363 $(CONFIG_H) \
1364 $(EMACS_ROOT)/nt/inc/unistd.h \
1365 $(EMACS_ROOT)/nt/inc/sys/time.h \
1366 $(LISP_H) \
1367 $(SRC)/atimer.h \
1368 $(SRC)/blockinput.h \
1369 $(SRC)/getpagesize.h \ 1236 $(SRC)/getpagesize.h \
1370 $(SRC)/systime.h 1237 $(NT_INC)/unistd.h \
1238 $(BLOCKINPUT_H) \
1239 $(CONFIG_H) \
1240 $(LISP_H)
1371 1241
1372$(BLD)/regex.$(O) : \ 1242$(BLD)/regex.$(O) : \
1373 $(SRC)/regex.c \ 1243 $(SRC)/regex.c \
1374 $(CONFIG_H) \
1375 $(LISP_H) \
1376 $(SRC)/buffer.h \ 1244 $(SRC)/buffer.h \
1377 $(SRC)/category.h \ 1245 $(SRC)/category.h \
1378 $(SRC)/character.h \
1379 $(SRC)/regex.h \ 1246 $(SRC)/regex.h \
1380 $(SRC)/syntax.h 1247 $(SRC)/syntax.h \
1248 $(NT_INC)/unistd.h \
1249 $(CHARACTER_H) \
1250 $(CONFIG_H) \
1251 $(LISP_H)
1381 1252
1382$(BLD)/region-cache.$(O) : \ 1253$(BLD)/region-cache.$(O) : \
1383 $(SRC)/region-cache.c \ 1254 $(SRC)/region-cache.c \
1384 $(CONFIG_H) \
1385 $(LISP_H) \
1386 $(SRC)/buffer.h \ 1255 $(SRC)/buffer.h \
1387 $(SRC)/region-cache.h 1256 $(SRC)/region-cache.h \
1257 $(CONFIG_H) \
1258 $(LISP_H)
1388 1259
1389$(BLD)/scroll.$(O) : \ 1260$(BLD)/scroll.$(O) : \
1390 $(SRC)/scroll.c \ 1261 $(SRC)/scroll.c \
1262 $(SRC)/termchar.h \
1391 $(CONFIG_H) \ 1263 $(CONFIG_H) \
1392 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1264 $(DISPEXTERN_H) \
1265 $(FRAME_H) \
1266 $(KEYBOARD_H) \
1393 $(LISP_H) \ 1267 $(LISP_H) \
1394 $(SRC)/coding.h \ 1268 $(TERMHOOKS_H) \
1395 $(SRC)/composite.h \ 1269 $(WINDOW_H)
1396 $(SRC)/dispextern.h \
1397 $(SRC)/frame.h \
1398 $(SRC)/keyboard.h \
1399 $(SRC)/systime.h \
1400 $(SRC)/termchar.h \
1401 $(SRC)/termhooks.h \
1402 $(SRC)/w32gui.h \
1403 $(SRC)/window.h
1404 1270
1405$(BLD)/search.$(O) : \ 1271$(BLD)/search.$(O) : \
1406 $(SRC)/search.c \ 1272 $(SRC)/search.c \
1407 $(CONFIG_H) \
1408 $(EMACS_ROOT)/nt/inc/sys/time.h \
1409 $(LISP_H) \
1410 $(SRC)/atimer.h \
1411 $(SRC)/blockinput.h \
1412 $(SRC)/buffer.h \ 1273 $(SRC)/buffer.h \
1413 $(SRC)/category.h \ 1274 $(SRC)/category.h \
1414 $(SRC)/character.h \
1415 $(SRC)/charset.h \
1416 $(SRC)/commands.h \ 1275 $(SRC)/commands.h \
1417 $(SRC)/composite.h \
1418 $(SRC)/dispextern.h \
1419 $(SRC)/intervals.h \
1420 $(SRC)/regex.h \ 1276 $(SRC)/regex.h \
1421 $(SRC)/region-cache.h \ 1277 $(SRC)/region-cache.h \
1422 $(SRC)/syntax.h \ 1278 $(SRC)/syntax.h \
1423 $(SRC)/systime.h \ 1279 $(BLOCKINPUT_H) \
1424 $(SRC)/w32gui.h 1280 $(CHARACTER_H) \
1281 $(CHARSET_H) \
1282 $(CONFIG_H) \
1283 $(INTERVALS_H) \
1284 $(LISP_H)
1425 1285
1426$(BLD)/sound.$(O) : \ 1286$(BLD)/sound.$(O) : \
1427 $(SRC)/sound.c \ 1287 $(SRC)/sound.c \
1428 $(CONFIG_H) \
1429 $(EMACS_ROOT)/nt/inc/unistd.h \
1430 $(EMACS_ROOT)/nt/inc/sys/time.h \
1431 $(LISP_H) \
1432 $(SRC)/atimer.h \
1433 $(SRC)/dispextern.h \
1434 $(SRC)/syssignal.h \ 1288 $(SRC)/syssignal.h \
1435 $(SRC)/systime.h \ 1289 $(NT_INC)/unistd.h \
1436 $(SRC)/w32gui.h 1290 $(ATIMER_H) \
1291 $(CONFIG_H) \
1292 $(DISPEXTERN_H) \
1293 $(LISP_H)
1437 1294
1438$(BLD)/syntax.$(O) : \ 1295$(BLD)/syntax.$(O) : \
1439 $(SRC)/syntax.c \ 1296 $(SRC)/syntax.c \
1440 $(CONFIG_H) \
1441 $(EMACS_ROOT)/nt/inc/sys/time.h \
1442 $(LISP_H) \
1443 $(SRC)/buffer.h \ 1297 $(SRC)/buffer.h \
1444 $(SRC)/category.h \ 1298 $(SRC)/category.h \
1445 $(SRC)/character.h \
1446 $(SRC)/commands.h \ 1299 $(SRC)/commands.h \
1447 $(SRC)/composite.h \
1448 $(SRC)/dispextern.h \
1449 $(SRC)/intervals.h \
1450 $(SRC)/keymap.h \ 1300 $(SRC)/keymap.h \
1451 $(SRC)/regex.h \ 1301 $(SRC)/regex.h \
1452 $(SRC)/syntax.h \ 1302 $(SRC)/syntax.h \
1453 $(SRC)/systime.h \ 1303 $(CHARACTER_H) \
1454 $(SRC)/w32gui.h 1304 $(CONFIG_H) \
1305 $(INTERVALS_H) \
1306 $(LISP_H)
1455 1307
1456$(BLD)/sysdep.$(O) : \ 1308$(BLD)/sysdep.$(O) : \
1457 $(SRC)/sysdep.c \ 1309 $(SRC)/sysdep.c \
1458 $(CONFIG_H) \
1459 $(EMACS_ROOT)/nt/inc/grp.h \
1460 $(EMACS_ROOT)/nt/inc/netdb.h \
1461 $(EMACS_ROOT)/nt/inc/pwd.h \
1462 $(EMACS_ROOT)/nt/inc/unistd.h \
1463 $(EMACS_ROOT)/nt/inc/sys/file.h \
1464 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
1465 $(EMACS_ROOT)/nt/inc/sys/socket.h \
1466 $(EMACS_ROOT)/nt/inc/sys/time.h \
1467 $(EMACS_ROOT)/lib/allocator.h \
1468 $(EMACS_ROOT)/lib/careadlinkat.h \
1469 $(EMACS_ROOT)/lib/ignore-value.h \
1470 $(LISP_H) \
1471 $(PROCESS_H) \
1472 $(SRC)/atimer.h \
1473 $(SRC)/blockinput.h \
1474 $(SRC)/cm.h \ 1310 $(SRC)/cm.h \
1475 $(SRC)/coding.h \
1476 $(SRC)/composite.h \
1477 $(SRC)/dispextern.h \
1478 $(SRC)/frame.h \
1479 $(SRC)/keyboard.h \
1480 $(SRC)/sysselect.h \ 1311 $(SRC)/sysselect.h \
1481 $(SRC)/syssignal.h \ 1312 $(SRC)/syssignal.h \
1482 $(SRC)/systime.h \
1483 $(SRC)/systty.h \
1484 $(SRC)/syswait.h \ 1313 $(SRC)/syswait.h \
1485 $(SRC)/termchar.h \ 1314 $(SRC)/termchar.h \
1486 $(SRC)/termhooks.h \
1487 $(SRC)/termopts.h \ 1315 $(SRC)/termopts.h \
1488 $(SRC)/w32.h \ 1316 $(NT_INC)/netdb.h \
1489 $(SRC)/w32gui.h \ 1317 $(NT_INC)/pwd.h \
1490 $(SRC)/window.h 1318 $(NT_INC)/sys/file.h \
1319 $(NT_INC)/sys/stat.h \
1320 $(NT_INC)/unistd.h \
1321 $(GNU_LIB)/allocator.h \
1322 $(GNU_LIB)/ignore-value.h \
1323 $(BLOCKINPUT_H) \
1324 $(CAREADLINKAT_H) \
1325 $(CONFIG_H) \
1326 $(DISPEXTERN_H) \
1327 $(FRAME_H) \
1328 $(GRP_H) \
1329 $(KEYBOARD_H) \
1330 $(LISP_H) \
1331 $(PROCESS_H) \
1332 $(SOCKET_H) \
1333 $(SYSTIME_H) \
1334 $(SYSTTY_H) \
1335 $(TERMHOOKS_H) \
1336 $(WINDOW_H)
1491 1337
1492$(BLD)/term.$(O) : \ 1338$(BLD)/term.$(O) : \
1493 $(SRC)/term.c \ 1339 $(SRC)/term.c \
1494 $(CONFIG_H) \
1495 $(EMACS_ROOT)/nt/inc/unistd.h \
1496 $(EMACS_ROOT)/nt/inc/sys/file.h \
1497 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
1498 $(EMACS_ROOT)/nt/inc/sys/time.h \
1499 $(LISP_H) \
1500 $(SRC)/atimer.h \
1501 $(SRC)/blockinput.h \
1502 $(SRC)/buffer.h \ 1340 $(SRC)/buffer.h \
1503 $(SRC)/character.h \
1504 $(SRC)/charset.h \
1505 $(SRC)/cm.h \ 1341 $(SRC)/cm.h \
1506 $(SRC)/coding.h \
1507 $(SRC)/composite.h \ 1342 $(SRC)/composite.h \
1508 $(SRC)/dispextern.h \
1509 $(SRC)/disptab.h \ 1343 $(SRC)/disptab.h \
1510 $(SRC)/frame.h \
1511 $(SRC)/intervals.h \
1512 $(SRC)/keyboard.h \
1513 $(SRC)/keymap.h \ 1344 $(SRC)/keymap.h \
1514 $(SRC)/syssignal.h \ 1345 $(SRC)/syssignal.h \
1515 $(SRC)/systime.h \
1516 $(SRC)/systty.h \
1517 $(SRC)/termchar.h \ 1346 $(SRC)/termchar.h \
1518 $(SRC)/termhooks.h \
1519 $(SRC)/termopts.h \ 1347 $(SRC)/termopts.h \
1520 $(SRC)/tparam.h \ 1348 $(SRC)/tparam.h \
1521 $(SRC)/w32gui.h \ 1349 $(NT_INC)/sys/file.h \
1522 $(SRC)/window.h 1350 $(NT_INC)/unistd.h \
1351 $(BLOCKINPUT_H) \
1352 $(CHARACTER_H) \
1353 $(CHARSET_H) \
1354 $(CODING_H) \
1355 $(CONFIG_H) \
1356 $(DISPEXTERN_H) \
1357 $(FRAME_H) \
1358 $(INTERVALS_H) \
1359 $(KEYBOARD_H) \
1360 $(LISP_H) \
1361 $(SYSTTY_H) \
1362 $(TERMHOOKS_H) \
1363 $(WINDOW_H)
1523 1364
1524$(BLD)/terminal.$(O) : \ 1365$(BLD)/terminal.$(O) : \
1525 $(SRC)/terminal.c \ 1366 $(SRC)/terminal.c \
1367 $(SRC)/termchar.h \
1368 $(CHARSET_H) \
1369 $(CODING_H) \
1526 $(CONFIG_H) \ 1370 $(CONFIG_H) \
1527 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1371 $(FRAME_H) \
1372 $(KEYBOARD_H) \
1528 $(LISP_H) \ 1373 $(LISP_H) \
1529 $(SRC)/charset.h \ 1374 $(TERMHOOKS_H)
1530 $(SRC)/coding.h \
1531 $(SRC)/composite.h \
1532 $(SRC)/dispextern.h \
1533 $(SRC)/frame.h \
1534 $(SRC)/keyboard.h \
1535 $(SRC)/systime.h \
1536 $(SRC)/termchar.h \
1537 $(SRC)/termhooks.h \
1538 $(SRC)/w32gui.h
1539 1375
1540$(BLD)/textprop.$(O) : \ 1376$(BLD)/textprop.$(O) : \
1541 $(SRC)/textprop.c \ 1377 $(SRC)/textprop.c \
1378 $(SRC)/buffer.h \
1542 $(CONFIG_H) \ 1379 $(CONFIG_H) \
1543 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1380 $(INTERVALS_H) \
1544 $(LISP_H) \ 1381 $(LISP_H) \
1545 $(SRC)/buffer.h \ 1382 $(WINDOW_H)
1546 $(SRC)/composite.h \
1547 $(SRC)/dispextern.h \
1548 $(SRC)/intervals.h \
1549 $(SRC)/systime.h \
1550 $(SRC)/w32gui.h \
1551 $(SRC)/window.h
1552 1383
1553$(BLD)/tparam.$(O) : \ 1384$(BLD)/tparam.$(O) : \
1554 $(SRC)/tparam.c \ 1385 $(SRC)/tparam.c \
1386 $(SRC)/tparam.h \
1555 $(CONFIG_H) \ 1387 $(CONFIG_H) \
1556 $(LISP_H) \ 1388 $(LISP_H)
1557 $(SRC)/tparam.h
1558 1389
1559$(BLD)/undo.$(O) : \ 1390$(BLD)/undo.$(O) : \
1560 $(SRC)/undo.c \ 1391 $(SRC)/undo.c \
1561 $(CONFIG_H) \
1562 $(EMACS_ROOT)/nt/inc/sys/time.h \
1563 $(LISP_H) \
1564 $(SRC)/buffer.h \ 1392 $(SRC)/buffer.h \
1565 $(SRC)/commands.h \ 1393 $(SRC)/commands.h \
1566 $(SRC)/dispextern.h \ 1394 $(CONFIG_H) \
1567 $(SRC)/systime.h \ 1395 $(LISP_H) \
1568 $(SRC)/w32gui.h \ 1396 $(WINDOW_H)
1569 $(SRC)/window.h
1570 1397
1571$(BLD)/unexw32.$(O) : \ 1398$(BLD)/unexw32.$(O) : \
1572 $(SRC)/unexw32.c \ 1399 $(SRC)/unexw32.c \
1573 $(CONFIG_H) \
1574 $(SRC)/unexec.h \ 1400 $(SRC)/unexec.h \
1575 $(SRC)/w32heap.h 1401 $(SRC)/w32heap.h \
1402 $(CONFIG_H)
1576 1403
1577$(BLD)/vm-limit.$(O) : \ 1404$(BLD)/vm-limit.$(O) : \
1578 $(SRC)/vm-limit.c \ 1405 $(SRC)/vm-limit.c \
1406 $(SRC)/mem-limits.h \
1579 $(CONFIG_H) \ 1407 $(CONFIG_H) \
1580 $(LISP_H) \ 1408 $(LISP_H)
1581 $(SRC)/mem-limits.h
1582 1409
1583$(BLD)/window.$(O) : \ 1410$(BLD)/window.$(O) : \
1584 $(SRC)/window.c \ 1411 $(SRC)/window.c \
1585 $(CONFIG_H) \
1586 $(EMACS_ROOT)/nt/inc/sys/time.h \
1587 $(LISP_H) \
1588 $(SRC)/atimer.h \
1589 $(SRC)/blockinput.h \
1590 $(SRC)/buffer.h \ 1412 $(SRC)/buffer.h \
1591 $(SRC)/coding.h \
1592 $(SRC)/commands.h \ 1413 $(SRC)/commands.h \
1593 $(SRC)/composite.h \
1594 $(SRC)/dispextern.h \
1595 $(SRC)/disptab.h \ 1414 $(SRC)/disptab.h \
1596 $(SRC)/frame.h \
1597 $(SRC)/indent.h \ 1415 $(SRC)/indent.h \
1598 $(SRC)/intervals.h \
1599 $(SRC)/keyboard.h \
1600 $(SRC)/keymap.h \ 1416 $(SRC)/keymap.h \
1601 $(SRC)/systime.h \
1602 $(SRC)/termchar.h \ 1417 $(SRC)/termchar.h \
1603 $(SRC)/termhooks.h \ 1418 $(BLOCKINPUT_H) \
1604 $(SRC)/w32gui.h \ 1419 $(CONFIG_H) \
1605 $(SRC)/w32term.h \ 1420 $(DISPEXTERN_H) \
1606 $(SRC)/window.h 1421 $(FRAME_H) \
1422 $(INTERVALS_H) \
1423 $(KEYBOARD_H) \
1424 $(LISP_H) \
1425 $(TERMHOOKS_H) \
1426 $(W32TERM_H) \
1427 $(WINDOW_H)
1607 1428
1608$(BLD)/xdisp.$(O) : \ 1429$(BLD)/xdisp.$(O) : \
1609 $(SRC)/xdisp.c \ 1430 $(SRC)/xdisp.c \
1610 $(CONFIG_H) \
1611 $(EMACS_ROOT)/nt/inc/unistd.h \
1612 $(EMACS_ROOT)/nt/inc/sys/time.h \
1613 $(LISP_H) \
1614 $(PROCESS_H) \
1615 $(SRC)/atimer.h \
1616 $(SRC)/blockinput.h \
1617 $(SRC)/buffer.h \ 1431 $(SRC)/buffer.h \
1618 $(SRC)/ccl.h \
1619 $(SRC)/character.h \
1620 $(SRC)/charset.h \
1621 $(SRC)/coding.h \
1622 $(SRC)/commands.h \ 1432 $(SRC)/commands.h \
1623 $(SRC)/composite.h \
1624 $(SRC)/dispextern.h \
1625 $(SRC)/disptab.h \ 1433 $(SRC)/disptab.h \
1626 $(SRC)/font.h \
1627 $(SRC)/fontset.h \ 1434 $(SRC)/fontset.h \
1628 $(SRC)/frame.h \
1629 $(SRC)/indent.h \ 1435 $(SRC)/indent.h \
1630 $(SRC)/intervals.h \
1631 $(SRC)/keyboard.h \
1632 $(SRC)/keymap.h \ 1436 $(SRC)/keymap.h \
1633 $(SRC)/macros.h \ 1437 $(SRC)/macros.h \
1634 $(SRC)/region-cache.h \ 1438 $(SRC)/region-cache.h \
1635 $(SRC)/systime.h \
1636 $(SRC)/termchar.h \ 1439 $(SRC)/termchar.h \
1637 $(SRC)/termhooks.h \
1638 $(SRC)/termopts.h \ 1440 $(SRC)/termopts.h \
1639 $(SRC)/w32gui.h \ 1441 $(BLOCKINPUT_H) \
1640 $(SRC)/w32term.h \ 1442 $(CHARACTER_H) \
1641 $(SRC)/window.h 1443 $(CHARSET_H) \
1444 $(CODING_H) \
1445 $(CONFIG_H) \
1446 $(DISPEXTERN_H) \
1447 $(FONT_H) \
1448 $(FRAME_H) \
1449 $(INTERVALS_H) \
1450 $(KEYBOARD_H) \
1451 $(LISP_H) \
1452 $(PROCESS_H) \
1453 $(TERMHOOKS_H) \
1454 $(W32TERM_H) \
1455 $(WINDOW_H)
1642 1456
1643$(BLD)/xfaces.$(O) : \ 1457$(BLD)/xfaces.$(O) : \
1644 $(SRC)/xfaces.c \ 1458 $(SRC)/xfaces.c \
1645 $(CONFIG_H) \
1646 $(EMACS_ROOT)/nt/inc/sys/time.h \
1647 $(LISP_H) \
1648 $(SRC)/atimer.h \
1649 $(SRC)/blockinput.h \
1650 $(SRC)/buffer.h \ 1459 $(SRC)/buffer.h \
1651 $(SRC)/ccl.h \
1652 $(SRC)/character.h \
1653 $(SRC)/charset.h \
1654 $(SRC)/coding.h \
1655 $(SRC)/composite.h \
1656 $(SRC)/dispextern.h \
1657 $(SRC)/font.h \
1658 $(SRC)/fontset.h \ 1460 $(SRC)/fontset.h \
1659 $(SRC)/frame.h \
1660 $(SRC)/intervals.h \
1661 $(SRC)/keyboard.h \
1662 $(SRC)/systime.h \
1663 $(SRC)/termchar.h \ 1461 $(SRC)/termchar.h \
1664 $(SRC)/termhooks.h \ 1462 $(NT_INC)/sys/stat.h \
1665 $(SRC)/w32gui.h \ 1463 $(BLOCKINPUT_H) \
1666 $(SRC)/w32term.h \ 1464 $(CHARACTER_H) \
1667 $(SRC)/window.h 1465 $(CHARSET_H) \
1466 $(CONFIG_H) \
1467 $(DISPEXTERN_H) \
1468 $(FONT_H) \
1469 $(FRAME_H) \
1470 $(INTERVALS_H) \
1471 $(KEYBOARD_H) \
1472 $(LISP_H) \
1473 $(TERMHOOKS_H) \
1474 $(W32TERM_H) \
1475 $(WINDOW_H)
1668 1476
1669$(BLD)/w32fns.$(O) : \ 1477$(BLD)/w32fns.$(O) : \
1670 $(SRC)/w32fns.c \ 1478 $(SRC)/w32fns.c \
1671 $(CONFIG_H) \
1672 $(EMACS_ROOT)/nt/inc/sys/time.h \
1673 $(LISP_H) \
1674 $(SRC)/atimer.h \
1675 $(SRC)/blockinput.h \
1676 $(SRC)/buffer.h \ 1479 $(SRC)/buffer.h \
1677 $(SRC)/ccl.h \ 1480 $(SRC)/ccl.h \
1678 $(SRC)/character.h \
1679 $(SRC)/charset.h \
1680 $(SRC)/coding.h \
1681 $(SRC)/composite.h \
1682 $(SRC)/dispextern.h \
1683 $(SRC)/epaths.h \ 1481 $(SRC)/epaths.h \
1684 $(SRC)/font.h \
1685 $(SRC)/fontset.h \ 1482 $(SRC)/fontset.h \
1686 $(SRC)/frame.h \
1687 $(SRC)/intervals.h \
1688 $(SRC)/keyboard.h \
1689 $(SRC)/systime.h \
1690 $(SRC)/termhooks.h \
1691 $(SRC)/w32.h \ 1483 $(SRC)/w32.h \
1692 $(SRC)/w32font.h \ 1484 $(SRC)/w32font.h \
1693 $(SRC)/w32gui.h \
1694 $(SRC)/w32heap.h \ 1485 $(SRC)/w32heap.h \
1695 $(SRC)/w32term.h \ 1486 $(BLOCKINPUT_H) \
1696 $(SRC)/window.h 1487 $(CHARACTER_H) \
1488 $(CHARSET_H) \
1489 $(CODING_H) \
1490 $(CONFIG_H) \
1491 $(DISPEXTERN_H) \
1492 $(FONT_H) \
1493 $(FRAME_H) \
1494 $(INTERVALS_H) \
1495 $(KEYBOARD_H) \
1496 $(LISP_H) \
1497 $(SYSTIME_H) \
1498 $(TERMHOOKS_H) \
1499 $(W32TERM_H) \
1500 $(WINDOW_H)
1697 1501
1698$(BLD)/w32menu.$(O) : \ 1502$(BLD)/w32menu.$(O) : \
1699 $(SRC)/w32menu.c \ 1503 $(SRC)/w32menu.c \
1700 $(CONFIG_H) \
1701 $(EMACS_ROOT)/nt/inc/sys/time.h \
1702 $(LISP_H) \
1703 $(SRC)/atimer.h \
1704 $(SRC)/blockinput.h \
1705 $(SRC)/buffer.h \ 1504 $(SRC)/buffer.h \
1706 $(SRC)/character.h \
1707 $(SRC)/charset.h \
1708 $(SRC)/coding.h \
1709 $(SRC)/composite.h \
1710 $(SRC)/dispextern.h \
1711 $(SRC)/frame.h \
1712 $(SRC)/keyboard.h \
1713 $(SRC)/keymap.h \ 1505 $(SRC)/keymap.h \
1714 $(SRC)/menu.h \ 1506 $(BLOCKINPUT_H) \
1715 $(SRC)/systime.h \ 1507 $(CHARSET_H) \
1716 $(SRC)/termhooks.h \ 1508 $(CODING_H) \
1717 $(SRC)/w32gui.h \ 1509 $(CONFIG_H) \
1718 $(SRC)/w32term.h \ 1510 $(DISPEXTERN_H) \
1719 $(SRC)/window.h 1511 $(FRAME_H) \
1512 $(KEYBOARD_H) \
1513 $(LISP_H) \
1514 $(MENU_H) \
1515 $(TERMHOOKS_H) \
1516 $(W32TERM_H) \
1517 $(WINDOW_H)
1720 1518
1721$(BLD)/w32term.$(O) : \ 1519$(BLD)/w32term.$(O) : \
1722 $(SRC)/w32term.c \ 1520 $(SRC)/w32term.c \
1723 $(CONFIG_H) \
1724 $(EMACS_ROOT)/nt/inc/unistd.h \
1725 $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
1726 $(EMACS_ROOT)/nt/inc/sys/time.h \
1727 $(LISP_H) \
1728 $(PROCESS_H) \
1729 $(SRC)/atimer.h \
1730 $(SRC)/blockinput.h \
1731 $(SRC)/buffer.h \ 1521 $(SRC)/buffer.h \
1732 $(SRC)/ccl.h \ 1522 $(SRC)/ccl.h \
1733 $(SRC)/character.h \
1734 $(SRC)/charset.h \
1735 $(SRC)/coding.h \
1736 $(SRC)/composite.h \
1737 $(SRC)/dispextern.h \
1738 $(SRC)/disptab.h \ 1523 $(SRC)/disptab.h \
1739 $(SRC)/font.h \
1740 $(SRC)/fontset.h \ 1524 $(SRC)/fontset.h \
1741 $(SRC)/frame.h \
1742 $(SRC)/intervals.h \
1743 $(SRC)/keyboard.h \
1744 $(SRC)/keymap.h \ 1525 $(SRC)/keymap.h \
1745 $(SRC)/systime.h \
1746 $(SRC)/systty.h \
1747 $(SRC)/termchar.h \ 1526 $(SRC)/termchar.h \
1748 $(SRC)/termhooks.h \
1749 $(SRC)/termopts.h \ 1527 $(SRC)/termopts.h \
1750 $(SRC)/w32font.h \ 1528 $(SRC)/w32font.h \
1751 $(SRC)/w32gui.h \
1752 $(SRC)/w32heap.h \ 1529 $(SRC)/w32heap.h \
1753 $(SRC)/w32term.h \ 1530 $(NT_INC)/sys/stat.h \
1754 $(SRC)/window.h 1531 $(ATIMER_H) \
1532 $(BLOCKINPUT_H) \
1533 $(CHARACTER_H) \
1534 $(CHARSET_H) \
1535 $(CODING_H) \
1536 $(CONFIG_H) \
1537 $(DISPEXTERN_H) \
1538 $(FONT_H) \
1539 $(FRAME_H) \
1540 $(INTERVALS_H) \
1541 $(KEYBOARD_H) \
1542 $(LISP_H) \
1543 $(PROCESS_H) \
1544 $(SYSTIME_H) \
1545 $(SYSTTY_H) \
1546 $(TERMHOOKS_H) \
1547 $(W32TERM_H) \
1548 $(WINDOW_H)
1755 1549
1756$(BLD)/w32select.$(O) : \ 1550$(BLD)/w32select.$(O) : \
1757 $(SRC)/w32select.c \ 1551 $(SRC)/w32select.c \
1758 $(CONFIG_H) \
1759 $(EMACS_ROOT)/nt/inc/sys/time.h \
1760 $(LISP_H) \
1761 $(SRC)/atimer.h \
1762 $(SRC)/blockinput.h \
1763 $(SRC)/character.h \
1764 $(SRC)/charset.h \
1765 $(SRC)/coding.h \
1766 $(SRC)/composite.h \ 1552 $(SRC)/composite.h \
1767 $(SRC)/systime.h \
1768 $(SRC)/w32gui.h \
1769 $(SRC)/w32heap.h \ 1553 $(SRC)/w32heap.h \
1770 $(SRC)/w32term.h 1554 $(BLOCKINPUT_H) \
1555 $(CHARSET_H) \
1556 $(CODING_H) \
1557 $(CONFIG_H) \
1558 $(LISP_H) \
1559 $(W32TERM_H)
1771 1560
1772$(BLD)/w32reg.$(O) : \ 1561$(BLD)/w32reg.$(O) : \
1773 $(SRC)/w32reg.c \ 1562 $(SRC)/w32reg.c \
1563 $(BLOCKINPUT_H) \
1774 $(CONFIG_H) \ 1564 $(CONFIG_H) \
1775 $(EMACS_ROOT)/nt/inc/sys/time.h \
1776 $(LISP_H) \ 1565 $(LISP_H) \
1777 $(SRC)/atimer.h \ 1566 $(W32TERM_H)
1778 $(SRC)/blockinput.h \
1779 $(SRC)/systime.h \
1780 $(SRC)/w32gui.h \
1781 $(SRC)/w32term.h
1782 1567
1783$(BLD)/w32xfns.$(O) : \ 1568$(BLD)/w32xfns.$(O) : \
1784 $(SRC)/w32xfns.c \ 1569 $(SRC)/w32xfns.c \
1570 $(SRC)/fontset.h \
1571 $(BLOCKINPUT_H) \
1572 $(CHARSET_H) \
1785 $(CONFIG_H) \ 1573 $(CONFIG_H) \
1786 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1574 $(FRAME_H) \
1575 $(KEYBOARD_H) \
1787 $(LISP_H) \ 1576 $(LISP_H) \
1788 $(SRC)/atimer.h \ 1577 $(W32TERM_H)
1789 $(SRC)/blockinput.h \
1790 $(SRC)/charset.h \
1791 $(SRC)/coding.h \
1792 $(SRC)/composite.h \
1793 $(SRC)/dispextern.h \
1794 $(SRC)/fontset.h \
1795 $(SRC)/frame.h \
1796 $(SRC)/keyboard.h \
1797 $(SRC)/systime.h \
1798 $(SRC)/w32gui.h \
1799 $(SRC)/w32term.h
1800 1578
1801$(BLD)/w32font.$(O) : \ 1579$(BLD)/w32font.$(O) : \
1802 $(SRC)/w32font.c \ 1580 $(SRC)/w32font.c \
1803 $(CONFIG_H) \
1804 $(EMACS_ROOT)/nt/inc/sys/time.h \
1805 $(LISP_H) \
1806 $(SRC)/ccl.h \
1807 $(SRC)/character.h \
1808 $(SRC)/charset.h \
1809 $(SRC)/coding.h \
1810 $(SRC)/composite.h \
1811 $(SRC)/dispextern.h \
1812 $(SRC)/font.h \
1813 $(SRC)/fontset.h \ 1581 $(SRC)/fontset.h \
1814 $(SRC)/frame.h \
1815 $(SRC)/systime.h \
1816 $(SRC)/w32font.h \ 1582 $(SRC)/w32font.h \
1817 $(SRC)/w32gui.h \ 1583 $(CHARACTER_H) \
1818 $(SRC)/w32term.h 1584 $(CHARSET_H) \
1585 $(CODING_H) \
1586 $(CONFIG_H) \
1587 $(DISPEXTERN_H) \
1588 $(FONT_H) \
1589 $(FRAME_H) \
1590 $(LISP_H) \
1591 $(W32TERM_H)
1819 1592
1820$(BLD)/w32uniscribe.$(O) : \ 1593$(BLD)/w32uniscribe.$(O) : \
1821 $(SRC)/w32uniscribe.c \ 1594 $(SRC)/w32uniscribe.c \
1822 $(CONFIG_H) \
1823 $(EMACS_ROOT)/nt/inc/sys/time.h \
1824 $(LISP_H) \
1825 $(SRC)/ccl.h \
1826 $(SRC)/character.h \
1827 $(SRC)/charset.h \
1828 $(SRC)/composite.h \ 1595 $(SRC)/composite.h \
1829 $(SRC)/dispextern.h \
1830 $(SRC)/font.h \
1831 $(SRC)/fontset.h \ 1596 $(SRC)/fontset.h \
1832 $(SRC)/frame.h \
1833 $(SRC)/systime.h \
1834 $(SRC)/w32font.h \ 1597 $(SRC)/w32font.h \
1835 $(SRC)/w32gui.h \ 1598 $(CHARACTER_H) \
1836 $(SRC)/w32term.h 1599 $(CHARSET_H) \
1600 $(CONFIG_H) \
1601 $(DISPEXTERN_H) \
1602 $(FONT_H) \
1603 $(FRAME_H) \
1604 $(LISP_H) \
1605 $(W32TERM_H)
1837 1606
1838# Each object file depends on stamp_BLD, because in parallel builds we must 1607# Each object file depends on stamp_BLD, because in parallel builds we must
1839# make sure $(BLD) exists before starting compilations. 1608# make sure $(BLD) exists before starting compilations.
diff --git a/src/process.c b/src/process.c
index c46437fe8cb..0fe7068af3b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4479,13 +4479,19 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4479 set_waiting_for_input (&timeout); 4479 set_waiting_for_input (&timeout);
4480 } 4480 }
4481 4481
4482 /* Skip the `select' call if input is available and we're
4483 waiting for keyboard input or a cell change (which can be
4484 triggered by processing X events). In the latter case, set
4485 nfds to 1 to avoid breaking the loop. */
4482 no_avail = 0; 4486 no_avail = 0;
4483 if (read_kbd && detect_input_pending ()) 4487 if ((read_kbd || !NILP (wait_for_cell))
4488 && detect_input_pending ())
4484 { 4489 {
4485 nfds = 0; 4490 nfds = read_kbd ? 0 : 1;
4486 no_avail = 1; 4491 no_avail = 1;
4487 } 4492 }
4488 else 4493
4494 if (!no_avail)
4489 { 4495 {
4490 4496
4491#ifdef ADAPTIVE_READ_BUFFERING 4497#ifdef ADAPTIVE_READ_BUFFERING
diff --git a/src/window.c b/src/window.c
index ebfe318defd..93f763ec9af 100644
--- a/src/window.c
+++ b/src/window.c
@@ -84,8 +84,8 @@ static int foreach_window_1 (struct window *,
84 int (* fn) (struct window *, void *), 84 int (* fn) (struct window *, void *),
85 void *); 85 void *);
86static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object); 86static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
87static int resize_window_check (struct window *, int); 87static int window_resize_check (struct window *, int);
88static void resize_window_apply (struct window *, int); 88static void window_resize_apply (struct window *, int);
89static Lisp_Object select_window (Lisp_Object, Lisp_Object, int); 89static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
90 90
91/* This is the window in which the terminal's cursor should 91/* This is the window in which the terminal's cursor should
@@ -436,37 +436,37 @@ Return nil if WINDOW has no parent. */)
436 return decode_any_window (window)->parent; 436 return decode_any_window (window)->parent;
437} 437}
438 438
439DEFUN ("window-vchild", Fwindow_vchild, Swindow_vchild, 0, 1, 0, 439DEFUN ("window-top-child", Fwindow_top_child, Swindow_top_child, 0, 1, 0,
440 doc: /* Return WINDOW's first vertical child window. 440 doc: /* Return WINDOW's topmost child window.
441WINDOW can be any window and defaults to the selected one. 441WINDOW can be any window and defaults to the selected one.
442Return nil if WINDOW has no vertical child. */) 442Return nil if WINDOW is not a vertical combination. */)
443 (Lisp_Object window) 443 (Lisp_Object window)
444{ 444{
445 return decode_any_window (window)->vchild; 445 return decode_any_window (window)->vchild;
446} 446}
447 447
448DEFUN ("window-hchild", Fwindow_hchild, Swindow_hchild, 0, 1, 0, 448DEFUN ("window-left-child", Fwindow_left_child, Swindow_left_child, 0, 1, 0,
449 doc: /* Return WINDOW's first horizontal child window. 449 doc: /* Return WINDOW's leftmost child window.
450WINDOW can be any window and defaults to the selected one. 450WINDOW can be any window and defaults to the selected one.
451Return nil if WINDOW has no horizontal child. */) 451Return nil if WINDOW is not a horizontal combination. */)
452 (Lisp_Object window) 452 (Lisp_Object window)
453{ 453{
454 return decode_any_window (window)->hchild; 454 return decode_any_window (window)->hchild;
455} 455}
456 456
457DEFUN ("window-next", Fwindow_next, Swindow_next, 0, 1, 0, 457DEFUN ("window-next-sibling", Fwindow_next_sibling, Swindow_next_sibling, 0, 1, 0,
458 doc: /* Return WINDOW's right sibling window. 458 doc: /* Return WINDOW's next sibling window.
459WINDOW can be any window and defaults to the selected one. 459WINDOW can be any window and defaults to the selected one.
460Return nil if WINDOW has no right sibling. */) 460Return nil if WINDOW has no next sibling. */)
461 (Lisp_Object window) 461 (Lisp_Object window)
462{ 462{
463 return decode_any_window (window)->next; 463 return decode_any_window (window)->next;
464} 464}
465 465
466DEFUN ("window-prev", Fwindow_prev, Swindow_prev, 0, 1, 0, 466DEFUN ("window-prev-sibling", Fwindow_prev_sibling, Swindow_prev_sibling, 0, 1, 0,
467 doc: /* Return WINDOW's left sibling window. 467 doc: /* Return WINDOW's previous sibling window.
468WINDOW can be any window and defaults to the selected one. 468WINDOW can be any window and defaults to the selected one.
469Return nil if WINDOW has no left sibling. */) 469Return nil if WINDOW has no previous sibling. */)
470 (Lisp_Object window) 470 (Lisp_Object window)
471{ 471{
472 return decode_any_window (window)->prev; 472 return decode_any_window (window)->prev;
@@ -2697,13 +2697,13 @@ window-start value is reasonable when this function is called. */)
2697 XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines)); 2697 XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines));
2698 w->top_line = r->top_line; 2698 w->top_line = r->top_line;
2699 resize_root_window (window, delta, Qnil, Qnil); 2699 resize_root_window (window, delta, Qnil, Qnil);
2700 if (resize_window_check (w, 0)) 2700 if (window_resize_check (w, 0))
2701 resize_window_apply (w, 0); 2701 window_resize_apply (w, 0);
2702 else 2702 else
2703 { 2703 {
2704 resize_root_window (window, delta, Qnil, Qt); 2704 resize_root_window (window, delta, Qnil, Qt);
2705 if (resize_window_check (w, 0)) 2705 if (window_resize_check (w, 0))
2706 resize_window_apply (w, 0); 2706 window_resize_apply (w, 0);
2707 else 2707 else
2708 resize_failed = 1; 2708 resize_failed = 1;
2709 } 2709 }
@@ -2715,13 +2715,13 @@ window-start value is reasonable when this function is called. */)
2715 XSETINT (delta, XINT (r->total_cols) - XINT (w->total_cols)); 2715 XSETINT (delta, XINT (r->total_cols) - XINT (w->total_cols));
2716 w->left_col = r->left_col; 2716 w->left_col = r->left_col;
2717 resize_root_window (window, delta, Qt, Qnil); 2717 resize_root_window (window, delta, Qt, Qnil);
2718 if (resize_window_check (w, 1)) 2718 if (window_resize_check (w, 1))
2719 resize_window_apply (w, 1); 2719 window_resize_apply (w, 1);
2720 else 2720 else
2721 { 2721 {
2722 resize_root_window (window, delta, Qt, Qt); 2722 resize_root_window (window, delta, Qt, Qt);
2723 if (resize_window_check (w, 1)) 2723 if (window_resize_check (w, 1))
2724 resize_window_apply (w, 1); 2724 window_resize_apply (w, 1);
2725 else 2725 else
2726 resize_failed = 1; 2726 resize_failed = 1;
2727 } 2727 }
@@ -3417,7 +3417,7 @@ Note: This function does not operate on any subwindows of WINDOW. */)
3417 `window-min-height' or `window-min-width'. It does check that window 3417 `window-min-height' or `window-min-width'. It does check that window
3418 sizes do not drop below one line (two columns). */ 3418 sizes do not drop below one line (two columns). */
3419static int 3419static int
3420resize_window_check (struct window *w, int horflag) 3420window_resize_check (struct window *w, int horflag)
3421{ 3421{
3422 struct window *c; 3422 struct window *c;
3423 3423
@@ -3431,7 +3431,7 @@ resize_window_check (struct window *w, int horflag)
3431 while (c) 3431 while (c)
3432 { 3432 {
3433 if ((XINT (c->new_total) != XINT (w->new_total)) 3433 if ((XINT (c->new_total) != XINT (w->new_total))
3434 || !resize_window_check (c, horflag)) 3434 || !window_resize_check (c, horflag))
3435 return 0; 3435 return 0;
3436 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3436 c = NILP (c->next) ? 0 : XWINDOW (c->next);
3437 } 3437 }
@@ -3444,7 +3444,7 @@ resize_window_check (struct window *w, int horflag)
3444 int sum_of_sizes = 0; 3444 int sum_of_sizes = 0;
3445 while (c) 3445 while (c)
3446 { 3446 {
3447 if (!resize_window_check (c, horflag)) 3447 if (!window_resize_check (c, horflag))
3448 return 0; 3448 return 0;
3449 sum_of_sizes = sum_of_sizes + XINT (c->new_total); 3449 sum_of_sizes = sum_of_sizes + XINT (c->new_total);
3450 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3450 c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3463,7 +3463,7 @@ resize_window_check (struct window *w, int horflag)
3463 int sum_of_sizes = 0; 3463 int sum_of_sizes = 0;
3464 while (c) 3464 while (c)
3465 { 3465 {
3466 if (!resize_window_check (c, horflag)) 3466 if (!window_resize_check (c, horflag))
3467 return 0; 3467 return 0;
3468 sum_of_sizes = sum_of_sizes + XINT (c->new_total); 3468 sum_of_sizes = sum_of_sizes + XINT (c->new_total);
3469 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3469 c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3476,7 +3476,7 @@ resize_window_check (struct window *w, int horflag)
3476 while (c) 3476 while (c)
3477 { 3477 {
3478 if ((XINT (c->new_total) != XINT (w->new_total)) 3478 if ((XINT (c->new_total) != XINT (w->new_total))
3479 || !resize_window_check (c, horflag)) 3479 || !window_resize_check (c, horflag))
3480 return 0; 3480 return 0;
3481 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3481 c = NILP (c->next) ? 0 : XWINDOW (c->next);
3482 } 3482 }
@@ -3496,9 +3496,9 @@ resize_window_check (struct window *w, int horflag)
3496 each of these windows. 3496 each of these windows.
3497 3497
3498 This function does not perform any error checks. Make sure you have 3498 This function does not perform any error checks. Make sure you have
3499 run resize_window_check on W before applying this function. */ 3499 run window_resize_check on W before applying this function. */
3500static void 3500static void
3501resize_window_apply (struct window *w, int horflag) 3501window_resize_apply (struct window *w, int horflag)
3502{ 3502{
3503 struct window *c; 3503 struct window *c;
3504 int pos; 3504 int pos;
@@ -3532,7 +3532,7 @@ resize_window_apply (struct window *w, int horflag)
3532 XSETFASTINT (c->left_col, pos); 3532 XSETFASTINT (c->left_col, pos);
3533 else 3533 else
3534 XSETFASTINT (c->top_line, pos); 3534 XSETFASTINT (c->top_line, pos);
3535 resize_window_apply (c, horflag); 3535 window_resize_apply (c, horflag);
3536 if (!horflag) 3536 if (!horflag)
3537 pos = pos + XINT (c->total_lines); 3537 pos = pos + XINT (c->total_lines);
3538 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3538 c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3548,7 +3548,7 @@ resize_window_apply (struct window *w, int horflag)
3548 XSETFASTINT (c->left_col, pos); 3548 XSETFASTINT (c->left_col, pos);
3549 else 3549 else
3550 XSETFASTINT (c->top_line, pos); 3550 XSETFASTINT (c->top_line, pos);
3551 resize_window_apply (c, horflag); 3551 window_resize_apply (c, horflag);
3552 if (horflag) 3552 if (horflag)
3553 pos = pos + XINT (c->total_cols); 3553 pos = pos + XINT (c->total_cols);
3554 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3554 c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3561,7 +3561,7 @@ resize_window_apply (struct window *w, int horflag)
3561} 3561}
3562 3562
3563 3563
3564DEFUN ("resize-window-apply", Fresize_window_apply, Sresize_window_apply, 1, 2, 0, 3564DEFUN ("window-resize-apply", Fwindow_resize_apply, Swindow_resize_apply, 1, 2, 0,
3565 doc: /* Apply requested size values for window-tree of FRAME. 3565 doc: /* Apply requested size values for window-tree of FRAME.
3566Optional argument HORIZONTAL omitted or nil means apply requested height 3566Optional argument HORIZONTAL omitted or nil means apply requested height
3567values. HORIZONTAL non-nil means apply requested width values. 3567values. HORIZONTAL non-nil means apply requested width values.
@@ -3586,12 +3586,12 @@ be applied on the Elisp level. */)
3586 f = XFRAME (frame); 3586 f = XFRAME (frame);
3587 r = XWINDOW (FRAME_ROOT_WINDOW (f)); 3587 r = XWINDOW (FRAME_ROOT_WINDOW (f));
3588 3588
3589 if (!resize_window_check (r, horflag) 3589 if (!window_resize_check (r, horflag)
3590 || ! EQ (r->new_total, (horflag ? r->total_cols : r->total_lines))) 3590 || ! EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
3591 return Qnil; 3591 return Qnil;
3592 3592
3593 BLOCK_INPUT; 3593 BLOCK_INPUT;
3594 resize_window_apply (r, horflag); 3594 window_resize_apply (r, horflag);
3595 3595
3596 windows_or_buffers_changed++; 3596 windows_or_buffers_changed++;
3597 FRAME_WINDOW_SIZES_CHANGED (f) = 1; 3597 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
@@ -3643,22 +3643,22 @@ resize_frame_windows (struct frame *f, int size, int horflag)
3643 XSETINT (delta, new_size - old_size); 3643 XSETINT (delta, new_size - old_size);
3644 /* Try a "normal" resize first. */ 3644 /* Try a "normal" resize first. */
3645 resize_root_window (root, delta, horflag ? Qt : Qnil, Qnil); 3645 resize_root_window (root, delta, horflag ? Qt : Qnil, Qnil);
3646 if (resize_window_check (r, horflag) && new_size == XINT (r->new_total)) 3646 if (window_resize_check (r, horflag) && new_size == XINT (r->new_total))
3647 resize_window_apply (r, horflag); 3647 window_resize_apply (r, horflag);
3648 else 3648 else
3649 { 3649 {
3650 /* Try with "reasonable" minimum sizes next. */ 3650 /* Try with "reasonable" minimum sizes next. */
3651 resize_root_window (root, delta, horflag ? Qt : Qnil, Qt); 3651 resize_root_window (root, delta, horflag ? Qt : Qnil, Qt);
3652 if (resize_window_check (r, horflag) 3652 if (window_resize_check (r, horflag)
3653 && new_size == XINT (r->new_total)) 3653 && new_size == XINT (r->new_total))
3654 resize_window_apply (r, horflag); 3654 window_resize_apply (r, horflag);
3655 else 3655 else
3656 { 3656 {
3657 /* Finally, try with "safe" minimum sizes. */ 3657 /* Finally, try with "safe" minimum sizes. */
3658 resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe); 3658 resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe);
3659 if (resize_window_check (r, horflag) 3659 if (window_resize_check (r, horflag)
3660 && new_size == XINT (r->new_total)) 3660 && new_size == XINT (r->new_total))
3661 resize_window_apply (r, horflag); 3661 window_resize_apply (r, horflag);
3662 else 3662 else
3663 { 3663 {
3664 /* We lost. Delete all windows but the frame's 3664 /* We lost. Delete all windows but the frame's
@@ -3767,7 +3767,7 @@ set correctly. See the code of `split-window' for how this is done. */)
3767 XSETINT (p->new_total, 3767 XSETINT (p->new_total,
3768 XINT (horflag ? p->total_cols : p->total_lines) 3768 XINT (horflag ? p->total_cols : p->total_lines)
3769 - XINT (total_size)); 3769 - XINT (total_size));
3770 if (!resize_window_check (p, horflag)) 3770 if (!window_resize_check (p, horflag))
3771 error ("Window sizes don't fit"); 3771 error ("Window sizes don't fit");
3772 else 3772 else
3773 /* Undo the temporary pretension. */ 3773 /* Undo the temporary pretension. */
@@ -3775,7 +3775,7 @@ set correctly. See the code of `split-window' for how this is done. */)
3775 } 3775 }
3776 else 3776 else
3777 { 3777 {
3778 if (!resize_window_check (o, horflag)) 3778 if (!window_resize_check (o, horflag))
3779 error ("Resizing old window failed"); 3779 error ("Resizing old window failed");
3780 else if (XINT (total_size) + XINT (o->new_total) 3780 else if (XINT (total_size) + XINT (o->new_total)
3781 != XINT (horflag ? o->total_cols : o->total_lines)) 3781 != XINT (horflag ? o->total_cols : o->total_lines))
@@ -3863,13 +3863,13 @@ set correctly. See the code of `split-window' for how this is done. */)
3863 n->total_cols = o->total_cols; 3863 n->total_cols = o->total_cols;
3864 } 3864 }
3865 3865
3866 /* Iso-coordinates and sizes are assigned by resize_window_apply, 3866 /* Iso-coordinates and sizes are assigned by window_resize_apply,
3867 get them ready here. */ 3867 get them ready here. */
3868 n->new_total = total_size; 3868 n->new_total = total_size;
3869 n->new_normal = normal_size; 3869 n->new_normal = normal_size;
3870 3870
3871 BLOCK_INPUT; 3871 BLOCK_INPUT;
3872 resize_window_apply (p, horflag); 3872 window_resize_apply (p, horflag);
3873 adjust_glyphs (f); 3873 adjust_glyphs (f);
3874 /* Set buffer of NEW to buffer of reference window. Don't run 3874 /* Set buffer of NEW to buffer of reference window. Don't run
3875 any hooks. */ 3875 any hooks. */
@@ -3947,13 +3947,13 @@ when WINDOW is the only window on its frame. */)
3947 XWINDOW (s->next)->prev = sibling; 3947 XWINDOW (s->next)->prev = sibling;
3948 } 3948 }
3949 3949
3950 if (resize_window_check (r, horflag) 3950 if (window_resize_check (r, horflag)
3951 && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines))) 3951 && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
3952 /* We can delete WINDOW now. */ 3952 /* We can delete WINDOW now. */
3953 { 3953 {
3954 /* Block input. */ 3954 /* Block input. */
3955 BLOCK_INPUT; 3955 BLOCK_INPUT;
3956 resize_window_apply (p, horflag); 3956 window_resize_apply (p, horflag);
3957 3957
3958 windows_or_buffers_changed++; 3958 windows_or_buffers_changed++;
3959 Vwindow_list = Qnil; 3959 Vwindow_list = Qnil;
@@ -4076,10 +4076,10 @@ grow_mini_window (struct window *w, int delta)
4076 root = FRAME_ROOT_WINDOW (f); 4076 root = FRAME_ROOT_WINDOW (f);
4077 r = XWINDOW (root); 4077 r = XWINDOW (root);
4078 value = call2 (Qresize_root_window_vertically, root, make_number (- delta)); 4078 value = call2 (Qresize_root_window_vertically, root, make_number (- delta));
4079 if (INTEGERP (value) && resize_window_check (r, 0)) 4079 if (INTEGERP (value) && window_resize_check (r, 0))
4080 { 4080 {
4081 BLOCK_INPUT; 4081 BLOCK_INPUT;
4082 resize_window_apply (r, 0); 4082 window_resize_apply (r, 0);
4083 4083
4084 /* Grow the mini-window. */ 4084 /* Grow the mini-window. */
4085 XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines)); 4085 XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines));
@@ -4111,10 +4111,10 @@ shrink_mini_window (struct window *w)
4111 r = XWINDOW (root); 4111 r = XWINDOW (root);
4112 value = call2 (Qresize_root_window_vertically, 4112 value = call2 (Qresize_root_window_vertically,
4113 root, make_number (size - 1)); 4113 root, make_number (size - 1));
4114 if (INTEGERP (value) && resize_window_check (r, 0)) 4114 if (INTEGERP (value) && window_resize_check (r, 0))
4115 { 4115 {
4116 BLOCK_INPUT; 4116 BLOCK_INPUT;
4117 resize_window_apply (r, 0); 4117 window_resize_apply (r, 0);
4118 4118
4119 /* Shrink the mini-window. */ 4119 /* Shrink the mini-window. */
4120 XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines)); 4120 XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines));
@@ -4152,12 +4152,12 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
4152 4152
4153 r = XWINDOW (FRAME_ROOT_WINDOW (f)); 4153 r = XWINDOW (FRAME_ROOT_WINDOW (f));
4154 height = XINT (r->total_lines) + XINT (w->total_lines); 4154 height = XINT (r->total_lines) + XINT (w->total_lines);
4155 if (resize_window_check (r, 0) 4155 if (window_resize_check (r, 0)
4156 && XINT (w->new_total) > 0 4156 && XINT (w->new_total) > 0
4157 && height == XINT (r->new_total) + XINT (w->new_total)) 4157 && height == XINT (r->new_total) + XINT (w->new_total))
4158 { 4158 {
4159 BLOCK_INPUT; 4159 BLOCK_INPUT;
4160 resize_window_apply (r, 0); 4160 window_resize_apply (r, 0);
4161 4161
4162 w->total_lines = w->new_total; 4162 w->total_lines = w->new_total;
4163 XSETFASTINT (w->top_line, XINT (r->top_line) + XINT (r->total_lines)); 4163 XSETFASTINT (w->top_line, XINT (r->top_line) + XINT (r->total_lines));
@@ -6600,10 +6600,10 @@ function `window-nest' and altered by the function `set-window-nest'. */);
6600 defsubr (&Swindow_clone_number); 6600 defsubr (&Swindow_clone_number);
6601 defsubr (&Swindow_buffer); 6601 defsubr (&Swindow_buffer);
6602 defsubr (&Swindow_parent); 6602 defsubr (&Swindow_parent);
6603 defsubr (&Swindow_vchild); 6603 defsubr (&Swindow_top_child);
6604 defsubr (&Swindow_hchild); 6604 defsubr (&Swindow_left_child);
6605 defsubr (&Swindow_next); 6605 defsubr (&Swindow_next_sibling);
6606 defsubr (&Swindow_prev); 6606 defsubr (&Swindow_prev_sibling);
6607 defsubr (&Swindow_splits); 6607 defsubr (&Swindow_splits);
6608 defsubr (&Sset_window_splits); 6608 defsubr (&Sset_window_splits);
6609 defsubr (&Swindow_nest); 6609 defsubr (&Swindow_nest);
@@ -6617,7 +6617,7 @@ function `window-nest' and altered by the function `set-window-nest'. */);
6617 defsubr (&Swindow_new_normal); 6617 defsubr (&Swindow_new_normal);
6618 defsubr (&Sset_window_new_total); 6618 defsubr (&Sset_window_new_total);
6619 defsubr (&Sset_window_new_normal); 6619 defsubr (&Sset_window_new_normal);
6620 defsubr (&Sresize_window_apply); 6620 defsubr (&Swindow_resize_apply);
6621 defsubr (&Swindow_body_size); 6621 defsubr (&Swindow_body_size);
6622 defsubr (&Swindow_hscroll); 6622 defsubr (&Swindow_hscroll);
6623 defsubr (&Sset_window_hscroll); 6623 defsubr (&Sset_window_hscroll);
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-24 09:51:41 +0000