emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r106601: Spelling fixes.


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r106601: Spelling fixes.
Date: Sun, 04 Dec 2011 00:02:42 -0800
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 106601
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-12-04 00:02:42 -0800
message:
  Spelling fixes.
modified:
  ChangeLog
  autogen.sh
  doc/misc/calc.texi
  doc/misc/idlwave.texi
  doc/misc/message.texi
  doc/misc/org.texi
  doc/misc/tramp.texi
  etc/NEWS.19
  etc/TODO
  etc/srecode/template.srt
  leim/ChangeLog
  leim/quail/greek.el
  lisp/ChangeLog.12
  lisp/ChangeLog.13
  lisp/ChangeLog.14
  lisp/ChangeLog.15
  lisp/ChangeLog.3
  lisp/ChangeLog.7
  lisp/calc/calc-menu.el
  lisp/calc/calc-yank.el
  lisp/calculator.el
  lisp/calendar/appt.el
  lisp/cedet/inversion.el
  lisp/cedet/semantic.el
  lisp/cedet/semantic/edit.el
  lisp/cedet/semantic/idle.el
  lisp/cedet/semantic/lex.el
  lisp/cedet/semantic/tag-ls.el
  lisp/cedet/srecode/fields.el
  lisp/delim-col.el
  lisp/delsel.el
  lisp/descr-text.el
  lisp/dired-x.el
  lisp/electric.el
  lisp/emacs-lisp/edebug.el
  lisp/emacs-lisp/eieio.el
  lisp/emulation/cua-base.el
  lisp/emulation/cua-gmrk.el
  lisp/emulation/vip.el
  lisp/emulation/viper-cmd.el
  lisp/emulation/viper-init.el
  lisp/emulation/viper-macs.el
  lisp/emulation/viper.el
  lisp/files.el
  lisp/follow.el
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-fun.el
  lisp/gnus/gnus-msg.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/gnus.el
  lisp/gnus/message.el
  lisp/gnus/nndiary.el
  lisp/gnus/nnir.el
  lisp/gnus/nntp.el
  lisp/ibuffer.el
  lisp/international/mule.el
  lisp/international/quail.el
  lisp/international/titdic-cnv.el
  lisp/international/ucs-normalize.el
  lisp/kmacro.el
  lisp/language/chinese.el
  lisp/language/viet-util.el
  lisp/man.el
  lisp/net/ange-ftp.el
  lisp/net/zeroconf.el
  lisp/nxml/rng-valid.el
  lisp/obsolete/pgg.el
  lisp/org/ChangeLog
  lisp/org/org-agenda.el
  lisp/org/org-clock.el
  lisp/org/org-list.el
  lisp/org/org-protocol.el
  lisp/org/org-publish.el
  lisp/org/org-taskjuggler.el
  lisp/play/gametree.el
  lisp/progmodes/cc-cmds.el
  lisp/progmodes/dcl-mode.el
  lisp/progmodes/idlwave.el
  lisp/progmodes/js.el
  lisp/progmodes/vhdl-mode.el
  lisp/ses.el
  lisp/simple.el
  lisp/speedbar.el
  lisp/term/x-win.el
  lisp/textmodes/artist.el
  lisp/textmodes/ispell.el
  lisp/textmodes/reftex-dcr.el
  lisp/textmodes/table.el
  lisp/textmodes/texinfmt.el
  lisp/time.el
  lisp/url/ChangeLog
  lisp/url/url-gw.el
  lisp/vc/ediff-init.el
  lisp/vc/pcvs.el
  lisp/vcursor.el
  lisp/view.el
  lisp/wid-edit.el
  lisp/window.el
  nt/addpm.c
  src/ChangeLog.10
  src/ChangeLog.11
  src/ChangeLog.2
  src/ChangeLog.8
  src/ccl.c
  src/cm.h
  src/emacsgtkfixed.c
  src/emacsgtkfixed.h
  src/eval.c
  src/font.c
  src/fontset.c
  src/frame.c
  src/keyboard.c
  src/sysdep.c
  src/w32fns.c
  src/w32term.h
  src/window.c
  src/window.h
  src/xdisp.c
  src/xfns.c
  src/xterm.h
  test/cedet/tests/test.el
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-12-03 20:28:21 +0000
+++ b/ChangeLog 2011-12-04 08:02:42 +0000
@@ -8171,7 +8171,7 @@
 1994-01-08  Roland McGrath  (address@hidden)
 
        * configure.in (creating src/Makefile): Put code inside 2nd arg to
-       AC_OUTPUT as it should be; hopefully noone will again see fit to
+       AC_OUTPUT as it should be; hopefully no one will again see fit to
        gratuitously break this and not make a change log entry.
        Optimized sed processing of Makefile.in and cpp output; now
        preserves comments previously removed from the cpp input.

=== modified file 'autogen.sh'
--- a/autogen.sh        2011-03-31 04:24:03 +0000
+++ b/autogen.sh        2011-12-04 08:02:42 +0000
@@ -67,7 +67,7 @@
 
 ## $1 = program
 ## $2 = minimum version.
-## Return 0 if program is present with version >= minumum version.
+## Return 0 if program is present with version >= minimum version.
 ## Return 1 if program is missing.
 ## Return 2 if program is present but too old.
 ## Return 3 for unexpected error (eg failed to parse version).

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2011-11-27 04:43:11 +0000
+++ b/doc/misc/calc.texi        2011-12-04 08:02:42 +0000
@@ -12878,7 +12878,7 @@
 use @samp{[[-inf .. 0), (0 .. inf]]}.  (There is no way in the
 current notation to say that @code{x} is nonzero but not necessarily
 real.)  The @kbd{a e} command does ``unsafe'' simplifications,
-including cancelling @samp{x} from the equation when @samp{x} is
+including canceling @samp{x} from the equation when @samp{x} is
 not known to be nonzero.
 
 Another set of type symbols distinguish between scalars and vectors.
@@ -21903,7 +21903,7 @@
 @end smallexample
 
 Unselecting the sub-formula reveals that the minus sign, which would
-normally have cancelled out with the subtraction automatically, has
+normally have canceled out with the subtraction automatically, has
 not been able to do so because the subtraction was not part of the
 selected portion.  Pressing @kbd{=} (@code{calc-evaluate}) or doing
 any other mathematical operation on the whole formula will cause it
@@ -22590,7 +22590,7 @@
 
 Quotients of products cancel only in the leading terms of the
 numerator and denominator.  In other words, @expr{a x b / a y b}
-is cancelled to @expr{x b / y b} but not to @expr{x / y}.  Once
+is canceled to @expr{x b / y b} but not to @expr{x / y}.  Once
 again this is because full cancellation can be slow; use @kbd{a s}
 to cancel all terms of the quotient.
 
@@ -22810,7 +22810,7 @@
 cancel @expr{x^2} from the top and bottom to get @expr{a b / c x d}.
 (The terms in the denominator will then be rearranged to @expr{c d x}
 as described above.)  If there is any common integer or fractional
-factor in the numerator and denominator, it is cancelled out;
+factor in the numerator and denominator, it is canceled out;
 for example, @expr{(4 x + 6) / 8 x} simplifies to @expr{(2 x + 3) / 4 x}.
 
 Non-constant common factors are not found even by @kbd{a s}.  To
@@ -22858,7 +22858,7 @@
 
 If the argument is multiplied by a constant, and this constant
 has a common integer divisor with the modulus, then this factor is
-cancelled out.  For example, @samp{12 x % 15} is changed to
+canceled out.  For example, @samp{12 x % 15} is changed to
 @samp{3 (4 x % 5)} by factoring out 3.  Also, @samp{(12 x + 1) % 15}
 is changed to @samp{3 ((4 x + 1:3) % 5)}.  While these forms may
 not seem ``simpler,'' they allow Calc to discover useful information
@@ -22938,13 +22938,13 @@
 \bigskip
 @end tex
 
-Equations and inequalities are simplified by cancelling factors
+Equations and inequalities are simplified by canceling factors
 of products, quotients, or sums on both sides.  Inequalities
-change sign if a negative multiplicative factor is cancelled.
+change sign if a negative multiplicative factor is canceled.
 Non-constant multiplicative factors as in @expr{a b = a c} are
