Mercurial > emacs

changeset 14036:621a575db6f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comment fixes.
author Karl Heuer <kwzh@gnu.org>
date Fri, 05 Jan 1996 10:03:17 +0000
parents 09cb73d0ec41
children f98acba8258a
files lib-src/emacstool.c lib-src/movemail.c lib-src/pop.c src/Makefile.in src/alloc.c src/callproc.c src/data.c src/dired.c src/fileio.c src/floatfns.c src/insdel.c src/intervals.c src/keyboard.c src/lread.c src/m/pmax.h src/m/tower32.h src/m/windowsnt.h src/msdos.c src/print.c src/process.c src/process.h src/ralloc.c src/s/cxux.h src/s/dgux5-4-3.h src/s/hpux9.h src/s/msdos.h src/search.c src/term.c src/textprop.c src/unexec.c src/unexw32.c src/vms-pp.c src/vmsgmalloc.c src/vmsproc.c src/w32faces.c src/w32menu.c src/w32proc.c src/widget.c src/xdisp.c src/xfaces.c src/xmenu.c
diffstat 41 files changed, 66 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/emacstool.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/lib-src/emacstool.c	Fri Jan 05 10:03:17 1996 +0000
@@ -150,7 +150,7 @@
  *  Variables to store the time of the previous mouse event that was
  *  sent to emacs.
  *
- *  The theory is that to time double clicks while ignoreing UP buttons,
+ *  The theory is that to time double clicks while ignoring UP buttons,
  *  we must keep track of the accumulated time.
  *
  *  If someone writes a SUN-SET-INPUT-MASK for emacstool,
