aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-11-19 19:07:02 -0800
committerPaul Eggert <[email protected]>2011-11-19 19:07:02 -0800
commit615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch)
treee0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src/s
parentc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff)
parente1dbe924b53c541fdf238a5a722b7177d5c8760b (diff)
Merge from trunk.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/msdos.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 29ca062989..9ee13d1286 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -119,7 +119,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
#ifdef HAVE_X_WINDOWS
/* We need a little extra space, see ../../lisp/loadup.el and the
commentary below, in the non-X branch. The 140KB number was
- measured on GNU/Linux and on MS-WIndows. */
+ measured on GNU/Linux and on MS-Windows. */
#define SYSTEM_PURESIZE_EXTRA (-170000+140000)
#else
/* We need a little extra space, see ../../lisp/loadup.el.
@@ -138,4 +138,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
registers relevant for conservative garbage collection in the jmp_buf. */
#define GC_SETJMP_WORKS 1
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-