[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106666: Spelling fixes.
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106666: Spelling fixes. |
|
Date: |
Sun, 11 Dec 2011 21:32:49 -0800 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106666
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-12-11 21:32:49 -0800
message:
Spelling fixes.
modified:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/internals.texi
doc/lispref/nonascii.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/dbus.texi
doc/misc/ebrowse.texi
doc/misc/emacs-mime.texi
doc/misc/gnus-faq.texi
doc/misc/gnus.texi
doc/misc/tramp.texi
etc/srecode/el.srt
lib-src/ChangeLog
lisp/ChangeLog.13
lisp/ChangeLog.15
lisp/ChangeLog.3
lisp/ChangeLog.7
lisp/calc/calc-poly.el
lisp/cedet/semantic/bovine/el.el
lisp/cedet/semantic/find.el
lisp/cedet/semantic/grammar.el
lisp/cedet/semantic/wisent/comp.el
lisp/cedet/srecode/srt-mode.el
lisp/comint.el
lisp/delim-col.el
lisp/emulation/cua-base.el
lisp/epa-dired.el
lisp/epa-file.el
lisp/erc/ChangeLog.03
lisp/eshell/em-dirs.el
lisp/forms.el
lisp/gnus/ChangeLog
lisp/gnus/plstore.el
lisp/ibuf-ext.el
lisp/international/mule-util.el
lisp/mail/emacsbug.el
lisp/net/ange-ftp.el
lisp/net/dbus.el
lisp/net/tramp-sh.el
lisp/net/xesam.el
lisp/obsolete/old-whitespace.el
lisp/org/ChangeLog
lisp/org/org.el
lisp/proced.el
lisp/progmodes/ada-mode.el
lisp/progmodes/ada-xref.el
lisp/progmodes/cc-awk.el
lisp/progmodes/cc-cmds.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-fonts.el
lisp/progmodes/cc-langs.el
lisp/progmodes/cc-mode.el
lisp/progmodes/grep.el
lisp/progmodes/gud.el
lisp/progmodes/hideif.el
lisp/progmodes/inf-lisp.el
lisp/progmodes/vhdl-mode.el
lisp/shell.el
lisp/url/url-cookie.el
lisp/url/url-vars.el
src/ChangeLog.10
src/ChangeLog.2
src/alloc.c
src/editfns.c
src/emacs.c
src/fontset.c
src/ftfont.c
src/lastfile.c
src/lread.c
src/nsfont.m
src/region-cache.c
src/region-cache.h
src/termhooks.h
src/xfns.c
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2011-12-10 09:12:00 +0000
+++ b/doc/emacs/ChangeLog 2011-12-12 05:32:49 +0000
@@ -1676,7 +1676,7 @@
2009-08-31 Nick Roberts <address@hidden>
* building.texi (Threads Buffer, Multithreaded Debugging):
- Re-organise these two sections.
+ Reorganize these two sections.
2009-08-29 Eli Zaretskii <address@hidden>
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-12-05 16:50:25 +0000
+++ b/doc/lispref/ChangeLog 2011-12-12 05:32:49 +0000
@@ -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 (address@hidden)
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2011-10-18 01:42:28 +0000
+++ b/doc/lispref/elisp.texi 2011-12-12 05:32:49 +0000
@@ -1381,7 +1381,7 @@
* 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 @@
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.
=== modified file 'doc/lispref/internals.texi'
--- a/doc/lispref/internals.texi 2011-11-15 07:55:13 +0000
+++ b/doc/lispref/internals.texi 2011-12-12 05:32:49 +0000
@@ -13,7 +13,7 @@
@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 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.
=== modified file 'doc/lispref/nonascii.texi'
--- a/doc/lispref/nonascii.texi 2011-08-23 14:45:14 +0000
+++ b/doc/lispref/nonascii.texi 2011-12-12 05:32:49 +0000
@@ -1580,7 +1580,7 @@
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
=== modified file 'doc/lispref/vol1.texi'
--- a/doc/lispref/vol1.texi 2011-10-18 01:42:28 +0000
+++ b/doc/lispref/vol1.texi 2011-12-12 05:32:49 +0000
@@ -44,7 +44,7 @@
@end ifset
@c per rms and peterb, use 10pt fonts for the main text, mostly to
address@hidden save on paper cost.
address@hidden save on paper cost.
@c Do this inside @tex for now, so current makeinfo does not complain.
@tex
@ifset smallbook
@@ -1402,7 +1402,7 @@
* 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 @@
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.
=== modified file 'doc/lispref/vol2.texi'
--- a/doc/lispref/vol2.texi 2011-10-18 01:42:28 +0000
+++ b/doc/lispref/vol2.texi 2011-12-12 05:32:49 +0000
@@ -1401,7 +1401,7 @@
* 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 @@
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.
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2011-12-04 08:02:42 +0000
+++ b/doc/misc/calc.texi 2011-12-12 05:32:49 +0000
@@ -16873,7 +16873,7 @@
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 (@address@hidden)
+precision, the result may be a float with (@address@hidden)
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 @@
The @kbd{M-6 t P} address@hidden 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} address@hidden function extracts the weekday
@@ -18499,7 +18499,7 @@
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
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2011-11-20 07:30:16 +0000
+++ b/doc/misc/cc-mode.texi 2011-12-12 05:32:49 +0000
@@ -2160,7 +2160,7 @@
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
=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi 2011-11-19 09:18:31 +0000
+++ b/doc/misc/dbus.texi 2011-12-12 05:32:49 +0000
@@ -1816,7 +1816,7 @@
@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.
=== modified file 'doc/misc/ebrowse.texi'
--- a/doc/misc/ebrowse.texi 2011-02-19 19:40:59 +0000
+++ b/doc/misc/ebrowse.texi 2011-12-12 05:32:49 +0000
@@ -482,7 +482,7 @@
@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 address@hidden
=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi 2011-11-15 07:55:13 +0000
+++ b/doc/misc/emacs-mime.texi 2011-12-12 05:32:49 +0000
@@ -417,7 +417,7 @@
@vindex mm-inline-text-html-with-images
Some @acronym{HTML} mails might have the trick of spammers using
@samp{<img>} 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
=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi 2011-12-06 01:30:54 +0000
+++ b/doc/misc/gnus-faq.texi 2011-12-12 05:32:49 +0000
@@ -1838,7 +1838,7 @@
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
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2011-12-05 08:55:25 +0000
+++ b/doc/misc/gnus.texi 2011-12-12 05:32:49 +0000
@@ -4622,7 +4622,7 @@
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 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
=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi 2011-12-04 08:02:42 +0000
+++ b/doc/misc/tramp.texi 2011-12-12 05:32:49 +0000
@@ -528,8 +528,8 @@
@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}.
=== modified file 'etc/srecode/el.srt'
--- a/etc/srecode/el.srt 2011-03-06 02:43:19 +0000
+++ b/etc/srecode/el.srt 2011-12-12 05:32:49 +0000
@@ -109,7 +109,7 @@
'($MODESYM$-mode-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"))))
(run-hooks '$MODESYM$-mode-hook)
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-12-04 17:13:01 +0000
+++ b/lib-src/ChangeLog 2011-12-12 05:32:49 +0000
@@ -3137,7 +3137,7 @@
(main): Call put_entries here even in CTAGS mode.
(main, process_file): Check the return values of fclose and pclose.
(process_file): Do not call put_entries after parsing each file.
- (process_file): Canonicalise file names even for ctags.
+ (process_file): Canonicalize file names even for ctags.
(process_file): Set curfile here...
(find_entries): ... not here any more.
(add_node): In etags mode, build a linked list of entries (on
=== modified file 'lisp/ChangeLog.13'
--- a/lisp/ChangeLog.13 2011-12-05 08:55:25 +0000
+++ b/lisp/ChangeLog.13 2011-12-12 05:32:49 +0000
@@ -7261,7 +7261,7 @@
* progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
(gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin)
(gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint)
- (gdb-goto-breakpoint): Generalise for breakpoints with multiple
+ (gdb-goto-breakpoint): Generalize for breakpoints with multiple
locations.
(gdb-info-breakpoints-custom, gdb-assembler-custom)
(gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp.
=== modified file 'lisp/ChangeLog.15'
--- a/lisp/ChangeLog.15 2011-12-04 08:02:42 +0000
+++ b/lisp/ChangeLog.15 2011-12-12 05:32:49 +0000
@@ -8618,7 +8618,7 @@
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom)
(menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions
- (menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
+ (menu-bar-showhide-tool-bar-menu): If tool bar is movable,
make a menu for Options => toolbar that can move it.
2010-07-29 Chong Yidong <address@hidden>
=== modified file 'lisp/ChangeLog.3'
--- a/lisp/ChangeLog.3 2011-12-04 08:02:42 +0000
+++ b/lisp/ChangeLog.3 2011-12-12 05:32:49 +0000
@@ -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.
=== modified file 'lisp/ChangeLog.7'
--- a/lisp/ChangeLog.7 2011-12-06 01:30:54 +0000
+++ b/lisp/ChangeLog.7 2011-12-12 05:32:49 +0000
@@ -13088,7 +13088,7 @@
1997-07-25 Simon Marshall <address@hidden>
- * 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 <address@hidden>
- * 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 <address@hidden>
- * 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.
=== modified file 'lisp/calc/calc-poly.el'
--- a/lisp/calc/calc-poly.el 2011-11-20 02:29:42 +0000
+++ b/lisp/calc/calc-poly.el 2011-12-12 05:32:49 +0000
@@ -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 @@
((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 @@
(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)
=== modified file 'lisp/cedet/semantic/bovine/el.el'
--- a/lisp/cedet/semantic/bovine/el.el 2011-11-20 02:29:42 +0000
+++ b/lisp/cedet/semantic/bovine/el.el 2011-12-12 05:32:49 +0000
@@ -497,15 +497,15 @@
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 "address@hidden,%s}" obsoletor (semantic-tag-name tag))
+ (setq obsoleter a)))))
+ (if obsoleter
+ (format "address@hidden,%s}" obsoleter (semantic-tag-name tag))
""))))
(define-mode-local-override semantic-documentation-for-tag
=== modified file 'lisp/cedet/semantic/find.el'
--- a/lisp/cedet/semantic/find.el 2011-11-15 07:55:13 +0000
+++ b/lisp/cedet/semantic/find.el 2011-12-12 05:32:49 +0000
@@ -427,7 +427,7 @@
;;; 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
=== modified file 'lisp/cedet/semantic/grammar.el'
--- a/lisp/cedet/semantic/grammar.el 2011-11-25 07:14:48 +0000
+++ b/lisp/cedet/semantic/grammar.el 2011-12-12 05:32:49 +0000
@@ -1290,7 +1290,7 @@
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
=== modified file 'lisp/cedet/semantic/wisent/comp.el'
--- a/lisp/cedet/semantic/wisent/comp.el 2011-04-01 15:16:50 +0000
+++ b/lisp/cedet/semantic/wisent/comp.el 2011-12-12 05:32:49 +0000
@@ -2640,7 +2640,7 @@
(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))
=== modified file 'lisp/cedet/srecode/srt-mode.el'
--- a/lisp/cedet/srecode/srt-mode.el 2011-11-14 06:27:12 +0000
+++ b/lisp/cedet/srecode/srt-mode.el 2011-12-12 05:32:49 +0000
@@ -194,7 +194,7 @@
'(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")))))
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2011-11-20 07:30:16 +0000
+++ b/lisp/comint.el 2011-12-12 05:32:49 +0000
@@ -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.
=== modified file 'lisp/delim-col.el'
--- a/lisp/delim-col.el 2011-12-04 08:02:42 +0000
+++ b/lisp/delim-col.el 2011-12-12 05:32:49 +0000
@@ -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 @@
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: \"<ccc>:<dddd>:\"
@@ -190,9 +190,9 @@
For example, the result is: \"<ccc >:<dddd >:\"
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 @@
(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 @@
(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)
=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el 2011-12-04 08:02:42 +0000
+++ b/lisp/emulation/cua-base.el 2011-12-12 05:32:49 +0000
@@ -368,7 +368,7 @@
(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)
=== modified file 'lisp/epa-dired.el'
--- a/lisp/epa-dired.el 2011-04-04 06:16:23 +0000
+++ b/lisp/epa-dired.el 2011-12-12 05:32:49 +0000
@@ -67,7 +67,7 @@
(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)))
=== modified file 'lisp/epa-file.el'
--- a/lisp/epa-file.el 2011-08-12 13:49:45 +0000
+++ b/lisp/epa-file.el 2011-12-12 05:32:49 +0000
@@ -235,7 +235,7 @@
(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 @@
(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
=== modified file 'lisp/erc/ChangeLog.03'
--- a/lisp/erc/ChangeLog.03 2011-12-09 03:12:38 +0000
+++ b/lisp/erc/ChangeLog.03 2011-12-12 05:32:49 +0000
@@ -416,7 +416,7 @@
* erc-button.el 1.47: 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 1.483 (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 1.438:
* 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
=== modified file 'lisp/eshell/em-dirs.el'
--- a/lisp/eshell/em-dirs.el 2011-03-05 04:11:05 +0000
+++ b/lisp/eshell/em-dirs.el 2011-12-12 05:32:49 +0000
@@ -160,7 +160,7 @@
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
=== modified file 'lisp/forms.el'
--- a/lisp/forms.el 2011-11-20 02:29:42 +0000
+++ b/lisp/forms.el 2011-12-12 05:32:49 +0000
@@ -709,7 +709,7 @@
(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.")
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-12-11 17:08:11 +0000
+++ b/lisp/gnus/ChangeLog 2011-12-12 05:32:49 +0000
@@ -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 <address@hidden>
- * 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'
=== modified file 'lisp/gnus/plstore.el'
--- a/lisp/gnus/plstore.el 2011-09-27 06:01:27 +0000
+++ b/lisp/gnus/plstore.el 2011-12-12 05:32:49 +0000
@@ -420,7 +420,7 @@
(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
=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el 2011-10-19 12:54:24 +0000
+++ b/lisp/ibuf-ext.el 2011-12-12 05:32:49 +0000
@@ -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:
=== modified file 'lisp/international/mule-util.el'
--- a/lisp/international/mule-util.el 2011-02-04 10:45:46 +0000
+++ b/lisp/international/mule-util.el 2011-12-12 05:32:49 +0000
@@ -314,7 +314,7 @@
(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)))
=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el 2011-09-23 23:47:27 +0000
+++ b/lisp/mail/emacsbug.el 2011-12-12 05:32:49 +0000
@@ -437,7 +437,7 @@
(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)
=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el 2011-12-04 08:02:42 +0000
+++ b/lisp/net/ange-ftp.el 2011-12-12 05:32:49 +0000
@@ -2854,7 +2854,7 @@
;; 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)
=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el 2011-11-26 08:26:37 +0000
+++ b/lisp/net/dbus.el 2011-12-12 05:32:49 +0000
@@ -101,7 +101,7 @@
(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.
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2011-12-02 19:23:19 +0000
+++ b/lisp/net/tramp-sh.el 2011-12-12 05:32:49 +0000
@@ -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 @@
;; 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 @@
(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)
=== modified file 'lisp/net/xesam.el'
--- a/lisp/net/xesam.el 2011-12-05 08:55:25 +0000
+++ b/lisp/net/xesam.el 2011-12-12 05:32:49 +0000
@@ -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)
=== modified file 'lisp/obsolete/old-whitespace.el'
--- a/lisp/obsolete/old-whitespace.el 2011-04-20 17:18:34 +0000
+++ b/lisp/obsolete/old-whitespace.el 2011-12-12 05:32:49 +0000
@@ -515,12 +515,12 @@
(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 @@
(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)
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2011-12-06 01:30:54 +0000
+++ b/lisp/org/ChangeLog 2011-12-12 05:32:49 +0000
@@ -7124,7 +7124,7 @@
2010-11-11 Dan Davison <address@hidden>
* 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 <address@hidden>
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2011-11-20 19:35:27 +0000
+++ b/lisp/org/org.el 2011-12-12 05:32:49 +0000
@@ -2580,7 +2580,7 @@
(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 @@
(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 @@
:target on a <<target>>
:radio-target on a <<<radio-target>>>
: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,
=== modified file 'lisp/proced.el'
--- a/lisp/proced.el 2011-08-24 18:09:18 +0000
+++ b/lisp/proced.el 2011-12-12 05:32:49 +0000
@@ -1332,7 +1332,7 @@
(proced-sort-interactive key arg)
(message "No sorter defined here."))))))
-;;; Formating
+;;; Formatting
(defun proced-format-time (time)
"Format time interval TIME."
=== modified file 'lisp/progmodes/ada-mode.el'
--- a/lisp/progmodes/ada-mode.el 2011-11-27 04:43:11 +0000
+++ b/lisp/progmodes/ada-mode.el 2011-12-12 05:32:49 +0000
@@ -499,7 +499,7 @@
(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 @@
;; `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 @@
(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)
=== modified file 'lisp/progmodes/ada-xref.el'
--- a/lisp/progmodes/ada-xref.el 2011-11-26 08:26:37 +0000
+++ b/lisp/progmodes/ada-xref.el 2011-12-12 05:32:49 +0000
@@ -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
=== modified file 'lisp/progmodes/cc-awk.el'
--- a/lisp/progmodes/cc-awk.el 2011-11-20 02:29:42 +0000
+++ b/lisp/progmodes/cc-awk.el 2011-12-12 05:32:49 +0000
@@ -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)))
=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2011-12-04 08:02:42 +0000
+++ b/lisp/progmodes/cc-cmds.el 2011-12-12 05:32:49 +0000
@@ -1360,7 +1360,7 @@
;; 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.
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2011-12-05 08:55:25 +0000
+++ b/lisp/progmodes/cc-engine.el 2011-12-12 05:32:49 +0000
@@ -2113,7 +2113,7 @@
;; 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
=== modified file 'lisp/progmodes/cc-fonts.el'
--- a/lisp/progmodes/cc-fonts.el 2011-12-06 02:22:48 +0000
+++ b/lisp/progmodes/cc-fonts.el 2011-12-12 05:32:49 +0000
@@ -1211,7 +1211,7 @@
;; 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.
=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el 2011-11-27 04:43:11 +0000
+++ b/lisp/progmodes/cc-langs.el 2011-12-12 05:32:49 +0000
@@ -522,7 +522,7 @@
(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
=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2011-11-20 02:29:42 +0000
+++ b/lisp/progmodes/cc-mode.el 2011-12-12 05:32:49 +0000
@@ -943,7 +943,7 @@
;; 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
=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el 2011-11-24 08:21:03 +0000
+++ b/lisp/progmodes/grep.el 2011-12-12 05:32:49 +0000
@@ -108,7 +108,7 @@
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)
=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el 2011-11-27 04:43:11 +0000
+++ b/lisp/progmodes/gud.el 2011-12-12 05:32:49 +0000
@@ -1919,7 +1919,7 @@
;; 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 @@
(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.
=== modified file 'lisp/progmodes/hideif.el'
--- a/lisp/progmodes/hideif.el 2011-10-20 00:26:14 +0000
+++ b/lisp/progmodes/hideif.el 2011-12-12 05:32:49 +0000
@@ -822,7 +822,7 @@
(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)))
=== modified file 'lisp/progmodes/inf-lisp.el'
--- a/lisp/progmodes/inf-lisp.el 2011-11-20 02:29:42 +0000
+++ b/lisp/progmodes/inf-lisp.el 2011-12-12 05:32:49 +0000
@@ -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:
=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el 2011-12-05 08:55:25 +0000
+++ b/lisp/progmodes/vhdl-mode.el 2011-12-12 05:32:49 +0000
@@ -10812,7 +10812,7 @@
(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 @@
(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 @@
(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 @@
(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 @@
(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 @@
(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 @@
(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)
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2011-11-20 02:29:42 +0000
+++ b/lisp/shell.el 2011-12-12 05:32:49 +0000
@@ -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:
=== modified file 'lisp/url/url-cookie.el'
--- a/lisp/url/url-cookie.el 2011-11-03 21:53:59 +0000
+++ b/lisp/url/url-cookie.el 2011-12-12 05:32:49 +0000
@@ -316,7 +316,7 @@
(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)))
=== modified file 'lisp/url/url-vars.el'
--- a/lisp/url/url-vars.el 2011-11-17 09:09:20 +0000
+++ b/lisp/url/url-vars.el 2011-12-12 05:32:49 +0000
@@ -62,7 +62,6 @@
(mapc 'make-variable-buffer-local
'(
url-current-object
- url-current-referer
url-current-mime-headers
))
=== modified file 'src/ChangeLog.10'
--- a/src/ChangeLog.10 2011-12-04 08:02:42 +0000
+++ b/src/ChangeLog.10 2011-12-12 05:32:49 +0000
@@ -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.
=== modified file 'src/ChangeLog.2'
--- a/src/ChangeLog.2 2011-12-04 08:02:42 +0000
+++ b/src/ChangeLog.2 2011-12-12 05:32:49 +0000
@@ -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 (address@hidden)
@@ -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.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2011-11-20 03:07:02 +0000
+++ b/src/alloc.c 2011-12-12 05:32:49 +0000
@@ -6399,7 +6399,7 @@
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. */);
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2011-10-20 06:52:55 +0000
+++ b/src/editfns.c 2011-12-12 05:32:49 +0000
@@ -3870,7 +3870,7 @@
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)
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2011-12-04 09:26:30 +0000
+++ b/src/emacs.c 2011-12-12 05:32:49 +0000
@@ -951,7 +951,7 @@
}
/* 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;
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2011-12-04 08:02:42 +0000
+++ b/src/fontset.c 2011-12-12 05:32:49 +0000
@@ -643,7 +643,7 @@
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++)
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2011-12-08 02:34:09 +0000
+++ b/src/ftfont.c 2011-12-12 05:32:49 +0000
@@ -960,7 +960,7 @@
/* 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,
=== modified file 'src/lastfile.c'
--- a/src/lastfile.c 2011-01-25 04:08:28 +0000
+++ b/src/lastfile.c 2011-12-12 05:32:49 +0000
@@ -23,7 +23,7 @@
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 @@
of the bss area used by Emacs. */
static char _my_endbss[1];
char * my_endbss_static = _my_endbss;
-
=== modified file 'src/lread.c'
--- a/src/lread.c 2011-12-07 02:16:53 +0000
+++ b/src/lread.c 2011-12-12 05:32:49 +0000
@@ -2822,7 +2822,7 @@
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
=== modified file 'src/nsfont.m'
--- a/src/nsfont.m 2011-11-20 19:35:27 +0000
+++ b/src/nsfont.m 2011-12-12 05:32:49 +0000
@@ -630,7 +630,7 @@
}
-/* 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(). */
=== modified file 'src/region-cache.c'
--- a/src/region-cache.c 2011-08-05 02:15:35 +0000
+++ b/src/region-cache.c 2011-12-12 05:32:49 +0000
@@ -699,7 +699,7 @@
/* 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 @@
/* 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)
{
=== modified file 'src/region-cache.h'
--- a/src/region-cache.h 2011-08-05 02:15:35 +0000
+++ b/src/region-cache.h 2011-12-12 05:32:49 +0000
@@ -97,7 +97,7 @@
/* 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 @@
/* 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,
=== modified file 'src/termhooks.h'
--- a/src/termhooks.h 2011-07-20 00:09:31 +0000
+++ b/src/termhooks.h 2011-12-12 05:32:49 +0000
@@ -553,7 +553,7 @@
/* 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 @@
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);
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2011-12-04 08:02:42 +0000
+++ b/src/xfns.c 2011-12-12 05:32:49 +0000
@@ -1877,7 +1877,7 @@
#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 @@
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 @@
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
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106666: Spelling fixes.,
Paul Eggert <=