@@ -376,7 +376,7 @@
     char **argv;
 {
 #ifndef TTERM
-    int i, font_width_adjust = 1; /* hackery, and hueristics */
+    int i, font_width_adjust = 1; /* hackery, and heuristics */
     /* if -Wt is not supplied, then font comes out as lucida-14 (width=8)
      * rather than the screen.r.12 (width=7) typically used
      * this hack attempts to workaround it.
--- a/lib-src/movemail.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/lib-src/movemail.c	Fri Jan 05 10:03:17 1996 +0000
@@ -167,7 +167,7 @@
   if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
     pfatal_with_name (outname);
 
-  /* Also check that outname's directory is writeable to the real uid.  */
+  /* Also check that outname's directory is writable to the real uid.  */
   {
     char *buf = (char *) xmalloc (strlen (outname) + 1);
     char *p;
--- a/lib-src/pop.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/lib-src/pop.c	Fri Jan 05 10:03:17 1996 +0000
@@ -906,7 +906,7 @@
  * Return value: 0 for success, non-zero otherwise with error in
  * 	pop_error.
  *
- * Side Effects: The popserver passed in is unuseable after this
+ * Side Effects: The popserver passed in is unusable after this
  * 	function is called, even if an error occurs.
  */
 int
@@ -1368,7 +1368,7 @@
  * 
  * Returns: 0 for success, else for failure and puts error in pop_error.
  *
- * Side effects: On failure, may make the connection unuseable.
+ * Side effects: On failure, may make the connection unusable.
  */
 static int
 getok (server)
@@ -1439,7 +1439,7 @@
  * 	try to get the server to quit, but ignoring any responses that
  * 	are received.
  *
- * Side effects: The server is unuseable after this function returns.
+ * Side effects: The server is unusable after this function returns.
  * 	Changes made to the maildrop since the session was started (or
  * 	since the last pop_reset) may be lost.
  */
--- a/src/Makefile.in	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/Makefile.in	Fri Jan 05 10:03:17 1996 +0000
@@ -232,7 +232,7 @@
    which will be in a file named localcpp.  */
 MYCPPFLAG= -Blocal
 /* LOCALCPP is the local one or nothing.
-   CPP is the local one or the standardone.  */
+   CPP is the local one or the standard one.  */
 LOCALCPP= localcpp
 #endif /* ! defined (LONGNAMEBBBARFOOX) */
 
--- a/src/alloc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/alloc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -151,7 +151,7 @@
 /* Define DONT_COPY_FLAG to be some bit which will always be zero in a
    pointer to a Lisp_Object, when that pointer is viewed as an integer.
    (On most machines, pointers are even, so we can use the low bit.
-   Word-addressible architectures may need to override this in the m-file.)
+   Word-addressable architectures may need to override this in the m-file.)
    When linking references to small strings through the size field, we
    use this slot to hold the bit that would otherwise be interpreted as
    the GC mark bit.  */
@@ -2157,7 +2157,7 @@
 
 #ifndef standalone
   /* Put all unmarked markers on free list.
-     Dechain each one first from the buffer it points into,
+     Unchain each one first from the buffer it points into,
      but only if it's a real marker.  */
   {
     register struct marker_block *mblk;
--- a/src/callproc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/callproc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -509,7 +509,7 @@
       {
 	/* Repeatedly read until we've filled as much as possible
 	   of the buffer size we have.  But don't read
-	   less than 1024--save that for the next bufferfull.  */
+	   less than 1024--save that for the next bufferful.  */
 
 	nread = 0;
 	while (nread < bufsize - 1024)
--- a/src/data.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/data.c	Fri Jan 05 10:03:17 1996 +0000
@@ -862,7 +862,7 @@
 
 /* Find the value of a symbol, returning Qunbound if it's not bound.
    This is helpful for code which just wants to get a variable's value
-   if it has one, without signalling an error.
+   if it has one, without signaling an error.
    Note that it must not be possible to quit
    within this function.  Great care is required for this.  */
 
--- a/src/dired.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/dired.c	Fri Jan 05 10:03:17 1996 +0000
@@ -152,7 +152,7 @@
       CHECK_STRING (match, 3);
 
       /* MATCH might be a flawed regular expression.  Rather than
-	 catching and signalling our own errors, we just call
+	 catching and signaling our own errors, we just call
 	 compile_pattern to do the work for us.  */
 #ifdef VMS
       bufp = compile_pattern (match, 0,
@@ -166,7 +166,7 @@
      which might compile a new regexp until we're done with the loop!  */
 
   /* Do this opendir after anything which might signal an error; if
-     an error is signalled while the directory stream is open, we
+     an error is signaled while the directory stream is open, we
      have to make sure it gets closed, and setting up an
      unwind_protect to do so would be a pain.  */
   d = opendir (XSTRING (dirfilename)->data);
--- a/src/fileio.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/fileio.c	Fri Jan 05 10:03:17 1996 +0000
@@ -2936,7 +2936,7 @@
 		 && FETCH_CHAR (same_at_start) == buffer[bufpos])
 	    same_at_start++, bufpos++;
 	  /* If we found a discrepancy, stop the scan.
-	     Otherwise loop around and scan the next bufferfull.  */
+	     Otherwise loop around and scan the next bufferful.  */
 	  if (bufpos != nread)
 	    break;
 	}
@@ -2979,7 +2979,7 @@
 		       XSTRING (filename)->data, strerror (errno));
 	      total_read += nread;
 	    }
-	  /* Scan this bufferfull from the end, comparing with
+	  /* Scan this bufferful from the end, comparing with
 	     the Emacs buffer.  */
 	  bufpos = total_read;
 	  /* Compare with same_at_start to avoid counting some buffer text
@@ -2988,7 +2988,7 @@
 		 && FETCH_CHAR (same_at_end - 1) == buffer[bufpos - 1])
 	    same_at_end--, bufpos--;
 	  /* If we found a discrepancy, stop the scan.
-	     Otherwise loop around and scan the preceding bufferfull.  */
+	     Otherwise loop around and scan the preceding bufferful.  */
 	  if (bufpos != 0)
 	    break;
 	  /* If display current starts at beginning of line,
--- a/src/floatfns.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/floatfns.c	Fri Jan 05 10:03:17 1996 +0000
@@ -37,7 +37,7 @@
    (What systems actually do this?  Please let us know.)
 
    Define FLOAT_CHECK_DOMAIN if the float library doesn't handle errors by
-   either setting errno, or signalling SIGFPE/SIGILL.  Otherwise, domain and
+   either setting errno, or signaling SIGFPE/SIGILL.  Otherwise, domain and
    range checking will happen before calling the float routines.  This has
    no effect if HAVE_MATHERR is defined (since matherr will be called when
    a domain error occurs.)
--- a/src/insdel.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/insdel.c	Fri Jan 05 10:03:17 1996 +0000
@@ -271,7 +271,7 @@
    a conceptual change in point as a marker.  In particular, point is
    not crossing any interval boundaries, so there's no need to use the
    usual SET_PT macro.  In fact it would be incorrect to do so, because
-   either the old or the new value of point is out of synch with the
+   either the old or the new value of point is out of sync with the
    current set of intervals.  */
 static void
 adjust_point (amount)
--- a/src/intervals.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/intervals.c	Fri Jan 05 10:03:17 1996 +0000
@@ -680,7 +680,7 @@
    Modifications are needed to handle the hungry bits -- after simply
    finding the interval at position (don't add length going down),
    if it's the beginning of the interval, get the previous interval
-   and check the hugry bits of both.  Then add the length going back up
+   and check the hungry bits of both.  Then add the length going back up
    to the root.  */
 
 static INTERVAL
@@ -793,7 +793,7 @@
 
       /* Even if we are positioned between intervals, we default
 	 to the left one if it exists.  We extend it now and split
-	 off a part later, if stickyness demands it.  */
+	 off a part later, if stickiness demands it.  */
       for (temp = prev ? prev : i;! NULL_INTERVAL_P (temp); temp = temp->parent)
 	{
 	  temp->total_length += length;
@@ -801,7 +801,7 @@
 	}
       
       /* If at least one interval has sticky properties,
-	 we check the stickyness property by property.  */
+	 we check the stickiness property by property.  */
       if (END_NONSTICKY_P (prev) || FRONT_STICKY_P (i))
 	{
 	  Lisp_Object pleft, pright;
@@ -1516,7 +1516,7 @@
   /* The inserted text "sticks" to the interval `under',
      which means it gets those properties.
      The properties of under are the result of
-     adjust_intervals_for_insertion, so stickyness has
+     adjust_intervals_for_insertion, so stickiness has
      already been taken care of.  */
      
   while (! NULL_INTERVAL_P (over))
--- a/src/keyboard.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/keyboard.c	Fri Jan 05 10:03:17 1996 +0000
@@ -7138,7 +7138,7 @@
 
 /*
  * Destroy the contents of a kboard object, but not the object itself.
- * We use this just before deleteing it, or if we're going to initialize
+ * We use this just before deleting it, or if we're going to initialize
  * it a second time.
  */
 static void
--- a/src/lread.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/lread.c	Fri Jan 05 10:03:17 1996 +0000
@@ -264,7 +264,7 @@
     goto retry;
 
   /* switch-frame events are put off until after the next ASCII
-     character.  This is better than signalling an error just because
+     character.  This is better than signaling an error just because
      the last characters were typed to a separate minibuffer frame,
      for example.  Eventually, some code which can deal with
      switch-frame events will read it and process it.  */
@@ -2297,7 +2297,7 @@
 #ifndef WINDOWSNT
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is 
      almost never correct, thereby causing a warning to be printed out that 
-     confuses users.  Since PATH_LOADSEARCH is always overriden by the
+     confuses users.  Since PATH_LOADSEARCH is always overridden by the
      EMACSLOADPATH environment variable below, disable the warning on NT.  */
 
   /* Warn if dirs in the *standard* path don't exist.  */
--- a/src/m/pmax.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/m/pmax.h	Fri Jan 05 10:03:17 1996 +0000
@@ -86,7 +86,7 @@
    also solve the problem, but I doubt you can convince everyone to do this. */
 /* Addendum: the MIT X11 distribution neglects to define certain symbols
    when NeedFunctionPrototypes is 0, but still tries to use them when
-   NeedVarargsProrotypes is 1 (which is its default value).  So if we're
+   NeedVarargsPrototypes is 1 (which is its default value).  So if we're
    going to disable non-variadic prototypes, we also need to disable
    variadic prototypes.  --kwzh@gnu.ai.mit.edu */
 #define C_SWITCH_X_MACHINE -DNeedFunctionPrototypes=0 -DNeedVarargsPrototypes=0
--- a/src/m/tower32.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/m/tower32.h	Fri Jan 05 10:03:17 1996 +0000
@@ -113,7 +113,7 @@
 /* #define C_OPTIMIZE_SWITCH -O2 */
 
 /* emacs's magic number isn't temacs's;
-   temacs is writeable text (the default!).  */
+   temacs is writable text (the default!).  */
 
 #include <asld.h>
 #define EXEC_MAGIC AOUT1MAGIC
--- a/src/m/windowsnt.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/m/windowsnt.h	Fri Jan 05 10:03:17 1996 +0000
@@ -83,7 +83,7 @@
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
 
-/* Text does preceed data space, but this is never a safe assumption.  */
+/* Text does precede data space, but this is never a safe assumption.  */
 #define VIRT_ADDR_VARIES
 
 /* Define C_ALLOCA if this machine does not support a true alloca
--- a/src/msdos.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/msdos.c	Fri Jan 05 10:03:17 1996 +0000
@@ -1785,7 +1785,7 @@
 			result = XM_IA_SELECT;
 		    *pane = state[i].pane - 1;
 		    *selidx = dy;
-		    /* We hit some part of a menu, so drop extra menues that
+		    /* We hit some part of a menu, so drop extra menus that
 		       have been opened.  That does not include an open and
 		       active submenu.  */
 		    if (i != statecount - 2
@@ -2518,7 +2518,7 @@
 #endif
 
 /*
- * Define overlayed functions:
+ * Define overlaid functions:
  *
  *	chdir -> sys_chdir
  *	tzset -> init_gettimeofday
--- a/src/print.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/print.c	Fri Jan 05 10:03:17 1996 +0000
@@ -708,7 +708,7 @@
 
 /*
  * The buffer should be at least as large as the max string size of the
- * largest float, printed in the biggest notation.  This is undoubtably
+ * largest float, printed in the biggest notation.  This is undoubtedly
  * 20d float_output_format, with the negative of the C-constant "HUGE"
  * from <math.h>.
  * 
--- a/src/process.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/process.c	Fri Jan 05 10:03:17 1996 +0000
@@ -1141,7 +1141,7 @@
 }
 
 /* This function is the unwind_protect form for Fstart_process.  If
-   PROC doesn't have its pid set, then we know someone has signalled
+   PROC doesn't have its pid set, then we know someone has signaled
    an error and the process wasn't started successfully, so we should
    remove it from the process list.  */
 static Lisp_Object
--- a/src/process.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/process.h	Fri Jan 05 10:03:17 1996 +0000
@@ -87,7 +87,7 @@
    are waiting for it.  */
 extern int synch_process_alive;
 
-/* Communicate exit status of synch process to from sigchld_handler
+/* Communicate exit status of sync process to from sigchld_handler
    to Fcall_process.  */
 extern int synch_process_retcode;
 extern char *synch_process_death;
--- a/src/ralloc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/ralloc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -131,7 +131,7 @@
    but they never move.
 
    We try to make just one heap and make it larger as necessary.
-   But sometimes we can't do that, because we can't get continguous
+   But sometimes we can't do that, because we can't get contiguous
    space to add onto the heap.  When that happens, we start a new heap.  */
    
 typedef struct heap
@@ -171,7 +171,7 @@
    An element with variable==NIL denotes a freed block, which has not yet
    been collected.  They may only appear while r_alloc_freeze > 0, and will be
    freed when the arena is thawed.  Currently, these blocs are not reusable,
-   while the arena is frozen.  Very inefficent.  */
+   while the arena is frozen.  Very inefficient.  */
 
 typedef struct bp
 {
@@ -180,7 +180,7 @@
   POINTER *variable;
   POINTER data;
   SIZE size;
-  POINTER new_data;		/* tmporarily used for relocation */
+  POINTER new_data;		/* temporarily used for relocation */
   struct heap *heap; 		/* Heap this bloc is in.  */
 } *bloc_ptr;
 
@@ -220,8 +220,8 @@
    if we can get that many within one heap.
 
    If enough space is not presently available in our reserve, this means
-   getting more page-aligned space from the system. If the retuned space
-   is not contiguos to the last heap, allocate a new heap, and append it
+   getting more page-aligned space from the system.  If the returned space
+   is not contiguous to the last heap, allocate a new heap, and append it
 
    obtain does not try to keep track of whether space is in use
    or not in use.  It just returns the address of SIZE bytes that
@@ -795,7 +795,7 @@
     {
       /* Allocate a page-aligned space.  GNU malloc would reclaim an
 	 extra space if we passed an unaligned one.  But we could
-	 not always find a space which is contiguos to the previous.  */
+	 not always find a space which is contiguous to the previous.  */
       POINTER new_bloc_start;
       heap_ptr h = first_heap;
       SIZE get = ROUNDUP (size);
@@ -978,7 +978,7 @@
    do nothing.
 
    In case r_alloc_freeze is set, a new bloc is allocated, and the
-   memory copied to it.  Not very efficent.  We could traverse the
+   memory copied to it.  Not very efficient.  We could traverse the
    bloc_list for a best fit of free blocs first.
 
    Change *PTR to reflect the new bloc, and return this value.
@@ -1077,7 +1077,7 @@
   if (--r_alloc_freeze_level < 0)
     abort ();
 
-  /* This frees all unused blocs.  It is not too inefficent, as the resize 
+  /* This frees all unused blocs.  It is not too inefficient, as the resize 
      and bcopy is done only once.  Afterwards, all unreferenced blocs are 
      already shrunk to zero size.  */
   if (!r_alloc_freeze_level) 
--- a/src/s/cxux.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/s/cxux.h	Fri Jan 05 10:03:17 1996 +0000
@@ -87,7 +87,7 @@
    INTERRUPT_INPUT to decide whether to use it by default.
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
@@ -114,7 +114,7 @@
  *	Define HAVE_TERMIO if the system provides sysV-style ioctls
  *	for terminal control.
  *
- *	Do not define both.  HAVE_TERMIOS is prefered, if it is
+ *	Do not define both.  HAVE_TERMIOS is preferred, if it is
  *	supported on your system.
  */
 
--- a/src/s/dgux5-4-3.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/s/dgux5-4-3.h	Fri Jan 05 10:03:17 1996 +0000
@@ -27,7 +27,7 @@
 #include "dgux5-4r2.h"
 
 /* DGUX 5.4R3.00 brought the definition of `struct inet_addr' into
-   compliance wiht the majority of Unix systems.  The workaround
+   compliance with the majority of Unix systems.  The workaround
    introduced in 5.4R2 is no longer necessary. */
 
 #ifdef HAVE_BROKEN_INET_ADDR
--- a/src/s/hpux9.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/s/hpux9.h	Fri Jan 05 10:03:17 1996 +0000
@@ -30,7 +30,7 @@
 #endif
 
 /* According to ngorelic@speclab.cr.usgs.gov,
-   references to the X11R4 directoriess in these variables
+   references to the X11R4 directories in these variables
    (inherited from hpux8.h)
    cause the wrong libraries to be found,
    and the options to specify the X11R5 directories are unnecessary
--- a/src/s/msdos.h	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/s/msdos.h	Fri Jan 05 10:03:17 1996 +0000
@@ -73,7 +73,7 @@
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
--- a/src/search.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/search.c	Fri Jan 05 10:03:17 1996 +0000
@@ -73,7 +73,7 @@
    Qnil if no searching has been done yet.  */
 static Lisp_Object last_thing_searched;
 
-/* error condition signalled when regexp compile_pattern fails */
+/* error condition signaled when regexp compile_pattern fails */
 
 Lisp_Object Qinvalid_regexp;
 
--- a/src/term.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/term.c	Fri Jan 05 10:03:17 1996 +0000
@@ -156,7 +156,7 @@
    away is a real pain - can you say set-window-configuration?
    Instead, we just assert at the beginning of redisplay that *all*
    scroll bars are to be removed, and then save scroll bars from the
-   firey pit when we actually redisplay their window.  */
+   fiery pit when we actually redisplay their window.  */
 
 /* Arrange for all scroll bars on FRAME to be removed at the next call
    to `*judge_scroll_bars_hook'.  A scroll bar may be spared if
--- a/src/textprop.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/textprop.c	Fri Jan 05 10:03:17 1996 +0000
@@ -1500,7 +1500,7 @@
       if (NILP (Vinhibit_read_only) || CONSP (Vinhibit_read_only))
 	{
 	  /* If I and PREV differ we need to check for the read-only
-	     property together with its stickyness. If either I or
+	     property together with its stickiness. If either I or
 	     PREV are 0, this check is all we need.
 	     We have to take special care, since read-only may be
 	     indirectly defined via the category property.  */
--- a/src/unexec.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/unexec.c	Fri Jan 05 10:03:17 1996 +0000
@@ -915,8 +915,8 @@
    * runs, it copies the table to where these parameters live during
    * execution.  This data is in text space, so it cannot be modified here
    * before saving the executable, so the data is written manually.  In
-   * addition, the table does not have a label, and the nearest accessable
-   * label (mcount) is not prefixed with a '_', thus making it inaccessable
+   * addition, the table does not have a label, and the nearest accessible
+   * label (mcount) is not prefixed with a '_', thus making it inaccessible
    * from within C programs.  To overcome this, emacs's executable is passed
    * through the command 'nm %s | fgrep mcount' into a pipe, and the
    * resultant output is then used to find the address of 'mcount'.  As far as
--- a/src/unexw32.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/unexw32.c	Fri Jan 05 10:03:17 1996 +0000
@@ -138,7 +138,7 @@
 #endif /* HAVE_NTGUI */
 }
 
-/* Dump out .data and .bss sections into a new exectubale.  */
+/* Dump out .data and .bss sections into a new executable.  */
 void
 unexec (char *new_name, char *old_name, void *start_data, void *start_bss,
 	void *entry_address)
--- a/src/vms-pp.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/vms-pp.c	Fri Jan 05 10:03:17 1996 +0000
@@ -42,7 +42,7 @@
  *		#define defined(XX) XX_val
  *		#if defined(foo)
  *
- *	This last contruction only works on single line #if's and takes
+ *	This last construction only works on single line #if's and takes
  *	advantage of a questionable C pre-processor trick. If there are
  *	comments within the #if, that contain "defined", then this will
  *	bomb.
--- a/src/vmsgmalloc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/vmsgmalloc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -1179,7 +1179,7 @@
 #endif /* defined(emacs) && defined(VMS) */
 
 #ifdef VMS
-/* Unfortunatelly, the VAX C sbrk() is buggy. For example, it returns
+/* Unfortunately, the VAX C sbrk() is buggy. For example, it returns
    memory in 512 byte chunks (not a bug, but there's more), AND it
    adds an extra 512 byte chunk if you ask for a multiple of 512
    bytes (you ask for 512 bytes, you get 1024 bytes...). And also,
--- a/src/vmsproc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/vmsproc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -719,7 +719,7 @@
     
     Event flags returned start at 1 for the keyboard.
     Since Unix expects descriptor 0 for the keyboard,
-    we substract one from the event flag.
+    we subtract one from the event flag.
     */
   inchannel = vs->eventFlag-1;
 
--- a/src/w32faces.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/w32faces.c	Fri Jan 05 10:03:17 1996 +0000
@@ -69,7 +69,7 @@
    lisp manipulates to control what gets displayed.  Elements 0 and 1
    of FRAME->display.x->param_faces are special - they describe the
    default and mode line faces.  None of the faces in param_faces have
-   GC's.  (See src/dispextern.h for the definiton of struct face.
+   GC's.  (See src/dispextern.h for the definition of struct face.
    lisp/faces.el maintains the isomorphism between face_alist and
    param_faces.)
 
--- a/src/w32menu.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/w32menu.c	Fri Jan 05 10:03:17 1996 +0000
@@ -586,7 +586,7 @@
     return (hmenu);
 }
 
-/* Push all the panes and items of a menu decsribed by the
+/* Push all the panes and items of a menu described by the
    alist-of-alists MENU.
    This handles old-fashioned calls to x-popup-menu.  */
 
@@ -1011,7 +1011,7 @@
   return (Qnil);
 }
 
-/* Push all the panes and items of a menu decsribed by the
+/* Push all the panes and items of a menu described by the
    alist-of-alists MENU.
    This handles old-fashioned calls to x-popup-menu.  */
 
@@ -1444,7 +1444,7 @@
     
   UNBLOCK_INPUT;
 }