-cancelled from equations only if they are provably nonzero (generally
+canceled from equations only if they are provably nonzero (generally
 because they were declared so; @pxref{Declarations}).  Factors
-are cancelled from inequalities only if they are nonzero and their
+are canceled from inequalities only if they are nonzero and their
 sign is known.
 
 Simplification also replaces an equation or inequality with
@@ -23035,9 +23035,9 @@
 unsafe because of problems with principal values (although these
 simplifications are safe if @expr{x} is known to be real).
 
-Common factors are cancelled from products on both sides of an
+Common factors are canceled from products on both sides of an
 equation, even if those factors may be zero:  @expr{a x / b x}
-to @expr{a / b}.  Such factors are never cancelled from
+to @expr{a / b}.  Such factors are never canceled from
 inequalities:  Even @kbd{a e} is not bold enough to reduce
 @expr{a x < b x} to @expr{a < b} (or @expr{a > b}, depending
 on whether you believe @expr{x} is positive or negative).
@@ -23071,7 +23071,7 @@
 which the first argument is a number which is out of range for the
 leading unit are modified accordingly.
 
-When cancelling and combining units in products and quotients,
+When canceling and combining units in products and quotients,
 Calc accounts for unit names that differ only in the prefix letter.
 For example, @samp{2 km m} is simplified to @samp{2000 m^2}.
 However, compatible but different units like @code{ft} and @code{in}

=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi     2011-11-27 04:43:11 +0000
+++ b/doc/misc/idlwave.texi     2011-12-04 08:02:42 +0000
@@ -1580,8 +1580,8 @@
 corresponding source code or DocLib header will be used as the help
 text.
 
address@hidden Completion, cancelling
address@hidden Cancelling completion
address@hidden Completion, canceling
address@hidden Canceling completion
 Completion is not a blocking operation --- you are free to continue
 editing, enter commands, or simply ignore the @file{*Completions*}
 buffer during a completion operation.  If, however, the most recent

=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi     2011-11-25 07:14:48 +0000
+++ b/doc/misc/message.texi     2011-12-04 08:02:42 +0000
@@ -1974,7 +1974,7 @@
 Hallvard B Furuseth <h.b.furuseth@@usit.uio.no> writes:
 @end example
 
address@hidden FIXME: Add `message-insert-formated-citation-line' and
address@hidden FIXME: Add `message-insert-formatted-citation-line' and
 @c `message-citation-line-format'
 
 Point will be at the beginning of the body of the message when this

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2011-11-25 07:14:48 +0000
+++ b/doc/misc/org.texi 2011-12-04 08:02:42 +0000
@@ -11399,16 +11399,16 @@
 @tab Should sorting be case-sensitive?  Default @code{nil}.
 
 @item @code{:sitemap-file-entry-format}
address@hidden With this option one can tell how a sitemap's entry is formated 
in the
address@hidden With this option one can tell how a sitemap's entry is formatted 
in the
 sitemap.  This is a format string with some escape sequences: @code{%t} stands
 for the title of the file, @code{%a} stands for the author of the file and
 @code{%d} stands for the date of the file.  The date is retrieved with the
address@hidden function and formated with
address@hidden function and formatted with
 @code{org-publish-sitemap-date-format}.  Default @code{%t}.
 
 @item @code{:sitemap-date-format}
 @tab Format string for the @code{format-time-string} function that tells how
-a sitemap entry's date is to be formated.  This property bypasses
+a sitemap entry's date is to be formatted.  This property bypasses
 @code{org-publish-sitemap-date-format} which defaults to @code{%Y-%m-%d}.
 
 @item @code{:sitemap-sans-extension}

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2011-11-25 07:14:48 +0000
+++ b/doc/misc/tramp.texi       2011-12-04 08:02:42 +0000
@@ -3704,4 +3704,4 @@
 @c   host and then send commands to it.
 @c * Use `filename' resp. `file name' consistently.
 @c * Use `host' resp. `machine' consistently.
address@hidden * Consistent small or capitalized words especially in menues.
address@hidden * Consistent small or capitalized words especially in menus.

=== modified file 'etc/NEWS.19'
--- a/etc/NEWS.19       2011-11-20 07:30:16 +0000
+++ b/etc/NEWS.19       2011-12-04 08:02:42 +0000
@@ -4457,7 +4457,7 @@
 
 So that such output processing may be done efficiently, there is a new
 variable, comint-last-output-start, that records the position of the start of
-the lastest output inserted into the buffer (effectively the previous value
+the last output inserted into the buffer (effectively the previous value
 of process-mark).  Output processing functions should process the text
 between comint-last-output-start (or perhaps the beginning of the line that
 the position lies on) and process-mark.

=== modified file 'etc/TODO'
--- a/etc/TODO  2011-11-27 04:43:11 +0000
+++ b/etc/TODO  2011-12-04 08:02:42 +0000
@@ -674,7 +674,7 @@
 
 *** image-type-header-regexps priorities the jpeg loader over the
 ImageMagick one.  This is not wrong, but how should a user go about
-prefering the ImageMagick loader?  The user might like zooming etc in jpegs.
+preferring the ImageMagick loader?  The user might like zooming etc in jpegs.
 
 Try (setq image-type-header-regexps nil) for a quick hack to prefer
 ImageMagick over the jpg loader.

=== modified file 'etc/srecode/template.srt'
--- a/etc/srecode/template.srt  2011-01-25 04:08:28 +0000
+++ b/etc/srecode/template.srt  2011-12-04 08:02:42 +0000
@@ -125,13 +125,13 @@
 bind "p"
 
 template priority :blank
-"Insert a priority statemept."
+"Insert a priority statement."
 ----
 set priority $^$
 ----
 
 template application :blank
-"Insert a priority statemept."
+"Insert an application statement."
 ----
 set application "$^$"
 ----

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2011-11-20 19:35:27 +0000
+++ b/leim/ChangeLog    2011-12-04 08:02:42 +0000
@@ -1801,7 +1801,7 @@
 1998-07-21  Kenichi Handa  <address@hidden>
 
        * quail/japanese.el (quail-japanese-kanji-kkc): Handle the case
-       that conversion is cancelled in kkc-region.
+       that conversion is canceled in kkc-region.
        (quail-japanese-switch-package): Fix previous change.
 
 1998-07-19  Kenichi Handa  <address@hidden>
@@ -1998,7 +1998,7 @@
        (quail-mode-map): Change binding for ethio-insert-ethio-space.
        (quail-mode-hook): Check the current Quail package name.
 
-       * quail/latin-post.el: Add rules for cancelling accents by typing
+       * quail/latin-post.el: Add rules for canceling accents by typing
        two accent keys (e.g. a~ => a-tilde, a~~ => a~) to all Quail
        packages.
 

=== modified file 'leim/quail/greek.el'
--- a/leim/quail/greek.el       2011-01-26 08:36:39 +0000
+++ b/leim/quail/greek.el       2011-12-04 08:02:42 +0000
@@ -152,7 +152,7 @@
 theta          Q               q
 iota           I               i
 kappa          K               k
-lamda          L               l
+lambda         L               l
 mu             M               m
 nu             N               n
 xi             X               x
@@ -433,7 +433,7 @@
 theta          J               j
 iota           I               i
 kappa          K               k
-lamda          L               l
+lambda         L               l
 mu             M               m
 nu             N               n
 xi             X               x

=== modified file 'lisp/ChangeLog.12'
--- a/lisp/ChangeLog.12 2011-11-27 04:43:11 +0000
+++ b/lisp/ChangeLog.12 2011-12-04 08:02:42 +0000
@@ -7177,7 +7177,7 @@
 2006-08-20  Chong Yidong  <address@hidden>
 
        * frame.el (blink-cursor-start): Set timer first.
-       (blink-cursor-end): Ignore timer cancelling errors.
+       (blink-cursor-end): Ignore timer canceling errors.
        Suggested by Ken Manheimer.
 
 2006-08-20  Juanma Barranquero  <address@hidden>
@@ -15842,7 +15842,7 @@
        interactive spec from "p" to "P".
 
        * progmodes/cc-styles.el: Amend the doc-string of c-set-style, in
-       reponse to a report from Joseph Kiniry <address@hidden> that it
+       response to a report from Joseph Kiniry <address@hidden> that it
        was difficult to understand.
 
 2005-12-08  Martin Stjernholm  <address@hidden>

=== modified file 'lisp/ChangeLog.13'
--- a/lisp/ChangeLog.13 2011-11-25 13:26:30 +0000
+++ b/lisp/ChangeLog.13 2011-12-04 08:02:42 +0000
@@ -8010,7 +8010,7 @@
 2007-10-31  Juanma Barranquero  <address@hidden>
 
        * help-at-pt.el (help-at-pt-unload-hook): Remove.
-       Timers are automatically cancelled by `unload-feature'.
+       Timers are automatically canceled by `unload-feature'.
 
        * delsel.el (delsel-unload-hook): Remove function and variable.
        (delsel-unload-function): New-style unload function, adapted

=== modified file 'lisp/ChangeLog.14'
--- a/lisp/ChangeLog.14 2011-11-20 19:35:27 +0000
+++ b/lisp/ChangeLog.14 2011-12-04 08:02:42 +0000
@@ -866,7 +866,7 @@
 
        * calc/calc-embed.el (calc-embedded-restore-original-modes):
        Add argument for Calculator buffer.
-       (calc-do-embedded): Use specific Calculator buffer when cancelling
+       (calc-do-embedded): Use specific Calculator buffer when canceling
        embedded mode.
 
        * calc/calc.el (calc-buffer-list): New variable.

=== modified file 'lisp/ChangeLog.15'
--- a/lisp/ChangeLog.15 2011-11-27 18:17:40 +0000
+++ b/lisp/ChangeLog.15 2011-12-04 08:02:42 +0000
@@ -7086,7 +7086,7 @@
        (sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
        syntax pattern.
        (sql-mode-postgres-font-lock-keywords): Support Postgres V9.
-       (sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands.
+       (sql-mode-sqlite-font-lock-keywords): Highlight sqlite commands.
 
 2010-09-10  Lars Magne Ingebrigtsen  <address@hidden>
 
@@ -11908,7 +11908,7 @@
        Add new VC methods: vc-log-incoming and vc-log-outgoing.
        * vc.el (vc-print-log-setup-buttons): New function split out from
        vc-print-log-internal.
-       (vc-log-internal-common): New function, a parametrized version of
+       (vc-log-internal-common): New function, a parameterized version of
        vc-print-log-internal.
        (vc-print-log-internal): Just call vc-log-internal-common with the
        right arguments.

=== modified file 'lisp/ChangeLog.3'
--- a/lisp/ChangeLog.3  2011-11-25 07:14:48 +0000
+++ b/lisp/ChangeLog.3  2011-12-04 08:02:42 +0000
@@ -6305,7 +6305,7 @@
        to "Non-echoed text: ".  This conforms with the convention
        used by existing prompts, and gives more room to type stuff.
 
-       * comint.el (comint-last-input-start): New varible.  In
+       * comint.el (comint-last-input-start): New variable.  In
        particular, this helps support subprocesses that insist on echoing
        their input.  Added comments to porting guide indicating that
        this should probably not be used for implementing history stuff.

=== modified file 'lisp/ChangeLog.7'
--- a/lisp/ChangeLog.7  2011-11-27 18:17:40 +0000
+++ b/lisp/ChangeLog.7  2011-12-04 08:02:42 +0000
@@ -884,7 +884,7 @@
 1998-07-21  Kenichi Handa  <address@hidden>
 
        * international/kkc.el (kkc-region): Handled the case that
-       conversion is cancelled.
+       conversion is canceled.
        (kkc-terminate): Update kkc-overlay-head correctly.
        (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil.
 

=== modified file 'lisp/calc/calc-menu.el'
--- a/lisp/calc/calc-menu.el    2011-03-20 20:59:29 +0000
+++ b/lisp/calc/calc-menu.el    2011-12-04 08:02:42 +0000
@@ -24,19 +24,19 @@
 (defvar calc-arithmetic-menu
   (list "Arithmetic"
         (list "Basic"
-              ["-(1:)"         calc-change-sign 
+              ["-(1:)"         calc-change-sign
                :keys "n" :active (>= (calc-stack-size) 1)]
-              ["(2:) + (1:)"   calc-plus   
+              ["(2:) + (1:)"   calc-plus
                :keys "+" :active (>= (calc-stack-size) 2)]
-              ["(2:) - (1:)"   calc-minus  
+              ["(2:) - (1:)"   calc-minus
                :keys "-" :active (>= (calc-stack-size) 2)]
-              ["(2:) * (1:)"   calc-times  
+              ["(2:) * (1:)"   calc-times
                :keys "*" :active (>= (calc-stack-size) 2)]
-              ["(2:) / (1:)"   calc-divide 
+              ["(2:) / (1:)"   calc-divide
                :keys "/" :active (>= (calc-stack-size) 2)]
-              ["(2:) ^ (1:)"   calc-power  
+              ["(2:) ^ (1:)"   calc-power
                :keys "^" :active (>= (calc-stack-size) 2)]
-              ["(2:) ^ (1/(1:))" 
+              ["(2:) ^ (1/(1:))"
                (progn
                  (require 'calc-ext)
                  (let ((calc-inverse-flag t))
@@ -44,8 +44,8 @@
                :keys "I ^"
                :active (>= (calc-stack-size) 2)
                :help "The (1:)th root of (2:)"]
-              ["abs(1:)"   
-               (progn 
+              ["abs(1:)"
+               (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-abs))
                :keys "A"
@@ -57,7 +57,7 @@
                  (call-interactively 'calc-inv))
                :keys "&"
                :active (>= (calc-stack-size) 1)]
-              ["sqrt(1:)" 
+              ["sqrt(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sqrt))
@@ -70,7 +70,7 @@
                :keys "\\"
                :active (>= (calc-stack-size) 2)
                :help "The integer quotient of (2:) over (1:)"]
-              ["(2:) mod (1:)"  
+              ["(2:) mod (1:)"
                (progn
                  (require 'calc-misc)
                  (call-interactively 'calc-mod))
@@ -78,28 +78,28 @@
                :active (>= (calc-stack-size) 2)
                :help "The remainder when (2:) is divided by (1:)"])
         (list "Rounding"
-              ["floor(1:)" 
+              ["floor(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-floor))
                :keys "F"
                :active (>= (calc-stack-size) 1)
                :help "The greatest integer less than or equal to (1:)"]
-              ["ceiling(1:)"  
+              ["ceiling(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-ceiling))
                :keys "I F"
                :active (>= (calc-stack-size) 1)
                :help "The smallest integer greater than or equal to (1:)"]
-              ["round(1:)"    
+              ["round(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-round))
                :keys "R"
                :active (>= (calc-stack-size) 1)
                :help "The nearest integer to (1:)"]
-              ["truncate(1:)" 
+              ["truncate(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-trunc))
@@ -140,32 +140,32 @@
                :active (>= (calc-stack-size) 1)
                :help "The argument (polar angle) of (1:)"])
         (list "Conversion"
-              ["Convert (1:) to a float"    
+              ["Convert (1:) to a float"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-float))
                :keys "c f"
                :active (>= (calc-stack-size) 1)]
-              ["Convert (1:) to a fraction" 
+              ["Convert (1:) to a fraction"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-fraction))
                :keys "c F"
                :active (>= (calc-stack-size) 1)])
         (list "Binary"
-              ["Set word size" 
+              ["Set word size"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-word-size))
                :keys "b w"]
-              ["Clip (1:) to word size" 
+              ["Clip (1:) to word size"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-clip))
                :keys "b c"
                :active (>= (calc-stack-size) 1)
                :help "Reduce (1:) modulo 2^wordsize"]
-              ["(2:) and (1:)"    
+              ["(2:) and (1:)"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-and))
@@ -180,13 +180,13 @@
                :active (>= (calc-stack-size) 2)
                :help "Bitwise inclusive OR [modulo 2^wordsize]"]
               ["(2:) xor (1:)"
-               (progn 
+               (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-xor))
                :keys "b x"
                :active (>= (calc-stack-size) 2)
                :help "Bitwise exclusive OR [modulo 2^wordsize]"]
-              ["diff(2:,1:)" 
+              ["diff(2:,1:)"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-diff))
@@ -263,82 +263,82 @@
                :keys "I P"
                :help "Euler's constant"])
         (list "Logs and Exps"
-              ["ln(1:)" 
-               (progn 
-                 (require 'calc-math) 
-                 (call-interactively 'calc-ln)) 
+              ["ln(1:)"
+               (progn
+                 (require 'calc-math)
+                 (call-interactively 'calc-ln))
                :keys "L"
                :active (>= (calc-stack-size) 1)
                :help "The natural logarithm"]
-              ["e^(1:)"   
+              ["e^(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-exp))
                :keys "E"
                :active (>= (calc-stack-size) 1)]
-              ["log(1:) [base 10]" 
+              ["log(1:) [base 10]"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-log10))
                :keys "H L"
                :active (>= (calc-stack-size) 1)
                :help "The common logarithm"]
-              ["10^(1:)" 
+              ["10^(1:)"
                (progn
                  (require 'calc-math)
                  (let ((calc-inverse-flag t))
                    (call-interactively 'calc-log10)))
                :keys "I H L"
                :active (>= (calc-stack-size) 1)]
-              ["log(2:) [base(1:)]" 
+              ["log(2:) [base(1:)]"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-log))
                :keys "B"
                :active (>= (calc-stack-size) 2)
                :help "The logarithm with an arbitrary base"]
-              ["(2:) ^ (1:)"  
-               calc-power 
+              ["(2:) ^ (1:)"
+               calc-power
                :keys "^"
                :active (>= (calc-stack-size) 2)])
         (list "Trigonometric Functions"
-              ["sin(1:)"  
+              ["sin(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sin))
                :keys "S"
                :active (>= (calc-stack-size) 1)]
-              ["cos(1:)"  
+              ["cos(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-cos))
                :keys "C"
                :active (>= (calc-stack-size) 1)]
-              ["tan(1:)"  
+              ["tan(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-tan))
                :keys "T"
                :active (>= (calc-stack-size) 1)]
-              ["arcsin(1:)" 
+              ["arcsin(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arcsin))
                :keys "I S"
                :active (>= (calc-stack-size) 1)]
-              ["arccos(1:)" 
+              ["arccos(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arccos))
                :keys "I C"
                :active (>= (calc-stack-size) 1)]
-              ["arctan(1:)" 
+              ["arctan(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctan))
                :keys "I T"
                :active (>= (calc-stack-size) 1)]
-              ["arctan2(2:,1:)" 
+              ["arctan2(2:,1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctan2))
@@ -367,65 +367,65 @@
                :style radio
                :selected (eq calc-angle-mode 'hms)])
         (list "Hyperbolic Functions"
-              ["sinh(1:)" 
+              ["sinh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sinh))
                :keys "H S"
                :active (>= (calc-stack-size) 1)]
-              ["cosh(1:)" 
+              ["cosh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-cosh))
                :keys "H C"
                :active (>= (calc-stack-size) 1)]
-              ["tanh(1:)" 
+              ["tanh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-tanh))
                :keys "H T"
                :active (>= (calc-stack-size) 1)]
-              ["arcsinh(1:)" 
+              ["arcsinh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arcsinh))
                :keys "I H S"
                :active (>= (calc-stack-size) 1)]
-              ["arccosh(1:)" 
+              ["arccosh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arccosh))
                :keys "I H C"
                :active (>= (calc-stack-size) 1)]
-              ["arctanh(1:)" 
+              ["arctanh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctanh))
                :keys "I H T"
                :active (>= (calc-stack-size) 1)])
         (list "Advanced Math Functions"
-              ["Gamma(1:)" 
+              ["Gamma(1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-gamma))
                :keys "f g"
                :active (>= (calc-stack-size) 1)
                :help "The Euler Gamma function"]
-              ["GammaP(2:,1:)" 
+              ["GammaP(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-inc-gamma))
                :keys "f G"
                :active (>= (calc-stack-size) 2)
                :help "The lower incomplete Gamma function"]
-              ["Beta(2:,1:)" 
+              ["Beta(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-beta))
                :keys "f b"
                :active (>= (calc-stack-size) 2)
                :help "The Euler Beta function"]
-              ["BetaI(3:,2:,1:)" 
+              ["BetaI(3:,2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-inc-beta))
@@ -439,14 +439,14 @@
                :keys "f e"
                :active (>= (calc-stack-size) 1)
                :help "The error function"]
-              ["BesselJ(2:,1:)" 
+              ["BesselJ(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-bessel-J))
                :keys "f j"
                :active (>= (calc-stack-size) 2)
                :help "The Bessel function of the first kind (of order (2:))"]
-              ["BesselY(2:,1:)" 
+              ["BesselY(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-bessel-Y))
@@ -454,44 +454,44 @@
                :active (>= (calc-stack-size) 2)
                :help "The Bessel function of the second kind (of order (2:))"])
         (list "Combinatorial Functions"
-              ["gcd(2:,1:)" 
+              ["gcd(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-gcd))
                  :keys "k g"
                  :active (>= (calc-stack-size) 2)]
-              ["lcm(2:,1:)" 
+              ["lcm(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-lcm))
                :keys "k l"
                :active (>= (calc-stack-size) 2)]
-              ["factorial(1:)" 
+              ["factorial(1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-factorial))
                :keys "!"
                :active (>= (calc-stack-size) 1)]
-              ["(2:) choose (1:)" 
+              ["(2:) choose (1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-choose))
                :keys "k c"
                :active (>= (calc-stack-size) 2)]
-              ["permutations(2:,1:)" 
+              ["permutations(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-perm))
                :keys "H k c"
                :active (>= (calc-stack-size) 2)]
-              ["Primality test for (1:)" 
+              ["Primality test for (1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-prime-test))
                :keys "k p"
                :active (>= (calc-stack-size) 1)
                :help "For large (1:), a probabilistic test"]
-              ["Factor (1:) into primes" 
+              ["Factor (1:) into primes"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-prime-factors))
@@ -527,17 +527,17 @@
         ["Help on Scientific Functions"
          (calc-info-goto-node "Scientific Functions")])
   "Menu for Calc's scientific functions.")
-              
+
 (defvar calc-algebra-menu
   (list "Algebra"
         (list "Simplification"
-              ["Simplify (1:)" 
+              ["Simplify (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-simplify))
                :keys "a s"
                :active (>= (calc-stack-size) 1)]
-              ["Simplify (1:) with extended rules" 
+              ["Simplify (1:) with extended rules"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-simplify-extended))
@@ -545,72 +545,72 @@
                :active (>= (calc-stack-size) 1)
                :help "Apply possibly unsafe simplifications"])
         (list "Manipulation"
-              ["Expand formula (1:)" 
+              ["Expand formula (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-expand-formula))
                :keys "a \""
                :active (>= (calc-stack-size) 1)
                :help "Expand (1:) into its defining formula, if possible"]
-              ["Evaluate variables in (1:)" 
+              ["Evaluate variables in (1:)"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-evaluate))
                :keys "="
                :active (>= (calc-stack-size) 1)]
-              ["Make substitution in (1:)" 
+              ["Make substitution in (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-substitute))
                :keys "a b"
                :active (>= (calc-stack-size) 1)
-               :help 
+               :help
                "Substitute all occurrences of a sub-expression with a new 
sub-expression"])
         (list "Polynomials"
-              ["Factor (1:)" 
+              ["Factor (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-factor))
                :keys "a f"
                :active (>= (calc-stack-size) 1)]
-              ["Collect terms in (1:)" 
+              ["Collect terms in (1:)"
                (progn
                  (require 'calc-alg)
-                 (call-interactively 'calc-collect)) 
+                 (call-interactively 'calc-collect))
                :keys "a c"
                :active (>= (calc-stack-size) 1)
                :help "Arrange as a polynomial in a given variable"]
-              ["Expand (1:)" 
+              ["Expand (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-expand))
                :keys "a x"
                :active (>= (calc-stack-size) 1)
                :help "Apply distributive law everywhere"]
-              ["Find roots of (1:)" 
+              ["Find roots of (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-poly-roots))
                :keys "a P"
                :active (>= (calc-stack-size) 1)])
         (list "Calculus"
-              ["Differentiate (1:)" 
+              ["Differentiate (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-derivative))
                :keys "a d"
                :active (>= (calc-stack-size) 1)]
-              ["Integrate (1:) [indefinite]" 
+              ["Integrate (1:) [indefinite]"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-integral))
                :keys "a i"
                :active (>= (calc-stack-size) 1)]
-              ["Integrate (1:) [definite]" 
+              ["Integrate (1:) [definite]"
                (progn
                  (require 'calcalg2)
                  (let ((var (read-string "Integration variable: ")))
-                   (calc-tabular-command 'calcFunc-integ "Integration" 
+                   (calc-tabular-command 'calcFunc-integ "Integration"
                                          "intg" nil var nil nil)))
                :keys "C-u a i"
                :active (>= (calc-stack-size) 1)]
@@ -621,20 +621,20 @@
                :keys "a I"
                :active (>= (calc-stack-size) 1)
                :help "Integrate using the open Romberg method"]
-              ["Taylor expand (1:)" 
+              ["Taylor expand (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-taylor))
                :keys "a t"
                :active (>= (calc-stack-size) 1)]
-              ["Minimize (2:) [initial guess = (1:)]" 
+              ["Minimize (2:) [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-minimum))
                :keys "a N"
                :active (>= (calc-stack-size) 2)
                :help "Find a local minimum"]
-              ["Maximize (2:) [initial guess = (1:)]" 
+              ["Maximize (2:) [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-maximum))
@@ -642,26 +642,26 @@
                :active (>= (calc-stack-size) 2)
                :help "Find a local maximum"])
         (list "Solving"
-              ["Solve equation (1:)" 
+              ["Solve equation (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-solve-for))
                :keys "a S"
                :active (>= (calc-stack-size) 1)]
-              ["Solve equation (2:) numerically [initial guess = (1:)]" 
+              ["Solve equation (2:) numerically [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-root))
                :keys "a R"
                :active (>= (calc-stack-size) 2)]
-              ["Find roots of polynomial (1:)" 
+              ["Find roots of polynomial (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-poly-roots))
                :keys "a P"
                :active (>= (calc-stack-size) 1)])
         (list "Curve Fitting"
-              ["Fit (1:)=[x values, y values] to a curve" 
+              ["Fit (1:)=[x values, y values] to a curve"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-curve-fit))
@@ -675,13 +675,13 @@
 
 (defvar calc-graphics-menu
   (list "Graphics"
-        ["Graph 2D [(1:)= y values, (2:)= x values]" 
+        ["Graph 2D [(1:)= y values, (2:)= x values]"
          (progn
            (require 'calc-graph)
            (call-interactively 'calc-graph-fast))
          :keys "g f"
          :active (>= (calc-stack-size) 2)]
-        ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]" 
+        ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]"
          (progn
            (require 'calc-graph)
            (call-interactively 'calc-graph-fast-3d))
@@ -696,11 +696,11 @@
 (defvar calc-vectors-menu
   (list "Matrices/Vectors"
         (list "Matrices"
-              ["(2:) + (1:)"   calc-plus   
+              ["(2:) + (1:)"   calc-plus
                :keys "+" :active (>= (calc-stack-size) 2)]
-              ["(2:) - (1:)"   calc-minus  
+              ["(2:) - (1:)"   calc-minus
                :keys "-" :active (>= (calc-stack-size) 2)]
-              ["(2:) * (1:)"   calc-times  
+              ["(2:) * (1:)"   calc-times
                :keys "*" :active (>= (calc-stack-size) 2)]
               ["(1:)^(-1)"
                (progn
@@ -709,17 +709,17 @@
                :keys "&"
                :active (>= (calc-stack-size) 1)]
               ["Create an identity matrix"
-               (progn 
+               (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-ident))
                :keys "v i"]
-              ["transpose(1:)" 
+              ["transpose(1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-transpose))
                :keys "v t"
                :active (>= (calc-stack-size) 1)]
-              ["det(1:)" 
+              ["det(1:)"
                (progn
                  (require 'calc-mtx)
                  (call-interactively 'calc-mdet))
@@ -731,19 +731,19 @@
                  (call-interactively 'calc-mtrace))
                :keys "V T"
                :active (>= (calc-stack-size) 1)]
-              ["LUD decompose (1:)" 
+              ["LUD decompose (1:)"
                (progn
                  (require 'calc-mtx)
                  (call-interactively 'calc-mlud))
                :keys "V L"
                :active (>= (calc-stack-size) 1)]
-              ["Extract a row from (1:)" 
+              ["Extract a row from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mrow))
                :keys "v r"
                :active (>= (calc-stack-size) 1)]
-              ["Extract a column from (1:)" 
+              ["Extract a column from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mcol))
@@ -756,13 +756,13 @@
                  (call-interactively 'calc-head))
                :keys "v h"
                :active (>= (calc-stack-size) 1)]
-              ["Extract an element from (1:)" 
+              ["Extract an element from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mrow))
                :keys "v r"
                :active (>= (calc-stack-size) 1)]
-              ["Reverse (1:)" 
+              ["Reverse (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-reverse-vector))
@@ -775,19 +775,19 @@
                :keys "v u"
                :active (>= (calc-stack-size) 1)
                :help "Separate the elements of (1:)"]
-              ["(2:) cross (1:)" 
+              ["(2:) cross (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-cross))
                :keys "V C"
                :active (>= (calc-stack-size) 2)
                :help "The cross product in R^3"]
-              ["(2:) dot (1:)" 
-               calc-mult 
+              ["(2:) dot (1:)"
+               calc-mult
                :keys "*"
                :active (>= (calc-stack-size) 2)
                :help "The dot product"]
-              ["Map a function across (1:)" 
+              ["Map a function across (1:)"
                (progn
                  (require 'calc-map)
                  (call-interactively 'calc-map))
@@ -795,25 +795,25 @@
                :active (>= (calc-stack-size) 1)
                :help "Apply a function to each element"])
         (list "Vectors As Sets"
-              ["Remove duplicates from (1:)" 
+              ["Remove duplicates from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-remove-duplicates))
                :keys "V +"
                :active (>= (calc-stack-size) 1)]
-              ["(2:) union (1:)" 
+              ["(2:) union (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-union))
                :keys "V V"
                :active (>= (calc-stack-size) 2)]
-              ["(2:) intersect (1:)" 
+              ["(2:) intersect (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-intersect))
                :keys "V ^"
                :active (>= (calc-stack-size) 2)]
-              ["(2:) \\ (1:)" 
+              ["(2:) \\ (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-difference))
@@ -821,35 +821,35 @@
                :help "Set difference"
                :active (>= (calc-stack-size) 2)])
         (list "Statistics On Vectors"
-              ["length(1:)" 
+              ["length(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-count))
                :keys "u #"
                :active (>= (calc-stack-size) 1)
                :help "The number of data values"]
-              ["sum(1:)"    
+              ["sum(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-sum))
                :keys "u +"
                :active (>= (calc-stack-size) 1)
                :help "The sum of the data values"]
-              ["max(1:)"    
+              ["max(1:)"
                (progn
                  (require 'calc-stat)
-                 (call-interactively 'calc-vector-max))  
+                 (call-interactively 'calc-vector-max))
                :keys "u x"
                :active (>= (calc-stack-size) 1)
                :help "The maximum of the data values"]
-              ["min(1:)"    
+              ["min(1:)"
                (progn
                  (require 'calc-stat)
-                 (call-interactively 'calc-vector-min))  
+                 (call-interactively 'calc-vector-min))
                :keys "u N"
                :active (>= (calc-stack-size) 1)
-               :help "The minumum of the data values"]
-              ["mean(1:)"   
+               :help "The minimum of the data values"]
+              ["mean(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-mean))
@@ -863,28 +863,28 @@
               :keys "I u M"
               :active (>= (calc-stack-size) 1)
               :help "The average (arithmetic mean) of the data values as an 
error form"]
-              ["sdev(1:)"   
+              ["sdev(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-sdev))
                :keys "u S"
                :active (>= (calc-stack-size) 1)
                :help "The sample sdev, sqrt[sum((values - mean)^2)/(N-1)]"]
-              ["variance(1:)" 
+              ["variance(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-variance))
                :keys "H u S"
                :active (>= (calc-stack-size) 1)
                :help "The sample variance, sum((values - mean)^2)/(N-1)"]
-              ["population sdev(1:)" 
+              ["population sdev(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-pop-sdev))
                :keys "I u S"
                :active (>= (calc-stack-size) 1)
                :help "The population sdev, sqrt[sum((values - mean)^2)/N]"]
-              ["population variance(1:)" 
+              ["population variance(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-pop-variance))
@@ -937,25 +937,25 @@
 
 (defvar calc-units-menu
   (list "Units"
-        ["Convert units in (1:)" 
+        ["Convert units in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-convert-units ))
          :keys "u c"
          :active (>= (calc-stack-size) 1)]
-        ["Convert temperature in (1:)" 
+        ["Convert temperature in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-convert-temperature))
          :keys "u t"
          :active (>= (calc-stack-size) 1)]
-        ["Simplify units in (1:)" 
+        ["Simplify units in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-simplify-units))
          :keys "u s"
          :active (>= (calc-stack-size) 1)]
-        ["View units table" 
+        ["View units table"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-view-units-table))
@@ -1072,40 +1072,40 @@
 
 (defvar calc-variables-menu
   (list "Variables"
-        ["Store (1:) into a variable" 
+        ["Store (1:) into a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-store))
          :keys "s s"
          :active (>= (calc-stack-size) 1)]
-        ["Recall a variable value" 
+        ["Recall a variable value"
           (progn
             (require 'calc-store)
             (call-interactively 'calc-recall ))
          :keys "s r"]
-        ["Edit the value of a variable" 
+        ["Edit the value of a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-edit-variable))
          :keys "s e"]
-        ["Exchange (1:) with a variable value" 
+        ["Exchange (1:) with a variable value"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-store-exchange))
          :keys "s x"
          :active (>= (calc-stack-size) 1)]
-        ["Clear variable value" 
+        ["Clear variable value"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-unstore))
          :keys "s u"]
-        ["Evaluate variables in (1:)" 
+        ["Evaluate variables in (1:)"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-evaluate))
          :keys "="
          :active (>= (calc-stack-size) 1)]
-        ["Evaluate (1:), assigning a value to a variable" 
+        ["Evaluate (1:), assigning a value to a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-let))
@@ -1119,19 +1119,19 @@
 
 (defvar calc-stack-menu
   (list "Stack"
-        ["Remove (1:)" 
-         calc-pop 
+        ["Remove (1:)"
+         calc-pop
          :keys "DEL"
          :active (>= (calc-stack-size) 1)]
-        ["Switch (1:) and (2:)" 
-         calc-roll-down 
+        ["Switch (1:) and (2:)"
+         calc-roll-down
          :keys "TAB"
          :active (>= (calc-stack-size) 2)]
-        ["Duplicate (1:)" 
-         calc-enter 
+        ["Duplicate (1:)"
+         calc-enter
          :keys "RET"
          :active (>= (calc-stack-size) 1)]
-        ["Edit (1:)" 
+        ["Edit (1:)"
          (progn
            (require 'calc-yank)
            (call-interactively calc-edit))
@@ -1144,12 +1144,12 @@
 
 (defvar calc-errors-menu
   (list "Undo"
-        ["Undo" 
+        ["Undo"
          (progn
            (require 'calc-undo)
            (call-interactively 'calc-undo))
          :keys "U"]
-        ["Redo" 
+        ["Redo"
          (progn
            (require 'calc-undo)
            (call-interactively 'calc-redo))
@@ -1162,7 +1162,7 @@
 
 (defvar calc-modes-menu
   (list "Modes"
-        ["Precision" 
+        ["Precision"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-precision))
@@ -1277,7 +1277,7 @@
               ["Binary"
                (progn
                  (require 'calc-bin)
-                 (call-interactively 
+                 (call-interactively
                   (lambda () (interactive) (calc-binary-radix t))))
                :keys "C-u d 2"
                :style radio
@@ -1330,7 +1330,7 @@
                :keys "d e"
                :style radio
                :selected (eq (car-safe calc-float-format) 'eng)])
-        (list "Complex Format"             
+        (list "Complex Format"
               ["Default"
                (progn
                  (require 'calc-cplx)
@@ -1522,17 +1522,17 @@
 
 (defvar  calc-help-menu
   (list "Help"
-        ["Manual"   
+        ["Manual"
          calc-info
          :keys "h i"]
-        ["Tutorial" 
-         calc-tutorial 
+        ["Tutorial"
+         calc-tutorial
          :keys "h t"]
-        ["Summary"  
-         calc-info-summary 
+        ["Summary"
+         calc-info-summary
          :keys "h s"]
         "----"
-        ["Help on Help" 
+        ["Help on Help"
          (progn
            (calc-info-goto-node "Introduction")
            (Info-goto-node "Help Commands"))])
@@ -1557,7 +1557,7 @@
         calc-errors-menu
         calc-modes-menu
         calc-help-menu
-        ["Reset"  
+        ["Reset"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-reset))
@@ -1565,4 +1565,3 @@
         ["Quit" calc-quit]))
 
 (provide 'calc-menu)
-

=== modified file 'lisp/calc/calc-yank.el'
--- a/lisp/calc/calc-yank.el    2011-01-25 04:08:28 +0000
+++ b/lisp/calc/calc-yank.el    2011-12-04 08:02:42 +0000
@@ -131,7 +131,7 @@
                      val))
                val))))))))
 
-;;; The Calc set- and get-register commands are modified versions of functions 
+;;; The Calc set- and get-register commands are modified versions of functions
 ;;; in register.el
 
 (defvar calc-register-alist nil
@@ -206,7 +206,7 @@
 
 (defun calc-add-to-register (register start end prepend delete-flag)
   "Add the lines in the region to register REGISTER.
-If PREPEND is non-nil, add them to the beginning of the register, 
+If PREPEND is non-nil, add them to the beginning of the register,
 otherwise the end.  If DELETE-FLAG is non-nil, also delete the region."
   (let* ((top-num (calc-locate-cursor-element start))
          (top-pos (save-excursion
@@ -242,7 +242,7 @@
   (if (eq major-mode 'calc-mode)
       (calc-add-to-register register start end nil delete-flag)
     (append-to-register register start end delete-flag)))
-  
+
 (defun calc-prepend-to-register (register start end &optional delete-flag)
   "Copy the lines in the region to the beginning of register REGISTER.
 With prefix arg, also delete the region."
@@ -250,7 +250,7 @@
   (if (eq major-mode 'calc-mode)
       (calc-add-to-register register start end t delete-flag)
     (prepend-to-register register start end delete-flag)))
-  
+
 
 
 (defun calc-clean-newlines (s)
@@ -585,12 +585,12 @@
     (setq calc-allow-ret allow-ret)
     (let ((inhibit-read-only t))
       (erase-buffer))
-    (add-hook 'kill-buffer-hook (lambda () 
+    (add-hook 'kill-buffer-hook (lambda ()
                                   (let ((calc-edit-handler nil))
                                     (calc-edit-finish t))
                                   (message "(Cancelled)")) t t)
     (insert (propertize
-             (concat 
+             (concat
               (or title title "Calc Edit Mode. ")
               "Press `C-c C-c'"
               (if allow-ret "" " or RET")

=== modified file 'lisp/calculator.el'
--- a/lisp/calculator.el        2011-10-30 01:56:03 +0000
+++ b/lisp/calculator.el        2011-12-04 08:02:42 +0000
@@ -81,7 +81,7 @@
 
 (defcustom calculator-prompt "Calc=%s> "
   "The prompt used by the Emacs calculator.
-It should contain a \"%s\" somewhere that will indicate the i/o radixes;
+It should contain a \"%s\" somewhere that will indicate the i/o radices;
 this will be a two-character string as described in the documentation
 for `calculator-mode'."
   :type  'string

=== modified file 'lisp/calendar/appt.el'
--- a/lisp/calendar/appt.el     2011-06-11 17:54:53 +0000
+++ b/lisp/calendar/appt.el     2011-12-04 08:02:42 +0000
@@ -508,7 +508,7 @@
 Optional argument WARNTIME is an integer (or string) giving the number
 of minutes before the appointment at which to start warning.
 The default is `appt-message-warning-time'."
-  (interactive "sTime (hh:mm[am/pm]): \nsMessage: 
+  (interactive "sTime (hh:mm[am/pm]): \nsMessage:
 sMinutes before the appointment to start warning: ")
   (unless (string-match appt-time-regexp time)
     (error "Unacceptable time-string"))
@@ -521,7 +521,7 @@
   (or appt-timer (appt-activate))
   (let ((time-msg (list (list (appt-convert-time time))
                         (concat time " " msg) t)))
-    ;; It is presently non-sensical to have multiple warnings about
+    ;; It is presently nonsensical to have multiple warnings about
     ;; the same appointment with just different delays, but it might
     ;; not always be so.  TODO
     (if warntime (setq time-msg (append time-msg (list warntime))))

=== modified file 'lisp/cedet/inversion.el'
--- a/lisp/cedet/inversion.el   2011-11-20 03:48:53 +0000
+++ b/lisp/cedet/inversion.el   2011-12-04 08:02:42 +0000
@@ -199,12 +199,12 @@
             (= v1-1 v2-1)
             (= v1-2 v2-2)
             (= v1-3 v2-3)
-            v1-4 v2-4          ; all or nothin if elt - is =
+            v1-4 v2-4          ; all or nothing if elt - is =
             (< v1-4 v2-4))
        (and (= v1-0 v2-0)
             (= v1-1 v2-1)
             (= v1-2 v2-2)
-            v1-3 v2-3          ; all or nothin if elt - is =
+            v1-3 v2-3          ; all or nothing if elt - is =
             (< v1-3 v2-3))
        (and (= v1-1 v2-1)
             (< v1-2 v2-2))

=== modified file 'lisp/cedet/semantic.el'
--- a/lisp/cedet/semantic.el    2011-11-23 07:03:56 +0000
+++ b/lisp/cedet/semantic.el    2011-12-04 08:02:42 +0000
@@ -680,7 +680,7 @@
                    (save-excursion (semantic-fetch-tags))
                    nil)
              ;; If we are here, it is because the lexical step failed,
-             ;; proably due to unterminated lists or something like that.
+             ;; probably due to unterminated lists or something like that.
 
              ;; We do nothing, and just wait for the next idle timer
              ;; to go off.  In the meantime, remember this, and make sure

=== modified file 'lisp/cedet/semantic/edit.el'
--- a/lisp/cedet/semantic/edit.el       2011-11-20 07:30:16 +0000
+++ b/lisp/cedet/semantic/edit.el       2011-12-04 08:02:42 +0000
@@ -859,7 +859,7 @@
          (setq cacheend chil)
          (while (and cacheend (not (eq last (car cacheend))))
            (setq cacheend (cdr cacheend)))
-         ;; The splicable part is after cacheend.. so move cacheend
+         ;; The spliceable part is after cacheend.. so move cacheend
          ;; one more tag.
          (setq cacheend (cdr cacheend))
          ;; Splice the found end tag into the cons cell

=== modified file 'lisp/cedet/semantic/idle.el'
--- a/lisp/cedet/semantic/idle.el       2011-11-20 03:48:53 +0000
+++ b/lisp/cedet/semantic/idle.el       2011-12-04 08:02:42 +0000
@@ -515,7 +515,7 @@
                        (save-excursion (semantic-fetch-tags))
                        nil)
                  ;; If we are here, it is because the lexical step failed,
-                 ;; proably due to unterminated lists or something like that.
+                 ;; probably due to unterminated lists or something like that.
 
                  ;; We do nothing, and just wait for the next idle timer
                  ;; to go off.  In the meantime, remember this, and make sure

=== modified file 'lisp/cedet/semantic/lex.el'
--- a/lisp/cedet/semantic/lex.el        2011-11-25 07:14:48 +0000
+++ b/lisp/cedet/semantic/lex.el        2011-12-04 08:02:42 +0000
@@ -1248,7 +1248,7 @@
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
          'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
               (match-end 0))
@@ -1271,7 +1271,7 @@
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
          'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (progn
         (setq semantic-lex-end-point (match-end 0))

=== modified file 'lisp/cedet/semantic/tag-ls.el'
--- a/lisp/cedet/semantic/tag-ls.el     2011-11-16 12:34:47 +0000
+++ b/lisp/cedet/semantic/tag-ls.el     2011-12-04 08:02:42 +0000
@@ -195,7 +195,7 @@
 ;;;###autoload
 (define-overloadable-function semantic-tag-prototype-p (tag)
   "Return non nil if TAG is a prototype.
-For some laguages, such as C, a prototype is a declaration of
+For some languages, such as C, a prototype is a declaration of
 something without an implementation."
   )
 

=== modified file 'lisp/cedet/srecode/fields.el'
--- a/lisp/cedet/srecode/fields.el      2011-11-15 17:37:37 +0000
+++ b/lisp/cedet/srecode/fields.el      2011-12-04 08:02:42 +0000
@@ -324,7 +324,7 @@
   )
 
 (defvar srecode-field-replication-max-size 100
-  "Maximum size of a field before cancelling replication.")
+  "Maximum size of a field before canceling replication.")
 
 (defun srecode-field-mod-hook (ol after start end &optional pre-len)
   "Modification hook for the field overlay.

=== modified file 'lisp/delim-col.el'
--- a/lisp/delim-col.el 2011-11-09 06:10:51 +0000
+++ b/lisp/delim-col.el 2011-12-04 08:02:42 +0000
@@ -206,7 +206,7 @@
   :group 'columns)
 
 (defcustom delimit-columns-start 0
-  "Specify column number to start prettifing.
+  "Specify column number to start prettifying.
 
 See also `delimit-columns-end' for documentation.
 
@@ -221,7 +221,7 @@
   :group 'columns)
 
 (defcustom delimit-columns-end 1000000
-  "Specify column number to end prettifing.
+  "Specify column number to end prettifying.
 
 See also `delimit-columns-start' for documentation.
 

=== modified file 'lisp/delsel.el'
--- a/lisp/delsel.el    2011-10-19 12:54:24 +0000
+++ b/lisp/delsel.el    2011-12-04 08:02:42 +0000
@@ -144,7 +144,7 @@
 (put 'newline 'delete-selection t)
 (put 'open-line 'delete-selection 'kill)
 
-;; This is very useful for cancelling a selection in the minibuffer without
+;; This is very useful for canceling a selection in the minibuffer without
 ;; aborting the minibuffer.
 (defun minibuffer-keyboard-quit ()
   "Abort recursive edit.

=== modified file 'lisp/descr-text.el'
--- a/lisp/descr-text.el        2011-11-20 19:35:27 +0000
+++ b/lisp/descr-text.el        2011-12-04 08:02:42 +0000
@@ -358,7 +358,7 @@
       (compose-string (string ch) 0 1 (format "\t%c\t" ch))
     (string ch)))
 
-;; Return a nicely formated list of categories; extended category
+;; Return a nicely formatted list of categories; extended category
 ;; description is added to the category name as a tooltip
 (defsubst describe-char-categories (category-set)
   (let ((mnemonics (category-set-mnemonics category-set)))

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2011-10-30 01:56:03 +0000
+++ b/lisp/dired-x.el   2011-12-04 08:02:42 +0000
@@ -1392,7 +1392,7 @@
 ;; Apparently people do use it. - lrd 12/22/97.
 
 (with-no-warnings
-  ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix".
+  ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
   ;; This is unbearably ugly, but not more than having global variables
   ;; named size, time, name or s, however practical it can be while writing
   ;; `dired-mark-sexp' predicates.

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2011-12-03 05:01:41 +0000
+++ b/lisp/electric.el  2011-12-04 08:02:42 +0000
@@ -85,7 +85,7 @@
              (eq last-input-event ?\C-g))
          (progn (setq unread-command-events nil
                       prefix-arg nil)
-                ;; If it wasn't cancelling a prefix character, then quit.
+                ;; If it wasn't canceling a prefix character, then quit.
                 (if (or (= (length (this-command-keys)) 1)
                         (not inhibit-quit)) ; safety
                     (progn (ding)

=== modified file 'lisp/emacs-lisp/edebug.el'
--- a/lisp/emacs-lisp/edebug.el 2011-11-18 08:31:02 +0000
+++ b/lisp/emacs-lisp/edebug.el 2011-12-04 08:02:42 +0000
@@ -3448,7 +3448,7 @@
 (defun edebug-on-entry (function &optional flag)
   "Cause Edebug to stop when FUNCTION is called.
 With prefix argument, make this temporary so it is automatically
-cancelled the first time the function is entered."
+canceled the first time the function is entered."
   (interactive "aEdebug on entry to: \nP")
   ;; Could store this in the edebug data instead.
   (put function 'edebug-on-entry (if flag 'temp t)))

=== modified file 'lisp/emacs-lisp/eieio.el'
--- a/lisp/emacs-lisp/eieio.el  2011-11-23 07:03:56 +0000
+++ b/lisp/emacs-lisp/eieio.el  2011-12-04 08:02:42 +0000
@@ -57,7 +57,7 @@
 
 (eval-and-compile
 ;; About the above.  EIEIO must process its own code when it compiles
-;; itself, thus, by eval-and-compiling outselves, we solve the problem.
+;; itself, thus, by eval-and-compiling ourselves, we solve the problem.
 
 ;; Compatibility
 (if (fboundp 'compiled-function-arglist)

=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el        2011-10-20 01:40:32 +0000
+++ b/lisp/emulation/cua-base.el        2011-12-04 08:02:42 +0000
@@ -1242,7 +1242,7 @@
 
    ;; Handle shifted cursor keys and other movement commands.
    ;; If region is not active, region is activated if key is shifted.
-   ;; If region is active, region is cancelled if key is unshifted
+   ;; If region is active, region is canceled if key is unshifted
    ;;   (and region not started with C-SPC).
    ;; If rectangle is active, expand rectangle in specified direction and
    ;;   ignore the movement.

=== modified file 'lisp/emulation/cua-gmrk.el'
--- a/lisp/emulation/cua-gmrk.el        2011-01-25 04:08:28 +0000
+++ b/lisp/emulation/cua-gmrk.el        2011-12-04 08:02:42 +0000
@@ -94,7 +94,7 @@
 global marker is in another buffer.
 If the global marker isn't set, set the global marker at point in the current
 buffer.  Otherwise jump to the global marker position and cancel it.
-With prefix argument, don't jump to global mark when cancelling it."
+With prefix argument, don't jump to global mark when canceling it."
   (interactive "P")
   (unless cua--global-mark-initialized
     (cua--init-global-mark))

=== modified file 'lisp/emulation/vip.el'
--- a/lisp/emulation/vip.el     2011-10-30 01:56:03 +0000
+++ b/lisp/emulation/vip.el     2011-12-04 08:02:42 +0000
@@ -420,7 +420,7 @@
        (goto-char (point-min))
        (if (y-or-n-p "Inhibit VIP startup message? ")
            (progn
-             (with-current-buffer 
+             (with-current-buffer
                   (find-file-noselect
                    (substitute-in-file-name vip-startup-file))
                (goto-char (point-max))
@@ -877,7 +877,7 @@
   (if (> beg end) (exchange-point-and-mark)))
 
 (defun vip-global-execute ()
-  "Call last keyboad macro for each line in the region."
+  "Call last keyboard macro for each line in the region."
   (if (> (point) (mark)) (exchange-point-and-mark))
   (beginning-of-line)
   (call-last-kbd-macro)

=== modified file 'lisp/emulation/viper-cmd.el'
--- a/lisp/emulation/viper-cmd.el       2011-11-23 07:03:56 +0000
+++ b/lisp/emulation/viper-cmd.el       2011-12-04 08:02:42 +0000
@@ -716,7 +716,7 @@
     (error
      (viper-message-conditions conds))))
 
-;; escape to emacs mode termporarily
+;; escape to emacs mode temporarily
 (defun viper-escape-to-emacs (arg &optional events)
   "Escape to Emacs state from Vi state for one Emacs command.
 ARG is used as the prefix value for the executed command.  If
@@ -726,7 +726,7 @@
       (message "Switched to EMACS state for the next command..."))
   (viper-escape-to-state arg events 'emacs-state))
 
-;; escape to Vi mode termporarily
+;; escape to Vi mode temporarily
 (defun viper-escape-to-vi (arg)
   "Escape from Emacs state to Vi state for one Vi 1-character command.
 If the Vi command that the user types has a prefix argument, e.g., `d2w', then
@@ -2407,7 +2407,7 @@
    t 'local)
   (add-hook
    'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
-  ;; guard against a smartie who switched from R-replace to normal replace
+  ;; guard against a smarty who switched from R-replace to normal replace
   (remove-hook
    'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
   (if overwrite-mode (overwrite-mode -1))
@@ -2531,7 +2531,7 @@
    'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
   (add-hook
    'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
-  ;; guard against a smartie who switched from R-replace to normal replace
+  ;; guard against a smarty who switched from R-replace to normal replace
   (remove-hook
    'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
   )
@@ -3767,7 +3767,7 @@
               "//" 'vi-state
               [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e 
return]
               scope)
-             ;; toggle regexp/vanila search
+             ;; toggle regexp/vanilla search
              (viper-record-kbd-macro
               "///" 'vi-state
               [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e 
return]
@@ -3824,7 +3824,7 @@
             "//" 'emacs-state
             [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e 
return]
             (or arg-majormode major-mode))
-           ;; toggle regexp/vanila search
+           ;; toggle regexp/vanilla search
            (viper-record-kbd-macro
             "///" 'emacs-state
             [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e 
return]
@@ -4017,7 +4017,7 @@
   (setq viper-prefix-commands
        (cons viper-buffer-search-char viper-prefix-commands)))
 
-;; This is a Viper wraper for isearch-forward.
+;; This is a Viper wrapper for isearch-forward.
 (defun viper-isearch-forward (arg)
   "Do incremental search forward."
   (interactive "P")
@@ -4025,7 +4025,7 @@
   (if (listp arg) (setq arg (car arg)))
   (viper-exec-form-in-emacs (list 'isearch-forward arg)))
 
-;; This is a Viper wraper for isearch-backward."
+;; This is a Viper wrapper for isearch-backward."
 (defun viper-isearch-backward (arg)
   "Do incremental search backward."
   (interactive "P")

=== modified file 'lisp/emulation/viper-init.el'
--- a/lisp/emulation/viper-init.el      2011-11-23 07:03:56 +0000
+++ b/lisp/emulation/viper-init.el      2011-12-04 08:02:42 +0000
@@ -818,7 +818,7 @@
 ;;; Face-saving tricks
 
 (defgroup viper-highlighting nil
-  "Hilighting of replace region, search pattern, minibuffer, etc."
+  "Highlighting of replace region, search pattern, minibuffer, etc."
   :prefix "viper-"
   :group 'viper)
 

=== modified file 'lisp/emulation/viper-macs.el'
--- a/lisp/emulation/viper-macs.el      2011-11-26 08:26:37 +0000
+++ b/lisp/emulation/viper-macs.el      2011-12-04 08:02:42 +0000
@@ -921,7 +921,7 @@
 
 
 (defun viper-global-execute ()
-  "Call last keyboad macro for each line in the region."
+  "Call last keyboard macro for each line in the region."
   (if (> (point) (mark t)) (exchange-point-and-mark))
   (beginning-of-line)
   (call-last-kbd-macro)

=== modified file 'lisp/emulation/viper.el'
--- a/lisp/emulation/viper.el   2011-11-19 09:18:31 +0000
+++ b/lisp/emulation/viper.el   2011-12-04 08:02:42 +0000
@@ -491,7 +491,7 @@
     )
   "List specifying how to modify the various major modes to enable some 
Viperisms.
 The list has the structure: ((mode viper-state keymap) (mode viper-state
-keymap) ...).  If `mode' is on the list, the `kemap' will be made active (on
+keymap) ...).  If `mode' is on the list, the `keymap' will be made active (on
 the minor-mode-map-alist) in the specified viper state.
 If you change this list, have to restart Emacs for the change to take effect.
 However, if you did the change through the customization widget, then Emacs

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-11-28 19:43:52 +0000
+++ b/lisp/files.el     2011-12-04 08:02:42 +0000
@@ -4866,7 +4866,7 @@
                directory 'full directory-files-no-dot-files-regexp))
          (error "Directory is not empty, not moving to trash")
        (move-file-to-trash directory)))
-     ;; Otherwise, call outselves recursively if needed.
+     ;; Otherwise, call ourselves recursively if needed.
      (t
       (if (and recursive (not (file-symlink-p directory)))
          (mapc (lambda (file)
@@ -6110,7 +6110,7 @@
 
 (defvar kill-emacs-query-functions nil
   "Functions to call with no arguments to query about killing Emacs.
-If any of these functions returns nil, killing Emacs is cancelled.
+If any of these functions returns nil, killing Emacs is canceled.
 `save-buffers-kill-emacs' calls these functions, but `kill-emacs',
 the low level primitive, does not.  See also `kill-emacs-hook'.")
 

=== modified file 'lisp/follow.el'
--- a/lisp/follow.el    2011-11-27 04:43:11 +0000
+++ b/lisp/follow.el    2011-12-04 08:02:42 +0000
@@ -1129,7 +1129,7 @@
 ;;{{{ Redisplay
 
 ;; Redraw all the windows on the screen, starting with the top window.
-;; The window used as as marker is WIN, or the selcted window if WIN
+;; The window used as as marker is WIN, or the selected window if WIN
 ;; is nil.  Start every window directly after the end of the previous
 ;; window, to make sure long lines are displayed correctly.
 
@@ -1993,7 +1993,7 @@
 ;; going to be recentered at the next redisplay, unless we do a
 ;; read-and-write cycle to update the `force' flag inside the windows.
 ;;
-;; In 19.30, a new varible `window-scroll-functions' is called every
+;; In 19.30, a new variable `window-scroll-functions' is called every
 ;; time a window is recentered.  It is not perfect for our situation,
 ;; since when it is called for a tail window, it is to late.  However,
 ;; if it is called for another window, we can try to update our

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-12-04 01:55:49 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-04 08:02:42 +0000
@@ -365,7 +365,7 @@
        (message-mail-other-window, message-mail-other-frame)
        (message-news-other-window, message-news-other-frame):
        Use switch-to-buffer-other-frame and switch-to-buffer-other-window
-       instead of setting buffer display varibles.
+       instead of setting buffer display variables.
 
 2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
 
@@ -7128,7 +7128,7 @@
 
        * gnus-start.el (gnus-activate-group): Take an optional parameter to
        say that you don't want to call gnus-request-group with don-check, but
-       do check the reponse.  This is for virtual groups only.
+       do check the response.  This is for virtual groups only.
        (gnus-get-unread-articles): Count the archive groups as secondary, so
        that they're activated the same way as before.
 

=== modified file 'lisp/gnus/gnus-fun.el'
--- a/lisp/gnus/gnus-fun.el     2011-09-20 00:21:58 +0000
+++ b/lisp/gnus/gnus-fun.el     2011-12-04 08:02:42 +0000
@@ -274,10 +274,10 @@
     result))
 
 (defun gnus-fun-ppm-change-string ()
-  (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
-                       "%02x%02x00" "00%02x%02x" "%02x00%02x"))
+  (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x"
+                         "%02x%02x00" "00%02x%02x" "%02x00%02x"))
         (format (concat "'#%02x%02x%02x' '#"
-                        (nth (random 6) possibilites)
+                        (nth (random 6) possibilities)
                         "'"))
         (values nil))
   (dotimes (i 255)

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2011-12-01 04:55:39 +0000
+++ b/lisp/gnus/gnus-msg.el     2011-12-04 08:02:42 +0000
@@ -1588,7 +1588,7 @@
                       ;; BUG: We really need to get the charset for
                       ;; each name in the Newsgroups and Followup-To
                       ;; lines to allow crossposting between group
-                      ;; namess with incompatible character sets.
+                      ;; names with incompatible character sets.
                       ;; -- Per Abrahamsen <address@hidden> 2001-10-08.
                       (group-field-charset
                        (gnus-group-name-charset

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-11-23 07:03:56 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-12-04 08:02:42 +0000
@@ -7087,7 +7087,7 @@
 (defun gnus-summary-find-for-reselect ()
   "Return the number of an article to stay on across a reselect.
 The current article is considered, then following articles, then previous
-articles.  An article is sought which is not cancelled and isn't a temporary
+articles.  An article is sought which is not canceled and isn't a temporary
 insertion from another group.  If there's no such then return a dummy 0."
   (let (found)
     (dolist (rev '(nil t))

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-11-17 09:09:20 +0000
+++ b/lisp/gnus/gnus.el 2011-12-04 08:02:42 +0000
@@ -700,7 +700,7 @@
 (defface gnus-summary-cancelled
   '((((class color))
      (:foreground "yellow" :background "black")))
-  "Face used for cancelled articles."
+  "Face used for canceled articles."
   :group 'gnus-summary)
 ;; backward-compatibility alias
 (put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-12-04 02:02:45 +0000
+++ b/lisp/gnus/message.el      2011-12-04 08:02:42 +0000
@@ -906,7 +906,7 @@
   :type 'hook)
 
 (defcustom message-cancel-hook nil
-  "Hook run when cancelling articles."
+  "Hook run when canceling articles."
   :group 'message-various
   :link '(custom-manual "(message)Various Message Variables")
   :type 'hook)
@@ -4840,7 +4840,7 @@
                           (message-fetch-field "Followup-To")))
         ;; BUG: We really need to get the charset for each name in the
         ;; Newsgroups and Followup-To lines to allow crossposting
-        ;; between group namess with incompatible character sets.
+        ;; between group names with incompatible character sets.
         ;; -- Per Abrahamsen <address@hidden> 2001-10-08.
         (group-field-charset
          (gnus-group-name-charset method newsgroups-field))

=== modified file 'lisp/gnus/nndiary.el'
--- a/lisp/gnus/nndiary.el      2011-11-20 02:29:42 +0000
+++ b/lisp/gnus/nndiary.el      2011-12-04 08:02:42 +0000
@@ -353,7 +353,7 @@
   ;; List of NNDiary headers that specify the time spec. Each header name is
   ;; followed by either two integers (specifying a range of possible values
   ;; for this header) or one list (specifying all the possible values for this
-  ;; header). In the latter case, the list does NOT include the unspecifyed
+  ;; header). In the latter case, the list does NOT include the unspecified
   ;; spec (*).
   ;; For time zone values, we have symbolic time zone names associated with
   ;; the (relative) number of seconds ahead GMT.
@@ -1163,9 +1163,9 @@
   ;; Parse the schedule string STR, or signal an error.
   ;; Signals are caught by `nndary-schedule'.
   (if (string-match "[ \t]*\\*[ \t]*" str)
-      ;; unspecifyed
+      ;; unspecified
       nil
-    ;; specifyed
+    ;; specified
     (if (listp min-or-values)
        ;; min-or-values is values
        ;; #### NOTE: this is actually only a hack for time zones.

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-11-20 19:35:27 +0000
+++ b/lisp/gnus/nnir.el 2011-12-04 08:02:42 +0000
@@ -1273,8 +1273,8 @@
       (message "Doing hyrex-search query \"%s\"...done" qstring)
       (sit-for 0)
       ;; nnir-search returns:
-      ;;   for nnml/nnfolder: "filename mailid weigth"
-      ;;   for nnimap:        "group mailid weigth"
+      ;;   for nnml/nnfolder: "filename mailid weight"
+      ;;   for nnimap:        "group mailid weight"
       (goto-char (point-min))
       (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$")
       ;; HyREX doesn't search directly in groups -- so filter out here.

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-11-20 07:30:16 +0000
+++ b/lisp/gnus/nntp.el 2011-12-04 08:02:42 +0000
@@ -665,7 +665,7 @@
                                                   (process-buffer -process))))
                               ;; When I an able to identify the
                               ;; connection to the server AND I've
-                              ;; received NO reponse for
+                              ;; received NO response for
                               ;; nntp-connection-timeout seconds.
                               (when (and -buffer (eq 0 (buffer-size -buffer)))
                                 ;; Close the connection.  Take no

=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el   2011-11-15 07:55:13 +0000
+++ b/lisp/ibuffer.el   2011-12-04 08:02:42 +0000
@@ -426,7 +426,7 @@
       '(menu-item "Save current filter groups permanently..."
         ibuffer-save-filter-groups
         :enable (and (featurep 'ibuf-ext) ibuffer-filter-groups)
-        :help "Use a mnemnonic name to store current filter groups"))
+        :help "Use a mnemonic name to store current filter groups"))
     (define-key-after groups-map [switch-to-saved-filter-groups]
       '(menu-item "Restore permanently saved filters..."
         ibuffer-switch-to-saved-filter-groups
@@ -676,7 +676,7 @@
     (define-key-after map [menu-bar view filter save-filters]
       '(menu-item "Save current filters permanently..." ibuffer-save-filters
         :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)
-        :help "Use a mnemnonic name to store current filter stack"))
+        :help "Use a mnemonic name to store current filter stack"))
     (define-key-after map [menu-bar view filter switch-to-saved-filters]
       '(menu-item "Restore permanently saved filters..."
         ibuffer-switch-to-saved-filters

=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el        2011-11-25 07:14:48 +0000
+++ b/lisp/international/mule.el        2011-12-04 08:02:42 +0000
@@ -1785,7 +1785,7 @@
 succeed, it checks to see if any function in `auto-coding-functions'
 gives a match.
 
-If a coding system is specifed, the return value is a cons
+If a coding system is specified, the return value is a cons
 \(CODING . SOURCE), where CODING is the specified coding system and
 SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist',
 `:coding', or `auto-coding-functions' indicating by what CODING is

=== modified file 'lisp/international/quail.el'
--- a/lisp/international/quail.el       2011-11-18 08:31:02 +0000
+++ b/lisp/international/quail.el       2011-12-04 08:02:42 +0000
@@ -2703,7 +2703,7 @@
 
 ;; Generate a half-cooked decode map (char-table) for the current
 ;; Quail map.  An element for a character C is a key string or a list
-;; of a key strings to type to input C.  The lenth of key string is at
+;; of a key strings to type to input C.  The length of key string is at
 ;; most 2.  If it is 2, more keys may be required to input C.
 
 (defun quail-gen-decode-map ()

=== modified file 'lisp/international/titdic-cnv.el'
--- a/lisp/international/titdic-cnv.el  2011-11-25 07:14:48 +0000
+++ b/lisp/international/titdic-cnv.el  2011-12-04 08:02:42 +0000
@@ -122,7 +122,7 @@
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 
2:$(0Dm(N(B, 3: $(0&9Vy(B,
+SPC, 1, 2, 3, or 4 specifying a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 
2:$(0Dm(N(B, 3: $(0&9Vy(B,
 4:$(0(+Vy(B).
 
 \\<quail-translation-docstring>")
@@ -203,7 +203,7 @@
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 
3:$(0&9Vy(B, 4:$(0(+Vy(B,
+SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 
3:$(0&9Vy(B, 4:$(0(+Vy(B,
 7:$(0M=Vy(B).
 
 \\<quail-translation-docstring>")))

=== modified file 'lisp/international/ucs-normalize.el'
--- a/lisp/international/ucs-normalize.el       2011-08-24 07:33:55 +0000
+++ b/lisp/international/ucs-normalize.el       2011-12-04 08:02:42 +0000
@@ -227,7 +227,7 @@
          (eval-when-compile decomposition-pair-to-composition)))
 
 (defun ucs-normalize-primary-composite (decomposition-pair 
composition-predicate)
-  "Convert DECOMPOSITION-PAIR to primay composite using COMPOSITION-PREDICATE."
+  "Convert DECOMPOSITION-PAIR to primary composite using 
COMPOSITION-PREDICATE."
   (let ((char (or (gethash decomposition-pair
                            
ucs-normalize-decomposition-pair-to-primary-composite)
                   (and (<= #x1100 (car decomposition-pair))

=== modified file 'lisp/kmacro.el'
--- a/lisp/kmacro.el    2011-11-17 09:09:20 +0000
+++ b/lisp/kmacro.el    2011-12-04 08:02:42 +0000
@@ -747,7 +747,7 @@
 ;; Create a separate keymap installed as a minor-mode keymap (e.g. in
 ;; the emulation-mode-map-alists) in which macro bindings are made
 ;; independent of any other bindings.  When first binding is made,
-;; the kemap is created, installed, and enabled.  Key seq. C-x C-k +
+;; the keymap is created, installed, and enabled.  Key seq. C-x C-k +
 ;; can then be used to toggle the use of this keymap on and off.
 ;; This means that it would be safe(r) to bind ordinary keys like
 ;; letters and digits, provided that we inhibit the keymap while

=== modified file 'lisp/language/chinese.el'
--- a/lisp/language/chinese.el  2011-01-26 08:36:39 +0000
+++ b/lisp/language/chinese.el  2011-12-04 08:02:42 +0000
@@ -125,7 +125,7 @@
 (define-coding-system 'chinese-big5
   "BIG5 8-bit encoding for Chinese (MIME:Big5)"
   :coding-type 'big5
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5)
   :mime-charset 'big5)
 
@@ -152,7 +152,7 @@
 (define-coding-system 'chinese-big5-hkscs
   "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement 
(MIME:Big5-HKSCS)"
   :coding-type 'charset
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5-hkscs)
   :mime-charset 'big5-hkscs)
 (define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs)
@@ -191,7 +191,7 @@
                          chinese-cns11643-5 chinese-cns11643-6
                          chinese-cns11643-7)
                 (iso639-language . zh)
-                (setup-function . (lambda () 
+                (setup-function . (lambda ()
                                     (use-cjk-char-width-table 'zh_TW)))
                 (exit-function . use-default-char-width-table)
                 (coding-system iso-2022-cn euc-tw)
@@ -211,7 +211,7 @@
                             chinese-cns11643-5 chinese-cns11643-6
                             chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
                    (iso639-language . zh)
-                   (setup-function . (lambda () 
+                   (setup-function . (lambda ()
                                        (use-cjk-char-width-table 'zh_TW)))
                    (exit-function . use-default-char-width-table)
                    (coding-system euc-tw iso-2022-cn)
@@ -220,7 +220,7 @@
                    (features china-util)
                    (input-method . "chinese-cns-quick")
                    (documentation . "\
-Support for Chinese, prefering the EUC-TW character set.  Note that
+Support for Chinese, preferring the EUC-TW character set.  Note that
 the EUC-TW coding system accepts Big5 for input also (which is then
 converted to CNS)."))
  '("Chinese"))
@@ -241,13 +241,13 @@
 (set-language-info-alist
  "Chinese-GBK" '((charset chinese-gbk)
                 (iso639-language . zh)
-                (setup-function . (lambda () 
+                (setup-function . (lambda ()
                                     (use-cjk-char-width-table 'zh_CN)))
                 (exit-function . use-default-char-width-table)
                 (coding-system chinese-gbk)
                 (coding-priority gbk iso-2022-cn chinese-big5
                                  chinese-iso-8bit) ; fixme?
-                (ctext-non-standard-encodings "gbk-0")          
+                (ctext-non-standard-encodings "gbk-0")
                 (input-method . "chinese-py-punct") ; fixme?
                 (sample-text . "Chinese 
($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B")
                 (features china-util)

=== modified file 'lisp/language/viet-util.el'
--- a/lisp/language/viet-util.el        2011-01-26 08:36:39 +0000
+++ b/lisp/language/viet-util.el        2011-12-04 08:02:42 +0000
@@ -34,7 +34,7 @@
 ;; for representing these characters: VISCII, TCVN-5712, VPS, VIQR,
 ;; and Unicode.  VISCII, TCVN-5712 and VPS are simple 1-byte code
 ;; which assigns 134 unique characters in control-code area
-;; (0x00..0x1F) and right half area (0x80..0xFF).  VIQR is a menmonic
+;; (0x00..0x1F) and right half area (0x80..0xFF).  VIQR is a mnemonic
 ;; encoding specification representing diacritical marks by following
 ;; ASCII characters.
 
@@ -47,7 +47,7 @@
   "Return VISCII character code of CHAR if appropriate."
   (encode-char char 'viscii))
 
-;; VIQR is a menmonic encoding specification for Vietnamese.
+;; VIQR is a mnemonic encoding specification for Vietnamese.
 ;; It represents diacritical marks by ASCII characters as follows:
 ;; ------------+----------+--------
 ;;     mark    | mnemonic | example

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2011-12-01 19:38:24 +0000
+++ b/lisp/man.el       2011-12-04 08:02:42 +0000
@@ -687,7 +687,7 @@
          ;; Otherwise record the current column and look backwards.
          (setq column (current-column))
          (skip-chars-backward ",; \t")
-         ;; Record the distance travelled.
+         ;; Record the distance traveled.
          (setq distance (- column (current-column)))
          (when (looking-back
                 (concat "([ \t]*\\(?:" Man-section-regexp "\\)[ \t]*)"))

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2011-11-27 04:43:11 +0000
+++ b/lisp/net/ange-ftp.el      2011-12-04 08:02:42 +0000
@@ -1664,7 +1664,7 @@
           (if (not (and seen-prompt ange-ftp-pending-error-line))
               (ange-ftp-process-handle-line line proc)
             ;; If we've seen a potential error message and it
-            ;; hasn't been cancelled by a good message before
+            ;; hasn't been canceled by a good message before
             ;; seeing a prompt, then the error was real.
             (delete-process proc)
             (setq ange-ftp-process-busy nil

=== modified file 'lisp/net/zeroconf.el'
--- a/lisp/net/zeroconf.el      2011-11-14 23:59:56 +0000
+++ b/lisp/net/zeroconf.el      2011-12-04 08:02:42 +0000
@@ -82,7 +82,7 @@
 
 ;; The function `zeroconf-publish-service' publishes a new service to
 ;; the Avahi daemon.  Although the domain, where to the service is
-;; published, can be specified by this function, it is usally the
+;; published, can be specified by this function, it is usually the
 ;; default domain "local" (also written as nil or "").
 
 ;;   (zeroconf-publish-service

=== modified file 'lisp/nxml/rng-valid.el'
--- a/lisp/nxml/rng-valid.el    2011-11-27 04:43:11 +0000
+++ b/lisp/nxml/rng-valid.el    2011-12-04 08:02:42 +0000
@@ -377,8 +377,8 @@
 (defun rng-kill-timers ()
   ;; rng-validate-timer and rng-validate-quick-timer have the
   ;; permanent-local property, so that the timers can be
-  ;; cancelled even after changing mode.
-  ;; This function takes care of cancelling the timers and
+  ;; canceled even after changing mode.
+  ;; This function takes care of canceling the timers and
   ;; then killing the local variables.
   (when (local-variable-p 'rng-validate-timer)
     (when rng-validate-timer

=== modified file 'lisp/obsolete/pgg.el'
--- a/lisp/obsolete/pgg.el      2011-01-25 04:08:28 +0000
+++ b/lisp/obsolete/pgg.el      2011-12-04 08:02:42 +0000
@@ -174,7 +174,7 @@
 (defvar pgg-pending-timers (make-vector 7 0)
   "Hash table for managing scheduled pgg cache management timers.
 
-We associate key and timer, so the timer can be cancelled if a new
+We associate key and timer, so the timer can be canceled if a new
 timeout for the key is set while an old one is still pending.")
 
 (defun pgg-read-passphrase (prompt &optional key notruncate)

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2011-11-25 07:14:48 +0000
+++ b/lisp/org/ChangeLog        2011-12-04 08:02:42 +0000
@@ -278,7 +278,7 @@
 
        * org-archive.el (org-archive-subtree): While it might be possible
        to archive an headline of a temporary buffer (i.e. not visiting a
-       file), it wouldn't be really sensical.
+       file), it wouldn't be really sensible.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
@@ -4008,7 +4008,7 @@
        * org-list.el (org-list-blocks): New variable.
        (org-list-context): New function.
        (org-list-full-item-re): New variable.
-       (org-list-struct-assoc-at-point): Use new varible.
+       (org-list-struct-assoc-at-point): Use new variable.
        (org-list-struct): Rewrite of function.  Now, list data is
        collected by looking at the list line after line.  It reads the
        whole list each time because reading only a subtree was not enough
@@ -8139,7 +8139,7 @@
 2010-11-11  Nicolas Goaziou  <address@hidden>
 
        * org-list.el (org-insert-item-internal): New function to handle
-       positionning and contents of an item being inserted at a specific
+       positioning and contents of an item being inserted at a specific
        pos. It is not possible anymore to split a term in a description
        list or a checkbox when inserting a new item.
 
@@ -9758,7 +9758,7 @@
 
 2010-07-19  Bastien Guerry  <address@hidden>
 
-       * org-timer.el (org-timer-set-timer): Fix bug about cancelling
+       * org-timer.el (org-timer-set-timer): Fix bug about canceling
        timers.
 
 2010-07-19  David Maus  <address@hidden>
@@ -12582,7 +12582,7 @@
        buffer and at the position of the given clock.  However, changes
        to the current clock are local and have no effect on the user's
        active clock.  This allows, for example, far any clock to be
-       cancelled without cancelling the active clock.
+       canceled without canceling the active clock.
        (org-clock-clock-in): New inline function that switches the active
        clock to the given clock.  If either the argument RESUME, or the
        global `org-clock-in-resume', are non-nil, it will resume a clock

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2011-11-27 04:43:11 +0000
+++ b/lisp/org/org-agenda.el    2011-12-04 08:02:42 +0000
@@ -8331,7 +8331,7 @@
          (org-agenda-remove-flag hdmarker)
          (let ((win (get-buffer-window "*Flagging Note*")))
            (and win (delete-window win)))
-         (message "Entry unflaged"))
+         (message "Entry unflagged"))
       (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
       (unless note
        (error "No flagging note"))
@@ -8354,7 +8354,7 @@
       (org-entry-delete nil "THEFLAGGINGNOTE")
       (setq newhead (org-get-heading)))
     (org-agenda-change-all-lines newhead marker)
-    (message "Entry unflaged")))
+    (message "Entry unflagged")))
 
 (defun org-agenda-get-any-marker (&optional pos)
   (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)

=== modified file 'lisp/org/org-clock.el'
--- a/lisp/org/org-clock.el     2011-11-23 07:03:56 +0000
+++ b/lisp/org/org-clock.el     2011-12-04 08:02:42 +0000
@@ -328,7 +328,7 @@
   "Hook run when stopping the current clock.")
 
 (defvar org-clock-cancel-hook nil
-  "Hook run when cancelling the current clock.")
+  "Hook run when canceling the current clock.")
 (defvar org-clock-goto-hook nil
   "Hook run when selecting the currently clocked-in entry.")
 (defvar org-clock-has-been-used nil
@@ -346,7 +346,7 @@
 (defvar org-clock-start-time "")
 
 (defvar org-clock-leftover-time nil
-  "If non-nil, user cancelled a clock; this is when leftover time started.")
+  "If non-nil, user canceled a clock; this is when leftover time started.")
 
 (defvar org-clock-effort ""
   "Effort estimate of the currently clocking task.")

=== modified file 'lisp/org/org-list.el'
--- a/lisp/org/org-list.el      2011-11-20 09:44:39 +0000
+++ b/lisp/org/org-list.el      2011-12-04 08:02:42 +0000
@@ -68,7 +68,7 @@
 
 ;; Computing a list structure can be a costly operation on huge lists
 ;; (a few thousand lines long).  Thus, code should follow the rule :
-;; "collect once, use many".  As a corollary, it is usally a bad idea
+;; "collect once, use many".  As a corollary, it is usually a bad idea
 ;; to use directly an interactive function inside the code, as those,
 ;; being independent entities, read the whole list structure another
 ;; time.

=== modified file 'lisp/org/org-protocol.el'
--- a/lisp/org/org-protocol.el  2011-08-18 20:41:06 +0000
+++ b/lisp/org/org-protocol.el  2011-12-04 08:02:42 +0000
@@ -145,8 +145,8 @@
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
 
-This is done by advising `server-visit-files' to scann the list of filenames
-for `org-protocol-the-protocol' and sub-procols defined in
+This is done by advising `server-visit-files' to scan the list of filenames
+for `org-protocol-the-protocol' and sub-protocols defined in
 `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
   :version "22.1"
   :group 'convenience

=== modified file 'lisp/org/org-publish.el'
--- a/lisp/org/org-publish.el   2011-11-14 23:59:56 +0000
+++ b/lisp/org/org-publish.el   2011-12-04 08:02:42 +0000
@@ -278,12 +278,12 @@
   :type 'string)
 
 (defcustom org-publish-sitemap-file-entry-format "%t"
-  "How a sitemap file entry is formated.
+  "How a sitemap file entry is formatted.
 You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date formated using `org-publish-sitemap-date-format'."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-publish
   :type 'string)
 

=== modified file 'lisp/org/org-taskjuggler.el'
--- a/lisp/org/org-taskjuggler.el       2011-11-18 08:31:02 +0000
+++ b/lisp/org/org-taskjuggler.el       2011-12-04 08:02:42 +0000
@@ -571,7 +571,7 @@
     (and filtered-items (mapconcat 'identity filtered-items "\n"))))
 
 (defun org-taskjuggler-get-attributes (item attributes)
-  "Return all attribute as a single formated string. ITEM is an
+  "Return all attributes as a single formatted string. ITEM is an
 alist representing either a resource or a task. ATTRIBUTES is a
 list of symbols. Only entries from ITEM are considered that are
 listed in ATTRIBUTES."

=== modified file 'lisp/play/gametree.el'
--- a/lisp/play/gametree.el     2011-04-21 12:24:46 +0000
+++ b/lisp/play/gametree.el     2011-12-04 08:02:42 +0000
@@ -549,7 +549,7 @@
 (defun gametree-save-and-hack-layout ()
   "Save the current tree layout and hack the file local variable spec.
 This function saves the current layout in `gametree-local-layout' and,
-if a local file varible specification for this variable exists in the
+if a local file variable specification for this variable exists in the
 buffer, it is replaced by the new value.  See the documentation for
 `gametree-local-layout' for more information."
   (interactive)

=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2011-11-24 01:58:14 +0000
+++ b/lisp/progmodes/cc-cmds.el 2011-12-04 08:02:42 +0000
@@ -2051,7 +2051,7 @@
        (c-narrow-to-comment-innards range) ; This may move point back.
        (let* ((here (point))
               last
-              (here-filler        ; matches WS and comment-prefices at point.
+              (here-filler        ; matches WS and comment-prefixes at point.
                (concat "\\=\\(^[ \t]*\\(" c-current-comment-prefix "\\)"
                        "\\|[ \t\n\r\f]\\)*"))
               (prefix-at-bol-here ; matches WS and prefix at BOL, just before 
point
@@ -2071,7 +2071,7 @@
 
          ;; Now seek successively earlier sentence ends between PAR-BEG and
          ;; HERE, until the "start of sentence" following it is earlier than
-         ;; HERE, or we hit PAR-BEG.  Beware of comment prefices!
+         ;; HERE, or we hit PAR-BEG.  Beware of comment prefixes!
          (while (and (re-search-backward (c-sentence-end) par-beg 'limit)
                      (setq last (point))
                      (goto-char (match-end 0)) ; tentative beginning of 
sentence

=== modified file 'lisp/progmodes/dcl-mode.el'
--- a/lisp/progmodes/dcl-mode.el        2011-11-15 17:37:37 +0000
+++ b/lisp/progmodes/dcl-mode.el        2011-12-04 08:02:42 +0000
@@ -708,7 +708,7 @@
            (setq done t)               ; not a label-only line, exit the loop
            (setq retval (point))))
        ;; We couldn't go further back, and we haven't found a command yet.
-       ;; Return to the start positionn
+       ;; Return to the start position.
        (goto-char start)
        (setq done t)
        (setq retval nil)))
@@ -756,7 +756,7 @@
              (setq done t)             ; not a label-only line, exit the loop
              (setq retval (point)))))
        ;; We couldn't go further back, and we haven't found a command yet.
-       ;; Return to the start positionn
+       ;; Return to the start position.
        (goto-char start)
        (setq done t)
        (setq retval nil)))

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2011-11-20 03:48:53 +0000
+++ b/lisp/progmodes/idlwave.el 2011-12-04 08:02:42 +0000
@@ -7866,7 +7866,7 @@
   "Display online help about the completion at point."
   (interactive "eP")
   ;; Restore last-command for next command, to make
-  ;; scrolling/cancelling of completions work.
+  ;; scrolling/canceling of completions work.
   (setq this-command last-command)
   (idlwave-do-mouse-completion-help ev))
 

=== modified file 'lisp/progmodes/js.el'
--- a/lisp/progmodes/js.el      2011-11-19 09:18:31 +0000
+++ b/lisp/progmodes/js.el      2011-12-04 08:02:42 +0000
@@ -3000,7 +3000,7 @@
                       '(js> ((fifth hitab) "selectedTab") (fourth hitab))
                       cmds)))
 
-                  ;; Hilighting whole window
+                  ;; Highlighting whole window
                   ((third hitab)
                    (push '(js! ((third hitab) "document"
                                 "documentElement" "setAttribute")

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el       2011-11-20 02:29:42 +0000
+++ b/lisp/progmodes/vhdl-mode.el       2011-12-04 08:02:42 +0000
@@ -1714,7 +1714,7 @@
 
 
 (defgroup vhdl-menu nil
-  "Customizations for menues."
+  "Customizations for menus."
   :group 'vhdl)
 
 (defcustom vhdl-index-menu nil
@@ -1844,7 +1844,7 @@
 ;; Internal variables
 
 (defvar vhdl-menu-max-size 20
-  "*Specifies the maximum size of a menu before splitting it into submenues.")
+  "*Specifies the maximum size of a menu before splitting it into submenus.")
 
 (defvar vhdl-progress-interval 1
   "*Interval used to update progress status during long operations.
@@ -2468,7 +2468,7 @@
   (goto-char marker))
 
 (defun vhdl-menu-split (list title)
-  "Split menu LIST into several submenues, if number of
+  "Split menu LIST into several submenus, if number of
 elements > `vhdl-menu-max-size'."
   (if (> (length list) vhdl-menu-max-size)
       (let ((remain list)

=== modified file 'lisp/ses.el'
--- a/lisp/ses.el       2011-11-23 07:03:56 +0000
+++ b/lisp/ses.el       2011-12-04 08:02:42 +0000
@@ -2273,7 +2273,7 @@
 
 (defun ses-read-printer (prompt default)
   "Common code for `ses-read-cell-printer', `ses-read-column-printer', and 
`ses-read-default-printer'.
-PROMPT should end with \": \".  Result is t if operation was cancelled."
+PROMPT should end with \": \".  Result is t if operation was canceled."
   (barf-if-buffer-read-only)
   (if (eq default t)
       (setq default "")

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-11-19 19:49:56 +0000
+++ b/lisp/simple.el    2011-12-04 08:02:42 +0000
@@ -1582,7 +1582,7 @@
      n)
     ;; next-matching-history-element always puts us at (point-min).
     ;; Move to the position we were at before changing the buffer contents.
-    ;; This is still sensical, because the text before point has not changed.
+    ;; This is still sensible, because the text before point has not changed.
     (goto-char point-at-start)))
 
 (defun previous-complete-history-element (n)
@@ -5704,7 +5704,7 @@
 (defvar buffer-quit-function nil
   "Function to call to \"quit\" the current buffer, or nil if none.
 \\[keyboard-escape-quit] calls this function when its more local actions
-\(such as cancelling a prefix argument, minibuffer or region) do not apply.")
+\(such as canceling a prefix argument, minibuffer or region) do not apply.")
 
 (defun keyboard-escape-quit ()
   "Exit the current \"mode\" (in a generalized sense of the word).
@@ -6209,7 +6209,7 @@
               choice buffer base-position nil)
         ;; This remove-text-properties should be unnecessary since `choice'
         ;; comes from buffer-substring-no-properties.
-        ;;(remove-text-properties 0 (lenth choice) '(mouse-face nil) choice)
+        ;;(remove-text-properties 0 (length choice) '(mouse-face nil) choice)
        ;; Insert the completion into the buffer where it was requested.
         (funcall (or insert-function completion-list-insert-choice-function)
                  (or (car base-position) (point))

=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el  2011-11-27 04:43:11 +0000
+++ b/lisp/speedbar.el  2011-12-04 08:02:42 +0000
@@ -1862,7 +1862,7 @@
            (if (not v)
                (setq speedbar-special-mode-expansion-list t)
              ;; If it is autoloaded, we need to load it now so that
-             ;; we have access to the varialbe -speedbar-menu-items.
+             ;; we have access to the variable -speedbar-menu-items.
              ;; Is this XEmacs safe?
              (let ((sf (symbol-function v)))
                (if (and (listp sf) (eq (car sf) 'autoload))

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2011-11-14 21:00:24 +0000
+++ b/lisp/term/x-win.el        2011-12-04 08:02:42 +0000
@@ -126,7 +126,7 @@
 
 (defun emacs-session-save ()
   "This function is called when the window system is shutting down.
-If this function returns non-nil, the window system shutdown is cancelled.
+If this function returns non-nil, the window system shutdown is canceled.
 
 When a session manager tells Emacs that the window system is shutting
 down, this function is called.  It calls the functions in the hook

=== modified file 'lisp/textmodes/artist.el'
--- a/lisp/textmodes/artist.el  2011-11-23 07:03:56 +0000
+++ b/lisp/textmodes/artist.el  2011-12-04 08:02:42 +0000
@@ -3960,11 +3960,11 @@
 ;; Implementation note: This really should honor the interval-fn entry
 ;; in the master table, `artist-mt', which would mean leaving a timer
 ;; that calls `draw-fn' every now and then. That timer would then have
-;; to be cancelled and reinstalled whenever the user moves the cursor.
+;; to be canceled and reinstalled whenever the user moves the cursor.
 ;; This could be done, but what if the user suddenly switches to another
 ;; drawing mode, or even kills the buffer! In the mouse case, it is much
 ;; simpler: when at the end of `artist-mouse-draw-continously', the
-;; user has released the button, so the timer will always be cancelled
+;; user has released the button, so the timer will always be canceled
 ;; at that point.
 (defun artist-key-draw-continously (x y)
   "Draw current continuous shape at X,Y."
@@ -5589,7 +5589,7 @@
 ;;         of drawing mode.
 ;;
 ;;         You should provide these functions. You might think that
-;;         only you is using your type of mode, so noone will be able
+;;         only you is using your type of mode, so no one will be able
 ;;         to switch to another operation of the same type of mode,
 ;;         but someone else might base a new drawing mode upon your
 ;;         work.

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2011-11-27 04:43:11 +0000
+++ b/lisp/textmodes/ispell.el  2011-12-04 08:02:42 +0000
@@ -2499,7 +2499,7 @@
       ;; hidden by new window, scroll it to just below new win
       ;; otherwise set top line of other win so it doesn't scroll.
       (if (< oldot top) (setq top oldot))
-      ;; if frame is unsplitable, temporarily disable that...
+      ;; if frame is unsplittable, temporarily disable that...
       (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
          (let ((frame (selected-frame)))
            (modify-frame-parameters frame '((unsplittable . nil)))
@@ -3979,7 +3979,7 @@
 ; LocalWords:  AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
 ; LocalWords:  minipage modeline pers dict unhighlight buf grep sync prev inc
 ; LocalWords:  fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
-; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
+; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict
 ; LocalWords:  lns XEmacs HTML casechars Multibyte
 
 ;;; ispell.el ends here

=== modified file 'lisp/textmodes/reftex-dcr.el'
--- a/lisp/textmodes/reftex-dcr.el      2011-11-20 03:48:53 +0000
+++ b/lisp/textmodes/reftex-dcr.el      2011-12-04 08:02:42 +0000
@@ -212,7 +212,7 @@
       (add-hook 'pre-command-hook 'reftex-highlight-shall-die)
 
       (when (eq how 'tmp-window)
-        ;; Resize window and arrange restauration
+        ;; Resize window and arrange restoration
         (shrink-window (1- (- (window-height) 9)))
         (recenter '(4))
         (add-hook 'pre-command-hook 'reftex-restore-window-conf))

=== modified file 'lisp/textmodes/table.el'
--- a/lisp/textmodes/table.el   2011-11-27 18:17:40 +0000
+++ b/lisp/textmodes/table.el   2011-12-04 08:02:42 +0000
@@ -4293,7 +4293,7 @@
     (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t))))
     (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil 
t))))))))
 
-(defun table-call-interactively (function &optional recoard-flag keys)
+(defun table-call-interactively (function &optional record-flag keys)
   "Call FUNCTION, or a table version of it if applicable.
 See `call-interactively' for full description of the arguments."
   (let ((table-func (intern-soft (format "*table--cell-%s" function))))
@@ -4301,7 +4301,7 @@
      (if (and table-func
              (table--point-in-cell-p))
         table-func
-       function) recoard-flag keys)))
+       function) record-flag keys)))
 
 (defun table-funcall (function &rest arguments)
   "Call FUNCTION, or a table version of it if applicable.

=== modified file 'lisp/textmodes/texinfmt.el'
--- a/lisp/textmodes/texinfmt.el        2011-12-03 20:44:19 +0000
+++ b/lisp/textmodes/texinfmt.el        2011-12-04 08:02:42 +0000
@@ -2088,11 +2088,11 @@
         (table-entry-height 0)
         ;; unformatted row looks like:  A1  @tab  A2  @tab  A3
         ;; extract-row command deletes the source line in the table.
-        (unformated-row (texinfo-multitable-extract-row)))
+        (unformatted-row (texinfo-multitable-extract-row)))
     ;; Use a temporary buffer
     (set-buffer (get-buffer-create texinfo-multitable-buffer-name))
     (delete-region (point-min) (point-max))
-    (insert unformated-row)
+    (insert unformatted-row)
     (goto-char (point-min))
 ;; 1. Check for correct number of @tab in line.
     (let ((tab-number 1))               ; one @tab between two columns

=== modified file 'lisp/time.el'
--- a/lisp/time.el      2011-10-19 12:54:24 +0000
+++ b/lisp/time.el      2011-12-04 08:02:42 +0000
@@ -369,7 +369,7 @@
       nil)))
 
 (with-no-warnings
-  ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix".
+  ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
   (defvar now)
   (defvar time)
   (defvar load)

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2011-11-27 04:43:11 +0000
+++ b/lisp/url/ChangeLog        2011-12-04 08:02:42 +0000
@@ -1673,7 +1673,7 @@
        (url-dav-process-DAV:activelock)
        (url-dav-process-DAV:lockdiscovery): Can now correctly parse
        DAV:lockdiscovery nodes, so that we can find out who has a
-       resource locked and properly parse the reponse to a LOCK request.
+       resource locked and properly parse the response to a LOCK request.
        (url-dav-process-DAV:status): Now parses out the numeric status
        from the HTTP response line.
        (url-dav-process-response): New function to handle all the

=== modified file 'lisp/url/url-gw.el'
--- a/lisp/url/url-gw.el        2011-04-02 23:41:03 +0000
+++ b/lisp/url/url-gw.el        2011-12-04 08:02:42 +0000
@@ -72,12 +72,12 @@
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-login-prompt "^\r*.?login:"
-  "Prompt that tells us we should send our username when loggin in w/telnet."
+  "Prompt that tells us we should send our username when logging in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-password-prompt "^\r*.?password:"
-  "Prompt that tells us we should send our password when loggin in w/telnet."
+  "Prompt that tells us we should send our password when logging in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2011-11-14 06:27:12 +0000
+++ b/lisp/vc/ediff-init.el     2011-12-04 08:02:42 +0000
@@ -370,7 +370,7 @@
             this-command)))
 
 (defgroup ediff-highlighting nil
-  "Hilighting of difference regions in Ediff."
+  "Highlighting of difference regions in Ediff."
   :prefix "ediff-"
   :group 'ediff)
 

=== modified file 'lisp/vc/pcvs.el'
--- a/lisp/vc/pcvs.el   2011-11-17 09:09:20 +0000
+++ b/lisp/vc/pcvs.el   2011-12-04 08:02:42 +0000
@@ -322,7 +322,7 @@
 by appending the branch to ARG which defaults to \"-r\".
 Since the `cvs-secondary-branch-prefix' is only active if the primary
 prefix is active, it is important to read the secondary prefix before
-the primay since reading the primary can deactivate it."
+the primary since reading the primary can deactivate it."
   (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only)
                     (cvs-prefix-get 'cvs-secondary-branch-prefix))))
     (if branch (cons (concat (or arg "-r") branch) flags) flags)))

=== modified file 'lisp/vcursor.el'
--- a/lisp/vcursor.el   2011-01-25 04:08:28 +0000
+++ b/lisp/vcursor.el   2011-12-04 08:02:42 +0000
@@ -223,7 +223,7 @@
 ;; automatically for a PC if Oemacs is detected.  This set uses separate
 ;; control, shift and meta keys with function keys 1 to 10.  In
 ;; particular, movement keys are concentrated on f5 to f8 with (in
-;; increasing order of distance travelled) C-, M- and S- as prefixes.
+;; increasing order of distance traveled) C-, M- and S- as prefixes.
 ;; See the actual bindings below (search for C-f1).  This is because the
 ;; C-S- prefix is represented by weird key sequences and the set is
 ;; incomplete; if you don't mind that, some hints are given in comments

=== modified file 'lisp/view.el'
--- a/lisp/view.el      2011-11-24 07:09:56 +0000
+++ b/lisp/view.el      2011-12-04 08:02:42 +0000
@@ -481,7 +481,7 @@
   ;; sets view-read-only to t as a buffer-local variable
   ;; after exiting View mode.  That arranges that the next toggle-read-only
   ;; will reenable View mode.
-  ;; Cancelling View mode in any other way should cancel that, too,
+  ;; Canceling View mode in any other way should cancel that, too,
   ;; so that View mode stays off if toggle-read-only is called.
   (if (local-variable-p 'view-read-only)
       (kill-local-variable 'view-read-only))

=== modified file 'lisp/wid-edit.el'
--- a/lisp/wid-edit.el  2011-11-15 07:55:13 +0000
+++ b/lisp/wid-edit.el  2011-12-04 08:02:42 +0000
@@ -295,10 +295,10 @@
             (error "Canceled"))
           value))))
 
-(defun widget-remove-if (predictate list)
+(defun widget-remove-if (predicate list)
   (let (result (tail list))
     (while tail
-      (or (funcall predictate (car tail))
+      (or (funcall predicate (car tail))
          (setq result (cons (car tail) result)))
       (setq tail (cdr tail)))
     (nreverse result)))
@@ -577,7 +577,7 @@
   "Map FUNCTION over the buttons in BUFFER.
 FUNCTION is called with the arguments WIDGET and MAPARG.
 
-If FUNCTION returns non-nil, the walk is cancelled.
+If FUNCTION returns non-nil, the walk is canceled.
 
 The arguments MAPARG, and BUFFER default to nil and (current-buffer),
 respectively."

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-11-28 19:43:52 +0000
+++ b/lisp/window.el    2011-12-04 08:02:42 +0000
@@ -1211,7 +1211,7 @@
 PREDICATE on each one of them with the window as its sole
 argument.  Return the first window for which PREDICATE returns
 non-nil.  Windows are scanned starting with the window following
-the selcted window.  If no window satisfies PREDICATE, return
+the selected window.  If no window satisfies PREDICATE, return
 DEFAULT.
 
 MINIBUF t means include the minibuffer window even if the
@@ -5234,7 +5234,7 @@
        ;; This `condition-case' shouldn't be necessary, but who knows?
        (condition-case nil
            (if (zerop delta)
-               ;; Return zero if DELTA became zero in the proces.
+               ;; Return zero if DELTA became zero in the process.
                0
              ;; Don't try to redisplay with the cursor at the end on its
              ;; own line--that would force a scroll and spoil things.

=== modified file 'nt/addpm.c'
--- a/nt/addpm.c        2011-03-25 15:39:59 +0000
+++ b/nt/addpm.c        2011-12-04 08:02:42 +0000
@@ -250,7 +250,7 @@
                               MB_OKCANCEL | MB_ICONQUESTION);
          if (result != IDOK)
            {
-             fprintf (stderr, "Install cancelled\n");
+             fprintf (stderr, "Install canceled\n");
              exit (1);
            }
        }
@@ -365,4 +365,3 @@
 
   return 0;
 }
-

=== modified file 'src/ChangeLog.10'
--- a/src/ChangeLog.10  2011-11-27 18:17:40 +0000
+++ b/src/ChangeLog.10  2011-12-04 08:02:42 +0000
@@ -516,7 +516,7 @@
        * w32fns.c (current_popup_menu): Use from w32menu.c.
        (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active
        and current_popup_menu to determine whether a menubar menu has
-       been cancelled.
+       been canceled.
 
        * w32term.h (w32_output): Remove menu_command_in_progress.
 

=== modified file 'src/ChangeLog.11'
--- a/src/ChangeLog.11  2011-11-27 04:43:11 +0000
+++ b/src/ChangeLog.11  2011-12-04 08:02:42 +0000
@@ -23182,7 +23182,7 @@
        * font.c (font_prop_validate_symbol, font_prop_validate_style)
        (font_prop_validate_non_neg, font_prop_validate_spacing):
        Delete argument prop_index.
-       (font_property_table): Change arguments to validater.  Change Callers.
+       (font_property_table): Change arguments to validator.  Change Callers.
        (font_lispy_object): Delete.
        (font_at): Use font_find_object instead fo font_lispy_object.
 

=== modified file 'src/ChangeLog.2'
--- a/src/ChangeLog.2   2011-11-20 02:29:42 +0000
+++ b/src/ChangeLog.2   2011-12-04 08:02:42 +0000
@@ -1811,7 +1811,7 @@
 1987-03-13  Richard M. Stallman  (address@hidden)
 
        * sysdep.c: Don't redefine TCSETAW if already defined.
-       (Cancelled by change on March 17).
+       (Canceled by change on March 17).
 
        * sunfns.c: New file containing interface to Sun windows.
        This is enabled by the switch HAVE_SUN_WINDOWS.

=== modified file 'src/ChangeLog.8'
--- a/src/ChangeLog.8   2011-11-27 04:43:11 +0000
+++ b/src/ChangeLog.8   2011-12-04 08:02:42 +0000
@@ -12583,7 +12583,7 @@
        quit_char is typed, in order to break out of potential deadlocks.
        (cancel_all_deferred_msgs): New function.
        (complete_deferred_msg): Don't abort if msg not found; may have
-       been cancelled.
+       been canceled.
        (Fw32_reconstruct_hot_key): Use pre-interned symbols.
        (Fw32_send_sys_command): Wait for system command to
        complete before returning.
@@ -13701,7 +13701,7 @@
        * ccl.c (CCL_WRITE_CHAR): Don't use bcopy.
        (ccl_driver): If BUFFER-MAGNIFICATION of the CCL program is 0,
        cause error if the program is going to output some bytes.  When
-       outputing a string to notify an error, check the case that
+       outputting a string to notify an error, check the case that
        DST_BYTES is zero.
 
        * coding.h (CODING_FINISH_INTERRUPT): New macro.

=== modified file 'src/ccl.c'
--- a/src/ccl.c 2011-11-25 07:14:48 +0000
+++ b/src/ccl.c 2011-12-04 08:02:42 +0000
@@ -552,7 +552,7 @@
    But, when VALm is mapped to VALn and VALn is not a number, the
    mapping proceed as below:
 
-   If VALn is nil, the lastest map is ignored and the mapping of VALm
+   If VALn is nil, the last map is ignored and the mapping of VALm
    proceed to the next map.
 
    In VALn is t, VALm is reverted to reg[rrr] and the mapping of VALm

=== modified file 'src/cm.h'
--- a/src/cm.h  2011-11-25 07:14:48 +0000
+++ b/src/cm.h  2011-12-04 08:02:42 +0000
@@ -16,7 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Holds the minimum and maximum costs for the parametrized capabilities.  */
+/* Holds the minimum and maximum costs for the parameterized capabilities.  */
 struct parmcap
   {
     int mincost, maxcost;
@@ -79,7 +79,7 @@
     struct parmcap cc_multiright; /* multiple right (RI) */
 #endif
 
-    /* Costs for the non-parametrized capabilities */
+    /* Costs for the non-parameterized capabilities */
     int cc_up;                 /* cost for up */
     int cc_down;               /* etc. */
     int cc_left;

=== modified file 'src/emacsgtkfixed.c'
--- a/src/emacsgtkfixed.c       2011-09-09 01:06:52 +0000
+++ b/src/emacsgtkfixed.c       2011-12-04 08:02:42 +0000
@@ -1,4 +1,4 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
+/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
 This file is only use when compiling with Gtk+ 3.
 
 Copyright (C) 2011  Free Software Foundation, Inc.

=== modified file 'src/emacsgtkfixed.h'
--- a/src/emacsgtkfixed.h       2011-06-26 18:47:07 +0000
+++ b/src/emacsgtkfixed.h       2011-12-04 08:02:42 +0000
@@ -1,4 +1,4 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
+/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
 This file is only use when compiling with Gtk+ 3.
 
 Copyright (C) 2011  Free Software Foundation, Inc.

=== modified file 'src/eval.c'
--- a/src/eval.c        2011-09-16 14:14:48 +0000
+++ b/src/eval.c        2011-12-04 08:02:42 +0000
@@ -3733,7 +3733,7 @@
 A value of `(t)' indicates an empty environment, otherwise it is an
 alist of active lexical bindings.  */);
   Vinternal_interpreter_environment = Qnil;
-  /* Don't export this variable to Elisp, so noone can mess with it
+  /* Don't export this variable to Elisp, so no one can mess with it
      (Just imagine if someone makes it buffer-local).  */
   Funintern (Qinternal_interpreter_environment, Qnil);
 

=== modified file 'src/font.c'
--- a/src/font.c        2011-11-23 07:09:27 +0000
+++ b/src/font.c        2011-12-04 08:02:42 +0000
@@ -614,7 +614,7 @@
   /* Function to validate PROP's value VAL, or NULL if any value is
      ok.  The value is VAL or its regularized value if VAL is valid,
      and Qerror if not.  */
-  Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val);
+  Lisp_Object (*validator) (Lisp_Object prop, Lisp_Object val);
 } font_property_table[] =
   { { &QCtype, font_prop_validate_symbol },
     { &QCfoundry, font_prop_validate_symbol },
@@ -672,7 +672,7 @@
       if (idx < 0)
        return val;
     }
-  validated = (font_property_table[idx].validater) (prop, val);
+  validated = (font_property_table[idx].validator) (prop, val);
   if (EQ (validated, Qerror))
     signal_error ("invalid font property", Fcons (prop, val));
   return validated;
@@ -825,7 +825,7 @@
     range_mask = (range_mask << 1) | 1;
 
   /* The triplet RANGE_FROM, RANGE_TO, and RANGE_MASK is a
-     position-based retriction for FIELD[I].  */
+     position-based restriction for FIELD[I].  */
   for (i = 0, range_from = 0, range_to = 14 - n; i < n;
        i++, range_from++, range_to++, range_mask <<= 1)
     {
@@ -842,7 +842,7 @@
       else
        {
          /* The triplet FROM, TO, and MASK is a value-based
-            retriction for FIELD[I].  */
+            restriction for FIELD[I].  */
          int from, to;
          unsigned mask;
 

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2011-11-23 07:03:56 +0000
+++ b/src/fontset.c     2011-12-04 08:02:42 +0000
@@ -166,7 +166,7 @@
    These structures are hidden from the other codes than this file.
    The other codes handle fontsets only by their ID numbers.  They
    usually use the variable name `fontset' for IDs.  But, in this
-   file, we always use varialbe name `id' for IDs, and name `fontset'
+   file, we always use variable name `id' for IDs, and name `fontset'
    for an actual fontset object, i.e., char-table.
 
 */

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-11-20 03:48:53 +0000
+++ b/src/frame.c       2011-12-04 08:02:42 +0000
@@ -1929,7 +1929,7 @@
 FOCUS-FRAME after reading an event typed at FRAME.
 
 If FOCUS-FRAME is omitted or nil, any existing redirection is
-cancelled, and the frame again receives its own keystrokes.
+canceled, and the frame again receives its own keystrokes.
 
 Focus redirection is useful for temporarily redirecting keystrokes to
 a surrogate minibuffer frame when a frame doesn't have its own

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-12-01 18:27:52 +0000
+++ b/src/keyboard.c    2011-12-04 08:02:42 +0000
@@ -12245,7 +12245,7 @@
   DEFVAR_LISP ("debug-on-event",
                Vdebug_on_event,
                doc: /* Enter debugger on this event.  When Emacs
-receives the special event specifed by this variable, it will try to
+receives the special event specified by this variable, it will try to
 break into the debugger as soon as possible instead of processing the
 event normally through `special-event-map'.
 

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2011-11-20 07:30:16 +0000
+++ b/src/sysdep.c      2011-12-04 08:02:42 +0000
@@ -433,7 +433,7 @@
 #endif /* AIX */
 
   /* We originally enabled ICANON (and set VEOF to 04), and then had
-     proces.c send additional EOF chars to flush the output when faced
+     process.c send additional EOF chars to flush the output when faced
      with long lines, but this leads to weird effects when the
      subprocess has disabled ICANON and ends up seeing those spurious
      extra EOFs.  So we don't send EOFs any more in

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-11-27 04:43:11 +0000
+++ b/src/w32fns.c      2011-12-04 08:02:42 +0000
@@ -2417,7 +2417,7 @@
   deferred_msg * msg_buf = find_deferred_msg (hwnd, msg);
 
   if (msg_buf == NULL)
-    /* Message may have been cancelled, so don't abort.  */
+    /* Message may have been canceled, so don't abort.  */
     return;
 
   msg_buf->result = result;
@@ -2538,7 +2538,7 @@
            the lisp thread to respond.
 
           Note that we don't want to block the input thread waiting for
-          a reponse from the lisp thread (although that would at least
+          a response from the lisp thread (although that would at least
           solve the deadlock problem above), because we want to be able
           to receive C-g to interrupt the lisp thread.  */
        cancel_all_deferred_msgs ();
@@ -3749,7 +3749,7 @@
          flags |= TPM_RIGHTBUTTON;
 
        /* Remember we did a SetCapture on the initial mouse down event,
-          so for safety, we make sure the capture is cancelled now.  */
+          so for safety, we make sure the capture is canceled now.  */
        ReleaseCapture ();
        button_state = 0;
 
@@ -4951,7 +4951,7 @@
 Otherwise TYPE is the name of the atom that denotes the type expected.
 If SOURCE is non-nil, get the property on that window instead of from
 FRAME.  The number 0 denotes the root window.
-If DELETE_P is non-nil, delete the property after retreiving it.
+If DELETE_P is non-nil, delete the property after retrieving it.
 If VECTOR_RET_P is non-nil, don't return a string but a vector of values.
 
 Value is nil if FRAME hasn't a property with name PROP or if PROP has
@@ -6032,7 +6032,7 @@
 
        file = DECODE_FILE (build_string (filename));
       }
-    /* User cancelled the dialog without making a selection.  */
+    /* User canceled the dialog without making a selection.  */
     else if (!CommDlgExtendedError ())
       file = Qnil;
     /* An error occurred, fallback on reading from the mini-buffer.  */

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2011-11-23 07:03:56 +0000
+++ b/src/w32term.h     2011-12-04 08:02:42 +0000
@@ -229,7 +229,7 @@
 {
   /* Values for focus_state, used as bit mask.
      EXPLICIT means we received a FocusIn for the frame and know it has
-     the focus.  IMPLICIT means we recevied an EnterNotify and the frame
+     the focus.  IMPLICIT means we received an EnterNotify and the frame
      may have the focus if no window manager is running.
      FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
   FOCUS_NONE     = 0,

=== modified file 'src/window.c'
--- a/src/window.c      2011-11-27 04:43:11 +0000
+++ b/src/window.c      2011-12-04 08:02:42 +0000
@@ -5767,7 +5767,7 @@
 
 
 /* Return a pointer to the glyph W's physical cursor is on.  Value is
-   null if W's current matrix is invalid, so that no meaningfull glyph
+   null if W's current matrix is invalid, so that no meaningful glyph
    can be returned.  */
 struct glyph *
 get_phys_cursor_glyph (struct window *w)

=== modified file 'src/window.h'
--- a/src/window.h      2011-11-20 02:29:42 +0000
+++ b/src/window.h      2011-12-04 08:02:42 +0000
@@ -877,7 +877,7 @@
 extern void check_frame_size (struct frame *frame, int *rows, int *cols);
 
 /* Return a pointer to the glyph W's physical cursor is on.  Value is
-   null if W's current matrix is invalid, so that no meaningfull glyph
+   null if W's current matrix is invalid, so that no meaningful glyph
    can be returned.  */
 
 struct glyph *get_phys_cursor_glyph (struct window *w);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-12-03 09:55:27 +0000
+++ b/src/xdisp.c       2011-12-04 08:02:42 +0000
@@ -10234,7 +10234,7 @@
 }
 
 
-/* Push the current message on Vmessage_stack for later restauration
+/* Push the current message on Vmessage_stack for later restoration
    by restore_message.  Value is non-zero if the current message isn't
    empty.  This is a relatively infrequent operation, so it's not
    worth optimizing.  */

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2011-11-28 08:20:58 +0000
+++ b/src/xfns.c        2011-12-04 08:02:42 +0000
@@ -4286,7 +4286,7 @@
 Otherwise TYPE is the name of the atom that denotes the type expected.
 If SOURCE is non-nil, get the property on that window instead of from
 FRAME.  The number 0 denotes the root window.
-If DELETE_P is non-nil, delete the property after retreiving it.
+If DELETE_P is non-nil, delete the property after retrieving it.
 If VECTOR_RET_P is non-nil, don't return a string but a vector of values.
 
 Value is nil if FRAME hasn't a property with name PROP or if PROP has

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2011-11-29 18:08:53 +0000
+++ b/src/xterm.h       2011-12-04 08:02:42 +0000
@@ -643,7 +643,7 @@
 {
   /* Values for focus_state, used as bit mask.
      EXPLICIT means we received a FocusIn for the frame and know it has
-     the focus.  IMPLICIT means we recevied an EnterNotify and the frame
+     the focus.  IMPLICIT means we received an EnterNotify and the frame
      may have the focus if no window manager is running.
      FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
   FOCUS_NONE     = 0,

=== modified file 'test/cedet/tests/test.el'
--- a/test/cedet/tests/test.el  2011-01-25 04:08:28 +0000
+++ b/test/cedet/tests/test.el  2011-12-04 08:02:42 +0000
@@ -144,7 +144,7 @@
   this
   that)
 
-(define-mode-local-override a-overriden-function
+(define-mode-local-override a-overridden-function
   emacs-lisp-mode (tag)
   "A function that is overloaded."
   nil)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]