aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2009-11-13 10:10:15 +0000
committerEli Zaretskii2009-11-13 10:10:15 +0000
commit241c4680c9d79855e7124693b2b1df6699cf2ae7 (patch)
tree86eaf9589f2c3594e6e0ff72c4074bdea4ee60c7 /src
parentdc92c039bcf7e7bf893070a962b2648c06df55a6 (diff)
downloademacs-241c4680c9d79855e7124693b2b1df6699cf2ae7.tar.gz
emacs-241c4680c9d79855e7124693b2b1df6699cf2ae7.zip
(SYSTEM_PURESIZE_EXTRA): Revert last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/s/msdos.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5bc83648c22..35296685a65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12009-11-13 Eli Zaretskii <eliz@gnu.org>
2
3 * menu.c (Fx_popup_menu): Call Fx_hide_tip only if HAVE_WINDOW_SYSTEM.
4
5 * s/msdos.h (SYSTEM_PURESIZE_EXTRA): Revert last change.
6
12009-11-12 Stefan Monnier <monnier@iro.umontreal.ca> 72009-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * xdisp.c (syms_of_xdisp): Fix typo in last change. 9 * xdisp.c (syms_of_xdisp): Fix typo in last change.
diff --git a/src/s/msdos.h b/src/s/msdos.h
index fdade5a6029..5ef414c6c18 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -196,7 +196,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
196/* We need a little extra space, see ../../lisp/loadup.el and the 196/* We need a little extra space, see ../../lisp/loadup.el and the
197 commentary below, in the non-X branch. The 140KB number was 197 commentary below, in the non-X branch. The 140KB number was
198 measured on GNU/Linux and on MS-WIndows. */ 198 measured on GNU/Linux and on MS-WIndows. */
199#define SYSTEM_PURESIZE_EXTRA (-200000+140000) 199#define SYSTEM_PURESIZE_EXTRA (-170000+140000)
200#define LIBX11_SYSTEM -lxext -lsys 200#define LIBX11_SYSTEM -lxext -lsys
201#else 201#else
202/* We need a little extra space, see ../../lisp/loadup.el. 202/* We need a little extra space, see ../../lisp/loadup.el.
@@ -208,7 +208,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
208 directory tree). Given the unknown policy of different DPMI 208 directory tree). Given the unknown policy of different DPMI
209 hosts regarding loading of untouched pages, I'm not going to risk 209 hosts regarding loading of untouched pages, I'm not going to risk
210 enlarging Emacs footprint by another 100+ KBytes. */ 210 enlarging Emacs footprint by another 100+ KBytes. */
211#define SYSTEM_PURESIZE_EXTRA (-200000+65000) 211#define SYSTEM_PURESIZE_EXTRA (-170000+65000)
212#endif 212#endif
213 213
214/* Tell the garbage collector that setjmp is known to save all 214/* Tell the garbage collector that setjmp is known to save all