-/* Called from Fwin32_create_frame to create the inital menubar of a frame
+/* Called from Fwin32_create_frame to create the initial menubar of a frame
    before it is mapped, so that the window is mapped with the menubar already
    there instead of us tacking it on later and thrashing the window after it
    is visible.  */
--- a/src/w32proc.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/w32proc.c	Fri Jan 05 10:03:17 1996 +0000
@@ -408,7 +408,7 @@
     }
 
   /* Massage the exit code from the process to match the format expected
-     by the WIFSTOPPED et al macros in syswait.h.  Only WIFSIGNALLED and
+     by the WIFSTOPPED et al macros in syswait.h.  Only WIFSIGNALED and
      WIFEXITED are supported; WIFSTOPPED doesn't make sense under NT.  */
 
   if (retval == STATUS_CONTROL_C_EXIT)
--- a/src/widget.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/widget.c	Fri Jan 05 10:03:17 1996 +0000
@@ -311,7 +311,7 @@
   
   if (! XtIsSubclass (wmshell, shellWidgetClass)) abort ();
 
-  /* We don't need this for the momment. The geometry is computed in 
+  /* We don't need this for the moment. The geometry is computed in 
      xfns.c.  */
 #if 0
   /* If the EmacsFrame doesn't have a geometry but the shell does,
--- a/src/xdisp.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/xdisp.c	Fri Jan 05 10:03:17 1996 +0000
@@ -2103,8 +2103,8 @@
 		 lines' charstarts in the case where the text of the
 		 screen line at bp.vpos has changed.
 		 (This can happen in a deletion that ends in mid-line.)
-		 To adjust properly, we need to make things constent at
-		 the position ep.
+		 To adjust properly, we need to make things consistent
+		 at the position ep.
 		 So do a second adjust to make that happen.
 		 Note that stop_vpos >= ep.vpos, so it is sufficient
 		 to update the charstarts for lines at ep.vpos and below.  */
