I'd like to revisit the patch that created this controversy in the
first place.
It did actually have a ChangeLog entry, but Steve feels a proper
ChangeLog entry should always have filenames and, where applicable,
function names. Therefore the patch is in rejection purgatory,
waiting for ChangeLog entries.
I continue to feel that a change OF THIS TYPE should not have a
ChangeLog entry at all, i.e. it makes XEmacs LESS maintainable, and
that it certainly isn't worth the effort of creating the `proper'
ChangeLog entries. As regular readers of xemacs-beta know, I'm no
stranger to pedantry, but I would rather have that exquisite human
quality expended on things like ensuring that added patches don't
increase the number of compiler warnings in the source code, or
creating a real test suite, or fixing spelling mistakes in the source code....
Steve continues to feel that ALL changes should be ChangeLog'ed,
because it makes his job as maintainer, especially bug-hunting using
diffs, much easier.
I recognize that there are going to be differences of opinion on this.
While respecting Steve's right to have a different opinion on what the
`proper' thing to do is, I also feel that Steve has an obligation as
maintainer to make compromises to accept contributions that he doesn't
entirely agree with, to maintain the vitality of the development
community.
Basically, Steve and I both like having things our own way, and don't
like to retreat on what we feel to be matters of principle.
Here's the patch. It has not been applied to the sources (yet!).
Martin
1998-06-15 Martin Buchholz <martin(a)xemacs.org>
* */*: Lots of Trivial spelling fixes
--- etc/MOTIVATION.old
+++ etc/MOTIVATION
@@ -96,7 +96,7 @@
First, rewards encourage people to focus narrowly on a task, to do it
as quickly as possible and to take few risks. "If they feel that
-'this is something I hve to get through to get the prize,' the're
+'this is something I have to get through to get the prize,' they're
going to be less creative," Amabile said.
Second, people come to see themselves as being controlled by the
--- etc/NEWS.old
+++ etc/NEWS
@@ -80,7 +80,7 @@
is initialized using the environment variable NAME and (failing that)
the user's system name.
-The behaviour of the `user-full-name' function with an argument
+The behavior of the `user-full-name' function with an argument
specified is unchanged.
** The new command `M-x customize-changed-options' lets you customize
@@ -196,7 +196,7 @@
subsystem. If the `dir' file does not exist in an Info directory, the
relevant information will be generated on-the-fly.
-This behaviour can be customized, look for `Info-auto-generate-directory'
+This behavior can be customized, look for `Info-auto-generate-directory'
and `Info-save-auto-generated-dir' in the `info' customization group.
@@ -451,14 +451,14 @@
*** Loading `jka-compr' no longer enables on-the-fly compression. Use
`toggle-auto-compression' instead.
-*** Loading `id-select' no longer enables its behaviour. Use
+*** Loading `id-select' no longer enables its behavior. Use
`id-select-install' instead.
** Zmacs region is not deactivated when an error is signaled.
The behavior of the zmacs region can now be controlled in the event of
a signaled error. The new variable `errors-deactivate-region' may be
-set to nil to revert to the old behaviour. As before, typing C-g
+set to nil to revert to the old behavior. As before, typing C-g
deactivates the region.
** Multiple Info `dir' functionality has been merged with GNU Emacs
@@ -568,7 +568,7 @@
** The default format for ChangeLog entries (as created by `C-x 4 a')
is now the international ISO 8601 format.
-To revert to the old behaviour, use:
+To revert to the old behavior, use:
(setq add-log-time-format 'current-time-string)
@@ -628,10 +628,10 @@
*** C++ member functions are now recognized as tags.
*** Java is tagged like C++. In addition, "extends" and "implements"
-constructs are tagged. Files are recognised by the extension .java.
+constructs are tagged. Files are recognized by the extension .java.
*** Etags can now handle programs written in Postscript. Files are
-recognised by the extensions .ps and .pdb (Postscript with C syntax).
+recognized by the extensions .ps and .pdb (Postscript with C syntax).
In Postscript, tags are lines that start with a slash.
*** Etags now handles Objective C and Objective C++ code. The usual C and
@@ -639,7 +639,7 @@
recognizes special Objective C syntax for classes, class categories,
methods and protocols.
-*** Etags also handles Cobol. Files are recognised by the extension
+*** Etags also handles Cobol. Files are recognized by the extension
.cobol. The tagged lines are those containing a word that begins in
column 8 and ends in a full stop, i.e. anything that could be a
paragraph name.
--- lib-src/gnuclient.c.old
+++ lib-src/gnuclient.c
@@ -521,7 +521,7 @@
if (read_line (s, buffer) == 0)
{
- fprintf (stderr, "%s: Could not establish Emacs procces id\n",
+ fprintf (stderr, "%s: Could not establish Emacs process id\n",
progname);
exit (1);
}
--- lib-src/gnuserv.c.old
+++ lib-src/gnuserv.c
@@ -563,7 +563,7 @@
/*
- setup_table -- initialise the table of hosts allowed to contact the server,
+ setup_table -- initialize the table of hosts allowed to contact the server,
by reading from the file specified by the GNU_SECURE
environment variable
Put in the local machine, and, if a security file is specifed,
--- lib-src/make-docfile.c.old
+++ lib-src/make-docfile.c
@@ -1032,7 +1032,7 @@
else
{
#ifdef DEBUG
- fprintf (stderr, "## unrecognised top-level form, %s (%s)\n",
+ fprintf (stderr, "## unrecognized top-level form, %s (%s)\n",
buffer, filename);
#endif
continue;
--- lib-src/make-msgfile.c.old
+++ lib-src/make-msgfile.c
@@ -69,7 +69,7 @@
This program (make-msgfile.c) addresses the first part, extracting the
strings.
- For the emacs C code, we need to recognise the following patterns:
+ For the emacs C code, we need to recognize the following patterns:
message ("string" ... )
error ("string")
@@ -94,7 +94,7 @@
there are no alphabetic characters in it that are not a part of a `%'
directive. (Careful not to translate either "%s%s" or "%s: ".)
- For the emacs Lisp code, we need to recognise the following patterns:
+ For the emacs Lisp code, we need to recognize the following patterns:
(message "string" ... )
(error "string" ... )
@@ -109,7 +109,7 @@
I expect there will be a lot like the above; basically, any function which
is a commonly used wrapper around an eventual call to `message' or
- `read-from-minibuffer' needs to be recognised by this program.
+ `read-from-minibuffer' needs to be recognized by this program.
(dgettext "domain-name" "string") #### do we still need this?
@@ -124,7 +124,7 @@
Menu descriptors: one way to extract the strings in menu labels would be
to teach this program about "^(defvar .*menu\n" forms; that's probably
kind of hard, though, so perhaps a better approach would be to make this
- program recognise lines of the form
+ program recognize lines of the form
"string" ... ;###translate
--- lib-src/make-msgfile.lex.old
+++ lib-src/make-msgfile.lex
@@ -134,7 +134,7 @@
This program (make-msgfile.c) addresses the first part, extracting the
strings.
- For the emacs C code, we need to recognise the following patterns:
+ For the emacs C code, we need to recognize the following patterns:
message ("string" ... )
error ("string")
@@ -159,7 +159,7 @@
there are no alphabetic characters in it that are not a part of a `%'
directive. (Careful not to translate either "%s%s" or "%s: ".)
- For the emacs Lisp code, we need to recognise the following patterns:
+ For the emacs Lisp code, we need to recognize the following patterns:
(message "string" ... )
(error "string" ... )
@@ -174,7 +174,7 @@
I expect there will be a lot like the above; basically, any function which
is a commonly used wrapper around an eventual call to `message' or
- `read-from-minibuffer' needs to be recognised by this program.
+ `read-from-minibuffer' needs to be recognized by this program.
(dgettext "domain-name" "string") #### do we still need this?
@@ -218,7 +218,7 @@
Menu descriptors: one way to extract the strings in menu labels would be
to teach this program about "^(defvar .*menu\n" forms; that's probably
kind of hard, though, so perhaps a better approach would be to make this
- program recognise lines of the form
+ program recognize lines of the form
"string" ... ;###translate
--- lib-src/pstogif.old
+++ lib-src/pstogif
@@ -59,7 +59,7 @@
#$PSTOPPM= $ENV{'PSTOPPM'} ||
# 'pstoppm.ps';
-# Available in the PBMPLUS libary
+# Available in the PBMPLUS library
$PNMCROP=$ENV{'PNMCROP'} || 'pnmcrop' ;
# Also in PBMPLUS
--- lisp/bytecomp.el.old
+++ lisp/bytecomp.el
@@ -171,7 +171,7 @@
;;; buffer, and that buffer is modified, you are asked whether you want
;;; to save the buffer before compiling.
;;;
-;;; o You can add this to /etc/magic to make file(1) recognise the files
+;;; o You can add this to /etc/magic to make file(1) recognize the files
;;; generated by this compiler:
;;;
;;; 0 string ;ELC GNU Emacs Lisp compiled file,
@@ -1257,7 +1257,7 @@
;; have (declare (ignore x)) yet; and second, inline
;; expansion produces forms like
;; ((lambda (arg) (byte-code "..." [arg])) x)
- ;; which we can't (ok, well, don't) recognise as
+ ;; which we can't (ok, well, don't) recognize as
;; containing a reference to arg, so every inline
;; expansion would generate a warning. (If we had
;; `ignore' then inline expansion could emit an
@@ -1939,7 +1939,7 @@
(byte-compile-file-form form)))))
;; Functions and variables with doc strings must be output separately,
-;; so make-docfile can recognise them. Most other things can be output
+;; so make-docfile can recognize them. Most other things can be output
;; as byte-code.
(put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst)
@@ -2392,7 +2392,7 @@
(byte-compile-warn "constant in arglist: %s" (car rest)))
((and (char= ?\& (aref (symbol-name (car rest)) 0))
(not (memq (car rest) '(&optional &rest))))
- (byte-compile-warn "unrecognised `&' keyword in arglist: %s"
+ (byte-compile-warn "unrecognized `&' keyword in arglist: %s"
(car rest))))
(setq rest (cdr rest))))
(cond (int
--- lisp/code-files.el.old
+++ lisp/code-files.el
@@ -58,7 +58,7 @@
(defvar file-coding-system-alist
'(("\\.elc$" . (binary . binary))
-;; This must not be neccessary, slb suggests -kkm
+;; This must not be necessary, slb suggests -kkm
;; ("loaddefs.el$" . (binary . binary))
("\\.tar$" . (binary . binary))
("\\.\\(tif\\|tiff\\)$" . (binary . binary))
--- lisp/etags.el.old
+++ lisp/etags.el
@@ -1064,7 +1064,7 @@
;; Sample uses of find-tag-hook and find-tag-default-hook
-;; This is wrong. We should either make this behaviour default and
+;; This is wrong. We should either make this behavior default and
;; back it up, or not use it at all. For now, I've commented it out.
;; --hniksic
--- lisp/font-lock.el.old
+++ lisp/font-lock.el
@@ -128,8 +128,8 @@
;; - Keep the faces distinct from each other as far as possible.
;; i.e., (a) above.
;; - Make the face attributes fit the concept as far as possible.
-;; i.e., function names might be a bold colour such as blue, comments might
-;; be a bright colour such as red, character strings might be brown, because,
+;; i.e., function names might be a bold color such as blue, comments might
+;; be a bright color such as red, character strings might be brown, because,
;; err, strings are brown (that was not the reason, please believe me).
;; - Don't use a non-nil OVERRIDE unless you have a good reason.
;; Only use OVERRIDE for special things that are easy to define, such as the
@@ -375,7 +375,7 @@
Where MATCHER is as for MATCH-HIGHLIGHT with one exception; see below.
PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after
the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be
-used to initialise before, and cleanup after, MATCHER is used. Typically,
+used to initialize before, and cleanup after, MATCHER is used. Typically,
PRE-MATCH-FORM is used to move to some position relative to the original
MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might
be used to move, before resuming with MATCH-ANCHORED's parent's MATCHER.
--- lisp/gnuserv.el.old
+++ lisp/gnuserv.el
@@ -68,7 +68,7 @@
;; ported the server-temp-file-regexp feature from server.el
;; ported server hooks from server.el
;; ported kill-*-query functions from server.el (and made it optional)
-;; synced other behaviour with server.el
+;; synced other behavior with server.el
;;
;; Jan Vroonhof
;; Customized.
--- lisp/menubar.el.old
+++ lisp/menubar.el
@@ -171,8 +171,8 @@
menuitem)))
)))
)
- ;; (t (signal 'error (list "unrecognised menu descriptor" menuitem))))
- (t (message "unrecognised menu descriptor %s" (prin1-to-string menuitem))))
+ ;; (t (signal 'error (list "unrecognized menu descriptor" menuitem))))
+ (t (message "unrecognized menu descriptor %s" (prin1-to-string menuitem))))
(setq menu (cdr menu)))))
--- lisp/minibuf.el.old
+++ lisp/minibuf.el
@@ -41,7 +41,7 @@
;;; Code:
(defgroup minibuffer nil
- "Controling the behaviour of the minibuffer."
+ "Controling the behavior of the minibuffer."
:group 'environment)
@@ -349,7 +349,7 @@
to be inserted into the minibuffer before reading input.
If INITIAL-CONTENTS is (STRING . POSITION), the initial input
is STRING, but point is placed POSITION characters into the string.
-Third arg KEYMAP is a keymap to use whilst reading;
+Third arg KEYMAP is a keymap to use while reading;
if omitted or nil, the default is `minibuffer-local-map'.
If fourth arg READ is non-nil, then interpret the result as a lisp object
and return that object:
--- lisp/mouse.el.old
+++ lisp/mouse.el
@@ -68,13 +68,13 @@
:group 'mouse)
(defcustom mouse-highlight-text 'context
- "*Choose the default double-click highlighting behaviour.
+ "*Choose the default double-click highlighting behavior.
If set to `context', double-click will highlight words when the mouse
is at a word character, or a symbol if the mouse is at a symbol
character.
If set to `word', double-click will always attempt to highlight a word.
If set to `symbol', double-click will always attempt to highlight a
- symbol (the default behaviour in previous XEmacs versions)."
+ symbol (the default behavior in previous XEmacs versions)."
:type '(choice (const context)
(const word)
(const symbol))
@@ -949,7 +949,7 @@
;; always sufficient but it seems to give something
;; approaching a 99% success rate. Making it higher yet
;; would help guarantee success with the price that the
- ;; delay would start to become noticable.
+ ;; delay would start to become noticeable.
;;
(and (eq (console-type) 'x)
(sit-for 0.15 t))
--- lisp/obsolete.el.old
+++ lisp/obsolete.el
@@ -673,7 +673,7 @@
;; ### This function is not compatible with FSF in some cases. Hard
;; to fix, because it is hard to trace the logic of the FSF function.
-;; In case we need the exact behaviour, we can always copy the FSF
+;; In case we need the exact behavior, we can always copy the FSF
;; version, which is very long and does lots of unnecessary stuff.
(defun truncate-string-to-width (str end-column &optional start-column padding)
"Truncate string STR to end at column END-COLUMN.
--- lisp/paragraphs.el.old
+++ lisp/paragraphs.el
@@ -57,7 +57,7 @@
Prefix argument says to turn mode on if positive, off if negative.
When the mode is turned on, if there are newlines in the buffer but no hard
-newlines, ask the user whether to mark as hard any newlines preceeding a
+newlines, ask the user whether to mark as hard any newlines preceding a
`paragraph-start' line. From a program, second arg INSERT specifies whether
to do this; it can be `never' to change nothing, t or `always' to force
marking, `guess' to try to do the right thing with no questions, nil
--- lisp/syntax.el.old
+++ lisp/syntax.el
@@ -183,7 +183,7 @@
b means C is comment starter or comment ender for comment style b."
(interactive
;; I really don't know why this is interactive
- ;; help-form should at least be made useful whilst reading the second arg
+ ;; help-form should at least be made useful while reading the second arg
"cSet syntax for character: \nsSet syntax for %c to: ")
(cond ((syntax-table-p table))
((not table)
--- lisp/term/internal.el.old
+++ lisp/term/internal.el
@@ -26,7 +26,7 @@
;; ---------------------------------------------------------------------------
;; keyboard setup -- that's simple!
(set-input-mode nil nil 0)
-(define-key function-key-map [backspace] "\177") ; Normal behaviour for BS
+(define-key function-key-map [backspace] "\177") ; Normal behavior for BS
(define-key function-key-map [delete] "\C-d") ; ... and Delete
(define-key function-key-map [tab] [?\t])
(define-key function-key-map [linefeed] [?\n])
--- lisp/toolbar-items.el.old
+++ lisp/toolbar-items.el
@@ -33,7 +33,7 @@
;; is compiled in).
;; Miscellaneous toolbar functions, useful for users to redefine, in
-;; order to get different behaviour.
+;; order to get different behavior.
;;; Code:
--- lisp/wid-edit.el.old
+++ lisp/wid-edit.el
@@ -533,7 +533,7 @@
widget-shadow-subrs)
(defun widget-put (widget property value)
"In WIDGET set PROPERTY to VALUE.
-The value can later be retrived with `widget-get'."
+The value can later be retrieved with `widget-get'."
(setcdr widget (plist-put (cdr widget) property value))))
;; Recoded in C, for efficiency:
@@ -1128,7 +1128,7 @@
(error "This widget is inactive"))
(let ((current-glyph 'down))
;; We always know what glyph is drawn currently, to avoid
- ;; unnecessary extent changes. Is this any noticable gain?
+ ;; unnecessary extent changes. Is this any noticeable gain?
(unwind-protect
(progn
;; Press the glyph.
--- man/lispref/dragndrop.texi.old
+++ man/lispref/dragndrop.texi
@@ -12,7 +12,7 @@
interface may change! The current implementation is considered experimental.
Drag'n'drop is a way to transfer information between multiple applications.
-To do this serveral GUIs define their own protocols. Examples are OffiX, CDE,
+To do this several GUIs define their own protocols. Examples are OffiX, CDE,
Motif, KDE, MSWindows, GNOME, and many more. To catch all these protocols,
XEmacs provides a generic API.
@@ -106,7 +106,7 @@
@code{experimental-dragdrop-drop-functions} for a function that can handle the
dropped data.
-To modify the drop behaviour, the user can modify the variable
+To modify the drop behavior, the user can modify the variable
@code{experimental-dragdrop-drop-functions}. Each element of this list
specifies a possible handler for dropped data. The first one that can handle
the data will return @code{t} and exit. Another possibility is to set a
--- man/lispref/edebug.texi.old
+++ man/lispref/edebug.texi
@@ -147,7 +147,7 @@
sometimes.
There is a bug in window updating when there is both a trace buffer
-and an evaluation list - the source buffer doesnt get displayed.
+and an evaluation list - the source buffer doesn't get displayed.
@item
Killing and reinserting an instrumented definition or parts of
--- man/lispref/menus.texi.old
+++ man/lispref/menus.texi
@@ -644,7 +644,7 @@
way that should be familiar to users of any of a certain family of popular PC
operating systems.
-This behaviour can be changed by modifying the bindings in
+This behavior can be changed by modifying the bindings in
menu-accelerator-map. At this point, the online help is your best bet
for more information about how to modify the menu traversal keys.
--- man/lispref/tooltalk.texi.old
+++ man/lispref/tooltalk.texi
@@ -225,7 +225,7 @@
@defun create-tooltalk-message
Create a new ToolTalk message. The message's session attribute is
-initialized to the default session. Other attributes can be intialized
+initialized to the default session. Other attributes can be initialized
with @code{set-tooltalk-message-attribute}.
@code{make-tooltalk-message} is the preferred way to create and
initialize a message.
--- man/xemacs-faq.texi.old
+++ man/xemacs-faq.texi
@@ -64,7 +64,7 @@
@item
If you do not have makeinfo installed, you may @uref{xemacs-faq.info,
download the faq} in info format, and install it in @file{<XEmacs
-libarary directory>/info/}. For example in
+library directory>/info/}. For example in
@file{/usr/local/lib/xemacs-20.4/info/}.
@end itemize
@@ -2727,7 +2727,7 @@
variables.
Instead, use feature-tests, such as @code{featurep}, @code{boundp},
-@code{fboundp}, or even simple behavioural tests, eg.:
+@code{fboundp}, or even simple behavioral tests, eg.:
@lisp
(defvar foo-old-losing-code-p
--- src/alloca.s.old
+++ src/alloca.s
@@ -186,7 +186,7 @@
move.l sp,d1 ; get current SP value
sub.l d0,d1 ; adjust to reflect required size...
sub.l #MAXREG*4,d1 ; ...and space needed for registers
- and.l #-4,d1 ; backup to longword boundry
+ and.l #-4,d1 ; backup to longword boundary
move.l sp,a0 ; save old SP value for register copy
move.l d1,sp ; set the new SP value
tst.b -4096(sp) ; grab an extra page (to cover caller)
--- src/backtrace.h.old
+++ src/backtrace.h
@@ -132,7 +132,7 @@
and Fcondition_case thus knows which clause to run. */
Lisp_Object chosen_clause;
- /* Used to effect the longjump out to the handler. */
+ /* Used to effect the longjmp() out to the handler. */
struct catchtag *tag;
/* The next enclosing handler. */
--- src/bufslots.h.old
+++ src/bufslots.h
@@ -69,7 +69,7 @@
Specifically, this lists those variables that have
a buffer-local value in this buffer: i.e. those
whose value does not shadow the default value.
- (Remember that for any particlar variable created
+ (Remember that for any particular variable created
with `make-local-variable' or `make-variable-buffer-local',
it will have a per-buffer value in some buffers and a
default value in others.)
@@ -241,7 +241,7 @@
the next few times we add a new slot. */
MARKED_SLOT (extra1, extra2, extra3);
#endif
- /* The cache of positions for whilch line number has last been
+ /* The cache of positions for which line number has last been
calculated. See line-number.c. */
MARKED_SLOT (line_number_cache);
--- src/console-msw.h.old
+++ src/console-msw.h
@@ -116,7 +116,7 @@
/* DC for this win32 window */
HDC hdc;
- /* compatibke DC for bitmap operations */
+ /* compatible DC for bitmap operations */
HDC cdc;
/* Time of last click event, for button 2 emul */
--- src/console-x.c.old
+++ src/console-x.c
@@ -104,7 +104,7 @@
{
CONST char *disp_name;
- /* If the user didn't explicitly specifify a display to use when
+ /* If the user didn't explicitly specify a display to use when
they called make-x-device, then we first check to see if a
display was specified on the command line with -display. If
so, we set disp_name to it. Otherwise we use XDisplayName to
--- src/device-msw.c.old
+++ src/device-msw.c
@@ -118,7 +118,7 @@
static void
mswindows_finish_init_device (struct device *d, Lisp_Object props)
{
- /* Initialise DDE management library and our related globals. We execute a
+ /* Initialize DDE management library and our related globals. We execute a
* dde Open("file") by simulating a drop, so this depends on dnd support. */
#ifdef HAVE_DRAGNDROP
mswindows_dde_mlid = 0;
--- src/dired.c.old
+++ src/dired.c
@@ -114,7 +114,7 @@
which might compile a new regexp until we're done with the loop! */
/* Do this opendir after anything which might signal an error.
- NOTE: the above comment is old; previosly, there was no
+ NOTE: the above comment is old; previously, there was no
unwind-protection in case of error, but now there is. */
d = opendir ((char *) XSTRING_DATA (dirname));
if (!d)
--- src/dynarr.c.old
+++ src/dynarr.c
@@ -44,7 +44,7 @@
This is a container object. Declare a dynamic array of a specific type
as follows:
-typdef struct
+typedef struct
{
Dynarr_declare (mytype);
} mytype_dynarr;
@@ -72,7 +72,7 @@
The elements should be contiguous in memory, starting at BASE.
Dynarr_insert_many(d, base, len, start)
- Insert LEN elements to the dynamic arrary starting at position
+ Insert LEN elements to the dynamic array starting at position
START. The elements should be contiguous in memory, starting at BASE.
int Dynarr_length(d)
--- src/ecrt0.c.old
+++ src/ecrt0.c
@@ -22,7 +22,7 @@
/* The standard Vax 4.2 Unix crt0.c cannot be used for Emacs
- because it makes `envron' an initialized variable.
+ because it makes `environ' an initialized variable.
It is easiest to have a special crt0.c on all machines
though I don't know whether other machines actually need it. */
--- src/editfns.c.old
+++ src/editfns.c
@@ -369,7 +369,7 @@
and cleaner never to alter the window/buffer connections. */
/* I'm certain some code somewhere depends on this behavior. --jwz */
/* Even if it did, it certainly doesn't matter anymore, because
- this has been the behaviour for countless XEmacs releases
+ this has been the behavior for countless XEmacs releases
now. --hniksic */
if (visible
&& (current_buffer != XBUFFER (XWINDOW (selected_window)->buffer)))
--- src/event-msw.c.old
+++ src/event-msw.c
@@ -154,7 +154,7 @@
/* This structure is allocated by the main thread, and is deallocated
in the thread upon exit. There are situations when a thread
remains blocked for a long time, much longer than the lstream
- exists. For exmaple, "start notepad" command is issued from the
+ exists. For example, "start notepad" command is issued from the
shell, then the shell is closed by C-c C-d. Although the shell
process exits, its output pipe will not get closed until the
notepad process exits also, because it inherits the pipe form the
@@ -193,7 +193,7 @@
sizeof (struct ntpipe_slurp_stream));
/* This function is thread-safe, and is called from either thread
- context. It serializes freeing shared dtata structure */
+ context. It serializes freeing shared data structure */
static void
slurper_free_shared_data_maybe (struct ntpipe_slurp_stream_shared_data* s)
{
@@ -267,7 +267,7 @@
if (s->die_p)
break;
- /* Block until the client finishes with retireving the rest of
+ /* Block until the client finishes with retrieving the rest of
pipe data */
WaitForSingleObject (s->hev_thread, INFINITE);
}
@@ -618,7 +618,7 @@
OVERLAPPED ov; /* Overlapped I/O structure */
void* buffer; /* Buffer. Allocated for input stream only */
unsigned int bufsize; /* Number of bytes last read */
- unsigned int bufpos; /* Psition in buffer for next fetch */
+ unsigned int bufpos; /* Position in buffer for next fetch */
unsigned int error_p :1; /* I/O Error seen */
unsigned int eof_p :1; /* EOF Error seen */
unsigned int pending_p :1; /* There is a pending I/O operation */
@@ -1164,7 +1164,7 @@
* neither are waitable handles checked. The function pumps
* thus only dispatch events already queued, as well as those
* resulted in dispatching thereof. This is done by setting
- * module local variable mswidows_in_modal_loop to nonzero.
+ * module local variable mswindows_in_modal_loop to nonzero.
*
* Return value is Qt if no errors was trapped, or Qunbound if
* there was an error.
@@ -1182,7 +1182,7 @@
* If the value of mswindows_error_caught_in_modal_loop is not
* nil already upon entry, the function just returns non-nil.
* This situation means that a new event has been queued while
- * cancleng mode. The event will be dequeued on the next regular
+ * in cancel mode. The event will be dequeued on the next regular
* call of next-event; the pump is off since error is caught.
* The caller must *unconditionally* cancel modal loop if the
* value returned by this function is nil. Otherwise, everything
@@ -1216,10 +1216,10 @@
}
/*
- * This is a special flavour of the mswindows_need_event function,
+ * This is a special flavor of the mswindows_need_event function,
* used while in event pump. Actually, there is only kind of events
* allowed while in event pump: a timer. An attempt to fetch any
- * other event leads to a dealock, as there's no source of user input
+ * other event leads to a deadlock, as there's no source of user input
* ('cause event pump mirrors windows modal loop, which is a sole
* owner of thread message queue).
*
@@ -1340,7 +1340,7 @@
{
if (errno != EINTR)
{
- /* something bad happended */
+ /* something bad happened */
assert(0);
}
}
@@ -1374,7 +1374,7 @@
else
{
int ix = active - WAIT_OBJECT_0;
- /* First, try to find which process' ouptut has signaled */
+ /* First, try to find which process' output has signaled */
struct Lisp_Process *p =
get_process_from_usid (HANDLE_TO_USID (mswindows_waitable_handles[ix]));
if (p != NULL)
@@ -1385,7 +1385,7 @@
else
{
/* None. This means that the process handle itself has signaled.
- Remove the handle from the wait vector, and make status_ntoify
+ Remove the handle from the wait vector, and make status_notify
note the exited process */
mswindows_waitable_handles [ix] =
mswindows_waitable_handles [--mswindows_waitable_count];
@@ -1549,7 +1549,7 @@
LRESULT WINAPI
mswindows_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- /* Note: Remember to initialise emacs_event and event before use.
+ /* Note: Remember to initialize emacs_event and event before use.
This code calls code that can GC. You must GCPRO before calling such code. */
Lisp_Object emacs_event = Qnil;
Lisp_Object fobj = Qnil;
@@ -1795,13 +1795,13 @@
break;
case WM_MOUSEMOVE:
- /* Optimization: don't report mouse movement while size is changind */
+ /* Optimization: don't report mouse movement while size is changing */
msframe = FRAME_MSWINDOWS_DATA (XFRAME (mswindows_find_frame (hwnd)));
if (!msframe->sizing)
{
/* When waiting for the second mouse button to finish
button2 emulation, and have moved too far, just pretend
- as if timer has expired. This impoves drag-select feedback */
+ as if timer has expired. This improves drag-select feedback */
if ((msframe->button2_need_lbutton || msframe->button2_need_rbutton)
&& !mswindows_button2_near_enough (msframe->last_click_point,
MAKEPOINTS (lParam)))
--- src/event-stream.c.old
+++ src/event-stream.c
@@ -47,9 +47,9 @@
sequence, without disturbing the key sequence composition, or the
command builder structure representing it.
- Someone should rethink univeral-argument and figure out how an
+ Someone should rethink universal-argument and figure out how an
arbitrary command can influence the next command (universal-argument
- or univeral-coding-system-argument) or the next key (hyperify).
+ or universal-coding-system-argument) or the next key (hyperify).
Both C-h and Help in the middle of a key sequence should trigger
prefix-help-command. help-char is stupid. Maybe we need
@@ -249,7 +249,7 @@
/* whether menu accelerators are enabled */
Lisp_Object Vmenu_accelerator_enabled;
-/* keymap for auxillary menu accelerator functions */
+/* keymap for auxiliary menu accelerator functions */
Lisp_Object Vmenu_accelerator_map;
Lisp_Object Qmenu_force;
@@ -2370,7 +2370,7 @@
The event returned will be a keyboard, mouse press, or mouse release event.
If there are non-command events available (mouse motion, sub-process output,
etc) then these will be executed (with `dispatch-event') and discarded. This
-function is provided as a convenience; it is rougly equivalent to the lisp code
+function is provided as a convenience; it is roughly equivalent to the lisp code
(while (progn
(next-event event prompt)
@@ -2510,7 +2510,7 @@
All of these routines install timeouts, so we clear the installed
timeout as well.
- Note: It's very easy to break the desired behaviours of these
+ Note: It's very easy to break the desired behaviors of these
3 routines. If you make any changes to anything in this area, run
the regression tests at the bottom of the file. -- dmoore */
@@ -2774,7 +2774,7 @@
if (noninteractive || !NILP (Vexecuting_macro))
return Qnil;
- /* Recusive call from a filter function or timeout handler. */
+ /* Recursive call from a filter function or timeout handler. */
if (!NILP(recursive_sit_for))
{
if (!event_stream_event_pending_p (1) && NILP (nodisplay))
@@ -4002,7 +4002,7 @@
/* Vthis_command_keys having value Qnil means that the next time
push_this_command_keys is called, it should start over.
The times at which the command-keys are reset
- (instead of merely being augmented) are pretty conterintuitive.
+ (instead of merely being augmented) are pretty counterintuitive.
(More specifically:
-- We do not reset this-command-keys when we finish reading a
@@ -5464,7 +5464,7 @@
(tst)^Jabc^G ==> ((quit) 97) with no signal, and "bc" inserted in buffer
; with sit-for only do the 2nd test.
-; Do all 3 tests with (accept-proccess-output nil 20)
+; Do all 3 tests with (accept-process-output nil 20)
Do this:
(setq enable-recursive-minibuffers t
--- src/frame-msw.c.old
+++ src/frame-msw.c
@@ -72,7 +72,7 @@
Lisp_Object Vmswindows_frame_being_created;
/* Geometry, in characters, as specified by proplist during frame
- creation. Memebers are set to -1 for unspecified */
+ creation. Members are set to -1 for unspecified */
XEMACS_RECT_WH mswindows_frame_target_rect;
static void
@@ -228,8 +228,8 @@
frame is created, it will never be displayed, except for
hollow border, unless we start pumping messages. Load progress
messages show in the bottom of the hollow frame, which is ugly.
- We redipsplay the initial frame here, so modeline and root window
- backgorund show.
+ We redisplay the initial frame here, so modeline and root window
+ background show.
*/
if (first_on_console)
redisplay ();
@@ -316,7 +316,7 @@
RECT rc_me, rc_other, rc_temp;
HWND hwnd = FRAME_MSWINDOWS_HANDLE(f);
- /* We test against not a whole window rectangle, only agaist its
+ /* We test against not a whole window rectangle, only against its
client part. So, if non-client are is covered and client area is
not, we return true. */
GetClientRect (hwnd, &rc_me);
@@ -565,7 +565,7 @@
/* Now we've extracted the properties, apply them.
Do not apply geometric properties during frame creation. This
- is excessive anyways, and this loses becuase WM_SIZE has not
+ is excessive anyways, and this loses because WM_SIZE has not
been sent yet, so frame width and height fields are not initialized
*/
if (f->init_finished
--- src/glyphs-msw.c.old
+++ src/glyphs-msw.c
@@ -87,9 +87,9 @@
if (DEVICE_MSWINDOWS_BITSPIXEL (d) > 0)
{
int bpline = BPLINE(width * 3);
- /* FIXME: we can do this because 24bpp implies no colour table, once
- * we start paletizing this is no longer true. The X versions of
- * this function quantises to 256 colours or bit masks down to a
+ /* FIXME: we can do this because 24bpp implies no color table, once
+ * we start palettizing this is no longer true. The X versions of
+ * this function quantises to 256 colors or bit masks down to a
* long. Windows can actually handle rgb triples in the raw so I
* don't see much point trying to optimize down to the best
* structure - unless it has memory / color allocation implications
@@ -1291,7 +1291,7 @@
/*
- * Based on an optimized version provided by Jim Becker, Auguest 5, 1988.
+ * Based on an optimized version provided by Jim Becker, August 5, 1988.
*/
#ifndef BitmapSuccess
#define BitmapSuccess 0
--- src/glyphs-x.c.old
+++ src/glyphs-x.c
@@ -456,7 +456,7 @@
}
if (NILP (Vdefault_x_device))
- /* This may occur during intialization. */
+ /* This may occur during initialization. */
return Qnil;
else
/* We only check the bitmapFilePath resource on the original X device. */
@@ -1480,7 +1480,7 @@
static Lisp_Object
xface_normalize (Lisp_Object inst, Lisp_Object console_type)
{
- /* This funcation can call lisp */
+ /* This function can call lisp */
Lisp_Object file = Qnil, mask_file = Qnil;
struct gcpro gcpro1, gcpro2, gcpro3;
Lisp_Object alist = Qnil;
--- src/imgproc.c.old
+++ src/imgproc.c
@@ -23,7 +23,7 @@
/* Original author: Jareth Hein */
/* Parts of this file are based on code from Sam Leffler's tiff library,
- with the original copywrite displayed here:
+ with the original copyright displayed here:
Copyright (c) 1988-1997 Sam Leffler
Copyright (c) 1991-1997 Silicon Graphics, Inc.
--- src/insdel.c.old
+++ src/insdel.c
@@ -1864,7 +1864,7 @@
Bytecount old_gap_size;
/* If we have to get more space, get enough to last a while. We use
- a geometric progession that saves on realloc space. */
+ a geometric progression that saves on realloc space. */
increment += 2000 + ((BI_BUF_Z (buf) - BI_BUF_BEG (buf)) / 8);
if (increment > BUF_END_GAP_SIZE (buf))
--- src/intl.c.old
+++ src/intl.c
@@ -123,7 +123,7 @@
insertion into the buffer of the whole string. It might require some
care, though, to avoid fragmenting memory through the allocation and
freeing of many small chunks. Maybe the existing system for
- (single-byte) string allocation can be used, multipling the length by
+ (single-byte) string allocation can be used, multiplying the length by
sizeof (wchar_t) to get the right size.
*/
void
--- src/menubar.c.old
+++ src/menubar.c
@@ -109,7 +109,7 @@
/* First element may be menu name, although can be omitted.
Let's think that if stuff begins with anything than a keyword
- or a list (submenu), this is a menu name, expected to be a stirng */
+ or a list (submenu), this is a menu name, expected to be a string */
if (!KEYWORDP (XCAR (desc)) && !CONSP (XCAR (desc)))
{
CHECK_STRING (XCAR (desc));
--- src/mule-coding.c.old
+++ src/mule-coding.c
@@ -2692,7 +2692,7 @@
Since the number of characters in Big5 is larger than maximum
characters in Emacs' charset (96x96), it can't be handled as one
- charset. So, in Emacs, Big5 is devided into two: `charset-big5-1'
+ charset. So, in Emacs, Big5 is divided into two: `charset-big5-1'
and `charset-big5-2'. Both <type>s are TYPE94x94. The former
contains frequently used characters and the latter contains less
frequently used characters. */
--- src/mule-mcpath.c.old
+++ src/mule-mcpath.c
@@ -217,7 +217,7 @@
path = (unsigned char *) getcwd ((char *)buffer, MAXPATHLEN);
if (path)
{
- /* here, shoule be (path == buffer). */
+ /* here, should be (path == buffer). */
path = (unsigned char *) xmalloc (MC_MAXPATHLEN); /* MSDOS */
if (path)
{
--- src/mule-wnnfns.c.old
+++ src/mule-wnnfns.c
@@ -397,7 +397,7 @@
DEFUN ("wnn-server-close", Fwnn_close, 0, 0, 0, /*
-Close the connection to jserver, Dictionary and friquency files
+Close the connection to jserver, Dictionary and frequency files
are not saved.
*/
())
--- src/nt.c.old
+++ src/nt.c
@@ -1231,7 +1231,7 @@
return -1;
}
- /* Emulate Unix behaviour - newname is deleted if it already exists
+ /* Emulate Unix behavior - newname is deleted if it already exists
(at least if it is a file; don't do this for directories).
However, don't do this if we are just changing the case of the file
name - we will end up deleting the file we are trying to rename! */
@@ -1350,7 +1350,7 @@
unsigned hash;
/* Get the truly canonical filename, if it exists. (Note: this
- doesn't resolve aliasing due to subst commands, or recognise hard
+ doesn't resolve aliasing due to subst commands, or recognize hard
links. */
if (!win32_get_long_filename ((char *)name, fullname, MAX_PATH))
abort ();
@@ -1452,8 +1452,8 @@
}
else if (!NILP (Vmswindows_get_true_file_attributes))
{
- /* This is more accurate in terms of gettting the correct number
- of links, but is quite slow (it is noticable when Emacs is
+ /* This is more accurate in terms of getting the correct number
+ of links, but is quite slow (it is noticeable when Emacs is
making a list of file name completions). */
BY_HANDLE_FILE_INFORMATION info;
@@ -1897,7 +1897,7 @@
*/
const int timer_prec = 10;
-/* Last itimevals, as set by calls to setitimer */
+/* Last itimervals, as set by calls to setitimer */
static struct itimerval it_alarm;
static struct itimerval it_prof;
@@ -1927,7 +1927,7 @@
if (tv->tv_sec == 0 && tv->tv_usec == 0)
return 0;
- /* Conver to ms and divide by denom */
+ /* Convert to ms and divide by denom */
res = (tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000) / denom;
/* Converge to minimum timer resolution */
--- src/ntheap.c.old
+++ src/ntheap.c
@@ -111,7 +111,7 @@
static char *
allocate_heap (void)
{
- /* The base address for our GNU malloc heap is chosen in conjuction
+ /* The base address for our GNU malloc heap is chosen in conjunction
with the link settings for temacs.exe which control the stack size,
the initial default process heap size and the executable image base
address. The link settings and the malloc heap base below must all
--- src/ntproc.c.old
+++ src/ntproc.c
@@ -58,7 +58,7 @@
/* Control whether spawnve quotes arguments as necessary to ensure
correct parsing by child process. Because not all uses of spawnve
- are careful about constructing argv arrays, we make this behaviour
+ are careful about constructing argv arrays, we make this behavior
conditional (off by default). */
Lisp_Object Vwin32_quote_process_args;
@@ -563,7 +563,7 @@
The Win32 GNU-based library from Cygnus doubles quotes to escape
them, while MSVC uses backslash for escaping. (Actually the MSVC
- startup code does attempt to recognise doubled quotes and accept
+ startup code does attempt to recognize doubled quotes and accept
them, but gets it wrong and ends up requiring three quotes to get a
single embedded quote!) So by default we decide whether to use
quote or backslash as the escape character based on whether the
@@ -571,7 +571,7 @@
Note that using backslash to escape embedded quotes requires
additional special handling if an embedded quote is already
- preceeded by backslash, or if an arg requiring quoting ends with
+ preceded by backslash, or if an arg requiring quoting ends with
backslash. In such cases, the run of escape characters needs to be
doubled. For consistency, we apply this special handling as long
as the escape character is not quote.
@@ -667,7 +667,7 @@
#if 0
/* This version does not escape quotes if they occur at the
beginning or end of the arg - this could lead to incorrect
- behaviour when the arg itself represents a command line
+ behavior when the arg itself represents a command line
containing quoted args. I believe this was originally done
as a hack to make some things work, before
`win32-quote-process-args' was added. */
@@ -1136,7 +1136,7 @@
DEFUN ("win32-get-locale-info", Fwin32_get_locale_info, 1, 2, "", /*
"Return information about the Windows locale LCID.
By default, return a three letter locale code which encodes the default
-language as the first two characters, and the country or regionial variant
+language as the first two characters, and the country or regional variant
as the third letter. For example, ENU refers to `English (United States)',
while ENC means `English (Canadian)'.
@@ -1338,7 +1338,7 @@
"Non-nil means attempt to fake realistic inode values.
This works by hashing the truename of files, and should detect
aliasing between long and short (8.3 DOS) names, but can have
-false positives because of hash collisions. Note that determing
+false positives because of hash collisions. Note that determining
the truename of a file can be slow.
*/ );
Vwin32_generate_fake_inodes = Qnil;
--- src/offix.c.old
+++ src/offix.c
@@ -316,7 +316,7 @@
}
/*================================================================== DndGetData
- * Return a pointer to the current data. Se HOWTO for more details.
+ * Return a pointer to the current data. See HOWTO for more details.
*===========================================================================*/
void
DndGetData(XEvent *event, unsigned char **Data,unsigned long *Size)
--- src/opaque.c.old
+++ src/opaque.c
@@ -226,7 +226,7 @@
(CONST void *) &val);
}
-/* Be wery wery careful with this. Same admonitions as with
+/* Be very very careful with this. Same admonitions as with
free_cons() apply. */
void
--- src/print.c.old
+++ src/print.c
@@ -166,7 +166,7 @@
CONST Bufbyte *newnonreloc = nonreloc;
struct gcpro gcpro1, gcpro2;
- /* Emacs won't print whilst GCing, but an external debugger might */
+ /* Emacs won't print while GCing, but an external debugger might */
if (gc_in_progress) return;
/* Perhaps not necessary but probably safer. */
@@ -278,7 +278,7 @@
static Lisp_Object
print_prepare (Lisp_Object printcharfun, Lisp_Object *frame_kludge)
{
- /* Emacs won't print whilst GCing, but an external debugger might */
+ /* Emacs won't print while GCing, but an external debugger might */
if (gc_in_progress)
return Qnil;
@@ -323,7 +323,7 @@
static void
print_finish (Lisp_Object stream, Lisp_Object frame_kludge)
{
- /* Emacs won't print whilst GCing, but an external debugger might */
+ /* Emacs won't print while GCing, but an external debugger might */
if (gc_in_progress)
return;
@@ -1041,7 +1041,7 @@
QUIT;
- /* Emacs won't print whilst GCing, but an external debugger might */
+ /* Emacs won't print while GCing, but an external debugger might */
if (gc_in_progress) return;
#ifdef I18N3
--- src/process-nt.c.old
+++ src/process-nt.c
@@ -1,4 +1,4 @@
-/* Asynchronous subprocess implemenation for Win32
+/* Asynchronous subprocess implementation for Win32
Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995
Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
@@ -42,7 +42,7 @@
/* Bound by winnt.el */
Lisp_Object Qnt_quote_process_args;
-/* Implemenation-specific data. Pointed to by Lisp_Process->process_data */
+/* Implementation-specific data. Pointed to by Lisp_Process->process_data */
struct nt_process_data
{
HANDLE h_process;
@@ -395,7 +395,7 @@
}
/*
- * Initialize XEmacs process implemenation once
+ * Initialize XEmacs process implementation once
*/
static void
nt_init_process (void)
@@ -411,7 +411,7 @@
* object. If this function signals, the caller is responsible for
* deleting (and finalizing) the process object.
*
- * The method must return PID of the new proces, a (positive??? ####) number
+ * The method must return PID of the new process, a (positive??? ####) number
* which fits into Lisp_Int. No return value indicates an error, the method
* must signal an error instead.
*/
@@ -605,7 +605,7 @@
}
/*
- * Stuff the entire contents of LSTREAM to the process ouptut pipe
+ * Stuff the entire contents of LSTREAM to the process output pipe
*/
/* #### If only this function could be somehow merged with
@@ -891,7 +891,7 @@
if (nsel > 0)
{
- /* Check was connnection successful or not */
+ /* Check was connection successful or not */
tv.tv_usec = 0;
nsel = select (0, NULL, NULL, &fdset, &tv);
if (nsel > 0)
--- src/redisplay-tty.c.old
+++ src/redisplay-tty.c
@@ -289,7 +289,7 @@
elt++;
}
}
- /* #### RUNE_HLINE is actualy a little more complicated than this
+ /* #### RUNE_HLINE is actually a little more complicated than this
but at the moment it is only used to draw a turned off
modeline and this will suffice for that. */
else if (rb->type == RUNE_BLANK || rb->type == RUNE_HLINE)
--- src/regex.c.old
+++ src/regex.c
@@ -3315,7 +3315,7 @@
return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
/* Can't have ranges spanning different charsets, except maybe for
- ranges entirely witin the first 256 chars. */
+ ranges entirely within the first 256 chars. */
if ((range_start >= 0x100 || range_end >= 0x100)
&& CHAR_LEADING_BYTE (range_start) !=
--- src/s/msdos.h.old
+++ src/s/msdos.h
@@ -169,7 +169,7 @@
#define FLOAT_CHECK_DOMAIN
/* When $TERM is "internal" then this is substituted: */
-#define INTERNAL_TERMINAL "pc|bios|IBM PC with colour display:\
+#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\
:co#80:li#25:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:"
/* Define this to a function (Fdowncase, Fupcase) if your file system
--- src/scrollbar-msw.c.old
+++ src/scrollbar-msw.c
@@ -1,6 +1,6 @@
/* scrollbar implementation -- mswindows interface.
Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
- Copyright (C) 1994 Amdhal Corporation.
+ Copyright (C) 1994 Amdahl Corporation.
Copyright (C) 1995 Sun Microsystems, Inc.
Copyright (C) 1995 Darrell Kindred <dkindred+(a)cmu.edu>.
--- src/sysdep.h.old
+++ src/sysdep.h
@@ -59,7 +59,7 @@
/* Suspend the Emacs process; give terminal to its superior. */
void sys_suspend (void);
-/* Suspend a process if possible; give termianl to its superior. */
+/* Suspend a process if possible; give terminal to its superior. */
void sys_suspend_process (int process);
void request_sigio (void);
--- src/toolbar.c.old
+++ src/toolbar.c
@@ -741,10 +741,10 @@
/* We're not officially "in redisplay", so we still have a
chance to re-layout toolbars and windows. This is done here,
because toolbar is the only thing which currently might
- necesseritate this layout, as it is outside any windows. We
+ necessitate this layout, as it is outside any windows. We
take care not to change size if toolbar geometry is really
unchanged, as it will hose windows whose pixsizes are not
- multiple of character sizes */
+ multiple of character sizes. */
for (pos = 0; pos < 4; pos++)
if (FRAME_REAL_TOOLBAR_SIZE (f, pos)
@@ -1200,7 +1200,7 @@
Lisp_Object oldval)
{
/* This could be smarter but I doubt that it would make any
- noticable difference given the infrequency with which this is
+ noticeable difference given the infrequency with which this is
probably going to be called.
*/
MARK_TOOLBAR_CHANGED;
@@ -1272,7 +1272,7 @@
Lisp_Object oldval)
{
/* This could be smarter but I doubt that it would make any
- noticable difference given the infrequency with which this is
+ noticeable difference given the infrequency with which this is
probably going to be called. */
MARK_TOOLBAR_CHANGED;
}
--- src/tooltalk.doc.old
+++ src/tooltalk.doc
@@ -203,7 +203,7 @@
(create-tooltalk-message)
Create a new tooltalk message. The messages session attribute is
-initialized to the default session. Other attributes can be intialized
+initialized to the default session. Other attributes can be initialized
with set-tooltalk-message-attribute. Make-tooltalk-message is the
preferred to create and initialize a message.
@@ -211,7 +211,7 @@
(destroy-tooltalk-message msg)
Apply tt_message_destroy to the message. It's not necessary
-to destroy messages after they've been proccessed by a message or
+to destroy messages after they've been processed by a message or
pattern callback, the Lisp/Tooltalk callback machinery does this
for you.
--- src/unexcw.c.old
+++ src/unexcw.c
@@ -245,7 +245,7 @@
void* empty_space;
extern int static_heap_dumped;
SCNHDR section;
- /* calculate new sizes f_ohdr.dsize is the total initalized data
+ /* calculate new sizes f_ohdr.dsize is the total initialized data
size on disk which is f_data.s_size + f_idata.s_size.
f_ohdr.data_start is the base addres of all data and so should
not be changed. *.s_vaddr is the virtual address of the start
--- src/unexec.c.old
+++ src/unexec.c
@@ -967,7 +967,7 @@
#ifdef RISCiX
- /* Acorn's RISC-iX has a wacky way of initialising the position of the heap.
+ /* Acorn's RISC-iX has a wacky way of initializing the position of the heap.
* There is a little table in crt0.o that is filled at link time with
* the min and current brk positions, among other things. When start
* runs, it copies the table to where these parameters live during
--- src/xmu.c.old
+++ src/xmu.c
@@ -158,7 +158,7 @@
/*
- * Based on an optimized version provided by Jim Becker, Auguest 5, 1988.
+ * Based on an optimized version provided by Jim Becker, August 5, 1988.
*/
@@ -388,7 +388,7 @@
/*
* XmuPrintDefaultErrorMessage - print a nice error that looks like the usual
- * message. Returns 1 if the caller should consider exitting else 0.
+ * message. Return 1 if the caller should consider exiting, else 0.
*/
int XmuPrintDefaultErrorMessage (Display *dpy, XErrorEvent *event, FILE *fp)
{