From 333f9019e29e9b6de3a7ec07448be1d364ba540b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 11 Dec 2011 21:32:49 -0800 Subject: [PATCH] Spelling fixes. --- doc/emacs/ChangeLog | 2 +- doc/lispref/ChangeLog | 2 +- doc/lispref/elisp.texi | 4 ++-- doc/lispref/internals.texi | 4 ++-- doc/lispref/nonascii.texi | 2 +- doc/lispref/vol1.texi | 6 +++--- doc/lispref/vol2.texi | 4 ++-- doc/misc/calc.texi | 6 +++--- doc/misc/cc-mode.texi | 2 +- doc/misc/dbus.texi | 2 +- doc/misc/ebrowse.texi | 2 +- doc/misc/emacs-mime.texi | 2 +- doc/misc/gnus-faq.texi | 2 +- doc/misc/gnus.texi | 4 ++-- doc/misc/tramp.texi | 4 ++-- etc/srecode/el.srt | 2 +- lib-src/ChangeLog | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.15 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.7 | 14 +++++++------- lisp/calc/calc-poly.el | 26 +++++++++++++------------- lisp/cedet/semantic/bovine/el.el | 8 ++++---- lisp/cedet/semantic/find.el | 2 +- lisp/cedet/semantic/grammar.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 2 +- lisp/cedet/srecode/srt-mode.el | 2 +- lisp/comint.el | 2 +- lisp/delim-col.el | 14 +++++++------- lisp/emulation/cua-base.el | 2 +- lisp/epa-dired.el | 2 +- lisp/epa-file.el | 4 ++-- lisp/erc/ChangeLog.03 | 8 ++++---- lisp/eshell/em-dirs.el | 2 +- lisp/forms.el | 2 +- lisp/gnus/ChangeLog | 4 ++-- lisp/gnus/plstore.el | 2 +- lisp/ibuf-ext.el | 2 +- lisp/international/mule-util.el | 2 +- lisp/mail/emacsbug.el | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/net/dbus.el | 2 +- lisp/net/tramp-sh.el | 6 +++--- lisp/net/xesam.el | 2 +- lisp/obsolete/old-whitespace.el | 8 ++++---- lisp/org/ChangeLog | 2 +- lisp/org/org.el | 6 +++--- lisp/proced.el | 2 +- lisp/progmodes/ada-mode.el | 6 +++--- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cc-cmds.el | 2 +- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-fonts.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/progmodes/grep.el | 2 +- lisp/progmodes/gud.el | 4 ++-- lisp/progmodes/hideif.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/vhdl-mode.el | 18 +++++++++--------- lisp/shell.el | 2 +- lisp/url/url-cookie.el | 2 +- lisp/url/url-vars.el | 1 - src/ChangeLog.10 | 6 +++--- src/ChangeLog.2 | 6 +++--- src/alloc.c | 2 +- src/editfns.c | 2 +- src/emacs.c | 2 +- src/fontset.c | 2 +- src/ftfont.c | 2 +- src/lastfile.c | 3 +-- src/lread.c | 2 +- src/nsfont.m | 2 +- src/region-cache.c | 4 ++-- src/region-cache.h | 4 ++-- src/termhooks.h | 4 ++-- src/xfns.c | 8 ++++---- 78 files changed, 146 insertions(+), 148 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7661b8c401..d1dbbfd083 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1676,7 +1676,7 @@ 2009-08-31 Nick Roberts * building.texi (Threads Buffer, Multithreaded Debugging): - Re-organise these two sections. + Reorganize these two sections. 2009-08-29 Eli Zaretskii diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d620c9e3c4..44d44e7528 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -9754,7 +9754,7 @@ directory have been changed to reflect this. * All instances of @indentedresultt{} have been changed to - ` @result{}', using 5 spaces at the begining of the line. + ` @result{}', using 5 spaces at the beginning of the line. 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index cefa917a4e..98eaf1f8ad 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -1381,7 +1381,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1438,7 +1438,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 0168c564e3..9ef4646b50 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -13,7 +13,7 @@ internal aspects of GNU Emacs that may be of interest to C programmers. @menu * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. @@ -196,7 +196,7 @@ function definition in pure storage. If it is non-@code{nil}, then the function definition is copied into pure storage. This flag is @code{t} while loading all of the basic functions for -building Emacs initially (allowing those functions to be sharable and +building Emacs initially (allowing those functions to be shareable and non-collectible). Dumping Emacs as an executable always writes @code{nil} in this variable, regardless of the value it actually has before and after dumping. diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 298c7c3d1a..46dbbb08e5 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1580,7 +1580,7 @@ decoding functions (@pxref{Explicit Encoding}). Sometimes, you need to prefer several coding systems for some operation, rather than fix a single one. Emacs lets you specify a priority order for using coding systems. This ordering affects the -sorting of lists of coding sysems returned by functions such as +sorting of lists of coding systems returned by functions such as @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). @defun coding-system-priority-list &optional highestp diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 914ba5b1fd..c89447fc13 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -44,7 +44,7 @@ @end ifset @c per rms and peterb, use 10pt fonts for the main text, mostly to -@c save on paper cost. +@c save on paper cost. @c Do this inside @tex for now, so current makeinfo does not complain. @tex @ifset smallbook @@ -1402,7 +1402,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1458,7 +1458,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 1f84b267c9..d45d23da36 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -1401,7 +1401,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1457,7 +1457,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 535efd8627..d0c15c1940 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -16873,7 +16873,7 @@ The @kbd{t U} (@code{calc-unix-time}) [@code{unixtime}] command converts a date form into a Unix time value, which is the number of seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result will be an integer if the current precision is 12 or less; for higher -precisions, the result may be a float with (@var{precision}@minus{}12) +precision, the result may be a float with (@var{precision}@minus{}12) digits after the decimal. Just as for @kbd{t J}, the numeric time is interpreted in the GMT time zone and the date form is interpreted in the current or specified zone. Some systems use Unix-like @@ -16943,7 +16943,7 @@ from a date form as an integer in the range 0 to 59. The @kbd{M-6 t P} [@code{second}] function extracts the second from a date form. If the current precision is 12 or less, the result is an integer in the range 0 to 59. For higher -precisions, the result may instead be a floating-point number. +precision, the result may instead be a floating-point number. @tindex weekday The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday @@ -18499,7 +18499,7 @@ counterparts, which are also available separately as @code{calc-sech} Calc can compute a variety of less common functions that arise in various branches of mathematics. All of the functions described in this section allow arbitrary complex arguments and, except as noted, -will work to arbitrarily large precisions. They can not at present +will work to arbitrarily large precision. They can not at present handle error forms or intervals as arguments. NOTE: These functions are still experimental. In particular, their diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index d5f403e5cd..c36e45e60f 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2160,7 +2160,7 @@ A space between the function name and opening parenthesis when calling a user function. The last character of the function name and the opening parenthesis are highlighted. This font-locking rule will spuriously highlight a valid concatenation expression where an -identifier precedes a parenthesised expression. Unfortunately. +identifier precedes a parenthesized expression. Unfortunately. @item Whitespace following the @samp{\} in what otherwise looks like an diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 88b068ccd5..06a52107d7 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -1816,7 +1816,7 @@ handled by a hook function. @defvar dbus-event-error-hooks This hook variable keeps a list of functions, which are called when a D-Bus error happens in the event handler. Every function must accept -two arguments, the event and the error variable catched in +two arguments, the event and the error variable caught in @code{condition-case} by @code{dbus-error}. Such functions can be used the adapt the error signal to be raised. diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 19ee970548..a2a4017eb6 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -482,7 +482,7 @@ name. @table @kbd @item SPC This command views the class declaration if the database -contains informations about it. If you don't parse the entire source +contains information about it. If you don't parse the entire source you are working on, some classes will only be known to exist but the location of their declarations and definitions will not be known.@refill diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index c44cc1c9b0..91440dcfe8 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -417,7 +417,7 @@ called with a @acronym{MIME} handle as the argument. @vindex mm-inline-text-html-with-images Some @acronym{HTML} mails might have the trick of spammers using @samp{} tags. It is likely to be intended to verify whether you -have read the mail. You can prevent your personal informations from +have read the mail. You can prevent your personal information from leaking by setting this option to @code{nil} (which is the default). It is currently ignored by Emacs/w3. For emacs-w3m, you may use the command @kbd{t} on the image anchor to show an image even if it is diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index ace7bb42c2..7bd3e4ac7f 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1838,7 +1838,7 @@ inconvenient since you are not displaying the found mail in Gnus. Here comes nnir into action. Nnir is a front end to search engines like swish-e or swish++ and others. You index your mail with one of those search -engines and with the help of nnir you can search trough +engines and with the help of nnir you can search through the indexed mail and generate a temporary group with all messages which met your search criteria. If this sound cool to you get nnir.el from diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 5ae86c4e63..68c7e8bbdb 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -4622,7 +4622,7 @@ Sieve is a server-side mail filtering language. In Gnus you can use the @code{sieve} group parameter (@pxref{Group Parameters}) to specify sieve rules that should apply to each group. Gnus provides two commands to translate all these group parameters into a proper Sieve -script that can be transfered to the server somehow. +script that can be transferred to the server somehow. @vindex gnus-sieve-file @vindex gnus-sieve-region-start @@ -8332,7 +8332,7 @@ Files with name matching this regular expression won't be viewed. Files with a @acronym{MIME} type matching this variable won't be viewed. Note that Gnus tries to guess what type the file is based on the name. @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly -kludgey. +kludgy. @item gnus-uu-tmp-dir @vindex gnus-uu-tmp-dir diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e2c2594b66..1cea074fa2 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -528,8 +528,8 @@ differ. @cindex methods, inline @cindex methods, external Loading or saving a remote file requires that the content of the file -be transfered between the two machines. The content of the file can -be transfered using one of two methods: the @dfn{inline method} over +be transferred between the two machines. The content of the file can +be transferred using one of two methods: the @dfn{inline method} over the same connection used to log in to the remote machine, or the @dfn{external method} through another connection using a remote copy program such as @command{rcp}, @command{scp} or @command{rsync}. diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 6117e72be2..03a797bb70 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt @@ -109,7 +109,7 @@ $ toolbar that can move it. 2010-07-29 Chong Yidong diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index b97bcea89c..e0f9bc9ade 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -8647,7 +8647,7 @@ * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's version 2.0 comint offerings. * ring.el: The underlying history mechanism for comint. - Generalised handling of a ring data type based on vectors. + Generalized handling of a ring data type based on vectors. * history.el: For now, a symlink to ring.el. * loaddefs.el: Updated shell-prompt-pattern doc string. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 3738712177..b05707abe5 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -13088,7 +13088,7 @@ 1997-07-25 Simon Marshall - * complete.el: Customise; as subgroup of minibuffer. + * complete.el: Customize; as subgroup of minibuffer. (partial-completion-mode): New option to toggle mode. (partial-completion-mode): New command to toggle mode. Add and remove hooks here, i.e., not at the top-level. @@ -13617,7 +13617,7 @@ 1997-07-15 Simon Marshall - * mouse-sel.el: Customise; create mouse-sel as subgroup of mouse. + * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse. (mouse-sel-mode): New option to toggle mode. (mouse-sel-mode): New command to toggle mode. (mouse-sel-set-selection-function): If mouse-sel-default-bindings is @@ -13625,7 +13625,7 @@ (mouse-sel-bindings): New function to install/restore mouse bindings. This is called by mouse-sel-mode, i.e., not at the top-level. - * delsel.el: Customise; as part of editing-basics group. + * delsel.el: Customize; as part of editing-basics group. (delete-selection-mode): Convert to autoloaded option. Default to nil. (delete-selection-mode): Define before option. Modify pre-command-hook here, i.e., not at the top-level. @@ -14943,7 +14943,7 @@ paren-matching) and put all blink-matching-paren variables in the former (as opposed to the latter) group. - * paren.el: Customise; paren-showing as a subgroup of paren-matching. + * paren.el: Customize; paren-showing as a subgroup of paren-matching. (show-paren-style): New variable. (show-paren-match-face) (show-paren-mismatch-face): New faces. @@ -18871,7 +18871,7 @@ 1997-04-16 Simon Marshall - * font-lock.el: Customise. + * font-lock.el: Customize. (font-lock-defaults-alist): Leave ~ syntax alone in C++. (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ characters here. @@ -18883,10 +18883,10 @@ (font-lock-compile-keywords): Don't set font-lock-keywords. (font-lock-fontify-keywords-region): Set it here. - * fast-lock.el: Customise. + * fast-lock.el: Customize. (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. - * lazy-lock.el: Customise. + * lazy-lock.el: Customize. (lazy-lock-fontify-conservatively): Fontify around WINDOW's point. * shell.el (shell-font-lock-keywords): Use EVAL form for prompt. diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index 97d955eb07..e21a095c82 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -147,7 +147,7 @@ ;;; Return only quotient to top of stack (nil if zero) -;; calc-poly-div-remainder is a local variable for +;; calc-poly-div-remainder is a local variable for ;; calc-poly-div (in calc-alg.el), but is used by ;; calcFunc-pdiv, which is called by calc-poly-div. (defvar calc-poly-div-remainder) @@ -512,7 +512,7 @@ ;;; Given an expression find all variables that are polynomial bases. ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). -;; The variable math-poly-base-total-base is local to +;; The variable math-poly-base-total-base is local to ;; math-total-polynomial-base, but is used by math-polynomial-p1, ;; which is called by math-total-polynomial-base. (defvar math-poly-base-total-base) @@ -539,19 +539,19 @@ nil) ;; The variable math-factored-vars is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-factor-expr and +;; calcFunc-factor, but is used by math-factor-expr and ;; math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor and calcFunc-factors. (defvar math-factored-vars) ;; The variable math-fact-expr is local to calcFunc-factors, -;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try +;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try ;; and math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor, calcFunc-factors and math-factor-expr. (defvar math-fact-expr) -;; The variable math-to-list is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-accum-factors, which is +;; The variable math-to-list is local to calcFunc-factors and +;; calcFunc-factor, but is used by math-accum-factors, which is ;; called (indirectly) by calcFunc-factors and calcFunc-factor. (defvar math-to-list) @@ -729,7 +729,7 @@ '(1))) ;; We now have a square-free polynomial with integer coefs. - ;; For now, we use a kludgey method that finds linear and + ;; For now, we use a kludgy method that finds linear and ;; quadratic terms using floating-point root-finding. (if (setq t1 (let ((calc-symbolic-mode nil)) (math-poly-all-roots nil p t))) @@ -749,7 +749,7 @@ (math-add (math-add (math-mul den (math-pow math-fet-x 2)) - (math-mul (math-mul coef1 den) + (math-mul (math-mul coef1 den) math-fet-x)) (math-mul coef0 den))) (let ((den (math-lcm-denoms coef0))) @@ -1077,7 +1077,7 @@ If no partial fraction representation can be found, return nil." ((and (eq (car-safe expr) '^) (memq (car-safe (nth 1 expr)) '(+ -)) (integerp (nth 2 expr)) - (if (and + (if (and (or (math-known-matrixp (nth 1 (nth 1 expr))) (math-known-matrixp (nth 2 (nth 1 expr))) (and @@ -1090,11 +1090,11 @@ If no partial fraction representation can be found, return nil." (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) (list '* (nth 2 (nth 1 expr)) (nth 1 expr)) nil (eq (car (nth 1 expr)) '-)) - (math-add-or-sub (list '* (nth 1 (nth 1 expr)) - (list '^ (nth 1 expr) + (math-add-or-sub (list '* (nth 1 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) - (list '* (nth 2 (nth 1 expr)) - (list '^ (nth 1 expr) + (list '* (nth 2 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) nil (eq (car (nth 1 expr)) '-))) (if (> (nth 2 expr) 0) diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 98f744dca6..1a2061d01e 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -497,15 +497,15 @@ used to perform the override." Unfortunately, this requires that the tag in question has been loaded into Emacs Lisp's memory." (let ((obsoletethis (intern-soft (semantic-tag-name tag))) - (obsoletor nil)) + (obsoleter nil)) ;; This asks if our tag is available in the Emacs name space for querying. (when obsoletethis (mapatoms (lambda (a) (let ((oi (get a 'byte-obsolete-info))) (if (and oi (eq (car oi) obsoletethis)) - (setq obsoletor a))))) - (if obsoletor - (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag)) + (setq obsoleter a))))) + (if obsoleter + (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag)) "")))) (define-mode-local-override semantic-documentation-for-tag diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el index b4d94321bc..a6d8669120 100644 --- a/lisp/cedet/semantic/find.el +++ b/lisp/cedet/semantic/find.el @@ -427,7 +427,7 @@ TABLE is a tag table. See `semantic-something-to-tag-table'." ;;; Old Style Brute Force Search Routines ;; -;; These functions will search through tags lists explicity for +;; These functions will search through tags lists explicitly for ;; desired information. ;; The -by-name nonterminal search can use the built in fcn diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 98b1ab55c3..1a79adc650 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag." semantic-grammar-mode-keywords-3) nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w")))) ;; Setup Semantic to parse grammar diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index f92ae88c14..884342a1df 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.") (defun wisent-print-results () "Print information on generated parser. -Report detailed informations if `wisent-verbose-flag' or +Report detailed information if `wisent-verbose-flag' or `wisent-debug-flag' are non-nil." (when (or wisent-verbose-flag wisent-debug-flag) (wisent-print-useless)) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 0a99b7869e..ed2b0e2cfd 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -194,7 +194,7 @@ we can tell font lock about them.") '(srecode-font-lock-keywords nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w"))))) diff --git a/lisp/comint.el b/lisp/comint.el index c0b02e5a23..77734b69af 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -45,7 +45,7 @@ ;; It is pretty easy to make new derived modes for other processes. ;; For documentation on the functionality provided by Comint mode, and -;; the hooks available for customising it, see the comments below. +;; the hooks available for customizing it, see the comments below. ;; For further information on the standard derived modes (shell, ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 96a0745dd3..a0a8af8038 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -97,7 +97,7 @@ ;; operates over the text rectangle selected which rectangle diagonal is ;; given by the region start and end. ;; -;; See `delimit-columns-format' variable documentation for column formating. +;; See `delimit-columns-format' variable documentation for column formatting. ;; ;; `delimit-columns-region' is useful when you have columns of text that ;; are not well aligned, like: @@ -171,7 +171,7 @@ For examples below, consider: Valid values are: - nil no formating. That is, `delimit-columns-after' is followed by + nil no formatting. That is, `delimit-columns-after' is followed by `delimit-columns-separator'. For example, the result is: \"::\" @@ -190,9 +190,9 @@ Valid values are: For example, the result is: \"::\" Any other value is treated as t." - :type '(choice :menu-tag "Column Formating" - :tag "Column Formating" - (const :tag "No Formating" nil) + :type '(choice :menu-tag "Column Formatting" + :tag "Column Formatting" + (const :tag "No Formatting" nil) (const :tag "Column Alignment" t) (const :tag "Separator Alignment" separator) (const :tag "Column Padding" padding)) @@ -404,7 +404,7 @@ START and END delimits the corners of text rectangle." (re-search-forward delimit-columns-separator delimit-columns-limit 'move)) (setq ncol (1+ ncol))) - ;; insert first formating + ;; insert first formatting (insert delimit-columns-str-before delimit-columns-before) ;; Adjust all columns but last one (while (progn @@ -436,7 +436,7 @@ START and END delimits the corners of text rectangle." (setq spaces (and delimit-columns-format (make-string (aref delimit-columns-max ncol) ?\s))))) - ;; insert last formating + ;; insert last formatting (cond ((null delimit-columns-format) (insert delimit-columns-after delimit-columns-str-after)) ((eq delimit-columns-format 'padding) diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a68c4dfdf6..b17fa6b147 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -368,7 +368,7 @@ interpreted as a register number." (defcustom cua-check-pending-input t "If non-nil, don't override prefix key if input pending. -It is rumoured that `input-pending-p' is unreliable under some window +It is rumored that `input-pending-p' is unreliable under some window managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean :group 'cua) diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el index 0834a8df23..d51045a5e3 100644 --- a/lisp/epa-dired.el +++ b/lisp/epa-dired.el @@ -67,7 +67,7 @@ If no one is selected, default secret key is used. " (while file-list (epa-encrypt-file (expand-file-name (car file-list)) - (epa-select-keys (epg-make-context) "Select recipents for encryption. + (epa-select-keys (epg-make-context) "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")) (setq file-list (cdr file-list))) (revert-buffer))) diff --git a/lisp/epa-file.el b/lisp/epa-file.el index bef67ba4f6..4d05563719 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -235,7 +235,7 @@ encryption is used." (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if epa-file-encrypt-to @@ -273,7 +273,7 @@ If no one is selected, symmetric encryption will be performed. " (epg-sub-key-id (car (epg-key-sub-key-list key)))) (epa-select-keys (epg-make-context) - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")))) ;;;###autoload diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 135d8f788f..3e687202d3 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -416,7 +416,7 @@ * erc-button.el: New variable erc-button-wrap-long-urls. Modified erc-button-add-buttons: New optional argument REGEXP. - If we're buttonising a URL and erc-button-wrap-long-urls is + If we're buttonizing a URL and erc-button-wrap-long-urls is non-nil, try and wrap them Modified erc-button-add-buttons-1: @@ -822,7 +822,7 @@ (define-erc-module): the enable and disable routines now update erc-modules accordingly erc-modules: new variable controlling the modules which erc has loaded/will - load. when customising, it will automatically enable modules. it won't + load. when customizing, it will automatically enable modules. it won't automatically disable modules which are removed, yet. (erc-update-modules): enable all modules in `erc-modules' @@ -1058,7 +1058,7 @@ * erc.el(erc-process-input-line): when displaying the help for a function, if no documentation exists, don't fall over - (erc-cmd-SAY): new function for quoting lines begining with / + (erc-cmd-SAY): new function for quoting lines beginning with / (erc-server-NICK): - fix a bug where the "is now known as" message doesn't appear on newly created /query buffers @@ -1491,7 +1491,7 @@ * erc.el: * removed duplicate do-no-parse-args properties for the defaliased defuns (erc-process-input-line): show function signature when incorrect args - (erc-extract-command-from-line): canonicalise defaliases before extracting + (erc-extract-command-from-line): canonicalize defaliases before extracting plist (erc-cmd-CLEAR): fixed (erc-cmd-UNIGNORE): fixed again diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 1aa2c34c39..cab8495114 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -160,7 +160,7 @@ it's far more automatic. `pushd' allows the user to decide which directories gets pushed, and its size is unlimited. `eshell-last-dir-ring' is meant for users who don't use `pushd' -explicity very much, but every once in a while would like to return to +explicitly very much, but every once in a while would like to return to a previously visited directory without having to type in the whole thing again." :type 'integer diff --git a/lisp/forms.el b/lisp/forms.el index 215f3ce88f..0d92dc3ffd 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -709,7 +709,7 @@ Commands: Equivalent keys in read-only mode: (forms-first-record)) ) - ;; user customising + ;; user customizing ;;(message "forms: proceeding setup (user hooks)...") (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) ;;(message "forms: setting up... done.") diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 72f99e6518..00b5417fa3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -3595,7 +3595,7 @@ (autoload): Silence byte-compiler. (nnir-open-server): Add a hook for nnir groups. (nnir-request-move-article): Don't mangle the header. Better to use - formating variables (which will be added in the future). + formatting variables (which will be added in the future). (nnir-registry-action): Update the registry using the original article group name. (nnir-mode): Install nnir-specific hooks for updating the registry. @@ -21851,7 +21851,7 @@ 2004-01-06 Steve Youngs - * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on + * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on XEmacs version. * dns.el (dns-make-network-process): Use `open-network-stream' diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el index 340c725595..50208cc5b0 100644 --- a/lisp/gnus/plstore.el +++ b/lisp/gnus/plstore.el @@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data." (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if plstore-encrypt-to diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 6c8db872c0..a0fae8d867 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -26,7 +26,7 @@ ;;; Commentary: ;; These functions should be automatically loaded when called, but you -;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them +;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them ;; preloaded. ;;; Code: diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index ef09cdda2d..f0a5ebbee4 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -314,7 +314,7 @@ Optional 5th argument NIL-FOR-TOO-LONG non-nil means return nil (defmacro with-coding-priority (coding-systems &rest body) "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. -This affects the implicit sorting of lists of coding sysems returned by +This affects the implicit sorting of lists of coding systems returned by operations such as `find-coding-systems-region'." (let ((current (make-symbol "current"))) `(let ((,current (coding-system-priority-list))) diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 576f443c8e..5b7601c633 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -437,7 +437,7 @@ and send the mail again%s." (car bug)) items)) (nreverse items)))) - (widget-insert "No bugs maching your keywords found.\n")) + (widget-insert "No bugs matching your keywords found.\n")) (widget-insert "\n") (widget-create 'push-button :notify (lambda (&rest ignore) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index a0d2281bfe..06d200c4e3 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -2854,7 +2854,7 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained." ;; that a wasted listing is not done: ;; 1. When looking for a .dired file in dired-x.el. ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid -;; subdirectory. This is of course an OS dependent judgement. +;; subdirectory. This is of course an OS dependent judgment. (defvar dired-local-variables-file) (defmacro ange-ftp-allow-child-lookup (dir file) diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8a8d9e6332..9254fef8a7 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -101,7 +101,7 @@ Otherwise, return result of last form in BODY, or all other errors." (defvar dbus-event-error-hooks nil "Functions to be called when a D-Bus error happens in the event handler. Every function must accept two arguments, the event and the error variable -catched in `condition-case' by `dbus-error'.") +caught in `condition-case' by `dbus-error'.") ;;; Hash table of registered functions. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ee4c896662..da6f8a69e6 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -44,7 +44,7 @@ (defcustom tramp-inline-compress-start-size 4096 "*The minimum size of compressing where inline transfer. -When inline transfer, compress transfered data of file +When inline transfer, compress transferred data of file whose size is this value or above (up to `tramp-copy-size-limit'). If it is nil, no compression at all will be applied." :group 'tramp @@ -3726,7 +3726,7 @@ process to set up. VEC specifies the connection." ;; Check whether the output of "uname -sr" has been changed. If ;; yes, this is a strong indication that we must expire all ;; connection properties. We start again with - ;; `tramp-maybe-open-connection', it will be catched there. + ;; `tramp-maybe-open-connection', it will be caught there. (tramp-message vec 5 "Checking system information") (let ((old-uname (tramp-get-connection-property vec "uname" nil)) (new-uname @@ -4215,7 +4215,7 @@ connection if a previous connection has died for some reason." (tramp-send-command vec "echo are you awake" t t) (unless (and (memq (process-status p) '(run open)) (tramp-wait-for-output p 10)) - ;; The error will be catched locally. + ;; The error will be caught locally. (tramp-error vec 'file-error "Awake did fail"))) (file-error (tramp-flush-connection-property vec) diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 279ea54e4c..17b22aa03b 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -172,7 +172,7 @@ (defface xesam-highlight '((t :inherit match)) "Face to highlight query entries. -It will be overlayed by `widget-documentation-face', so it shall +It will be overlaid by `widget-documentation-face', so it shall be different at least in one face property not set in that face." :group 'xesam) diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el index c33794f668..0c0580b55d 100644 --- a/lisp/obsolete/old-whitespace.el +++ b/lisp/obsolete/old-whitespace.el @@ -515,12 +515,12 @@ See `whitespace-buffer' docstring for a summary of the problems." (whitespace-check-whitespace-mode current-prefix-arg) (if (and buffer-file-name whitespace-mode) (let ((whitespace-any nil) - (whitespace-tabwith 8) - (whitespace-tabwith-saved tab-width)) + (whitespace-tabwidth 8) + (whitespace-tabwidth-saved tab-width)) ;; since all printable TABS should be 8, irrespective of how ;; they are displayed. - (setq tab-width whitespace-tabwith) + (setq tab-width whitespace-tabwidth) (if (and whitespace-check-buffer-leading (whitespace-buffer-leading)) @@ -562,7 +562,7 @@ See `whitespace-buffer' docstring for a summary of the problems." (message "The region is now clean") (message "%s is now clean" buffer-file-name))) (whitespace-update-modeline))) - (setq tab-width whitespace-tabwith-saved)))) + (setq tab-width whitespace-tabwidth-saved)))) ;;;###autoload (defun whitespace-cleanup-region (s e) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 555709f1fa..6f835c7bfa 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -7124,7 +7124,7 @@ 2010-11-11 Dan Davison * ob.el (org-babel-get-src-block-info): Form info list correctly - when parenthesised arguments are missing. + when parenthesized arguments are missing. 2010-11-11 Dan Davison diff --git a/lisp/org/org.el b/lisp/org/org.el index afd4ea6b4c..8aca74e69c 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -2580,7 +2580,7 @@ To turn this on on a per-file basis, insert anywhere in the file: (defcustom org-time-stamp-custom-formats '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american "Custom formats for time stamps. See `format-time-string' for the syntax. -These are overlayed over the default ISO format if the variable +These are overlaid over the default ISO format if the variable `org-display-custom-times' is set. Time like %H:%M should be at the end of the second format. The custom formats are also honored by export commands, if custom time display is turned on at the time of export." @@ -15109,7 +15109,7 @@ The command returns the inserted time stamp." (org-restart-font-lock) (setq org-table-may-need-update t) (if org-display-custom-times - (message "Time stamps are overlayed with custom format") + (message "Time stamps are overlaid with custom format") (message "Time stamp overlays removed"))) (defun org-display-custom-time (beg end) @@ -18961,7 +18961,7 @@ contexts are: :target on a <> :radio-target on a <<>> :latex-fragment on a LaTeX fragment -:latex-preview on a LaTeX fragment with overlayed preview image +:latex-preview on a LaTeX fragment with overlaid preview image This function expects the position to be visible because it uses font-lock faces as a help to recognize the following contexts: :table-special, :link, diff --git a/lisp/proced.el b/lisp/proced.el index e4987bd926..baee7c0f6e 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'." (proced-sort-interactive key arg) (message "No sorter defined here.")))))) -;;; Formating +;;; Formatting (defun proced-format-time (time) "Format time interval TIME." diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 64734420a8..17ff4bd32a 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'")) (defvar ada-case-exception-substring '() "Alist of substrings (entities) that have special casing. -The substrings are detected for word constituant when the word +The substrings are detected for word constituent when the word is not itself in `ada-case-exception', and only for substrings that either are at the beginning or end of the word, or start after '_'.") @@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!" ;; `ada-insert-paramlist'. ;; Both steps are called from `ada-format-paramlist'. ;; Note: Comments inside the parameter list are lost. -;; The syntax has to be correct, or the reformating will fail. +;; The syntax has to be correct, or the reformatting will fail. ;;-------------------------------------------------------------- (defun ada-format-paramlist () @@ -2139,7 +2139,7 @@ command like: (while command-line-args-left (let ((source (car command-line-args-left))) - (message "Formating %s" source) + (message "Formatting %s" source) (find-file source) (ada-indent-region (point-min) (point-max)) (ada-adjust-case-buffer) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 2f6a7be393..f30457992a 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -30,7 +30,7 @@ ;;; for lookup and completion in Ada mode. ;;; ;;; If a file *.`adp' exists in the ada-file directory, then it is -;;; read for configuration informations. It is read only the first +;;; read for configuration information. It is read only the first ;;; time a cross-reference is asked for, and is not read later. ;;; You need Emacs >= 20.2 to run this package diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 8213a83461..f44b34ac35 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -545,7 +545,7 @@ (defun c-awk-vsemi-status-unknown-p () ;; Are we unsure whether there is a virtual semicolon on the current line? ;; DO NOT under any circumstances attempt to calculate this; that would - ;; defeat the (admittedly kludgey) purpose of this function, which is to + ;; defeat the (admittedly kludgy) purpose of this function, which is to ;; prevent an infinite recursion in c-beginning-of-statement-1 when point ;; starts at a `while' token. (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 4981bbfd2b..686695bc83 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1360,7 +1360,7 @@ No indentation or other \"electric\" behavior is performed." ;; Determine where we are with respect to functions (or other brace ;; constructs, included in the term "function" in the rest of this comment). ;; Point is assumed to be outside any macro or literal. - ;; This is used by c-\(begining\|end\)-of-defun. + ;; This is used by c-\(beginning\|end\)-of-defun. ;; ;; Return one of these symbols: ;; at-header : we're at the start of a function's header. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index cd483d20f2..28e7ffae40 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2113,7 +2113,7 @@ comment at the start of cc-engine.el for more info." ;; buffer). Otherwise, return nil. ;; ;; This function is almost the same as `c-literal-limits'. It differs in - ;; that it is a lower level function, and that it rigourously follows the + ;; that it is a lower level function, and that it rigorously follows the ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. ;; ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index ac4d1bf9e5..c18789de07 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1211,7 +1211,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; o - '<> if the arglist is of angle bracket type; ;; o - 'arglist if it's some other arglist; ;; o - nil, if not in an arglist at all. This includes the - ;; parenthesised condition which follows "if", "while", etc. + ;; parenthesized condition which follows "if", "while", etc. context ;; The position of the next token after the closing paren of ;; the last detected cast. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 37818638d4..0bfca84cd9 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -522,7 +522,7 @@ don't have EOL terminated statements. " (c-lang-defconst c-vsemi-status-unknown-p-fn "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". -The (admittedly kludgey) purpose of such a function is to prevent an infinite +The (admittedly kludgy) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, even indirectly. This variable contains nil for languages which don't have diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index cc5a523625..6a40378935 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -943,7 +943,7 @@ Note that the style variables are always made local to the buffer." ;; Note that this function must be FAST rather than accurate. Note ;; also that it only has any effect when font locking is enabled. ;; We exploit this by checking for font-lock-*-face instead of doing - ;; rigourous syntactic analysis. + ;; rigorous syntactic analysis. ;; If either change boundary is wholly inside an identifier, delete ;; it/them from the cache. Don't worry about being inside a string diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 75d71d2d8a..b379ce67fd 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -108,7 +108,7 @@ To change the default value, use Customize or call the function Setting it causes the grep commands to put point at the end of their output window so that the end of the output is always visible rather -than the begining." +than the beginning." :type 'boolean :version "22.1" :group 'grep) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 406db76487..de8da09768 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1919,7 +1919,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; in petticoat junction. (defun gud-jdb-skip-block () - ;; Find the begining of the block. + ;; Find the beginning of the block. (while (not (eq (following-char) ?{)) @@ -1936,7 +1936,7 @@ extension EXTN. Normally EXTN is given as the regular expression (gud-jdb-skip-character-literal)) (t (forward-char)))) - ;; Now at the begining of the block. + ;; Now at the beginning of the block. (forward-char) ;; Skip over the body of the block as well as the final brace. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 374a45acec..8296137666 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -822,7 +822,7 @@ Point is left unchanged." (defun hif-possibly-hide () "Called at #ifX expression, this hides those parts that should be hidden. -It uses the judgement of `hide-ifdef-evaluator'." +It uses the judgment of `hide-ifdef-evaluator'." ;; (message "hif-possibly-hide") (sit-for 1) (let ((test (hif-canonicalize)) (range (hif-find-range))) diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 1328e303d4..dd24aeea9a 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -36,7 +36,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on inferior-lisp mode, see the comments below. ;; Needs fixin: diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index a81cc107ce..deac85581d 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -10812,7 +10812,7 @@ but not if inside a comment or quote." (defvar vhdl-port-list nil "Variable to hold last port map parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (ent-name ;; ((generic-names) generic-type generic-init generic-comment group-comment) ;; ((port-names) port-object port-direct port-type port-comment group-comment) @@ -11660,7 +11660,7 @@ reflected in a subsequent paste operation." (defvar vhdl-subprog-list nil "Variable to hold last subprogram interface parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (subprog-name kind ;; ((names) object direct type init comment group-comment) ;; return-type return-comment group-comment) @@ -12971,7 +12971,7 @@ This does background highlighting of translate-off regions.") (defvar vhdl-entity-alist nil "Cache with entities and corresponding architectures for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (ent-key ent-name ent-file ent-line ;; (arch-key arch-name arch-file arch-line @@ -12982,7 +12982,7 @@ project/directory.") (defvar vhdl-config-alist nil "Cache with configurations for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (conf-key conf-name conf-file conf-line ent-key arch-key ;; (inst-key inst-comp-name inst-ent-key inst-arch-key @@ -12991,7 +12991,7 @@ project/directory.") (defvar vhdl-package-alist nil "Cache with packages for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (pack-key pack-name pack-file pack-line ;; (comp-key comp-name comp-file comp-line) @@ -13003,19 +13003,19 @@ project/directory.") (defvar vhdl-ent-inst-alist nil "Cache with instantiated entities for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (inst-ent-key)) (defvar vhdl-file-alist nil "Cache with design units in each file for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) (defvar vhdl-directory-alist nil "Cache with source directories for each project.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (directory)) (defvar vhdl-speedbar-shown-unit-alist nil @@ -13655,7 +13655,7 @@ of PROJECT." (vhdl-speedbar-update-current-unit) (when updated (message "Updating hierarchy...done"))))) -;; structure (parenthesised expression means list of such entries) +;; structure (parenthesized expression means list of such entries) ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker ;; comp-lib-name level) diff --git a/lisp/shell.el b/lisp/shell.el index 47119e6769..fdfc8b3cf1 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -35,7 +35,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on shell mode, see the comments below. ;; Needs fixin: diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index f8417791ce..746a4dc77b 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -316,7 +316,7 @@ telling Microsoft that." (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) (cond (untrusted - ;; The site was explicity marked as untrusted by the user. + ;; The site was explicitly marked as untrusted by the user. nil) ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index cfb98c6937..19e0b621d8 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -62,7 +62,6 @@ (mapc 'make-variable-buffer-local '( url-current-object - url-current-referer url-current-mime-headers )) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index e759183724..53f7a01665 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -15816,14 +15816,14 @@ Add prototypes. * macterm.c (mac_draw_bitmap): Add overlay_p arg. - (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; + (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps; thanks to YAMAMOTO Mitsuharu for advice on how to do this. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from - xterm.c to handle overlayed fringe bitmaps and to use cursor color + xterm.c to handle overlaid fringe bitmaps and to use cursor color for displaying cursor in fringe. (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 specific functions to define and destroy fringe bitmaps in fringe_bmp. @@ -15849,7 +15849,7 @@ (display_line): Handle cursor in fringe at eob. (display_line): Set row user fringe bitmaps from iterator. - * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. + * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ba61c337ef..d3be006461 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -2254,7 +2254,7 @@ Initialize save_color. * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: - Delete/replace unused/conditionalised variables + Delete/replace unused/conditionalized variables 1987-01-15 Richard M. Stallman (rms@prep) @@ -2632,7 +2632,7 @@ * fns.c: Fding requires an arg; pass Qnil. * m-alliant.h: define TEXT_START as 0x1000. - Don't define LIBS_STANDARD; the default (sharable) library + Don't define LIBS_STANDARD; the default (shareable) library is said to work now. * alloc.c (mark_object): Now pass address of slot being marked. @@ -4220,7 +4220,7 @@ Increase PURESIZE again (sigh) * unexec.c (write_segment): - Kludgey coercions ("(int)") to get this line to compile: + Kludgy coercions ("(int)") to get this line to compile: nwrite = (((int) ptr + 128) & ~127) - (int) ptr; Also changed incorrect ~128 to ~127. diff --git a/src/alloc.c b/src/alloc.c index 96d63f53cf..6f70976c34 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */); Vgc_cons_percentage = make_float (0.1); DEFVAR_INT ("pure-bytes-used", pure_bytes_used, - doc: /* Number of bytes of sharable Lisp data allocated so far. */); + doc: /* Number of bytes of shareable Lisp data allocated so far. */); DEFVAR_INT ("cons-cells-consed", cons_cells_consed, doc: /* Number of cons cells that have been consed so far. */); diff --git a/src/editfns.c b/src/editfns.c index 83cd4bd553..7077f40e51 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */) enum { /* Maximum precision for a %f conversion such that the - trailing output digit might be nonzero. Any precisions + trailing output digit might be nonzero. Any precision larger than this will not yield useful information. */ USEFUL_PRECISION_MAX = ((1 - DBL_MIN_EXP) diff --git a/src/emacs.c b/src/emacs.c index 6bfc0dc60d..12a48b2655 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -951,7 +951,7 @@ main (int argc, char **argv) } /* Command line option --no-windows is deprecated and thus not mentioned - in the manual and usage informations. */ + in the manual and usage information. */ if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) inhibit_window_system = 1; diff --git a/src/fontset.c b/src/fontset.c index 605d807aa3..281ac92f82 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa if (font_has_char (f, font_object, c)) goto found; - /* Find a font already opened, maching with the current spec, + /* Find a font already opened, matching with the current spec, and supporting C. */ font_def = RFONT_DEF_FONT_DEF (rfont_def); for (; found_index + 1 < ASIZE (vec); found_index++) diff --git a/src/ftfont.c b/src/ftfont.c index bab97e44fa..dbb2ce2745 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec) /* Need fix because this finds any fonts. */ if (fontset->nfont == 0 && ! NILP (family)) { - /* Try maching with configuration. For instance, the + /* Try matching with configuration. For instance, the configuration may specify "Nimbus Mono L" as an alias of "Courier". */ FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, diff --git a/src/lastfile.c b/src/lastfile.c index d348e4ebb0..ab07e74893 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -23,7 +23,7 @@ along with GNU Emacs. If not, see . */ The files of Emacs are written so as to have no initialized data that can ever need to be altered except at the first startup. - This is so that those words can be dumped as sharable text. + This is so that those words can be dumped as shareable text. It is not possible to exercise such control over library files. So it is necessary to refrain from making their data areas shared. @@ -47,4 +47,3 @@ char my_endbss[1]; of the bss area used by Emacs. */ static char _my_endbss[1]; char * my_endbss_static = _my_endbss; - diff --git a/src/lread.c b/src/lread.c index 582d8f4663..7c0b047578 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) So we now use the same heuristic as for backquote: old-style unquotes are only recognized when first on a list, and when followed by a space. - Because it's more difficult to peak 2 chars ahead, a new-style + Because it's more difficult to peek 2 chars ahead, a new-style ,@ can still not be used outside of a `, unless it's in the middle of a list. */ if (new_backquote_flag diff --git a/src/nsfont.m b/src/nsfont.m index 7d691ced6e..6a053af344 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec) } -/* Return a font entity most closely maching with FONT_SPEC on +/* Return a font entity most closely matching with FONT_SPEC on FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. Properties to be considered are same as for list(). */ diff --git a/src/region-cache.c b/src/region-cache.c index ed7a07a670..054374eb68 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c, /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ int region_cache_forward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) @@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c, /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ int region_cache_backward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) { diff --git a/src/region-cache.h b/src/region-cache.h index 8e1be71677..6758f8bcd0 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF, /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ extern int region_cache_forward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, @@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF, /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ extern int region_cache_backward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, diff --git a/src/termhooks.h b/src/termhooks.h index 63d166b641..5bd081d6d8 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -553,7 +553,7 @@ struct terminal /* 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 - `*redeem_scroll_bar_hook' is applied to its window before the judgement. + `*redeem_scroll_bar_hook' is applied to its window before the judgment. This should be applied to each frame each time its window tree is redisplayed, even if it is not displaying scroll bars at the moment; @@ -565,7 +565,7 @@ struct terminal currently displaying them. */ void (*condemn_scroll_bars_hook) (struct frame *frame); - /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. + /* Unmark WINDOW's scroll bar for deletion in this judgment cycle. Note that it's okay to redeem a scroll bar that is not condemned. */ void (*redeem_scroll_bar_hook) (struct window *window); diff --git a/src/xfns.c b/src/xfns.c index 95154395e9..e44f28df87 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] = #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ -static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; +static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; /* Create an Xt fontset spec from the name of a base font. If `motif' is True use the Motif syntax. */ @@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif) char *fontsetname; /* Make a fontset name from the base font name. */ - if (xic_defaut_fontset == base_fontname) + if (xic_default_fontset == base_fontname) { /* There is no base font name, use the default. */ ptrdiff_t len = strlen (base_fontname) + 2; fontsetname = xmalloc (len); @@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif) modify it to generalize it to allcs and allfamilies. Use the specified font plus the default. */ ptrdiff_t len = - strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; + strlen (base_fontname) + strlen (xic_default_fontset) + 3; fontsetname = xmalloc (len); memset (fontsetname, 0, len); strcpy (fontsetname, base_fontname); strcat (fontsetname, sep); - strcat (fontsetname, xic_defaut_fontset); + strcat (fontsetname, xic_default_fontset); } else { -- 2.20.1