--- a/src/xfaces.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/xfaces.c	Fri Jan 05 10:03:17 1996 +0000
@@ -95,7 +95,7 @@
    lisp manipulates to control what gets displayed.  Elements 0 and 1
    of FRAME->output_data.x->param_faces are special - they describe the
    default and mode line faces.  None of the faces in param_faces have
-   GC's.  (See src/dispextern.h for the definiton of struct face.
+   GC's.  (See src/dispextern.h for the definition of struct face.
    lisp/faces.el maintains the isomorphism between face_alist and
    param_faces.)
 
--- a/src/xmenu.c	Fri Jan 05 08:57:33 1996 +0000
+++ b/src/xmenu.c	Fri Jan 05 10:03:17 1996 +0000
@@ -673,7 +673,7 @@
     }
 }
 
-/* Push all the panes and items of a menu decsribed by the
+/* Push all the panes and items of a menu described by the
    alist-of-alists MENU.
    This handles old-fashioned calls to x-popup-menu.  */
 
@@ -1766,7 +1766,7 @@
   UNBLOCK_INPUT;
 }
 
-/* Called from Fx_create_frame to create the inital menubar of a frame
+/* Called from Fx_create_frame to create the initial menubar of a frame
    before it is mapped, so that the window is mapped with the menubar already
    there instead of us tacking it on later and thrashing the window after it
    is visible.  */