From 8e6208c5d2c91d70f2338d1c3d788e194c6c9d52 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Fri, 5 Jan 1996 10:03:17 +0000 Subject: [PATCH] Comment fixes. --- lib-src/emacstool.c | 4 ++-- lib-src/movemail.c | 2 +- lib-src/pop.c | 6 +++--- src/Makefile.in | 2 +- src/alloc.c | 4 ++-- src/callproc.c | 2 +- src/data.c | 2 +- src/dired.c | 4 ++-- src/fileio.c | 6 +++--- src/floatfns.c | 2 +- src/insdel.c | 2 +- src/intervals.c | 8 ++++---- src/keyboard.c | 2 +- src/lread.c | 4 ++-- src/m/pmax.h | 2 +- src/m/tower32.h | 2 +- src/m/windowsnt.h | 2 +- src/msdos.c | 4 ++-- src/print.c | 2 +- src/process.c | 2 +- src/process.h | 2 +- src/ralloc.c | 16 ++++++++-------- src/s/cxux.h | 4 ++-- src/s/dgux5-4-3.h | 2 +- src/s/hpux9.h | 2 +- src/s/msdos.h | 2 +- src/search.c | 2 +- src/term.c | 2 +- src/textprop.c | 2 +- src/unexec.c | 4 ++-- src/unexw32.c | 2 +- src/vms-pp.c | 2 +- src/vmsgmalloc.c | 2 +- src/vmsproc.c | 2 +- src/w32faces.c | 2 +- src/w32menu.c | 6 +++--- src/w32proc.c | 2 +- src/widget.c | 2 +- src/xdisp.c | 4 ++-- src/xfaces.c | 2 +- src/xmenu.c | 4 ++-- 41 files changed, 66 insertions(+), 66 deletions(-) diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c index 2e946e224c2..120bb3eaaea 100644 --- a/lib-src/emacstool.c +++ b/lib-src/emacstool.c @@ -150,7 +150,7 @@ button_value (event) * 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 @@ int interpose_on_window(argc,argv) 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. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 0cbd426478e..0286b65af65 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -167,7 +167,7 @@ main (argc, argv) 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; diff --git a/lib-src/pop.c b/lib-src/pop.c index 125df24f130..9ae0bf3b0c0 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -906,7 +906,7 @@ pop_reset (server) * 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 @@ fullwrite (fd, buf, nbytes) * * 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 @@ gettermination (server) * 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. */ diff --git a/src/Makefile.in b/src/Makefile.in index b707fa9e8e4..94817d280f4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -232,7 +232,7 @@ STARTFILES = START_FILES 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) */ diff --git a/src/alloc.c b/src/alloc.c index 06b1cdaf814..e911dfce35c 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -151,7 +151,7 @@ Lisp_Object memory_signal_data; /* 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 @@ gc_sweep () #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; diff --git a/src/callproc.c b/src/callproc.c index 2efff15d348..25b917c9c05 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -509,7 +509,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") { /* 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) diff --git a/src/data.c b/src/data.c index 10cd316cf78..b0229430141 100644 --- a/src/data.c +++ b/src/data.c @@ -862,7 +862,7 @@ swap_in_symval_forwarding (sym, valcontents) /* 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. */ diff --git a/src/dired.c b/src/dired.c index 8e6add1f6e8..54ba7437912 100644 --- a/src/dired.c +++ b/src/dired.c @@ -152,7 +152,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\ 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 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\ 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); diff --git a/src/fileio.c b/src/fileio.c index 921ccf96501..6faf1563959 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2936,7 +2936,7 @@ and (2) it puts less data in the undo list.") && 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 @@ and (2) it puts less data in the undo list.") 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 @@ and (2) it puts less data in the undo list.") && 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, diff --git a/src/floatfns.c b/src/floatfns.c index 4a9e969a8a2..f26e6945bf0 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ (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.) diff --git a/src/insdel.c b/src/insdel.c index a33e4be616f..b74ebe74947 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -271,7 +271,7 @@ adjust_markers_for_insert (pos, amount) 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) diff --git a/src/intervals.c b/src/intervals.c index 279d8e6739a..1d528058498 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -680,7 +680,7 @@ previous_interval (interval) 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 @@ adjust_intervals_for_insertion (tree, position, length) /* 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 @@ adjust_intervals_for_insertion (tree, position, length) } /* 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 @@ graft_intervals_into_buffer (source, position, length, buffer, inherit) /* 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)) diff --git a/src/keyboard.c b/src/keyboard.c index f20631485ec..f4f06ecff6f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -7138,7 +7138,7 @@ init_kboard (kb) /* * 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 diff --git a/src/lread.c b/src/lread.c index 8315b7ac711..a4660ab634c 100644 --- a/src/lread.c +++ b/src/lread.c @@ -264,7 +264,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii) 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 @@ init_lread () #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. */ diff --git a/src/m/pmax.h b/src/m/pmax.h index bbb7430dde8..ac54aec3e94 100644 --- a/src/m/pmax.h +++ b/src/m/pmax.h @@ -86,7 +86,7 @@ NOTE-END */ 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 diff --git a/src/m/tower32.h b/src/m/tower32.h index a59cffbdec4..ff424da070f 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -113,7 +113,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* #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 #define EXEC_MAGIC AOUT1MAGIC diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index 301f7e04a57..b34fa5ab01a 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -83,7 +83,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 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 diff --git a/src/msdos.c b/src/msdos.c index a8435d6ec26..4c0c36a4ad7 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1785,7 +1785,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, 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 @@ sys_select (nfds, rfds, wfds, efds, timeout) #endif /* - * Define overlayed functions: + * Define overlaid functions: * * chdir -> sys_chdir * tzset -> init_gettimeofday diff --git a/src/print.c b/src/print.c index 32210145741..5d42b580bea 100644 --- a/src/print.c +++ b/src/print.c @@ -708,7 +708,7 @@ print_error_message (data, stream) /* * 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 . * diff --git a/src/process.c b/src/process.c index 1afb701dd28..7155fce8795 100644 --- a/src/process.c +++ b/src/process.c @@ -1141,7 +1141,7 @@ Remaining arguments are strings to give program as arguments.") } /* 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 diff --git a/src/process.h b/src/process.h index 3c41bb043be..8767f80b4a6 100644 --- a/src/process.h +++ b/src/process.h @@ -87,7 +87,7 @@ extern Lisp_Object Vprocess_alist; 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; diff --git a/src/ralloc.c b/src/ralloc.c index b6fcb323395..9645bfd5f3f 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -131,7 +131,7 @@ static int extra_bytes; 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 @@ static heap_ptr first_heap, last_heap; 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 @@ typedef struct bp 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 @@ find_heap (address) 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 @@ r_alloc_sbrk (size) { /* 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 @@ r_alloc_free (ptr) 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 @@ r_alloc_thaw () 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) diff --git a/src/s/cxux.h b/src/s/cxux.h index 6e711f9f651..90484858712 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -87,7 +87,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 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 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ * 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. */ diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h index 8321235b0ee..6e8ce8268d6 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -27,7 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #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 diff --git a/src/s/hpux9.h b/src/s/hpux9.h index f6e81cd492e..6ad1cf0c423 100644 --- a/src/s/hpux9.h +++ b/src/s/hpux9.h @@ -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 diff --git a/src/s/msdos.h b/src/s/msdos.h index 298499a5a71..5dbb2f1dd52 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -73,7 +73,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ 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. diff --git a/src/search.c b/src/search.c index c426fe91833..81d2be58e9e 100644 --- a/src/search.c +++ b/src/search.c @@ -73,7 +73,7 @@ static struct re_registers search_regs; 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; diff --git a/src/term.c b/src/term.c index a6fb26a5961..7441c672b57 100644 --- a/src/term.c +++ b/src/term.c @@ -156,7 +156,7 @@ void (*set_vertical_scroll_bar_hook) 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 diff --git a/src/textprop.c b/src/textprop.c index 4fea8d9e4fb..85f8c5ed1c7 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1500,7 +1500,7 @@ verify_interval_modification (buf, start, end) 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. */ diff --git a/src/unexec.c b/src/unexec.c index 8387fd044e9..6b6136beadd 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -915,8 +915,8 @@ copy_text_and_data (new, a_out) * 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 diff --git a/src/unexw32.c b/src/unexw32.c index 7b9712c11c5..684b6177709 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -138,7 +138,7 @@ _start (void) #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) diff --git a/src/vms-pp.c b/src/vms-pp.c index d93ab6743aa..e9dd0733146 100644 --- a/src/vms-pp.c +++ b/src/vms-pp.c @@ -42,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * #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. diff --git a/src/vmsgmalloc.c b/src/vmsgmalloc.c index d9939dd1123..83aeaec7053 100644 --- a/src/vmsgmalloc.c +++ b/src/vmsgmalloc.c @@ -1179,7 +1179,7 @@ VMS_present_buffer() #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, diff --git a/src/vmsproc.c b/src/vmsproc.c index c28a0261e37..a20a1a64544 100644 --- a/src/vmsproc.c +++ b/src/vmsproc.c @@ -719,7 +719,7 @@ create_process (process, new_argv) 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; diff --git a/src/w32faces.c b/src/w32faces.c index dd0cbbaa8a7..a95870c8942 100644 --- a/src/w32faces.c +++ b/src/w32faces.c @@ -69,7 +69,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 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.) diff --git a/src/w32menu.c b/src/w32menu.c index e07255021e6..7af74adcdb8 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -586,7 +586,7 @@ single_keymap_panes (lpmm, keymap, pane_name, prefix, notreal) 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 @@ get_list_of_items_event (pane, lpnum) 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 @@ free_frame_menubar (f) 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. */ diff --git a/src/w32proc.c b/src/w32proc.c index b2df278a0dc..b4bd6394ae7 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -408,7 +408,7 @@ win32_wait (int *status) } /* 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) diff --git a/src/widget.c b/src/widget.c index 5c46e99ac80..66dd9c0ac77 100644 --- a/src/widget.c +++ b/src/widget.c @@ -311,7 +311,7 @@ set_frame_size (ew) 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, diff --git a/src/xdisp.c b/src/xdisp.c index 4f236b7fa7f..5427214ff16 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2103,8 +2103,8 @@ try_window_id (window) 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. */ diff --git a/src/xfaces.c b/src/xfaces.c index d99ce172d3c..36a2fe0e839 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -95,7 +95,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 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.) diff --git a/src/xmenu.c b/src/xmenu.c index e6cd2251582..63188cb4c5c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -673,7 +673,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal) } } -/* 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 @@ set_frame_menubar (f, first_time, deep_p) 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. */ -- 2.39.2