Now on revision 106446.
------------------------------------------------------------
revno: 106446
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sat 2011-11-19 23:30:16 -0800
message:
  Spelling fixes.
diff:
=== modified file 'admin/grammars/c.by'
--- admin/grammars/c.by	2011-11-16 12:34:47 +0000
+++ admin/grammars/c.by	2011-11-20 07:30:16 +0000
@@ -122,7 +122,7 @@
 %put DELETE summary "delete <object>;"
 
 ;; Despite this, this parser can find templates by ignoring the TEMPLATE
-;; keyword, and finding the class/method being templateized.
+;; keyword, and finding the class/method being templatized.
 %token TEMPLATE "template"
 %put TEMPLATE summary "template <class TYPE ...> TYPE_OR_FUNCTION"
 

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- doc/lispintro/emacs-lisp-intro.texi	2011-11-16 17:47:25 +0000
+++ doc/lispintro/emacs-lisp-intro.texi	2011-11-20 07:30:16 +0000
@@ -887,7 +887,7 @@
 to a country not yet visited: interesting, but not the same as being
 there.
 
-Much of this introduction is dedicated to walk-throughs or guided tours
+Much of this introduction is dedicated to walkthroughs or guided tours
 of code used in GNU Emacs.  These tours are designed for two purposes:
 first, to give you familiarity with real, working code (code you use
 every day); and, second, to give you familiarity with the way Emacs

=== modified file 'doc/lispref/spellfile'
--- doc/lispref/spellfile	2011-11-20 02:29:42 +0000
+++ doc/lispref/spellfile	2011-11-20 07:30:16 +0000
@@ -639,7 +639,7 @@
 symbolp
 symlink
 syms
-syntatic
+syntactic
 tabname
 temacs
 temporarily'

=== modified file 'doc/misc/calc.texi'
--- doc/misc/calc.texi	2011-11-20 02:29:42 +0000
+++ doc/misc/calc.texi	2011-11-20 07:30:16 +0000
@@ -90,7 +90,7 @@
 This file documents Calc, the GNU Emacs calculator.
 @end ifinfo
 @ifnotinfo
-This file documents Calc, the GNU Emacs calculator, included with 
+This file documents Calc, the GNU Emacs calculator, included with
 GNU Emacs @value{EMACSVER}.
 @end ifnotinfo
 
@@ -324,7 +324,7 @@
 @c @cindex Marginal notes
 Every Calc keyboard command is listed in the Calc Summary, and also
 in the Key Index.  Algebraic functions, @kbd{M-x} commands, and
-variables also have their own indices.  
+variables also have their own indices.
 @c @texline Each
 @c @infoline In the printed manual, each
 @c paragraph that is referenced in the Key or Function Index is marked
@@ -338,7 +338,7 @@
 command @kbd{C-x * t} will jump to the Tutorial and start Calc if
 necessary.  Pressing @kbd{h s} or @kbd{C-x * s} will take you directly
 to the Calc Summary.  Within Calc, you can also go to the part of the
-manual describing any Calc key, function, or variable using 
+manual describing any Calc key, function, or variable using
 @w{@kbd{h k}}, @kbd{h f}, or @kbd{h v}, respectively.  @xref{Help Commands}.
 
 @ifnottex
@@ -437,12 +437,12 @@
 then the command to operate on the numbers.
 
 @noindent
-Type @kbd{2 @key{RET} 3 + Q} to compute 
+Type @kbd{2 @key{RET} 3 + Q} to compute
 @texline @math{\sqrt{2+3} = 2.2360679775}.
 @infoline the square root of 2+3, which is 2.2360679775.
 
 @noindent
-Type @kbd{P 2 ^} to compute 
+Type @kbd{P 2 ^} to compute
 @texline @math{\pi^2 = 9.86960440109}.
 @infoline the value of `pi' squared, 9.86960440109.
 
@@ -461,14 +461,14 @@
 use the apostrophe key.
 
 @noindent
-Type @kbd{' sqrt(2+3) @key{RET}} to compute 
+Type @kbd{' sqrt(2+3) @key{RET}} to compute
 @texline @math{\sqrt{2+3}}.
 @infoline the square root of 2+3.
 
 @noindent
-Type @kbd{' pi^2 @key{RET}} to enter 
+Type @kbd{' pi^2 @key{RET}} to enter
 @texline @math{\pi^2}.
-@infoline `pi' squared.  
+@infoline `pi' squared.
 To evaluate this symbolic formula as a number, type @kbd{=}.
 
 @noindent
@@ -526,10 +526,10 @@
 the lower-right @samp{8} and press @kbd{C-x * r}.
 
 @noindent
-Type @kbd{v t} to transpose this 
+Type @kbd{v t} to transpose this
 @texline @math{3\times2}
-@infoline 3x2 
-matrix into a 
+@infoline 3x2
+matrix into a
 @texline @math{2\times3}
 @infoline 2x3
 matrix.  Type @w{@kbd{v u}} to unpack the rows into two separate
@@ -605,7 +605,7 @@
 
 @noindent
 On most systems, you can type @kbd{C-x *} to start the Calculator.
-The key sequence @kbd{C-x *} is bound to the command @code{calc-dispatch}, 
+The key sequence @kbd{C-x *} is bound to the command @code{calc-dispatch},
 which can be rebound if convenient (@pxref{Customizing Calc}).
 
 When you press @kbd{C-x *}, Emacs waits for you to press a second key to
@@ -1154,9 +1154,9 @@
 @noindent
 Calc was originally started as a two-week project to occupy a lull
 in the author's schedule.  Basically, a friend asked if I remembered
-the value of 
+the value of
 @texline @math{2^{32}}.
-@infoline @expr{2^32}.  
+@infoline @expr{2^32}.
 I didn't offhand, but I said, ``that's easy, just call up an
 @code{xcalc}.''  @code{Xcalc} duly reported that the answer to our
 question was @samp{4.294967e+09}---with no way to see the full ten
@@ -1213,7 +1213,7 @@
 Many people have contributed to Calc by reporting bugs and suggesting
 features, large and small.  A few deserve special mention:  Tim Peters,
 who helped develop the ideas that led to the selection commands, rewrite
-rules, and many other algebra features; 
+rules, and many other algebra features;
 @texline Fran\c{c}ois
 @infoline Francois
 Pinard, who contributed an early prototype of the Calc Summary appendix
@@ -1226,7 +1226,7 @@
 Sarlin, who first worked out how to split Calc into quickly-loading
 parts; Bob Weiner, who helped immensely with the Lucid Emacs port; and
 Robert J. Chassell, who suggested the Calc Tutorial and exercises as
-well as many other things.  
+well as many other things.
 
 @cindex Bibliography
 @cindex Knuth, Art of Computer Programming
@@ -1472,9 +1472,9 @@
 multiplication.)  Figure it out by hand, then try it with Calc to see
 if you're right.  @xref{RPN Answer 1, 1}. (@bullet{})
 
-(@bullet{}) @strong{Exercise 2.}  Compute 
+(@bullet{}) @strong{Exercise 2.}  Compute
 @texline @math{(2\times4) + (7\times9.4) + {5\over4}}
-@infoline @expr{2*4 + 7*9.5 + 5/4} 
+@infoline @expr{2*4 + 7*9.5 + 5/4}
 using the stack.  @xref{RPN Answer 2, 2}. (@bullet{})
 
 The @key{DEL} key is called Backspace on some keyboards.  It is
@@ -1889,7 +1889,7 @@
 accomplish this in Calc by performing your calculation as a series
 of algebraic entries, using the @kbd{$} sign to tie them together.
 In an algebraic formula, @kbd{$} represents the number on the top
-of the stack.  Here, we perform the calculation 
+of the stack.  Here, we perform the calculation
 @texline @math{\sqrt{2\times4+1}},
 @infoline @expr{sqrt(2*4+1)},
 which on a traditional calculator would be done by pressing
@@ -2149,7 +2149,7 @@
 to cancel it.  (In fact, you can press @kbd{C-g} to cancel almost
 anything in Emacs.)  To get help on a prefix key, press that key
 followed by @kbd{?}.  Some prefixes have several lines of help,
-so you need to press @kbd{?} repeatedly to see them all.  
+so you need to press @kbd{?} repeatedly to see them all.
 You can also type @kbd{h h} to see all the help at once.
 
 Try pressing @kbd{t ?} now.  You will see a line of the form,
@@ -2550,13 +2550,13 @@
 
 @noindent
 The shift-@kbd{S} command computes the sine of an angle.  The sine
-of 45 degrees is 
+of 45 degrees is
 @texline @math{\sqrt{2}/2};
-@infoline @expr{sqrt(2)/2}; 
+@infoline @expr{sqrt(2)/2};
 squaring this yields @expr{2/4 = 0.5}.  However, there has been a slight
-roundoff error because the representation of 
+roundoff error because the representation of
 @texline @math{\sqrt{2}/2}
-@infoline @expr{sqrt(2)/2} 
+@infoline @expr{sqrt(2)/2}
 wasn't exact.  The @kbd{c 1} command is a handy way to clean up numbers
 in this case; it temporarily reduces the precision by one digit while it
 re-rounds the number on the top of the stack.
@@ -2595,9 +2595,9 @@
 @end smallexample
 
 @noindent
-Here we compute the Inverse Sine of 
+Here we compute the Inverse Sine of
 @texline @math{\sqrt{0.5}},
-@infoline @expr{sqrt(0.5)}, 
+@infoline @expr{sqrt(0.5)},
 first in radians, then in degrees.
 
 Use @kbd{c d} and @kbd{c r} to convert a number from radians to degrees
@@ -2783,9 +2783,9 @@
 @kbd{H} (hyperbolic) prefix keys.
 
 Let's compute the sine and cosine of an angle, and verify the
-identity 
+identity
 @texline @math{\sin^2x + \cos^2x = 1}.
-@infoline @expr{sin(x)^2 + cos(x)^2 = 1}.  
+@infoline @expr{sin(x)^2 + cos(x)^2 = 1}.
 We'll arbitrarily pick @mathit{-64} degrees as a good value for @expr{x}.
 With the angular mode set to degrees (type @w{@kbd{m d}}), do:
 
@@ -2806,7 +2806,7 @@
 Remember, @kbd{f h} is the @code{calc-hypot}, or square-root of sum
 of squares, command.
 
-Another identity is 
+Another identity is
 @texline @math{\displaystyle\tan x = {\sin x \over \cos x}}.
 @infoline @expr{tan(x) = sin(x) / cos(x)}.
 @smallexample
@@ -2871,7 +2871,7 @@
 A similar identity is supposed to hold for hyperbolic sines and cosines,
 except that it is the @emph{difference}
 @texline @math{\cosh^2x - \sinh^2x}
-@infoline @expr{cosh(x)^2 - sinh(x)^2} 
+@infoline @expr{cosh(x)^2 - sinh(x)^2}
 that always equals one.  Let's try to verify this identity.
 
 @smallexample
@@ -2993,7 +2993,7 @@
 @end smallexample
 
 @noindent
-Here we verify the identity 
+Here we verify the identity
 @texline @math{n! = \Gamma(n+1)}.
 @infoline @expr{@var{n}!@: = gamma(@var{n}+1)}.
 
@@ -3283,11 +3283,11 @@
 vector.
 
 (@bullet{}) @strong{Exercise 1.}  Use @samp{*} to sum along the rows
-of the above 
+of the above
 @texline @math{2\times3}
-@infoline 2x3 
+@infoline 2x3
 matrix to get @expr{[6, 15]}.  Now use @samp{*} to sum along the columns
-to get @expr{[5, 7, 9]}. 
+to get @expr{[5, 7, 9]}.
 @xref{Matrix Answer 1, 1}. (@bullet{})
 
 @cindex Identity matrix
@@ -3432,7 +3432,7 @@
 assume the vector was a row vector in order to make the dimensions
 come out right, and the answer would be incorrect.  If you
 don't feel safe letting Calc take either interpretation of your
-vectors, use explicit 
+vectors, use explicit
 @texline @math{N\times1}
 @infoline Nx1
 or
@@ -3482,9 +3482,9 @@
 @tex
 $A^T A \, X = A^T B$, where $A^T$ is the transpose \samp{trn(A)}.
 @end tex
-Now 
+Now
 @texline @math{A^T A}
-@infoline @expr{trn(A)*A} 
+@infoline @expr{trn(A)*A}
 is a square matrix so a solution is possible.  It turns out that the
 @expr{X} vector you compute in this way will be a ``least-squares''
 solution, which can be regarded as the ``closest'' solution to the set
@@ -3577,9 +3577,9 @@
 of each element.
 
 (@bullet{}) @strong{Exercise 1.}  Compute a vector of powers of two
-from 
+from
 @texline @math{2^{-4}}
-@infoline @expr{2^-4} 
+@infoline @expr{2^-4}
 to @expr{2^4}.  @xref{List Answer 1, 1}. (@bullet{})
 
 You can also @dfn{reduce} a binary operator across a vector.
@@ -3780,9 +3780,9 @@
 @end tex
 
 @noindent
-where 
+where
 @texline @math{\sum x}
-@infoline @expr{sum(x)} 
+@infoline @expr{sum(x)}
 represents the sum of all the values of @expr{x}.  While there is an
 actual @code{sum} function in Calc, it's easier to sum a vector using a
 simple reduction.  First, let's compute the four different sums that
@@ -3883,9 +3883,9 @@
 @end group
 @end smallexample
 
-Let's ``plot'' this straight line approximation, 
+Let's ``plot'' this straight line approximation,
 @texline @math{y \approx m x + b},
-@infoline @expr{m x + b}, 
+@infoline @expr{m x + b},
 and compare it with the original data.
 
 @smallexample
@@ -3959,7 +3959,7 @@
 (If you are reading this tutorial on-line while running Calc, typing
 @kbd{g a} may cause the tutorial to disappear from its window and be
 replaced by a buffer named @samp{*Gnuplot Commands*}.  The tutorial
-will reappear when you terminate GNUPLOT by typing @kbd{g q}.) 
+will reappear when you terminate GNUPLOT by typing @kbd{g q}.)
 @end ifinfo
 
 @smallexample
@@ -4138,7 +4138,7 @@
 @c [fix-ref Numerical Solutions]
 (@bullet{}) @strong{Exercise 8.}  Compute a list of values of Bessel's
 @texline @math{J_1(x)}
-@infoline @expr{J1} 
+@infoline @expr{J1}
 function @samp{besJ(1,x)} for @expr{x} from 0 to 5 in steps of 0.25.
 Find the value of @expr{x} (from among the above set of values) for
 which @samp{besJ(1,x)} is a maximum.  Use an ``automatic'' method,
@@ -4150,7 +4150,7 @@
 @cindex Digits, vectors of
 (@bullet{}) @strong{Exercise 9.}  You are given an integer in the range
 @texline @math{0 \le N < 10^m}
-@infoline @expr{0 <= N < 10^m} 
+@infoline @expr{0 <= N < 10^m}
 for @expr{m=12} (i.e., an integer of less than
 twelve digits).  Convert this integer into a vector of @expr{m}
 digits, each in the range from 0 to 9.  In vector-of-digits notation,
@@ -4164,12 +4164,12 @@
 happened?  How would you do this test?  @xref{List Answer 10, 10}. (@bullet{})
 
 (@bullet{}) @strong{Exercise 11.}  The area of a circle of radius one
-is @cpi{}.  The area of the 
+is @cpi{}.  The area of the
 @texline @math{2\times2}
 @infoline 2x2
 square that encloses that circle is 4.  So if we throw @var{n} darts at
 random points in the square, about @cpiover{4} of them will land inside
-the circle.  This gives us an entertaining way to estimate the value of 
+the circle.  This gives us an entertaining way to estimate the value of
 @cpi{}.  The @w{@kbd{k r}}
 command picks a random number between zero and the value on the stack.
 We could get a random floating-point number between @mathit{-1} and 1 by typing
@@ -4183,12 +4183,12 @@
 another way to calculate @cpi{}.  Say you have an infinite field
 of vertical lines with a spacing of one inch.  Toss a one-inch matchstick
 onto the field.  The probability that the matchstick will land crossing
-a line turns out to be 
+a line turns out to be
 @texline @math{2/\pi}.
-@infoline @expr{2/pi}.  
+@infoline @expr{2/pi}.
 Toss 100 matchsticks to estimate @cpi{}.  (If you want still more fun,
 the probability that the GCD (@w{@kbd{k g}}) of two large integers is
-one turns out to be 
+one turns out to be
 @texline @math{6/\pi^2}.
 @infoline @expr{6/pi^2}.
 That provides yet another way to estimate @cpi{}.)
@@ -4488,7 +4488,7 @@
 @cindex Torus, volume of
 (@bullet{}) @strong{Exercise 7.}  The volume of a torus (a donut shape) is
 @texline @math{2 \pi^2 R r^2}
-@infoline @w{@expr{2 pi^2 R r^2}} 
+@infoline @w{@expr{2 pi^2 R r^2}}
 where @expr{R} is the radius of the circle that
 defines the center of the tube and @expr{r} is the radius of the tube
 itself.  Suppose @expr{R} is 20 cm and @expr{r} is 4 cm, each known to
@@ -4569,7 +4569,7 @@
 new number which, when multiplied by 5 modulo 24, produces the original
 number, 21.  If @var{m} is prime and the divisor is not a multiple of
 @var{m}, it is always possible to find such a number.  For non-prime
-@var{m} like 24, it is only sometimes possible. 
+@var{m} like 24, it is only sometimes possible.
 
 @smallexample
 @group
@@ -4587,7 +4587,7 @@
 
 @cindex Fermat, primality test of
 (@bullet{}) @strong{Exercise 10.}  A theorem of Pierre de Fermat
-says that 
+says that
 @texline @w{@math{x^{n-1} \bmod n = 1}}
 @infoline @expr{x^(n-1) mod n = 1}
 if @expr{n} is a prime number and @expr{x} is an integer less than
@@ -4615,9 +4615,9 @@
 This calculation tells me it is six hours and 22 minutes until midnight.
 
 (@bullet{}) @strong{Exercise 11.}  A rule of thumb is that one year
-is about 
+is about
 @texline @math{\pi \times 10^7}
-@infoline @w{@expr{pi * 10^7}} 
+@infoline @w{@expr{pi * 10^7}}
 seconds.  What time will it be that many seconds from right now?
 @xref{Types Answer 11, 11}. (@bullet{})
 
@@ -5093,18 +5093,18 @@
 @end smallexample
 
 (@bullet{}) @strong{Exercise 3.}  Find the integral from 1 to @expr{y}
-of 
+of
 @texline @math{x \sin \pi x}
-@infoline @w{@expr{x sin(pi x)}} 
+@infoline @w{@expr{x sin(pi x)}}
 (where the sine is calculated in radians).  Find the values of the
 integral for integers @expr{y} from 1 to 5.  @xref{Algebra Answer 3,
 3}. (@bullet{})
 
 Calc's integrator can do many simple integrals symbolically, but many
 others are beyond its capabilities.  Suppose we wish to find the area
-under the curve 
+under the curve
 @texline @math{\sin x \ln x}
-@infoline @expr{sin(x) ln(x)} 
+@infoline @expr{sin(x) ln(x)}
 over the same range of @expr{x}.  If you entered this formula and typed
 @kbd{a i x @key{RET}} (don't bother to try this), Calc would work for a
 long time but would be unable to find a solution.  In fact, there is no
@@ -5242,10 +5242,10 @@
 \afterdisplay
 @end tex
 
-Compute the integral from 1 to 2 of 
+Compute the integral from 1 to 2 of
 @texline @math{\sin x \ln x}
-@infoline @expr{sin(x) ln(x)} 
-using Simpson's rule with 10 slices.  
+@infoline @expr{sin(x) ln(x)}
+using Simpson's rule with 10 slices.
 @xref{Algebra Answer 4, 4}. (@bullet{})
 
 Calc has a built-in @kbd{a I} command for doing numerical integration.
@@ -5396,7 +5396,7 @@
 
 To edit a variable, type @kbd{s e} and the variable name, use regular
 Emacs editing commands as necessary, then type @kbd{C-c C-c} to store
-the edited value back into the variable. 
+the edited value back into the variable.
 You can also use @w{@kbd{s e}} to create a new variable if you wish.
 
 Notice that the first time you use each rule, Calc puts up a ``compiling''
@@ -5780,7 +5780,7 @@
 @tindex Si
 (@bullet{}) @strong{Exercise 1.}  The ``sine integral'' function
 @texline @math{{\rm Si}(x)}
-@infoline @expr{Si(x)} 
+@infoline @expr{Si(x)}
 is defined as the integral of @samp{sin(t)/t} for
 @expr{t = 0} to @expr{x} in radians.  (It was invented because this
 integral has no solution in terms of basic functions; if you give it
@@ -5857,9 +5857,9 @@
 
 @enumerate
 @item
-Compute 
+Compute
 @texline @math{\displaystyle{\sin x \over x}},
-@infoline @expr{sin(x) / x}, 
+@infoline @expr{sin(x) / x},
 where @expr{x} is the number on the top of the stack.
 
 @item
@@ -5923,15 +5923,15 @@
 @cindex Golden ratio
 @cindex Phi, golden ratio
 A fascinating property of the Fibonacci numbers is that the @expr{n}th
-Fibonacci number can be found directly by computing 
+Fibonacci number can be found directly by computing
 @texline @math{\phi^n / \sqrt{5}}
 @infoline @expr{phi^n / sqrt(5)}
-and then rounding to the nearest integer, where 
+and then rounding to the nearest integer, where
 @texline @math{\phi} (``phi''),
-@infoline @expr{phi}, 
-the ``golden ratio,'' is 
+@infoline @expr{phi},
+the ``golden ratio,'' is
 @texline @math{(1 + \sqrt{5}) / 2}.
-@infoline @expr{(1 + sqrt(5)) / 2}. 
+@infoline @expr{(1 + sqrt(5)) / 2}.
 (For convenience, this constant is available from the @code{phi}
 variable, or the @kbd{I H P} command.)
 
@@ -5946,19 +5946,19 @@
 
 @cindex Continued fractions
 (@bullet{}) @strong{Exercise 5.}  The @dfn{continued fraction}
-representation of 
+representation of
 @texline @math{\phi}
-@infoline @expr{phi} 
-is 
+@infoline @expr{phi}
+is
 @texline @math{1 + 1/(1 + 1/(1 + 1/( \ldots )))}.
 @infoline @expr{1 + 1/(1 + 1/(1 + 1/( ...@: )))}.
 We can compute an approximate value by carrying this however far
-and then replacing the innermost 
+and then replacing the innermost
 @texline @math{1/( \ldots )}
-@infoline @expr{1/( ...@: )} 
+@infoline @expr{1/( ...@: )}
 by 1.  Approximate
 @texline @math{\phi}
-@infoline @expr{phi} 
+@infoline @expr{phi}
 using a twenty-term continued fraction.
 @xref{Programming Answer 5, 5}. (@bullet{})
 
@@ -6056,9 +6056,9 @@
 The @dfn{Bernoulli numbers} are a sequence with the interesting
 property that all of the odd Bernoulli numbers are zero, and the
 even ones, while difficult to compute, can be roughly approximated
-by the formula 
+by the formula
 @texline @math{\displaystyle{2 n! \over (2 \pi)^n}}.
-@infoline @expr{2 n!@: / (2 pi)^n}.  
+@infoline @expr{2 n!@: / (2 pi)^n}.
 Let's write a keyboard macro to compute (approximate) Bernoulli numbers.
 (Calc has a command, @kbd{k b}, to compute exact Bernoulli numbers, but
 this command is very slow for large @expr{n} since the higher Bernoulli
@@ -6166,7 +6166,7 @@
 0                       ;; calc digits       (Push a zero onto the stack)
 st                      ;; calc-store-into   (Store it in the following variable)
 1                       ;; calc quick variable  (Quick variable q1)
-1                       ;; calc digits       (Initial value for the loop) 
+1                       ;; calc digits       (Initial value for the loop)
 TAB                     ;; calc-roll-down    (Swap initial and final)
 Z(                      ;; calc-kbd-for      (Begin the "for" loop)
 &                       ;; calc-inv          (Take the reciprocal)
@@ -6193,10 +6193,10 @@
 
 The @file{edmacro} package defines a handy @code{read-kbd-macro} command
 which reads the current region of the current buffer as a sequence of
-keystroke names, and defines that sequence on the @kbd{X} 
+keystroke names, and defines that sequence on the @kbd{X}
 (and @kbd{C-x e}) key.  Because this is so useful, Calc puts this
 command on the @kbd{C-x * m} key.  Try reading in this macro in the
-following form:  Press @kbd{C-@@} (or @kbd{C-@key{SPC}}) at 
+following form:  Press @kbd{C-@@} (or @kbd{C-@key{SPC}}) at
 one end of the text below, then type @kbd{C-x * m} at the other.
 
 @example
@@ -6230,12 +6230,12 @@
 where @expr{f'(x)} is the derivative of @expr{f}.  The @expr{x}
 values will quickly converge to a solution, i.e., eventually
 @texline @math{x_{\rm new}}
-@infoline @expr{new_x} 
+@infoline @expr{new_x}
 and @expr{x} will be equal to within the limits
 of the current precision.  Write a program which takes a formula
 involving the variable @expr{x}, and an initial guess @expr{x_0},
 on the stack, and produces a value of @expr{x} for which the formula
-is zero.  Use it to find a solution of 
+is zero.  Use it to find a solution of
 @texline @math{\sin(\cos x) = 0.5}
 @infoline @expr{sin(cos(x)) = 0.5}
 near @expr{x = 4.5}.  (Use angles measured in radians.)  Note that
@@ -6245,12 +6245,12 @@
 @cindex Digamma function
 @cindex Gamma constant, Euler's
 @cindex Euler's gamma constant
-(@bullet{}) @strong{Exercise 9.}  The @dfn{digamma} function 
+(@bullet{}) @strong{Exercise 9.}  The @dfn{digamma} function
 @texline @math{\psi(z) (``psi'')}
 @infoline @expr{psi(z)}
-is defined as the derivative of 
+is defined as the derivative of
 @texline @math{\ln \Gamma(z)}.
-@infoline @expr{ln(gamma(z))}.  
+@infoline @expr{ln(gamma(z))}.
 For large values of @expr{z}, it can be approximated by the infinite sum
 
 @ifnottex
@@ -6267,9 +6267,9 @@
 @end tex
 
 @noindent
-where 
+where
 @texline @math{\sum}
-@infoline @expr{sum} 
+@infoline @expr{sum}
 represents the sum over @expr{n} from 1 to infinity
 (or to some limit high enough to give the desired accuracy), and
 the @code{bern} function produces (exact) Bernoulli numbers.
@@ -6277,27 +6277,27 @@
 An interesting mathematical constant is Euler's gamma, which is equal
 to about 0.5772.  One way to compute it is by the formula,
 @texline @math{\gamma = -\psi(1)}.
-@infoline @expr{gamma = -psi(1)}.  
+@infoline @expr{gamma = -psi(1)}.
 Unfortunately, 1 isn't a large enough argument
 for the above formula to work (5 is a much safer value for @expr{z}).
-Fortunately, we can compute 
+Fortunately, we can compute
 @texline @math{\psi(1)}
-@infoline @expr{psi(1)} 
-from 
+@infoline @expr{psi(1)}
+from
 @texline @math{\psi(5)}
-@infoline @expr{psi(5)} 
-using the recurrence 
+@infoline @expr{psi(5)}
+using the recurrence
 @texline @math{\psi(z+1) = \psi(z) + {1 \over z}}.
-@infoline @expr{psi(z+1) = psi(z) + 1/z}.  
-Your task:  Develop a program to compute 
+@infoline @expr{psi(z+1) = psi(z) + 1/z}.
+Your task:  Develop a program to compute
 @texline @math{\psi(z)};
-@infoline @expr{psi(z)}; 
+@infoline @expr{psi(z)};
 it should ``pump up'' @expr{z}
 if necessary to be greater than 5, then use the above summation
 formula.  Use looping commands to compute the sum.  Use your function
-to compute 
+to compute
 @texline @math{\gamma}
-@infoline @expr{gamma} 
+@infoline @expr{gamma}
 to twelve decimal places.  (Calc has a built-in command
 for Euler's constant, @kbd{I P}, which you can use to check your answer.)
 @xref{Programming Answer 9, 9}. (@bullet{})
@@ -6470,7 +6470,7 @@
 @noindent
 @kbd{1 @key{RET} 2 @key{RET} 3 @key{RET} 4 + * -}
 
-The result is 
+The result is
 @texline @math{1 - (2 \times (3 + 4)) = -13}.
 @infoline @expr{1 - (2 * (3 + 4)) = -13}.
 
@@ -6481,9 +6481,9 @@
 @texline @math{2\times4 + 7\times9.5 + {5\over4} = 75.75}
 @infoline @expr{2*4 + 7*9.5 + 5/4 = 75.75}
 
-After computing the intermediate term 
+After computing the intermediate term
 @texline @math{2\times4 = 8},
-@infoline @expr{2*4 = 8}, 
+@infoline @expr{2*4 = 8},
 you can leave that result on the stack while you compute the second
 term.  With both of these results waiting on the stack you can then
 compute the final term, then press @kbd{+ +} to add everything up.
@@ -6790,7 +6790,7 @@
 give a floating-point result that is inaccurate even when rounded
 down to an integer.  Consider @expr{123456789 / 2} when the current
 precision is 6 digits.  The true answer is @expr{61728394.5}, but
-with a precision of 6 this will be rounded to 
+with a precision of 6 this will be rounded to
 @texline @math{12345700.0/2.0 = 61728500.0}.
 @infoline @expr{12345700.@: / 2.@: = 61728500.}.
 The result, when converted to an integer, will be off by 106.
@@ -6900,18 +6900,18 @@
 @subsection Matrix Tutorial Exercise 3
 
 @noindent
-To solve 
+To solve
 @texline @math{A^T A \, X = A^T B},
-@infoline @expr{trn(A) * A * X = trn(A) * B}, 
+@infoline @expr{trn(A) * A * X = trn(A) * B},
 first we compute
 @texline @math{A' = A^T A}
-@infoline @expr{A2 = trn(A) * A} 
-and 
+@infoline @expr{A2 = trn(A) * A}
+and
 @texline @math{B' = A^T B};
-@infoline @expr{B2 = trn(A) * B}; 
-now, we have a system 
+@infoline @expr{B2 = trn(A) * B};
+now, we have a system
 @texline @math{A' X = B'}
-@infoline @expr{A2 * X = B2} 
+@infoline @expr{A2 * X = B2}
 which we can solve using Calc's @samp{/} command.
 
 @ifnottex
@@ -6942,7 +6942,7 @@
 The first step is to enter the coefficient matrix.  We'll store it in
 quick variable number 7 for later reference.  Next, we compute the
 @texline @math{B'}
-@infoline @expr{B2} 
+@infoline @expr{B2}
 vector.
 
 @smallexample
@@ -6958,9 +6958,9 @@
 @end smallexample
 
 @noindent
-Now we compute the matrix 
+Now we compute the matrix
 @texline @math{A'}
-@infoline @expr{A2} 
+@infoline @expr{A2}
 and divide.
 
 @smallexample
@@ -6979,16 +6979,16 @@
 (The actual computed answer will be slightly inexact due to
 round-off error.)
 
-Notice that the answers are similar to those for the 
+Notice that the answers are similar to those for the
 @texline @math{3\times3}
 @infoline 3x3
-system solved in the text.  That's because the fourth equation that was 
+system solved in the text.  That's because the fourth equation that was
 added to the system is almost identical to the first one multiplied
 by two.  (If it were identical, we would have gotten the exact same
-answer since the 
+answer since the
 @texline @math{4\times3}
 @infoline 4x3
-system would be equivalent to the original 
+system would be equivalent to the original
 @texline @math{3\times3}
 @infoline 3x3
 system.)
@@ -7064,7 +7064,7 @@
 \afterdisplay
 @end tex
 
-Thus we want a 
+Thus we want a
 @texline @math{19\times2}
 @infoline 19x2
 matrix with our @expr{x} vector as one column and
@@ -7083,12 +7083,12 @@
 @end smallexample
 
 @noindent
-Now we compute 
+Now we compute
 @texline @math{A^T y}
-@infoline @expr{trn(A) * y} 
-and 
+@infoline @expr{trn(A) * y}
+and
 @texline @math{A^T A}
-@infoline @expr{trn(A) * A} 
+@infoline @expr{trn(A) * A}
 and divide.
 
 @smallexample
@@ -7114,9 +7114,9 @@
 @end group
 @end smallexample
 
-Since we were solving equations of the form 
+Since we were solving equations of the form
 @texline @math{m \times x + b \times 1 = y},
-@infoline @expr{m*x + b*1 = y}, 
+@infoline @expr{m*x + b*1 = y},
 these numbers should be @expr{m} and @expr{b}, respectively.  Sure
 enough, they agree exactly with the result computed using @kbd{V M} and
 @kbd{V R}!
@@ -7177,9 +7177,9 @@
 @subsection List Tutorial Exercise 4
 
 @noindent
-A number @expr{j} is a divisor of @expr{n} if 
+A number @expr{j} is a divisor of @expr{n} if
 @texline @math{n \mathbin{\hbox{\code{\%}}} j = 0}.
-@infoline @samp{n % j = 0}.  
+@infoline @samp{n % j = 0}.
 The first step is to get a vector that identifies the divisors.
 
 @smallexample
@@ -7248,9 +7248,9 @@
 zero, so adding zeros on the left and right is safe.  From then on
 the job is pretty straightforward.
 
-Incidentally, Calc provides the 
+Incidentally, Calc provides the
 @texline @dfn{M@"obius} @math{\mu}
-@infoline @dfn{Moebius mu} 
+@infoline @dfn{Moebius mu}
 function which is zero if and only if its argument is square-free.  It
 would be a much more convenient way to do the above test in practice.
 
@@ -7282,7 +7282,7 @@
 The numbers down the lefthand edge of the list we desire are called
 the ``triangular numbers'' (now you know why!).  The @expr{n}th
 triangular number is the sum of the integers from 1 to @expr{n}, and
-can be computed directly by the formula 
+can be computed directly by the formula
 @texline @math{n (n+1) \over 2}.
 @infoline @expr{n * (n+1) / 2}.
 
@@ -7378,7 +7378,7 @@
 
 @noindent
 It's a good idea to verify, as in the last step above, that only
-one value is equal to the maximum.  (After all, a plot of 
+one value is equal to the maximum.  (After all, a plot of
 @texline @math{\sin x}
 @infoline @expr{sin(x)}
 might have many points all equal to the maximum value, 1.)
@@ -7650,12 +7650,12 @@
 This problem can be made a lot easier by taking advantage of some
 symmetries.  First of all, after some thought it's clear that the
 @expr{y} axis can be ignored altogether.  Just pick a random @expr{x}
-component for one end of the match, pick a random direction 
+component for one end of the match, pick a random direction
 @texline @math{\theta},
 @infoline @expr{theta},
-and see if @expr{x} and 
+and see if @expr{x} and
 @texline @math{x + \cos \theta}
-@infoline @expr{x + cos(theta)} 
+@infoline @expr{x + cos(theta)}
 (which is the @expr{x} coordinate of the other endpoint) cross a line.
 The lines are at integer coordinates, so this happens when the two
 numbers surround an integer.
@@ -7670,9 +7670,9 @@
 coordinates 0 and 1 for the lines on either side of the leftmost
 endpoint.  The rightmost endpoint will be between 0 and 1 if the
 match does not cross a line, or between 1 and 2 if it does.  So:
-Pick random @expr{x} and 
+Pick random @expr{x} and
 @texline @math{\theta},
-@infoline @expr{theta}, 
+@infoline @expr{theta},
 compute
 @texline @math{x + \cos \theta},
 @infoline @expr{x + cos(theta)},
@@ -8997,7 +8997,7 @@
 algebraic entry, whichever way you prefer:
 
 @noindent
-Computing 
+Computing
 @texline @math{\displaystyle{\sin x \over x}}:
 @infoline @expr{sin(x) / x}:
 
@@ -9068,7 +9068,7 @@
 
 @noindent
 This program is quite efficient because Calc knows how to raise a
-matrix (or other value) to the power @expr{n} in only 
+matrix (or other value) to the power @expr{n} in only
 @texline @math{\log_2 n}
 @infoline @expr{log(n,2)}
 steps.  For example, this program can compute the 1000th Fibonacci
@@ -9122,7 +9122,7 @@
 
 @noindent
 The first step is to compute the derivative @expr{f'(x)} and thus
-the formula 
+the formula
 @texline @math{\displaystyle{x - {f(x) \over f'(x)}}}.
 @infoline @expr{x - f(x)/f'(x)}.
 
@@ -9239,12 +9239,12 @@
 @noindent
 The first step is to adjust @expr{z} to be greater than 5.  A simple
 ``for'' loop will do the job here.  If @expr{z} is less than 5, we
-reduce the problem using 
+reduce the problem using
 @texline @math{\psi(z) = \psi(z+1) - 1/z}.
 @infoline @expr{psi(z) = psi(z+1) - 1/z}.  We go
-on to compute 
+on to compute
 @texline @math{\psi(z+1)},
-@infoline @expr{psi(z+1)}, 
+@infoline @expr{psi(z+1)},
 and remember to add back a factor of @expr{-1/z} when we're done.  This
 step is repeated until @expr{z > 5}.
 
@@ -9283,7 +9283,7 @@
 @end group
 @end smallexample
 
-Now we compute the initial part of the sum:  
+Now we compute the initial part of the sum:
 @texline @math{\ln z - {1 \over 2z}}
 @infoline @expr{ln(z) - 1/2z}
 minus the adjustment factor.
@@ -9326,9 +9326,9 @@
 @end group
 @end smallexample
 
-This is the value of 
+This is the value of
 @texline @math{-\gamma},
-@infoline @expr{- gamma}, 
+@infoline @expr{- gamma},
 with a slight bit of roundoff error.  To get a full 12 digits, let's use
 a higher precision:
 
@@ -9361,9 +9361,9 @@
 
 @noindent
 Taking the derivative of a term of the form @expr{x^n} will produce
-a term like 
+a term like
 @texline @math{n x^{n-1}}.
-@infoline @expr{n x^(n-1)}.  
+@infoline @expr{n x^(n-1)}.
 Taking the derivative of a constant
 produces zero.  From this it is easy to see that the @expr{n}th
 derivative of a polynomial, evaluated at @expr{x = 0}, will equal the
@@ -9652,7 +9652,7 @@
 @mindex @null
 @end ignore
 In most installations, the @kbd{C-x * c} key sequence is a more
-convenient way to start the Calculator.  Also, @kbd{C-x * *} 
+convenient way to start the Calculator.  Also, @kbd{C-x * *}
 is a synonym for @kbd{C-x * c} unless you last used Calc
 in its Keypad mode.
 
@@ -9908,9 +9908,9 @@
 The @kbd{h f} (@code{calc-describe-function}) command looks up an
 algebraic function or a command name in the Calc manual.  Enter an
 algebraic function name to look up that function in the Function
-Index or enter a command name beginning with @samp{calc-} to look it 
+Index or enter a command name beginning with @samp{calc-} to look it
 up in the Command Index.  This command will also look up operator
-symbols that can appear in algebraic formulas, like @samp{%} and 
+symbols that can appear in algebraic formulas, like @samp{%} and
 @samp{=>}.
 
 @kindex h v
@@ -10038,7 +10038,7 @@
 @cindex Formulas, entering
 The @kbd{'} (@code{calc-algebraic-entry}) command can be used to enter
 calculations in algebraic form.  This is accomplished by typing the
-apostrophe key, ', followed by the expression in standard format:  
+apostrophe key, ', followed by the expression in standard format:
 
 @example
 ' 2+3*4 @key{RET}.
@@ -10047,7 +10047,7 @@
 @noindent
 This will compute
 @texline @math{2+(3\times4) = 14}
-@infoline @expr{2+(3*4) = 14} 
+@infoline @expr{2+(3*4) = 14}
 and push it on the stack.  If you wish you can
 ignore the RPN aspect of Calc altogether and simply enter algebraic
 expressions in this way.  You may want to use @key{DEL} every so often to
@@ -10453,9 +10453,9 @@
 approximation.  This value will not need to be recomputed ever again
 unless you raise the precision still further.  Many operations such as
 logarithms and sines make use of similarly cached values such as
-@cpiover{4} and 
+@cpiover{4} and
 @texline @math{\ln 2}.
-@infoline @expr{ln(2)}.  
+@infoline @expr{ln(2)}.
 The visible effect of caching is that
 high-precision computations may seem to do extra work the first time.
 Other things cached include powers of two (for the binary arithmetic
@@ -10612,10 +10612,10 @@
 A floating-point number or @dfn{float} is a number stored in scientific
 notation.  The number of significant digits in the fractional part is
 governed by the current floating precision (@pxref{Precision}).  The
-range of acceptable values is from 
+range of acceptable values is from
 @texline @math{10^{-3999999}}
-@infoline @expr{10^-3999999} 
-(inclusive) to 
+@infoline @expr{10^-3999999}
+(inclusive) to
 @texline @math{10^{4000000}}
 @infoline @expr{10^4000000}
 (exclusive), plus the corresponding negative values and zero.
@@ -10690,18 +10690,18 @@
 Rectangular complex numbers can also be displayed in @samp{@var{a}+@var{b}i}
 notation; @pxref{Complex Formats}.
 
-Polar complex numbers are displayed in the form 
+Polar complex numbers are displayed in the form
 @texline `@tfn{(}@var{r}@tfn{;}@math{\theta}@tfn{)}'
 @infoline `@tfn{(}@var{r}@tfn{;}@var{theta}@tfn{)}'
-where @var{r} is the nonnegative magnitude and 
-@texline @math{\theta}
-@infoline @var{theta} 
-is the argument or phase angle.  The range of 
-@texline @math{\theta}
-@infoline @var{theta} 
+where @var{r} is the nonnegative magnitude and
+@texline @math{\theta}
+@infoline @var{theta}
+is the argument or phase angle.  The range of
+@texline @math{\theta}
+@infoline @var{theta}
 depends on the current angular mode (@pxref{Angular Modes}); it is
 generally between @mathit{-180} and @mathit{+180} degrees or the equivalent range
-in radians. 
+in radians.
 
 Complex numbers are entered in stages using incomplete objects.
 @xref{Incomplete Objects}.
@@ -10742,9 +10742,9 @@
 larger, becomes arbitrarily close to zero.  So you can imagine
 that if @expr{x} got ``all the way to infinity,'' then @expr{1 / x}
 would go all the way to zero.  Similarly, when they say that
-@samp{exp(inf) = inf}, they mean that 
+@samp{exp(inf) = inf}, they mean that
 @texline @math{e^x}
-@infoline @expr{exp(x)} 
+@infoline @expr{exp(x)}
 grows without bound as @expr{x} grows.  The symbol @samp{-inf} likewise
 stands for an infinitely negative real value; for example, we say that
 @samp{exp(-inf) = 0}.  You can have an infinity pointing in any
@@ -10839,7 +10839,7 @@
 @end ignore
 @tindex vec
 Algebraic functions for building vectors include @samp{vec(a, b, c)}
-to build @samp{[a, b, c]}, @samp{cvec(a, n, m)} to build an 
+to build @samp{[a, b, c]}, @samp{cvec(a, n, m)} to build an
 @texline @math{n\times m}
 @infoline @var{n}x@var{m}
 matrix of @samp{a}s, and @samp{index(n)} to build a vector of integers
@@ -11184,9 +11184,9 @@
 division is left in symbolic form.  Other operations, such as square
 roots, are not yet supported for modulo forms.  (Note that, although
 @w{`@tfn{(}@var{a} @tfn{mod} @var{M}@tfn{)^.5}'} will compute a ``modulo square root''
-in the sense of reducing 
+in the sense of reducing
 @texline @math{\sqrt a}
-@infoline @expr{sqrt(a)} 
+@infoline @expr{sqrt(a)}
 modulo @expr{M}, this is not a useful definition from the
 number-theoretical point of view.)
 
@@ -11220,11 +11220,11 @@
 @cindex Standard deviations
 An @dfn{error form} is a number with an associated standard
 deviation, as in @samp{2.3 +/- 0.12}.  The notation
-@texline `@var{x} @tfn{+/-} @math{\sigma}' 
-@infoline `@var{x} @tfn{+/-} sigma' 
+@texline `@var{x} @tfn{+/-} @math{\sigma}'
+@infoline `@var{x} @tfn{+/-} sigma'
 stands for an uncertain value which follows
 a normal or Gaussian distribution of mean @expr{x} and standard
-deviation or ``error'' 
+deviation or ``error''
 @texline @math{\sigma}.
 @infoline @expr{sigma}.
 Both the mean and the error can be either numbers or
@@ -11235,7 +11235,7 @@
 
 All arithmetic and transcendental functions accept error forms as input.
 Operations on the mean-value part work just like operations on regular
-numbers.  The error part for any function @expr{f(x)} (such as 
+numbers.  The error part for any function @expr{f(x)} (such as
 @texline @math{\sin x}
 @infoline @expr{sin(x)})
 is defined by the error of @expr{x} times the derivative of @expr{f}
@@ -11267,35 +11267,35 @@
 of standard deviations.  Actual errors often are neither Gaussian-distributed
 nor uncorrelated, and the above formulas are valid only when errors
 are small.  As an example, the error arising from
-@texline `@tfn{sin(}@var{x} @tfn{+/-} @math{\sigma}@tfn{)}' 
-@infoline `@tfn{sin(}@var{x} @tfn{+/-} @var{sigma}@tfn{)}' 
-is 
-@texline `@math{\sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.  
-@infoline `@var{sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.  
+@texline `@tfn{sin(}@var{x} @tfn{+/-} @math{\sigma}@tfn{)}'
+@infoline `@tfn{sin(}@var{x} @tfn{+/-} @var{sigma}@tfn{)}'
+is
+@texline `@math{\sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.
+@infoline `@var{sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.
 When @expr{x} is close to zero,
 @texline @math{\cos x}
-@infoline @expr{cos(x)} 
-is close to one so the error in the sine is close to 
+@infoline @expr{cos(x)}
+is close to one so the error in the sine is close to
 @texline @math{\sigma};
 @infoline @expr{sigma};
-this makes sense, since 
+this makes sense, since
 @texline @math{\sin x}
-@infoline @expr{sin(x)} 
+@infoline @expr{sin(x)}
 is approximately @expr{x} near zero, so a given error in @expr{x} will
 produce about the same error in the sine.  Likewise, near 90 degrees
 @texline @math{\cos x}
-@infoline @expr{cos(x)} 
+@infoline @expr{cos(x)}
 is nearly zero and so the computed error is
 small:  The sine curve is nearly flat in that region, so an error in @expr{x}
-has relatively little effect on the value of 
+has relatively little effect on the value of
 @texline @math{\sin x}.
-@infoline @expr{sin(x)}.  
+@infoline @expr{sin(x)}.
 However, consider @samp{sin(90 +/- 1000)}.  The cosine of 90 is zero, so
 Calc will report zero error!  We get an obviously wrong result because
 we have violated the small-error approximation underlying the error
 analysis.  If the error in @expr{x} had been small, the error in
 @texline @math{\sin x}
-@infoline @expr{sin(x)} 
+@infoline @expr{sin(x)}
 would indeed have been negligible.
 
 @ignore
@@ -11402,14 +11402,14 @@
 
 While it may seem that intervals and error forms are similar, they are
 based on entirely different concepts of inexact quantities.  An error
-form 
-@texline `@var{x} @tfn{+/-} @math{\sigma}' 
-@infoline `@var{x} @tfn{+/-} @var{sigma}' 
+form
+@texline `@var{x} @tfn{+/-} @math{\sigma}'
+@infoline `@var{x} @tfn{+/-} @var{sigma}'
 means a variable is random, and its value could
-be anything but is ``probably'' within one 
-@texline @math{\sigma} 
-@infoline @var{sigma} 
-of the mean value @expr{x}. An interval 
+be anything but is ``probably'' within one
+@texline @math{\sigma}
+@infoline @var{sigma}
+of the mean value @expr{x}. An interval
 `@tfn{[}@var{a} @tfn{..@:} @var{b}@tfn{]}' means a
 variable's value is unknown, but guaranteed to lie in the specified
 range.  Error forms are statistical or ``average case'' approximations;
@@ -11641,7 +11641,7 @@
 @samp{=>} [@code{evalto}].
 
 Note that, unlike in usual computer notation, multiplication binds more
-strongly than division:  @samp{a*b/c*d} is equivalent to 
+strongly than division:  @samp{a*b/c*d} is equivalent to
 @texline @math{a b \over c d}.
 @infoline @expr{(a*b)/(c*d)}.
 
@@ -11858,13 +11858,13 @@
 stack and the point on the line containing @samp{30}, @kbd{C-x C-t}
 creates @samp{10 20 40 30 50}.  More generally, @kbd{C-x C-t} acts on
 the stack objects determined by the current point (and mark) similar
-to how the text-mode command @code{transpose-lines} acts on 
+to how the text-mode command @code{transpose-lines} acts on
 lines.  With argument @var{n}, @kbd{C-x C-t} will move the stack object
 at the level above the current point and move it past N other objects;
 for example, with @samp{10 20 30 40 50} on the stack and the point on
-the line containing @samp{30}, @kbd{C-u 2 C-x C-t} creates 
+the line containing @samp{30}, @kbd{C-u 2 C-x C-t} creates
 @samp{10 40 20 30 50}. With an argument of 0, @kbd{C-x C-t} will switch
-the stack objects at the levels determined by the point and the mark. 
+the stack objects at the levels determined by the point and the mark.
 
 @node Editing Stack Entries, Trail Commands, Stack Manipulation, Stack and Trail
 @section Editing Stack Entries
@@ -12056,7 +12056,7 @@
 With the exception of keyboard macros, this works for all commands that
 take arguments off the stack. (To avoid potentially unpleasant behavior,
 a @kbd{K} prefix before a keyboard macro will be ignored.  A @kbd{K}
-prefix called @emph{within} the keyboard macro will still take effect.)  
+prefix called @emph{within} the keyboard macro will still take effect.)
 As another example, @kbd{K a s} simplifies a formula, pushing the
 simplified version of the formula onto the stack after the original
 formula (rather than replacing the original formula).  Note that you
@@ -12064,7 +12064,7 @@
 formula and then simplifying the copy. One difference is that for a very
 large formula the time taken to format the intermediate copy in
 @kbd{@key{RET} a s} could be noticeable; @kbd{K a s} would avoid this
-extra work. 
+extra work.
 
 Even stack manipulation commands are affected.  @key{TAB} works by
 popping two values and pushing them back in the opposite order,
@@ -12155,7 +12155,7 @@
 If the file name you give is your user init file (typically
 @file{~/.emacs}), @kbd{m F} will not automatically load the new file.  This
 is because your user init file may contain other things you don't want
-to reread.  You can give 
+to reread.  You can give
 a numeric prefix argument of 1 to @kbd{m F} to force it to read the
 file no matter what.  Conversely, an argument of @mathit{-1} tells
 @kbd{m F} @emph{not} to read the new file.  An argument of 2 or @mathit{-2}
@@ -12274,7 +12274,7 @@
 @pindex calc-option
 The @kbd{O} key (@code{calc-option}) sets another flag, the
 @dfn{Option Flag}, which also can alter the subsequent Calc command in
-various ways. 
+various ways.
 
 The Inverse, Hyperbolic and Option flags apply only to the next
 Calculator command, after which they are automatically cleared.  (They
@@ -12366,7 +12366,7 @@
 rather get an exact fractional answer.  One way to accomplish this is
 to use the @kbd{:} (@code{calc-fdiv}) [@code{fdiv}] command, which
 divides the two integers on the top of the stack to produce a fraction:
-@kbd{6 @key{RET} 4 :} produces @expr{3:2} even though 
+@kbd{6 @key{RET} 4 :} produces @expr{3:2} even though
 @kbd{6 @key{RET} 4 /} produces @expr{1.5}.
 
 @kindex m f
@@ -13155,11 +13155,11 @@
 command causes integers to be padded out with leading zeros according to the
 current binary word size.  (@xref{Binary Functions}, for a discussion of
 word size.)  If the absolute value of the word size is @expr{w}, all integers
-are displayed with at least enough digits to represent 
+are displayed with at least enough digits to represent
 @texline @math{2^w-1}
-@infoline @expr{(2^w)-1} 
+@infoline @expr{(2^w)-1}
 in the current radix.  (Larger integers will still be displayed in their
-entirety.) 
+entirety.)
 
 @cindex Two's complements
 Calc can display @expr{w}-bit integers using two's complement
@@ -13181,7 +13181,7 @@
 are represented by themselves and the integers from
 @texline @math{-2^{w-1}}
 @infoline @expr{-2^(w-1)}
-to @expr{-1} are represented by the integers from 
+to @expr{-1} are represented by the integers from
 @texline @math{2^{w-1}}
 @infoline @expr{2^(w-1)}
 to @expr{2^w-1} (the integer @expr{k} is represented by @expr{k+2^w}).
@@ -13190,7 +13190,7 @@
 representation (including any leading zeros necessary to include all
 @expr{w} bits).  In a two's complement display mode, numbers that
 are not displayed in two's complement notation (i.e., that aren't
-integers from  
+integers from
 @texline @math{-2^{w-1}}
 @infoline @expr{-2^(w-1)}
 to
@@ -14095,13 +14095,13 @@
 formulas (a reference to an existing entry on the stack).
 
 Complex numbers are displayed as in @samp{3 + 4i}.  Fractions and
-quotients are written using @code{\over} in @TeX{} mode (as in 
+quotients are written using @code{\over} in @TeX{} mode (as in
 @code{@{a \over b@}}) and @code{\frac} in La@TeX{} mode (as in
 @code{\frac@{a@}@{b@}});  binomial coefficients are written with
 @code{\choose} in @TeX{} mode (as in @code{@{a \choose b@}}) and
 @code{\binom} in La@TeX{} mode (as in @code{\binom@{a@}@{b@}}).
 Interval forms are written with @code{\ldots}, and error forms are
-written with @code{\pm}. Absolute values are written as in 
+written with @code{\pm}. Absolute values are written as in
 @samp{|x + 1|}, and the floor and ceiling functions are written with
 @code{\lfloor}, @code{\rfloor}, etc. The words @code{\left} and
 @code{\right} are ignored when reading formulas in @TeX{} and La@TeX{}
@@ -14114,10 +14114,10 @@
 instead of parentheses for very simple arguments.  During input, curly
 braces and parentheses work equally well for grouping, but when the
 document is formatted the curly braces will be invisible.  Thus the
-printed result is 
+printed result is
 @texline @math{\sin{2 x}}
-@infoline @expr{sin 2x} 
-but 
+@infoline @expr{sin 2x}
+but
 @texline @math{\sin(2 + x)}.
 @infoline @expr{sin(2 + x)}.
 
@@ -14131,7 +14131,7 @@
 @kbd{d L} with a positive numeric prefix argument, names of more than
 one character will instead be enclosed in a protective commands that
 will prevent them from being typeset in the math italics; they will be
-written @samp{\hbox@{@var{name}@}} in @TeX{} mode and 
+written @samp{\hbox@{@var{name}@}} in @TeX{} mode and
 @samp{\text@{@var{name}@}} in La@TeX{} mode.  The
 @samp{\hbox@{ @}} and @samp{\text@{ @}} notations are ignored during
 reading.  If you use a negative prefix argument, such function names are
@@ -14143,7 +14143,7 @@
 
 During reading, text of the form @samp{\matrix@{ ...@: @}} is replaced
 by @samp{[ ...@: ]}.  The same also applies to @code{\pmatrix} and
-@code{\bmatrix}.  In La@TeX{} mode this also applies to 
+@code{\bmatrix}.  In La@TeX{} mode this also applies to
 @samp{\begin@{matrix@} ... \end@{matrix@}},
 @samp{\begin@{bmatrix@} ... \end@{bmatrix@}},
 @samp{\begin@{pmatrix@} ... \end@{pmatrix@}}, as well as
@@ -14151,12 +14151,12 @@
 The symbol @samp{&} is interpreted as a comma,
 and the symbols @samp{\cr} and @samp{\\} are interpreted as semicolons.
 During output, matrices are displayed in @samp{\matrix@{ a & b \\ c & d@}}
-format in @TeX{} mode and in 
+format in @TeX{} mode and in
 @samp{\begin@{pmatrix@} a & b \\ c & d \end@{pmatrix@}} format in
 La@TeX{} mode; you may need to edit this afterwards to change to your
 preferred matrix form.  If you invoke @kbd{d T} or @kbd{d L} with an
 argument of 2 or -2, then matrices will be displayed in two-dimensional
-form, such as 
+form, such as
 
 @example
 \begin@{pmatrix@}
@@ -14300,25 +14300,25 @@
 @example
 Calc      TeX           LaTeX         eqn
 ----      ---           -----         ---
-acute     \acute        \acute        
-Acute                   \Acute        
+acute     \acute        \acute
+Acute                   \Acute
 bar       \bar          \bar          bar
 Bar                     \Bar
-breve     \breve        \breve        
-Breve                   \Breve        
-check     \check        \check        
-Check                   \Check        
+breve     \breve        \breve
+Breve                   \Breve
+check     \check        \check
+Check                   \Check
 dddot                   \dddot
 ddddot                  \ddddot
 dot       \dot          \dot          dot
 Dot                     \Dot
 dotdot    \ddot         \ddot         dotdot
-DotDot                  \Ddot         
+DotDot                  \Ddot
 dyad                                  dyad
-grave     \grave        \grave        
-Grave                   \Grave        
+grave     \grave        \grave
+Grave                   \Grave
 hat       \hat          \hat          hat
-Hat                     \Hat          
+Hat                     \Hat
 Prime                                 prime
 tilde     \tilde        \tilde        tilde
 Tilde                   \Tilde
@@ -14363,7 +14363,7 @@
 
 Note that, because these symbols are ignored, reading a @TeX{} or
 La@TeX{} formula into Calc and writing it back out may lose spacing and
-font information. 
+font information.
 
 Also, the ``discretionary multiplication sign'' @samp{\*} is read
 the same as @samp{*}.
@@ -14542,7 +14542,7 @@
 of quotes in @dfn{eqn}, but it is good enough for most uses.
 
 Accent codes (@samp{@var{x} dot}) are handled by treating them as
-function calls (@samp{dot(@var{x})}) internally.  
+function calls (@samp{dot(@var{x})}) internally.
 @xref{TeX and LaTeX Language Modes}, for a table of these accent
 functions.  The @code{prime} accent is treated specially if it occurs on
 a variable or function name: @samp{f prime prime @w{( x prime )}} is
@@ -14572,7 +14572,7 @@
 The @kbd{d Y} (@code{calc-yacas-language}) command selects the
 conventions of Yacas, a free computer algebra system.  While the
 operators and functions in Yacas are similar to those of Calc, the names
-of built-in functions in Yacas are capitalized.  The Calc formula 
+of built-in functions in Yacas are capitalized.  The Calc formula
 @samp{sin(2 x)}, for example, is entered and displayed @samp{Sin(2 x)}
 in Yacas mode,  and `@samp{arcsin(x^2)} is @samp{ArcSin(x^2)} in Yacas
 mode.  Complex numbers are written  are written @samp{3 + 4 I}.
@@ -14581,9 +14581,9 @@
 represents both @code{inf} and @code{uinf}, and @code{Undefined}
 represents @code{nan}.
 
-Certain operators on functions, such as @code{D} for differentiation 
+Certain operators on functions, such as @code{D} for differentiation
 and @code{Integrate} for integration, take a prefix form in Yacas.  For
-example, the derivative of @w{@samp{e^x sin(x)}} can be computed with 
+example, the derivative of @w{@samp{e^x sin(x)}} can be computed with
 @w{@samp{D(x) Exp(x)*Sin(x)}}.
 
 Other notable differences between Yacas and standard Calc expressions
@@ -14602,7 +14602,7 @@
 The @kbd{d X} (@code{calc-maxima-language}) command selects the
 conventions of Maxima, another free computer algebra system.  The
 function names in Maxima are similar, but not always identical, to Calc.
-For example, instead of @samp{arcsin(x)}, Maxima will use 
+For example, instead of @samp{arcsin(x)}, Maxima will use
 @samp{asin(x)}.  Complex numbers are written @samp{3 + 4 %i}.  The
 standard special constants are written @code{%pi},  @code{%e},
 @code{%i}, @code{%phi} and @code{%gamma}.  In Maxima,  @code{inf} means
@@ -14610,8 +14610,8 @@
 
 Underscores as well as percent signs are allowed in function and
 variable names in Maxima mode.  The underscore again is equivalent to
-the @samp{#} in Normal mode, and the percent sign is equivalent to 
-@samp{o'o}.  
+the @samp{#} in Normal mode, and the percent sign is equivalent to
+@samp{o'o}.
 
 Maxima uses square brackets for lists and vectors, and matrices are
 written as calls to the function @code{matrix}, given the row vectors of
@@ -14629,7 +14629,7 @@
 names in Giac are similar to Maxima.  Complex numbers are written
 @samp{3 + 4 i}.  The standard special constants in Giac are the same as
 in Calc, except that @code{infinity} represents both Calc's @code{inf}
-and @code{uinf}. 
+and @code{uinf}.
 
 Underscores are allowed in function and variable names in Giac mode.
 Brackets are used for subscripts.  In Giac, indexing of lists begins at
@@ -15786,9 +15786,9 @@
 @item
 Matrix/Scalar mode.  Default value is @mathit{-1}.  Value is 0 for Scalar
 mode, @mathit{-2} for Matrix mode, @mathit{-3} for square Matrix mode,
-or @var{N} for  
+or @var{N} for
 @texline @math{N\times N}
-@infoline @var{N}x@var{N} 
+@infoline @var{N}x@var{N}
 Matrix mode.  Command is @kbd{m v}.
 
 @item
@@ -16178,7 +16178,7 @@
 @mindex @null
 @end ignore
 @tindex /
-The @kbd{/} (@code{calc-divide}) command divides two numbers.  
+The @kbd{/} (@code{calc-divide}) command divides two numbers.
 
 When combining multiplication and division in an algebraic formula, it
 is good style to use parentheses to distinguish between possible
@@ -16187,7 +16187,7 @@
 parentheses, Calc will interpret @samp{a/b*c} as @samp{a/(b*c)}, since
 in algebraic entry Calc gives division a lower precedence than
 multiplication. (This is not standard across all computer languages, and
-Calc may change the precedence depending on the language mode being used.  
+Calc may change the precedence depending on the language mode being used.
 @xref{Language Modes}.)  This default ordering can be changed by setting
 the customizable variable @code{calc-multiplication-has-precedence} to
 @code{nil} (@pxref{Customizing Calc}); this will give multiplication and
@@ -16373,7 +16373,7 @@
 The @kbd{f M} (@code{calc-mant-part}) [@code{mant}] function extracts
 the ``mantissa'' part @expr{m} of its floating-point argument; @kbd{f X}
 (@code{calc-xpon-part}) [@code{xpon}] extracts the ``exponent'' part
-@expr{e}.  The original number is equal to 
+@expr{e}.  The original number is equal to
 @texline @math{m \times 10^e},
 @infoline @expr{m * 10^e},
 where @expr{m} is in the interval @samp{[1.0 ..@: 10.0)} except that
@@ -16406,9 +16406,9 @@
 For example, incrementing @samp{12.3456} when the current precision
 is 6 digits yields @samp{12.3457}.  If the current precision had been
 8 digits, the result would have been @samp{12.345601}.  Incrementing
-@samp{0.0} produces 
+@samp{0.0} produces
 @texline @math{10^{-p}},
-@infoline @expr{10^-p}, 
+@infoline @expr{10^-p},
 where @expr{p} is the current
 precision.  These operations are defined only on integers and floats.
 With numeric prefix arguments, they change the number by @expr{n} units.
@@ -16852,7 +16852,7 @@
 The @kbd{t J} (@code{calc-julian}) [@code{julian}] command converts
 a date form into a Julian day count, which is the number of days
 since noon (GMT) on Jan 1, 4713 BC.  A pure date is converted to an
-integer Julian count representing noon of that day.  A date/time form 
+integer Julian count representing noon of that day.  A date/time form
 is converted to an exact floating-point Julian count, adjusted to
 interpret the date form in the current time zone but the Julian
 day count in Greenwich Mean Time.  A numeric prefix argument allows
@@ -17294,12 +17294,12 @@
 default get the time zone and daylight saving information from the
 calendar (@pxref{Daylight Saving,Calendar/Diary,The Calendar and the Diary,
 emacs,The GNU Emacs Manual}).  To use a different time zone, or if the
-calendar does not give the desired result, you can set the Calc variable 
+calendar does not give the desired result, you can set the Calc variable
 @code{TimeZone} (which is by default @code{nil}) to an appropriate
 time zone name.  (The easiest way to do this is to edit the
 @code{TimeZone} variable using Calc's @kbd{s T} command, then use the
 @kbd{s p} (@code{calc-permanent-variable}) command to save the value of
-@code{TimeZone} permanently.)  
+@code{TimeZone} permanently.)
 If the time zone given by @code{TimeZone} is a generalized time zone,
 e.g., @code{EGT}, Calc examines the date being converted to tell whether
 to use standard or daylight saving time.  But if the current time zone
@@ -17311,12 +17311,12 @@
 
 The @kbd{t J} and @code{t U} commands with no numeric prefix
 arguments do the same thing as @samp{tzone()}; namely, use the
-information from the calendar if @code{TimeZone} is @code{nil}, 
+information from the calendar if @code{TimeZone} is @code{nil},
 otherwise use the time zone given by @code{TimeZone}.
 
 @vindex math-daylight-savings-hook
 @findex math-std-daylight-savings
-When Calc computes the daylight saving information itself (i.e., when 
+When Calc computes the daylight saving information itself (i.e., when
 the @code{TimeZone} variable is set), it will by default consider
 daylight saving time to begin at 2 a.m.@: on the second Sunday of March
 (for years from 2007 on) or on the last Sunday in April (for years
@@ -17392,7 +17392,7 @@
 from 3 a.m.@: to 4 a.m.  At the end of daylight saving time, the
 hour from 1 a.m.@: to 2 a.m.@: repeats itself; converting a date/time
 form that falls in this hour results in a time value for the first
-manifestation of that time (@emph{not} the one that occurs one hour 
+manifestation of that time (@emph{not} the one that occurs one hour
 later).
 
 If @code{math-daylight-savings-hook} is @code{nil}, then the
@@ -17995,12 +17995,12 @@
 @expr{2^w} by all binary functions.
 
 If the word size is negative, binary operations produce twos-complement
-integers from 
+integers from
 @texline @math{-2^{-w-1}}
-@infoline @expr{-(2^(-w-1))} 
-to 
+@infoline @expr{-(2^(-w-1))}
+to
 @texline @math{2^{-w-1}-1}
-@infoline @expr{2^(-w-1)-1} 
+@infoline @expr{2^(-w-1)-1}
 inclusive.  Either mode accepts inputs in any range; the sign of
 @expr{w} affects only the results produced.
 
@@ -18182,13 +18182,13 @@
 One miscellaneous command is shift-@kbd{P} (@code{calc-pi}), which pushes
 the value of @cpi{} (at the current precision) onto the stack.  With the
 Hyperbolic flag, it pushes the value @expr{e}, the base of natural logarithms.
-With the Inverse flag, it pushes Euler's constant 
+With the Inverse flag, it pushes Euler's constant
 @texline @math{\gamma}
-@infoline @expr{gamma} 
+@infoline @expr{gamma}
 (about 0.5772).  With both Inverse and Hyperbolic, it
-pushes the ``golden ratio'' 
+pushes the ``golden ratio''
 @texline @math{\phi}
-@infoline @expr{phi} 
+@infoline @expr{phi}
 (about 1.618).  (At present, Euler's constant is not available
 to unlimited precision; Calc knows only the first 100 digits.)
 In Symbolic mode, these commands push the
@@ -18266,7 +18266,7 @@
 (base-10) logarithm of a number.  (With the Inverse flag [@code{exp10}],
 it raises ten to a given power.)  Note that the common logarithm of a
 complex number is computed by taking the natural logarithm and dividing
-by 
+by
 @texline @math{\ln10}.
 @infoline @expr{ln(10)}.
 
@@ -18278,7 +18278,7 @@
 The @kbd{B} (@code{calc-log}) [@code{log}] command computes a logarithm
 to any base.  For example, @kbd{1024 @key{RET} 2 B} produces 10, since
 @texline @math{2^{10} = 1024}.
-@infoline @expr{2^10 = 1024}.  
+@infoline @expr{2^10 = 1024}.
 In certain cases like @samp{log(3,9)}, the result
 will be either @expr{1:2} or @expr{0.5} depending on the current Fraction
 mode setting.  With the Inverse flag [@code{alog}], this command is
@@ -18300,11 +18300,11 @@
 @tindex expm1
 The @kbd{f E} (@code{calc-expm1}) [@code{expm1}] command computes
 @texline @math{e^x - 1},
-@infoline @expr{exp(x)-1}, 
+@infoline @expr{exp(x)-1},
 but using an algorithm that produces a more accurate
-answer when the result is close to zero, i.e., when 
+answer when the result is close to zero, i.e., when
 @texline @math{e^x}
-@infoline @expr{exp(x)} 
+@infoline @expr{exp(x)}
 is close to one.
 
 @kindex f L
@@ -18312,7 +18312,7 @@
 @tindex lnp1
 The @kbd{f L} (@code{calc-lnp1}) [@code{lnp1}] command computes
 @texline @math{\ln(x+1)},
-@infoline @expr{ln(x+1)}, 
+@infoline @expr{ln(x+1)},
 producing a more accurate answer when @expr{x} is close to zero.
 
 @node Trigonometric and Hyperbolic Functions, Advanced Math Functions, Logarithmic Functions, Scientific Functions
@@ -18515,9 +18515,9 @@
 gamma function.  For positive integer arguments, this is related to the
 factorial function:  @samp{gamma(n+1) = fact(n)}.  For general complex
 arguments the gamma function can be defined by the following definite
-integral:  
+integral:
 @texline @math{\Gamma(a) = \int_0^\infty t^{a-1} e^t dt}.
-@infoline @expr{gamma(a) = integ(t^(a-1) exp(t), t, 0, inf)}.  
+@infoline @expr{gamma(a) = integ(t^(a-1) exp(t), t, 0, inf)}.
 (The actual implementation uses far more efficient computational methods.)
 
 @kindex f G
@@ -18549,7 +18549,7 @@
 @tindex gammaG
 The @kbd{f G} (@code{calc-inc-gamma}) [@code{gammaP}] command computes
 the incomplete gamma function, denoted @samp{P(a,x)}.  This is defined by
-the integral, 
+the integral,
 @texline @math{P(a,x) = \left( \int_0^x t^{a-1} e^t dt \right) / \Gamma(a)}.
 @infoline @expr{gammaP(a,x) = integ(t^(a-1) exp(t), t, 0, x) / gamma(a)}.
 This implies that @samp{gammaP(a,inf) = 1} for any @expr{a} (see the
@@ -18583,7 +18583,7 @@
 The @kbd{f b} (@code{calc-beta}) [@code{beta}] command computes the
 Euler beta function, which is defined in terms of the gamma function as
 @texline @math{B(a,b) = \Gamma(a) \Gamma(b) / \Gamma(a+b)},
-@infoline @expr{beta(a,b) = gamma(a) gamma(b) / gamma(a+b)}, 
+@infoline @expr{beta(a,b) = gamma(a) gamma(b) / gamma(a+b)},
 or by
 @texline @math{B(a,b) = \int_0^1 t^{a-1} (1-t)^{b-1} dt}.
 @infoline @expr{beta(a,b) = integ(t^(a-1) (1-t)^(b-1), t, 0, 1)}.
@@ -18606,7 +18606,7 @@
 @tindex erf
 @tindex erfc
 The @kbd{f e} (@code{calc-erf}) [@code{erf}] command computes the
-error function 
+error function
 @texline @math{\hbox{erf}(x) = {2 \over \sqrt{\pi}} \int_0^x e^{-t^2} dt}.
 @infoline @expr{erf(x) = 2 integ(exp(-(t^2)), t, 0, x) / sqrt(pi)}.
 The complementary error function @kbd{I f e} (@code{calc-erfc}) [@code{erfc}]
@@ -18784,9 +18784,9 @@
 random numbers of various sorts.
 
 Given a positive numeric prefix argument @expr{M}, it produces a random
-integer @expr{N} in the range 
+integer @expr{N} in the range
 @texline @math{0 \le N < M}.
-@infoline @expr{0 <= N < M}.  
+@infoline @expr{0 <= N < M}.
 Each possible value @expr{N} appears with equal probability.
 
 With no numeric prefix argument, the @kbd{k r} command takes its argument
@@ -18794,17 +18794,17 @@
 the result is a random integer less than @expr{M}.  However, note that
 while numeric prefix arguments are limited to six digits or so, an @expr{M}
 taken from the stack can be arbitrarily large.  If @expr{M} is negative,
-the result is a random integer in the range 
+the result is a random integer in the range
 @texline @math{M < N \le 0}.
 @infoline @expr{M < N <= 0}.
 
 If the value on the stack is a floating-point number @expr{M}, the result
-is a random floating-point number @expr{N} in the range 
+is a random floating-point number @expr{N} in the range
 @texline @math{0 \le N < M}
 @infoline @expr{0 <= N < M}
-or 
+or
 @texline @math{M < N \le 0},
-@infoline @expr{M < N <= 0}, 
+@infoline @expr{M < N <= 0},
 according to the sign of @expr{M}.
 
 If @expr{M} is zero, the result is a Gaussian-distributed random real
@@ -18812,14 +18812,14 @@
 of one.  The algorithm used generates random numbers in pairs; thus,
 every other call to this function will be especially fast.
 
-If @expr{M} is an error form 
+If @expr{M} is an error form
 @texline @math{m} @code{+/-} @math{\sigma}
-@infoline @samp{m +/- s} 
-where @var{m} and 
+@infoline @samp{m +/- s}
+where @var{m} and
 @texline @math{\sigma}
-@infoline @var{s} 
+@infoline @var{s}
 are both real numbers, the result uses a Gaussian distribution with mean
-@var{m} and standard deviation 
+@var{m} and standard deviation
 @texline @math{\sigma}.
 @infoline @var{s}.
 
@@ -18932,9 +18932,9 @@
 
 If @code{RandSeed} contains an integer, Calc uses this integer to
 seed an ``additive congruential'' method (Knuth's algorithm 3.2.2A,
-computing 
+computing
 @texline @math{X_{n-55} - X_{n-24}}.
-@infoline @expr{X_n-55 - X_n-24}).  
+@infoline @expr{X_n-55 - X_n-24}).
 This method expands the seed
 value into a large table which is maintained internally; the variable
 @code{RandSeed} is changed from, e.g., 42 to the vector @expr{[42]}
@@ -18970,18 +18970,18 @@
 To create a random floating-point number with precision @var{p}, Calc
 simply creates a random @var{p}-digit integer and multiplies by
 @texline @math{10^{-p}}.
-@infoline @expr{10^-p}.  
+@infoline @expr{10^-p}.
 The resulting random numbers should be very clean, but note
 that relatively small numbers will have few significant random digits.
 In other words, with a precision of 12, you will occasionally get
-numbers on the order of 
+numbers on the order of
 @texline @math{10^{-9}}
-@infoline @expr{10^-9} 
-or 
+@infoline @expr{10^-9}
+or
 @texline @math{10^{-10}},
-@infoline @expr{10^-10}, 
+@infoline @expr{10^-10},
 but those numbers will only have two or three random digits since they
-correspond to small integers times 
+correspond to small integers times
 @texline @math{10^{-12}}.
 @infoline @expr{10^-12}.
 
@@ -19032,7 +19032,7 @@
 @tindex egcd
 The @kbd{k E} (@code{calc-extended-gcd}) [@code{egcd}] command computes
 the GCD of two integers @expr{x} and @expr{y} and returns a vector
-@expr{[g, a, b]} where 
+@expr{[g, a, b]} where
 @texline @math{g = \gcd(x,y) = a x + b y}.
 @infoline @expr{g = gcd(x,y) = a x + b y}.
 
@@ -19119,11 +19119,11 @@
 @tindex stir1
 @tindex stir2
 The @kbd{k s} (@code{calc-stirling-number}) [@code{stir1}] command
-computes a Stirling number of the first 
+computes a Stirling number of the first
 @texline kind@tie{}@math{n \brack m},
 @infoline kind,
 given two integers @expr{n} and @expr{m} on the stack.  The @kbd{H k s}
-[@code{stir2}] command computes a Stirling number of the second 
+[@code{stir2}] command computes a Stirling number of the second
 @texline kind@tie{}@math{n \brace m}.
 @infoline kind.
 These are the number of @expr{m}-cycle permutations of @expr{n} objects,
@@ -19202,7 +19202,7 @@
 @pindex calc-totient
 @tindex totient
 The @kbd{k t} (@code{calc-totient}) [@code{totient}] command computes the
-Euler ``totient'' 
+Euler ``totient''
 @texline function@tie{}@math{\phi(n)},
 @infoline function,
 the number of integers less than @expr{n} which
@@ -19277,7 +19277,7 @@
 @tindex ltpc
 The @samp{utpc(x,v)} function uses the chi-square distribution with
 @texline @math{\nu}
-@infoline @expr{v} 
+@infoline @expr{v}
 degrees of freedom.  It is the probability that a model is
 correct if its chi-square statistic is @expr{x}.
 
@@ -19293,10 +19293,10 @@
 @end ignore
 @tindex ltpf
 The @samp{utpf(F,v1,v2)} function uses the F distribution, used in
-various statistical tests.  The parameters 
+various statistical tests.  The parameters
 @texline @math{\nu_1}
-@infoline @expr{v1} 
-and 
+@infoline @expr{v1}
+and
 @texline @math{\nu_2}
 @infoline @expr{v2}
 are the degrees of freedom in the numerator and denominator,
@@ -19314,9 +19314,9 @@
 @end ignore
 @tindex ltpn
 The @samp{utpn(x,m,s)} function uses a normal (Gaussian) distribution
-with mean @expr{m} and standard deviation 
+with mean @expr{m} and standard deviation
 @texline @math{\sigma}.
-@infoline @expr{s}.  
+@infoline @expr{s}.
 It is the probability that such a normal-distributed random variable
 would exceed @expr{x}.
 
@@ -19347,20 +19347,20 @@
 @end ignore
 @tindex ltpt
 The @samp{utpt(t,v)} function uses the Student's ``t'' distribution
-with 
+with
 @texline @math{\nu}
-@infoline @expr{v} 
+@infoline @expr{v}
 degrees of freedom.  It is the probability that a
 t-distributed random variable will be greater than @expr{t}.
-(Note:  This computes the distribution function 
+(Note:  This computes the distribution function
 @texline @math{A(t|\nu)}
 @infoline @expr{A(t|v)}
-where 
+where
 @texline @math{A(0|\nu) = 1}
-@infoline @expr{A(0|v) = 1} 
-and 
+@infoline @expr{A(0|v) = 1}
+and
 @texline @math{A(\infty|\nu) \to 0}.
-@infoline @expr{A(inf|v) -> 0}.  
+@infoline @expr{A(inf|v) -> 0}.
 The @code{UTPT} operation on the HP-48 uses a different definition which
 returns half of Calc's value:  @samp{UTPT(t,v) = .5*utpt(t,v)}.)
 
@@ -19670,7 +19670,7 @@
 the stack is a scalar, it is used for each element on the diagonal, and
 the prefix argument is required.
 
-To build a constant square matrix, e.g., a 
+To build a constant square matrix, e.g., a
 @texline @math{3\times3}
 @infoline 3x3
 matrix filled with ones, use @kbd{0 M-3 v d 1 +}, i.e., build a zero
@@ -19911,7 +19911,7 @@
 With the Hyperbolic flag, @kbd{H v l} [@code{mdims}] computes a vector
 of the dimensions of a vector, matrix, or higher-order object.  For
 example, @samp{mdims([[a,b,c],[d,e,f]])} returns @samp{[2, 3]} since
-its argument is a 
+its argument is a
 @texline @math{2\times3}
 @infoline 2x3
 matrix.
@@ -19945,17 +19945,17 @@
 in the vector, the last row will be short and the result will not be
 suitable for use as a matrix.  For example, with the matrix
 @samp{[[1, 2], @w{[3, 4]}]} on the stack, @kbd{v a 4} produces
-@samp{[[1, 2, 3, 4]]} (a 
+@samp{[[1, 2, 3, 4]]} (a
 @texline @math{1\times4}
 @infoline 1x4
-matrix), @kbd{v a 1} produces @samp{[[1], [2], [3], [4]]} (a 
+matrix), @kbd{v a 1} produces @samp{[[1], [2], [3], [4]]} (a
 @texline @math{4\times1}
 @infoline 4x1
-matrix), @kbd{v a 2} produces @samp{[[1, 2], [3, 4]]} (the original 
+matrix), @kbd{v a 2} produces @samp{[[1, 2], [3, 4]]} (the original
 @texline @math{2\times2}
 @infoline 2x2
 matrix), @w{@kbd{v a 3}} produces @samp{[[1, 2, 3], [4]]} (not a
-matrix), and @kbd{v a 0} produces the flattened list 
+matrix), and @kbd{v a 0} produces the flattened list
 @samp{[1, 2, @w{3, 4}]}.
 
 @cindex Sorting data
@@ -20040,9 +20040,9 @@
 will be used to determine the bins. (If a positive integer is given at
 this prompt, it will be still treated as if it were given as a
 prefix.)  Each bin will consist of the interval of numbers closest to
-the corresponding number of this new vector; if the vector 
-@expr{[a, b, c, ...]} is entered at the prompt, the bins will be 
-@expr{(-inf, (a+b)/2]}, @expr{((a+b)/2, (b+c)/2]}, etc.  The result of 
+the corresponding number of this new vector; if the vector
+@expr{[a, b, c, ...]} is entered at the prompt, the bins will be
+@expr{(-inf, (a+b)/2]}, @expr{((a+b)/2, (b+c)/2]}, etc.  The result of
 this command will be a vector counting how many elements of the
 original vector are in each bin.
 
@@ -20313,10 +20313,10 @@
 sets are disjoint, i.e., if they share no common elements, the result
 will be the empty vector @samp{[]}.  Note that the characters @kbd{V}
 and @kbd{^} were chosen to be close to the conventional mathematical
-notation for set 
+notation for set
 @texline union@tie{}(@math{A \cup B})
 @infoline union
-and 
+and
 @texline intersection@tie{}(@math{A \cap B}).
 @infoline intersection.
 
@@ -20432,7 +20432,7 @@
 not include any negative numbers.  The input is interpreted as a
 set of integers in the sense of @kbd{V F} (@code{vfloor}).  Beware
 that a simple input like @samp{[100]} can result in a huge integer
-representation 
+representation
 @texline (@math{2^{100}}, a 31-digit integer, in this case).
 @infoline (@expr{2^100}, a 31-digit integer, in this case).
 
@@ -20544,10 +20544,10 @@
 @cindex Mean of data values
 The @kbd{u M} (@code{calc-vector-mean}) [@code{vmean}] command
 computes the average (arithmetic mean) of the data values.
-If the inputs are error forms 
+If the inputs are error forms
 @texline @math{x \pm \sigma},
-@infoline @samp{x +/- s}, 
-this is the weighted mean of the @expr{x} values with weights 
+@infoline @samp{x +/- s},
+this is the weighted mean of the @expr{x} values with weights
 @texline @math{1 /\sigma^2}.
 @infoline @expr{1 / s^2}.
 @tex
@@ -20558,9 +20558,9 @@
 values divided by the count of the values.
 
 Note that a plain number can be considered an error form with
-error 
+error
 @texline @math{\sigma = 0}.
-@infoline @expr{s = 0}.  
+@infoline @expr{s = 0}.
 If the input to @kbd{u M} is a mixture of
 plain numbers and error forms, the result is the mean of the
 plain numbers, ignoring all values with non-zero errors.  (By the
@@ -20662,7 +20662,7 @@
 @cindex Standard deviation
 @cindex Sample statistics
 The @kbd{u S} (@code{calc-vector-sdev}) [@code{vsdev}] command
-computes the standard 
+computes the standard
 @texline deviation@tie{}@math{\sigma}
 @infoline deviation
 of the data values.  If the values are error forms, the errors are used
@@ -20677,9 +20677,9 @@
 This function also applies to distributions.  The standard deviation
 of a single error form is simply the error part.  The standard deviation
 of a continuous interval happens to equal the difference between the
-limits, divided by 
+limits, divided by
 @texline @math{\sqrt{12}}.
-@infoline @expr{sqrt(12)}.  
+@infoline @expr{sqrt(12)}.
 The standard deviation of an integer interval is the same as the
 standard deviation of a vector of those integers.
 
@@ -20714,7 +20714,7 @@
 The @kbd{H u S} (@code{calc-vector-variance}) [@code{vvar}] and
 @kbd{H I u S} (@code{calc-vector-pop-variance}) [@code{vpvar}]
 commands compute the variance of the data values.  The variance
-is the 
+is the
 @texline square@tie{}@math{\sigma^2}
 @infoline square
 of the standard deviation, i.e., the sum of the
@@ -20738,7 +20738,7 @@
 vectors of equal size.  The vectors are each flattened in the same
 way as by the single-variable statistical functions.  Given a numeric
 prefix argument of 1, these functions instead take one object from
-the stack, which must be an 
+the stack, which must be an
 @texline @math{N\times2}
 @infoline Nx2
 matrix of data values.  Once again, variable names can be used in place
@@ -20996,7 +20996,7 @@
 If any argument to @kbd{V M} is a matrix, the operator is normally mapped
 across all elements of the matrix.  For example, given the matrix
 @expr{[[1, -2, 3], [-4, 5, -6]]}, @kbd{V M A} takes six absolute values to
-produce another 
+produce another
 @texline @math{3\times2}
 @infoline 3x2
 matrix, @expr{[[1, 2, 3], [4, 5, 6]]}.
@@ -21612,8 +21612,8 @@
 @pindex calc-break-selections
 The @kbd{j b} (@code{calc-break-selections}) command controls a mode
 in which the ``deep structure'' of these associative formulas shows
-through.  Calc actually stores the above formulas as 
-@samp{((a + b) - c) + d} and @samp{x * (y * z)}.  (Note that for certain 
+through.  Calc actually stores the above formulas as
+@samp{((a + b) - c) + d} and @samp{x * (y * z)}.  (Note that for certain
 obscure reasons, by default Calc treats multiplication as
 right-associative.)  Once you have enabled @kbd{j b} mode, selecting
 with the cursor on the @samp{-} sign would only select the @samp{a + b -
@@ -22098,7 +22098,7 @@
 example, if the formula on the stack is @samp{1 / (sqrt(a) + 1)}, you may
 wish to eliminate the square root in the denominator by multiplying
 the top and bottom by @samp{sqrt(a) - 1}.  If you did this simply by using
-a simple @kbd{j *} command, you would get 
+a simple @kbd{j *} command, you would get
 @samp{(sqrt(a)-1)/ (sqrt(a) (sqrt(a) - 1) + sqrt(a) - 1)}.  Instead,
 you would probably want to use @kbd{C-u 0 j *}, which would expand the
 bottom and give you the desired result @samp{(sqrt(a)-1)/(a-1)}.  More
@@ -22405,7 +22405,7 @@
 For example, @expr{2 + 3} is evaluated to @expr{5}, and @expr{@tfn{sqrt}(9)}
 is evaluated to @expr{3}.  Evaluation does not occur if the arguments
 to a function are somehow of the wrong type @expr{@tfn{tan}([2,3,4])}),
-range (@expr{@tfn{tan}(90)}), or number (@expr{@tfn{tan}(3,5)}), 
+range (@expr{@tfn{tan}(90)}), or number (@expr{@tfn{tan}(3,5)}),
 or if the function name is not recognized (@expr{@tfn{f}(5)}), or if
 Symbolic mode (@pxref{Symbolic Mode}) prevents evaluation
 (@expr{@tfn{sqrt}(2)}).
@@ -22452,7 +22452,7 @@
 arguments in Calc's internal form.  Sums and products of three or
 more terms are arranged by the associative law of algebra into
 a left-associative form for sums, @expr{((a + b) + c) + d}, and
-(by default) a right-associative form for products, 
+(by default) a right-associative form for products,
 @expr{a * (b * (c * d))}.  Formulas like @expr{(a + b) + (c + d)} are
 rearranged to left-associative form, though this rarely matters since
 Calc's algebra commands are designed to hide the inner structure of sums
@@ -22533,7 +22533,7 @@
 rewritten to @expr{a (c - b)}.
 
 The distributive law of products and powers is used for adjacent
-terms of the product: @expr{x^a x^b} goes to 
+terms of the product: @expr{x^a x^b} goes to
 @texline @math{x^{a+b}}
 @infoline @expr{x^(a+b)}
 where @expr{a} is a number, or an implicit 1 (as in @expr{x}),
@@ -22544,9 +22544,9 @@
 @expr{1} or to @samp{idn(1)} if Matrix mode is enabled.
 
 The product of a negative power times anything but another negative
-power is changed to use division:  
+power is changed to use division:
 @texline @math{x^{-2} y}
-@infoline @expr{x^(-2) y} 
+@infoline @expr{x^(-2) y}
 goes to @expr{y / x^2} unless Matrix mode is
 in effect and neither @expr{x} nor @expr{y} are scalar (in which
 case it is considered unsafe to rearrange the order of the terms).
@@ -22568,13 +22568,13 @@
 infinite quantity, as directed by the current infinite mode.
 @xref{Infinite Mode}.
 
-The expression 
+The expression
 @texline @math{a / b^{-c}}
-@infoline @expr{a / b^(-c)} 
+@infoline @expr{a / b^(-c)}
 is changed to @expr{a b^c}, where @expr{-c} is any negative-looking
-power.  Also, @expr{1 / b^c} is changed to 
+power.  Also, @expr{1 / b^c} is changed to
 @texline @math{b^{-c}}
-@infoline @expr{b^(-c)} 
+@infoline @expr{b^(-c)}
 for any power @expr{c}.
 
 Also, @expr{(-a) / b} and @expr{a / (-b)} go to @expr{-(a/b)};
@@ -22614,22 +22614,22 @@
 is an integer, or if either @expr{a} or @expr{b} are nonnegative
 real numbers.  Powers of powers @expr{(a^b)^c} are simplified to
 @texline @math{a^{b c}}
-@infoline @expr{a^(b c)} 
+@infoline @expr{a^(b c)}
 only when @expr{c} is an integer and @expr{b c} also
 evaluates to an integer.  Without these restrictions these simplifications
 would not be safe because of problems with principal values.
-(In other words, 
+(In other words,
 @texline @math{((-3)^{1/2})^2}
-@infoline @expr{((-3)^1:2)^2} 
+@infoline @expr{((-3)^1:2)^2}
 is safe to simplify, but
 @texline @math{((-3)^2)^{1/2}}
-@infoline @expr{((-3)^2)^1:2} 
+@infoline @expr{((-3)^2)^1:2}
 is not.)  @xref{Declarations}, for ways to inform Calc that your
 variables satisfy these requirements.
 
 As a special case of this rule, @expr{@tfn{sqrt}(x)^n} is simplified to
 @texline @math{x^{n/2}}
-@infoline @expr{x^(n/2)} 
+@infoline @expr{x^(n/2)}
 only for even integers @expr{n}.
 
 If @expr{a} is known to be real, @expr{b} is an even integer, and
@@ -22642,13 +22642,13 @@
 
 Square roots @expr{@tfn{sqrt}(x)} generally act like one-half powers
 @texline @math{x^{1:2}}
-@infoline @expr{x^1:2} 
+@infoline @expr{x^1:2}
 for the purposes of the above-listed simplifications.
 
-Also, note that 
+Also, note that
 @texline @math{1 / x^{1:2}}
-@infoline @expr{1 / x^1:2} 
-is changed to 
+@infoline @expr{1 / x^1:2}
+is changed to
 @texline @math{x^{-1:2}},
 @infoline @expr{x^(-1:2)},
 but @expr{1 / @tfn{sqrt}(x)} is left alone.
@@ -22660,9 +22660,9 @@
 Generic identity matrices (@pxref{Matrix Mode}) are simplified by the
 following rules:  @expr{@tfn{idn}(a) + b} to @expr{a + b} if @expr{b}
 is provably scalar, or expanded out if @expr{b} is a matrix;
-@expr{@tfn{idn}(a) + @tfn{idn}(b)} to @expr{@tfn{idn}(a + b)}; 
-@expr{-@tfn{idn}(a)} to @expr{@tfn{idn}(-a)}; @expr{a @tfn{idn}(b)} to 
-@expr{@tfn{idn}(a b)} if @expr{a} is provably scalar, or to @expr{a b} 
+@expr{@tfn{idn}(a) + @tfn{idn}(b)} to @expr{@tfn{idn}(a + b)};
+@expr{-@tfn{idn}(a)} to @expr{@tfn{idn}(-a)}; @expr{a @tfn{idn}(b)} to
+@expr{@tfn{idn}(a b)} if @expr{a} is provably scalar, or to @expr{a b}
 if @expr{a} is provably non-scalar;  @expr{@tfn{idn}(a) @tfn{idn}(b)} to
 @expr{@tfn{idn}(a b)}; analogous simplifications for quotients involving
 @code{idn}; and @expr{@tfn{idn}(a)^n} to @expr{@tfn{idn}(a^n)} where
@@ -22683,7 +22683,7 @@
 The expression @expr{@tfn{abs}(@tfn{abs}(x))} changes to
 @expr{@tfn{abs}(x)};  in fact, @expr{@tfn{abs}(x)} changes to @expr{x} or
 @expr{-x} if @expr{x} is provably nonnegative or nonpositive
-(@pxref{Declarations}). 
+(@pxref{Declarations}).
 
 While most functions do not recognize the variable @code{i} as an
 imaginary number, the @code{arg} function does handle the two cases
@@ -22693,7 +22693,7 @@
 Various other expressions involving @code{conj}, @code{re}, and
 @code{im} are simplified, especially if some of the arguments are
 provably real or involve the constant @code{i}.  For example,
-@expr{@tfn{conj}(a + b i)} is changed to 
+@expr{@tfn{conj}(a + b i)} is changed to
 @expr{@tfn{conj}(a) - @tfn{conj}(b) i},  or to @expr{a - b i} if @expr{a}
 and @expr{b} are known to be real.
 
@@ -22836,7 +22836,7 @@
 Symbolic mode.)  First, square integer or rational factors are
 pulled out so that @expr{@tfn{sqrt}(8)} is rewritten as
 @texline @math{2\,@tfn{sqrt}(2)}.
-@infoline @expr{2 sqrt(2)}.  
+@infoline @expr{2 sqrt(2)}.
 Conceptually speaking this implies factoring the argument into primes
 and moving pairs of primes out of the square root, but for reasons of
 efficiency Calc only looks for primes up to 29.
@@ -22879,7 +22879,7 @@
 Trigonometric functions are simplified in several ways.  Whenever a
 products of two trigonometric functions can be replaced by a single
 function, the replacement is made; for example,
-@expr{@tfn{tan}(x) @tfn{cos}(x)} is simplified to @expr{@tfn{sin}(x)}. 
+@expr{@tfn{tan}(x) @tfn{cos}(x)} is simplified to @expr{@tfn{sin}(x)}.
 Reciprocals of trigonometric functions are replaced by their reciprocal
 function; for example, @expr{1/@tfn{sec}(x)} is simplified to
 @expr{@tfn{cos}(x)}.  The corresponding simplifications for the
@@ -22887,7 +22887,7 @@
 
 Trigonometric functions of their inverse functions are
 simplified. The expression @expr{@tfn{sin}(@tfn{arcsin}(x))} is
-simplified to @expr{x}, and similarly for @code{cos} and @code{tan}.  
+simplified to @expr{x}, and similarly for @code{cos} and @code{tan}.
 Trigonometric functions of inverses of different trigonometric
 functions can also be simplified, as in @expr{@tfn{sin}(@tfn{arccos}(x))}
 to @expr{@tfn{sqrt}(1 - x^2)}.
@@ -22905,30 +22905,30 @@
 functions are known, except for negative arguments of @code{arcsin},
 @code{arctan}, @code{arcsinh}, and @code{arctanh}.  Note that
 @expr{@tfn{arcsin}(@tfn{sin}(x))} can @emph{not} safely change to
-@expr{x}, since this only correct within an integer multiple of 
+@expr{x}, since this only correct within an integer multiple of
 @texline @math{2 \pi}
-@infoline @expr{2 pi} 
+@infoline @expr{2 pi}
 radians or 360 degrees.  However, @expr{@tfn{arcsinh}(@tfn{sinh}(x))} is
 simplified to @expr{x} if @expr{x} is known to be real.
 
 Several simplifications that apply to logarithms and exponentials
-are that @expr{@tfn{exp}(@tfn{ln}(x))}, 
+are that @expr{@tfn{exp}(@tfn{ln}(x))},
 @texline @tfn{e}@math{^{\ln(x)}},
-@infoline @expr{e^@tfn{ln}(x)}, 
+@infoline @expr{e^@tfn{ln}(x)},
 and
 @texline @math{10^{{\rm log10}(x)}}
-@infoline @expr{10^@tfn{log10}(x)} 
+@infoline @expr{10^@tfn{log10}(x)}
 all reduce to @expr{x}.  Also, @expr{@tfn{ln}(@tfn{exp}(x))}, etc., can
 reduce to @expr{x} if @expr{x} is provably real.  The form
 @expr{@tfn{exp}(x)^y} is simplified to @expr{@tfn{exp}(x y)}.  If @expr{x}
-is a suitable multiple of 
-@texline @math{\pi i} 
+is a suitable multiple of
+@texline @math{\pi i}
 @infoline @expr{pi i}
 (as described above for the trigonometric functions), then
 @expr{@tfn{exp}(x)} or @expr{e^x} will be expanded.  Finally,
 @expr{@tfn{ln}(x)} is simplified to a form involving @code{pi} and
 @code{i} where @expr{x} is provably negative, positive imaginary, or
-negative imaginary. 
+negative imaginary.
 
 The error functions @code{erf} and @code{erfc} are simplified when
 their arguments are negative-looking or are calls to the @code{conj}
@@ -23006,18 +23006,18 @@
 are folded down to the 360-degree range that the inverse trigonometric
 functions always produce.
 
-Powers of powers @expr{(x^a)^b} are simplified to 
+Powers of powers @expr{(x^a)^b} are simplified to
 @texline @math{x^{a b}}
 @infoline @expr{x^(a b)}
 for all @expr{a} and @expr{b}.  These results will be valid only
-in a restricted range of @expr{x}; for example, in 
+in a restricted range of @expr{x}; for example, in
 @texline @math{(x^2)^{1:2}}
 @infoline @expr{(x^2)^1:2}
 the powers cancel to get @expr{x}, which is valid for positive values
 of @expr{x} but not for negative or complex values.
 
 Similarly, @expr{@tfn{sqrt}(x^a)} and @expr{@tfn{sqrt}(x)^a} are both
-simplified (possibly unsafely) to 
+simplified (possibly unsafely) to
 @texline @math{x^{a/2}}.
 @infoline @expr{x^(a/2)}.
 
@@ -23027,7 +23027,7 @@
 
 Arguments of square roots are partially factored to look for
 squared terms that can be extracted.  For example,
-@expr{@tfn{sqrt}(a^2 b^3 + a^3 b^2)} simplifies to 
+@expr{@tfn{sqrt}(a^2 b^3 + a^3 b^2)} simplifies to
 @expr{a b @tfn{sqrt}(a+b)}.
 
 The simplifications of @expr{@tfn{ln}(@tfn{exp}(x))},
@@ -23093,9 +23093,9 @@
 
 For powers and square roots, the ``unsafe'' simplifications
 @expr{(a b)^c} to @expr{a^c b^c}, @expr{(a/b)^c} to @expr{a^c / b^c},
-and @expr{(a^b)^c} to 
+and @expr{(a^b)^c} to
 @texline @math{a^{b c}}
-@infoline @expr{a^(b c)} 
+@infoline @expr{a^(b c)}
 are done if the powers are real numbers.  (These are safe in the context
 of units because all numbers involved can reasonably be assumed to be
 real.)
@@ -23108,12 +23108,12 @@
 is simplified by noting that @expr{1.5 = 3:2}, that @samp{acre}
 is defined in terms of @samp{m^2}, and that the 2 in the power of
 @code{m} is a multiple of 2 in @expr{3:2}.  Thus, @code{acre^1.5} is
-replaced by approximately 
+replaced by approximately
 @texline @math{(4046 m^2)^{1.5}}
-@infoline @expr{(4046 m^2)^1.5}, 
-which is then changed to 
+@infoline @expr{(4046 m^2)^1.5},
+which is then changed to
 @texline @math{4046^{1.5} \, (m^2)^{1.5}},
-@infoline @expr{4046^1.5 (m^2)^1.5}, 
+@infoline @expr{4046^1.5 (m^2)^1.5},
 then to @expr{257440 m^3}.
 
 The functions @code{float}, @code{frac}, @code{clean}, @code{abs},
@@ -23401,7 +23401,7 @@
 
 If you use the @code{deriv} function directly in an algebraic formula,
 you can write @samp{deriv(f,x,x0)} which represents the derivative
-of @expr{f} with respect to @expr{x}, evaluated at the point 
+of @expr{f} with respect to @expr{x}, evaluated at the point
 @texline @math{x=x_0}.
 @infoline @expr{x=x0}.
 
@@ -23441,7 +23441,7 @@
 work for all integrable functions, but it is able to integrate several
 large classes of formulas.  In particular, any polynomial or rational
 function (a polynomial divided by a polynomial) is acceptable.
-(Rational functions don't have to be in explicit quotient form, however; 
+(Rational functions don't have to be in explicit quotient form, however;
 @texline @math{x/(1+x^{-2})}
 @infoline @expr{x/(1+x^-2)}
 is not strictly a quotient of polynomials, but it is equivalent to
@@ -23472,7 +23472,7 @@
 
 Please note that the current implementation of Calc's integrator sometimes
 produces results that are significantly more complex than they need to
-be.  For example, the integral Calc finds for 
+be.  For example, the integral Calc finds for
 @texline @math{1/(x+\sqrt{x^2+1})}
 @infoline @expr{1/(x+sqrt(x^2+1))}
 is several times more complicated than the answer Mathematica
@@ -23480,11 +23480,11 @@
 equivalent.  Also, any indefinite integral should be considered to have
 an arbitrary constant of integration added to it, although Calc does not
 write an explicit constant of integration in its result.  For example,
-Calc's solution for 
+Calc's solution for
 @texline @math{1/(1+\tan x)}
-@infoline @expr{1/(1+tan(x))} 
+@infoline @expr{1/(1+tan(x))}
 differs from the solution given in the @emph{CRC Math Tables} by a
-constant factor of  
+constant factor of
 @texline @math{\pi i / 2}
 @infoline @expr{pi i / 2},
 due to a different choice of constant of integration.
@@ -23544,9 +23544,9 @@
 @tindex Ei
 As a more serious example, the expression @samp{exp(x)/x} cannot be
 integrated in terms of the standard functions, so the ``exponential
-integral'' function 
+integral'' function
 @texline @math{{\rm Ei}(x)}
-@infoline @expr{Ei(x)} 
+@infoline @expr{Ei(x)}
 was invented to describe it.
 We can get Calc to do this integral in terms of a made-up @code{Ei}
 function by adding the rule @samp{[integtry(exp(x)/x, x) := Ei(x)]}
@@ -23717,18 +23717,18 @@
 
 This command also works for inequalities, as in @expr{y < 3x + 6}.
 Some inequalities cannot be solved where the analogous equation could
-be; for example, solving 
+be; for example, solving
 @texline @math{a < b \, c}
-@infoline @expr{a < b c} 
+@infoline @expr{a < b c}
 for @expr{b} is impossible
 without knowing the sign of @expr{c}.  In this case, @kbd{a S} will
-produce the result 
+produce the result
 @texline @math{b \mathbin{\hbox{\code{!=}}} a/c}
-@infoline @expr{b != a/c} 
+@infoline @expr{b != a/c}
 (using the not-equal-to operator) to signify that the direction of the
-inequality is now unknown.  The inequality 
+inequality is now unknown.  The inequality
 @texline @math{a \le b \, c}
-@infoline @expr{a <= b c} 
+@infoline @expr{a <= b c}
 is not even partially solved.  @xref{Declarations}, for a way to tell
 Calc that the signs of the variables in a formula are in fact known.
 
@@ -24186,13 +24186,13 @@
 with the minimum value itself.
 
 Note that this command looks for a @emph{local} minimum.  Many functions
-have more than one minimum; some, like 
+have more than one minimum; some, like
 @texline @math{x \sin x},
-@infoline @expr{x sin(x)}, 
+@infoline @expr{x sin(x)},
 have infinitely many.  In fact, there is no easy way to define the
-``global'' minimum of 
+``global'' minimum of
 @texline @math{x \sin x}
-@infoline @expr{x sin(x)} 
+@infoline @expr{x sin(x)}
 but Calc can still locate any particular local minimum
 for you.  Calc basically goes downhill from the initial guess until it
 finds a point at which the function's value is greater both to the left
@@ -24271,7 +24271,7 @@
 no single @expr{m} and @expr{b} that exactly fit the data; in this
 case, Calc chooses values of the parameters that provide the closest
 possible fit.  The model formula can be entered in various ways after
-the key sequence @kbd{a F} is pressed.  
+the key sequence @kbd{a F} is pressed.
 
 If the letter @kbd{P} is pressed after @kbd{a F} but before the model
 description is entered, the data as well as the model formula will be
@@ -24319,7 +24319,7 @@
 
 The @kbd{a F} command takes the data set to be fitted from the stack.
 By default, it expects the data in the form of a matrix.  For example,
-for a linear or polynomial fit, this would be a 
+for a linear or polynomial fit, this would be a
 @texline @math{2\times N}
 @infoline 2xN
 matrix where the first row is a list of @expr{x} values and the second
@@ -24327,10 +24327,10 @@
 shown above, the matrix would have four rows (@expr{x_1}, @expr{x_2},
 @expr{x_3}, and @expr{y}, respectively).
 
-If you happen to have an 
+If you happen to have an
 @texline @math{N\times2}
 @infoline Nx2
-matrix instead of a 
+matrix instead of a
 @texline @math{2\times N}
 @infoline 2xN
 matrix, just press @kbd{v t} first to transpose the matrix.
@@ -24425,13 +24425,13 @@
 which is clearly zero if @expr{a + b x} exactly fits all data points,
 and increases as various @expr{a + b x_i} values fail to match the
 corresponding @expr{y_i} values.  There are several reasons why the
-summand is squared, one of them being to ensure that 
+summand is squared, one of them being to ensure that
 @texline @math{\chi^2 \ge 0}.
 @infoline @expr{chi^2 >= 0}.
 Least-squares fitting simply chooses the values of @expr{a} and @expr{b}
-for which the error 
+for which the error
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 is as small as possible.
 
 Other kinds of models do the same thing but with a different model
@@ -24593,9 +24593,9 @@
 or all be plain numbers.  Error forms can go anywhere but generally
 go on the numbers in the last row of the data matrix.  If the last
 row contains error forms
-@texline `@var{y_i}@w{ @tfn{+/-} }@math{\sigma_i}', 
-@infoline `@var{y_i}@w{ @tfn{+/-} }@var{sigma_i}', 
-then the 
+@texline `@var{y_i}@w{ @tfn{+/-} }@math{\sigma_i}',
+@infoline `@var{y_i}@w{ @tfn{+/-} }@var{sigma_i}',
+then the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 statistic is now,
@@ -24617,9 +24617,9 @@
 
 If there are error forms on other rows of the data matrix, all the
 errors for a given data point are combined; the square root of the
-sum of the squares of the errors forms the 
+sum of the squares of the errors forms the
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
+@infoline @expr{sigma_i}
 used for the data point.
 
 Both @kbd{a F} and @kbd{H a F} can accept error forms in the input
@@ -24627,19 +24627,19 @@
 probably use @kbd{H a F} so that the output also contains error
 estimates.
 
-If the input contains error forms but all the 
+If the input contains error forms but all the
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
+@infoline @expr{sigma_i}
 values are the same, it is easy to see that the resulting fitted model
-will be the same as if the input did not have error forms at all 
+will be the same as if the input did not have error forms at all
 @texline (@math{\chi^2}
 @infoline (@expr{chi^2}
-is simply scaled uniformly by 
+is simply scaled uniformly by
 @texline @math{1 / \sigma^2},
-@infoline @expr{1 / sigma^2}, 
+@infoline @expr{1 / sigma^2},
 which doesn't affect where it has a minimum).  But there @emph{will} be
 a difference in the estimated errors of the coefficients reported by
-@kbd{H a F}. 
+@kbd{H a F}.
 
 Consult any text on statistical modeling of data for a discussion
 of where these error estimates come from and how they should be
@@ -24671,18 +24671,18 @@
 The covariance matrix @expr{C} computed from the fit.  This is
 an @var{m}x@var{m} symmetric matrix; the diagonal elements
 @texline @math{C_{jj}}
-@infoline @expr{C_j_j} 
-are the variances 
+@infoline @expr{C_j_j}
+are the variances
 @texline @math{\sigma_j^2}
-@infoline @expr{sigma_j^2} 
+@infoline @expr{sigma_j^2}
 of the parameters.  The other elements are covariances
-@texline @math{\sigma_{ij}^2} 
-@infoline @expr{sigma_i_j^2} 
+@texline @math{\sigma_{ij}^2}
+@infoline @expr{sigma_i_j^2}
 that describe the correlation between pairs of parameters.  (A related
-set of numbers, the @dfn{linear correlation coefficients} 
+set of numbers, the @dfn{linear correlation coefficients}
 @texline @math{r_{ij}},
 @infoline @expr{r_i_j},
-are defined as 
+are defined as
 @texline @math{\sigma_{ij}^2 / \sigma_i \, \sigma_j}.)
 @infoline @expr{sigma_i_j^2 / sigma_i sigma_j}.)
 
@@ -24693,35 +24693,35 @@
 polynomial and multilinear fits described so far.
 
 @item
-The value of 
+The value of
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 for the fit, calculated by the formulas shown above.  This gives a
 measure of the quality of the fit; statisticians consider
 @texline @math{\chi^2 \approx N - M}
-@infoline @expr{chi^2 = N - M} 
+@infoline @expr{chi^2 = N - M}
 to indicate a moderately good fit (where again @expr{N} is the number of
 data points and @expr{M} is the number of parameters).
 
 @item
 A measure of goodness of fit expressed as a probability @expr{Q}.
 This is computed from the @code{utpc} probability distribution
-function using 
+function using
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 with @expr{N - M} degrees of freedom.  A
 value of 0.5 implies a good fit; some texts recommend that often
 @expr{Q = 0.1} or even 0.001 can signify an acceptable fit.  In
-particular, 
+particular,
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 statistics assume the errors in your inputs
 follow a normal (Gaussian) distribution; if they don't, you may
 have to accept smaller values of @expr{Q}.
 
 The @expr{Q} value is computed only if the input included error
 estimates.  Otherwise, Calc will report the symbol @code{nan}
-for @expr{Q}.  The reason is that in this case the 
+for @expr{Q}.  The reason is that in this case the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 value has effectively been used to estimate the original errors
@@ -24763,7 +24763,7 @@
 @item q
 Quadratic.  @mathit{a + b (x-c)^2 + d (x-e)^2}.
 @item g
-Gaussian.  
+Gaussian.
 @texline @math{{a \over b \sqrt{2 \pi}} \exp\left( -{1 \over 2} \left( x - c \over b \right)^2 \right)}.
 @infoline @mathit{(a / b sqrt(2 pi)) exp(-0.5*((x-c)/b)^2)}.
 @item s
@@ -24788,7 +24788,7 @@
 
 All models except Gaussian, logistics, Hubbert and polynomials can
 generalize as shown to any number of independent variables.  Also, all
-the built-in models except for the logistic and Hubbert curves have an 
+the built-in models except for the logistic and Hubbert curves have an
 additive or multiplicative parameter shown as @expr{a} in the above table
 which can be replaced by zero or one, as appropriate, by typing @kbd{h}
 before the model key.
@@ -24893,9 +24893,9 @@
 returns results in the range from @mathit{-90} to 90 degrees (or the
 equivalent range in radians).  Suppose you had data that you
 believed to represent roughly three oscillations of a sine wave,
-so that the argument of the sine might go from zero to 
+so that the argument of the sine might go from zero to
 @texline @math{3\times360}
-@infoline @mathit{3*360} 
+@infoline @mathit{3*360}
 degrees.
 The above model would appear to be a good way to determine the
 true frequency and phase of the sine wave, but in practice it
@@ -24955,18 +24955,18 @@
 @end example
 
 @noindent
-which matches the desired form with 
+which matches the desired form with
 @texline @math{Y = \ln(y)},
-@infoline @expr{Y = ln(y)}, 
+@infoline @expr{Y = ln(y)},
 @texline @math{A = \ln(a)},
 @infoline @expr{A = ln(a)},
-@expr{F = 1}, @expr{B = b}, and 
+@expr{F = 1}, @expr{B = b}, and
 @texline @math{G = \ln(x)}.
-@infoline @expr{G = ln(x)}.  
+@infoline @expr{G = ln(x)}.
 Calc thus computes the logarithms of your @expr{y} and @expr{x} values,
-does a linear fit for @expr{A} and @expr{B}, then solves to get 
-@texline @math{a = \exp(A)} 
-@infoline @expr{a = exp(A)} 
+does a linear fit for @expr{A} and @expr{B}, then solves to get
+@texline @math{a = \exp(A)}
+@infoline @expr{a = exp(A)}
 and @expr{b = B}.
 
 Another interesting example is the ``quadratic'' model, which can
@@ -25015,7 +25015,7 @@
 
 A last desperate step would be to use the general-purpose
 @code{minimize} function rather than @code{fit}.  After all, both
-functions solve the problem of minimizing an expression (the 
+functions solve the problem of minimizing an expression (the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 sum) by adjusting certain parameters in the expression.  The @kbd{a F}
@@ -25026,9 +25026,9 @@
 A compromise would be to pick out a few parameters without which the
 fit is linearizable, and use @code{minimize} on a call to @code{fit}
 which efficiently takes care of the rest of the parameters.  The thing
-to be minimized would be the value of 
+to be minimized would be the value of
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 returned as the fifth result of the @code{xfit} function:
 
 @smallexample
@@ -25086,13 +25086,13 @@
 and @expr{y} to be plain numbers, and makes @expr{z} into an error
 form with this combined error.  The @expr{Y(x,y,z)} part of the
 linearized model is evaluated, and the result should be an error
-form.  The error part of that result is used for 
+form.  The error part of that result is used for
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
-for the data point.  If for some reason @expr{Y(x,y,z)} does not return 
-an error form, the combined error from @expr{z} is used directly for 
+@infoline @expr{sigma_i}
+for the data point.  If for some reason @expr{Y(x,y,z)} does not return
+an error form, the combined error from @expr{z} is used directly for
 @texline @math{\sigma_i}.
-@infoline @expr{sigma_i}.  
+@infoline @expr{sigma_i}.
 Finally, @expr{z} is also stripped of its error
 for use in computing @expr{F(x,y,z)}, @expr{G(x,y,z)} and so on;
 the righthand side of the linearized model is computed in regular
@@ -25104,7 +25104,7 @@
 often simply equal to @expr{z}.  For common cases like polynomials
 and multilinear models, the combined error is simply used as the
 @texline @math{\sigma}
-@infoline @expr{sigma} 
+@infoline @expr{sigma}
 for the data point with no further ado.)
 
 @tex
@@ -25481,7 +25481,7 @@
 formula works out to the indeterminate form @expr{0 / 0}, which
 Calc will not assume is zero.  Better would be to use
 @samp{(k != k_0) ? 1/(k-k_0) : 0}; the @samp{? :} operator does
-an ``if-then-else'' test:  This expression says, ``if 
+an ``if-then-else'' test:  This expression says, ``if
 @texline @math{k \ne k_0},
 @infoline @expr{k != k_0},
 then @expr{1/(k-k_0)}, else zero.''  Now the formula @expr{1/(k-k_0)}
@@ -26496,16 +26496,16 @@
 then the rule set @samp{[f(0) := 0, import(linearF)]} will apply
 all three rules.  It is possible to modify the imported rules
 slightly:  @samp{import(x, v1, x1, v2, x2, @dots{})} imports
-the rule set @expr{x} with all occurrences of 
+the rule set @expr{x} with all occurrences of
 @texline @math{v_1},
-@infoline @expr{v1}, 
-as either a variable name or a function name, replaced with 
+@infoline @expr{v1},
+as either a variable name or a function name, replaced with
 @texline @math{x_1}
-@infoline @expr{x1} 
-and so on.  (If 
+@infoline @expr{x1}
+and so on.  (If
 @texline @math{v_1}
-@infoline @expr{v1} 
-is used as a function name, then 
+@infoline @expr{v1}
+is used as a function name, then
 @texline @math{x_1}
 @infoline @expr{x1}
 must be either a function name itself or a @w{@samp{< >}} nameless
@@ -27609,7 +27609,7 @@
 @code{tri} to the value on the top of the stack.  @xref{Programming}.
 
 @cindex Quaternions
-The following rule set, contributed by 
+The following rule set, contributed by
 @texline Fran\c cois
 @infoline Francois
 Pinard, implements @dfn{quaternions}, a generalization of the concept of
@@ -27764,9 +27764,9 @@
 While many of Calc's conversion factors are exact, some are necessarily
 approximate.  If Calc is in fraction mode (@pxref{Fraction Mode}), then
 unit conversions will try to give exact, rational conversions, but it
-isn't always possible.  Given @samp{55 mph} in fraction mode, typing 
-@kbd{u c m/s @key{RET}} produces  @samp{15367:625 m/s}, for example, 
-while typing @kbd{u c au/yr @key{RET}} produces 
+isn't always possible.  Given @samp{55 mph} in fraction mode, typing
+@kbd{u c m/s @key{RET}} produces  @samp{15367:625 m/s}, for example,
+while typing @kbd{u c au/yr @key{RET}} produces
 @samp{5.18665819999e-3 au/yr}.
 
 If the units you request are inconsistent with the original units, the
@@ -27994,7 +27994,7 @@
 Other units used by @TeX{} are available; they are @code{texpc} (a pica),
 @code{texbp} (a ``big point'', equal to a standard point which is larger
 than the point used by @TeX{}), @code{texdd} (a Didot point),
-@code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point, 
+@code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point,
 all dimensions representable in @TeX{} are multiples of this value).
 
 When Calc is using the @TeX{} or La@TeX{} language mode (@pxref{TeX
@@ -28131,17 +28131,17 @@
 units which are manipulated differently than standard units.  Calc
 provides commands to work with these logarithmic units.
 
-Decibels and nepers are used to measure power quantities as well as 
+Decibels and nepers are used to measure power quantities as well as
 field quantities (quantities whose squares are proportional to power);
 these two types of quantities are handled slightly different from each
 other.  By default the Calc commands work as if power quantities are
 being used; with the @kbd{H} prefix the Calc commands work as if field
 quantities are being used.
 
-The decibel level of a power 
+The decibel level of a power
 @infoline @math{P1},
 @texline @math{P_1},
-relative to a reference power 
+relative to a reference power
 @infoline @math{P0},
 @texline @math{P_0},
 is defined to be
@@ -28151,10 +28151,10 @@
 one-tenth of a bel. The bel, named after Alexander Graham Bell, was
 considered to be too large of a unit and was effectively replaced by
 the decibel.)  If @math{F} is a field quantity with power
-@math{P=k F^2}, then a reference quantity of 
+@math{P=k F^2}, then a reference quantity of
 @infoline @math{F0}
 @texline @math{F_0}
-would correspond to a power of 
+would correspond to a power of
 @infoline @math{P0=k F0^2}.
 @texline @math{P_{0}=kF_{0}^2}.
 If
@@ -28163,7 +28163,7 @@
 then
 
 @ifnottex
-@example 
+@example
 10 log10(P1/P0) = 10 log10(F1^2/F0^2) = 20 log10(F1/F0).
 @end example
 @end ifnottex
@@ -28175,42 +28175,42 @@
 @noindent
 In order to get the same decibel level regardless of whether a field
 quantity or the corresponding power quantity is used,  the decibel
-level of a field quantity 
+level of a field quantity
 @infoline @math{F1},
-@texline @math{F_1}, 
-relative to a reference 
+@texline @math{F_1},
+relative to a reference
 @infoline @math{F0},
-@texline @math{F_0}, 
+@texline @math{F_0},
 is defined as
 @infoline @math{20 log10(F1/F0) dB}.
 @texline @math{20 \log_{10}(F_{1}/F_{0}) {\rm dB}}.
-For example, the decibel value of a sound pressure level of 
+For example, the decibel value of a sound pressure level of
 @infoline @math{60 uPa}
 @texline @math{60 \mu{\rm Pa}}
-relative to 
+relative to
 @infoline @math{20 uPa}
 @texline @math{20 \mu{\rm Pa}}
-(the threshhold of human hearing) is 
+(the threshold of human hearing) is
 @infoline @math{20 log10(60 uPa/ 20 uPa) dB = 20 log10(3) dB},
 @texline  @math{20 \log_{10}(60 \mu{\rm Pa}/20 \mu{\rm Pa}) {\rm dB} = 20 \log_{10}(3) {\rm dB}},
-which is about 
+which is about
 @infoline @math{9.54 dB}.
 @texline @math{9.54 {\rm dB}}.
 Note that in taking the ratio, the original units cancel and so these
-logarithmic units are dimensionless. 
+logarithmic units are dimensionless.
 
 Nepers (named after John Napier, who is credited with inventing the
 logarithm) are similar to bels except they use natural logarithms instead
-of common logarithms.  The neper level of a power 
+of common logarithms.  The neper level of a power
 @infoline @math{P1},
 @texline @math{P_1},
-relative to a reference power 
+relative to a reference power
 @infoline @math{P0},
 @texline @math{P_0},
 is
 @infoline @math{(1/2) ln(P1/P0) Np}.
 @texline @math{(1/2) \ln(P_1/P_0) {\rm Np}}.
-The neper level of a field 
+The neper level of a field
 @infoline @math{F1},
 @texline @math{F_1},
 relative to a reference field
@@ -28223,13 +28223,13 @@
 @vindex calc-lu-power-reference
 @vindex calc-lu-field-reference
 For power quantities, Calc uses
-@infoline @math{1 mW} 
+@infoline @math{1 mW}
 @texline @math{1 {\rm mW}}
-as the default reference quantity; this default can be changed by changing 
+as the default reference quantity; this default can be changed by changing
 the value of the customizable variable
 @code{calc-lu-power-reference} (@pxref{Customizing Calc}).
-For field quantities, Calc uses 
-@infoline @math{20 uPa} 
+For field quantities, Calc uses
+@infoline @math{20 uPa}
 @texline @math{20 \mu{\rm Pa}}
 as the default reference quantity; this is the value used in acoustics
 which is where decibels are commonly encountered.  This default can be
@@ -28247,9 +28247,9 @@
 logarithmic units. With the capital @kbd{O} prefix, @kbd{O l q}, the
 reference level will be read from the top of the stack. (In an
 algebraic formula, @code{lupquant} can be given an optional second
-argument which will be used for the reference level.) For example, 
-@code{20 dB @key{RET} l q} will return @code{100 mW}; 
-@code{20 dB @key{RET} 4 W @key{RET} O l q} will return @code{400 W}.   
+argument which will be used for the reference level.) For example,
+@code{20 dB @key{RET} l q} will return @code{100 mW};
+@code{20 dB @key{RET} 4 W @key{RET} O l q} will return @code{400 W}.
 The @kbd{H l q} [@code{lufquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
@@ -28288,13 +28288,13 @@
 @tindex lufdiv
 The sum of two power or field quantities doesn't correspond to the sum
 of the corresponding decibel or neper levels.  If the powers
-corresponding to decibel levels 
-@infoline @math{D1} 
-@texline @math{D_1} 
-and 
-@infoline @math{D2} 
-@texline @math{D_2} 
-are added, the corresponding decibel level ``sum'' will be 
+corresponding to decibel levels
+@infoline @math{D1}
+@texline @math{D_1}
+and
+@infoline @math{D2}
+@texline @math{D_2}
+are added, the corresponding decibel level ``sum'' will be
 
 @ifnottex
 @example
@@ -28338,7 +28338,7 @@
 
 @noindent
 if a field quantity is multiplied by @math{N} the corresponding decibel level
-will be 
+will be
 
 @ifnottex
 @example
@@ -28375,31 +28375,31 @@
 Scientific pitch notation refers to a note by giving a letter
 A through G, possibly followed by a flat or sharp) with a subscript
 indicating an octave number.  Each octave starts with C and ends with
-B and 
+B and
 @c increasing each note by a semitone will result
 @c in the sequence @expr{C}, @expr{C} sharp, @expr{D}, @expr{E} flat, @expr{E},
 @c @expr{F}, @expr{F} sharp, @expr{G}, @expr{A} flat, @expr{A}, @expr{B}
-@c flat and @expr{B}.  
+@c flat and @expr{B}.
 the octave numbered 0 was chosen to correspond to the lowest
 audible frequency.  Using this system, middle C (about 261.625 Hz)
 corresponds to the note @expr{C} in octave 4 and is denoted
 @expr{C_4}.  Any frequency can be described by giving a note plus an
 offset in cents (where a cent is a ratio of frequencies so that a
-semitone consists of 100 cents). 
+semitone consists of 100 cents).
 
 The midi note number system assigns numbers to notes so that
 @expr{C_(-1)} corresponds to the midi note number 0 and @expr{G_9}
 corresponds to the midi note number 127.   A midi controller can have
 up to 128 keys and each midi note number from  0 to 127 corresponds to
-a possible key. 
+a possible key.
 
 @kindex l s
 @pindex calc-spn
 @tindex spn
 The @kbd{l s} (@code{calc-spn}) [@code{spn}] command converts either
 a frequency or a midi number to scientific pitch notation.  For
-example, @code{500 Hz} gets converted to 
-@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}. 
+example, @code{500 Hz} gets converted to
+@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}.
 
 
 @kindex l m
@@ -28464,7 +28464,7 @@
 the stack into a specified variable.  It prompts you to enter the
 name of the variable.  If you press a single digit, the value is stored
 immediately in one of the ``quick'' variables @code{q0} through
-@code{q9}.  Or you can enter any variable name.  
+@code{q9}.  Or you can enter any variable name.
 
 @kindex s t
 @pindex calc-store-into
@@ -28554,12 +28554,12 @@
 All the arithmetic stores accept the Inverse prefix to reverse the
 order of the operands.  If @expr{v} represents the contents of the
 variable, and @expr{a} is the value drawn from the stack, then regular
-@w{@kbd{s -}} assigns 
+@w{@kbd{s -}} assigns
 @texline @math{v \coloneq v - a},
-@infoline @expr{v := v - a}, 
+@infoline @expr{v := v - a},
 but @kbd{I s -} assigns
 @texline @math{v \coloneq a - v}.
-@infoline @expr{v := a - v}.  
+@infoline @expr{v := a - v}.
 While @kbd{I s *} might seem pointless, it is
 useful if matrix multiplication is involved.  Actually, all the
 arithmetic stores use formulas designed to behave usefully both
@@ -28668,7 +28668,7 @@
 @kindex s k
 @pindex calc-copy-special-constant
 If one of the ``special constants'' is redefined (or undefined) so that
-it no longer has its magic property, the property can be restored with 
+it no longer has its magic property, the property can be restored with
 @kbd{s k} (@code{calc-copy-special-constant}).  This command will prompt
 for a special constant and a variable to store it in, and so a special
 constant can be stored in any variable.  Here, the special constant that
@@ -28850,7 +28850,7 @@
 The @kbd{s i} (@code{calc-insert-variables}) command writes
 the values of all Calc variables into a specified buffer.
 The variables are written with the prefix @code{var-} in the form of
-Lisp @code{setq} commands 
+Lisp @code{setq} commands
 which store the values in string form.  You can place these commands
 in your Calc init file (or @file{.emacs}) if you wish, though in this case it
 would be easier to use @kbd{s p @key{RET}}.  (Note that @kbd{s i}
@@ -29159,9 +29159,9 @@
 the same length); either or both may instead be interval forms.  The
 ``z'' value must be a matrix with the same number of rows as elements
 in ``x'', and the same number of columns as elements in ``y''.  The
-result is a surface plot where 
+result is a surface plot where
 @texline @math{z_{ij}}
-@infoline @expr{z_ij} 
+@infoline @expr{z_ij}
 is the height of the point
 at coordinate @expr{(x_i, y_j)} on the surface.  The 3D graph will
 be displayed from a certain default viewpoint; you can change this
@@ -29270,9 +29270,9 @@
 values covered by all the curves ought to be roughly the same if
 they are to look nice on the same graph.)
 
-For example, to plot 
+For example, to plot
 @texline @math{\sin n x}
-@infoline @expr{sin(n x)} 
+@infoline @expr{sin(n x)}
 for integers @expr{n}
 from 1 to 5, you could use @kbd{v x} to create a vector of integers
 (@expr{n}), then @kbd{V M '} or @kbd{V M $} to map @samp{sin(n x)}
@@ -29510,8 +29510,8 @@
 The @kbd{g S} (@code{calc-graph-point-style}) command similarly turns
 the symbols at the data points on or off, or sets the point style.
 If you turn both lines and points off, the data points will show as
-tiny dots.  If the ``y'' values being plotted contain error forms and 
-the connecting lines are turned off, then this command will also turn 
+tiny dots.  If the ``y'' values being plotted contain error forms and
+the connecting lines are turned off, then this command will also turn
 the error bars on or off.
 
 @cindex @code{LineStyles} variable
@@ -29563,7 +29563,7 @@
 picture of the graph composed of characters like @code{-} and @code{|}
 to a buffer called @samp{*Gnuplot Trail*}, which Calc then displays.
 The graph is made the same size as the Emacs screen, which on most
-dumb terminals will be 
+dumb terminals will be
 @texline @math{80\times24}
 @infoline 80x24
 characters.  The graph is displayed in
@@ -29820,7 +29820,7 @@
 @pindex calc-prepend-to-register
 @pindex calc-append-to-register
 @cindex Registers
-An alternative to killing and yanking stack entries is using 
+An alternative to killing and yanking stack entries is using
 registers in Calc.  Saving stack entries in registers is like
 saving text in normal Emacs registers; although, like Calc's kill
 commands, register commands always operate on whole stack
@@ -29935,7 +29935,7 @@
 would correctly split the line into two error forms.
 
 @xref{Matrix Functions}, to see how to pull the matrix apart into its
-constituent rows and columns.  (If it is a 
+constituent rows and columns.  (If it is a
 @texline @math{1\times1}
 @infoline 1x1
 matrix, just hit @kbd{v u} (@code{calc-unpack}) twice.)
@@ -30273,7 +30273,7 @@
 
 @key{INV GCD} computes the LCM (least common multiple) function.
 
-@key{INV FACT} is the gamma function.  
+@key{INV FACT} is the gamma function.
 @texline @math{\Gamma(x) = (x-1)!}.
 @infoline @expr{gamma(x) = (x-1)!}.
 
@@ -30490,7 +30490,7 @@
 @code{plain-tex-mode} and @code{context-mode}, C language for
 @code{c-mode} and @code{c++-mode}, FORTRAN language for
 @code{fortran-mode} and @code{f90-mode}, Pascal for @code{pascal-mode},
-and eqn for @code{nroff-mode} (@pxref{Customizing Calc}).  
+and eqn for @code{nroff-mode} (@pxref{Customizing Calc}).
 These can be overridden with Calc's mode
 changing commands (@pxref{Mode Settings in Embedded Mode}).  If no
 suitable language is available, Calc will continue with its current language.
@@ -30670,13 +30670,13 @@
 
 Plain formulas are preceded and followed by @samp{%%%} signs
 by default.  This notation has the advantage that the @samp{%}
-character begins a comment in @TeX{} and La@TeX{}, so if your formula is 
+character begins a comment in @TeX{} and La@TeX{}, so if your formula is
 embedded in a @TeX{} or La@TeX{} document its plain version will be
 invisible in the final printed copy.  Certain major modes have different
-delimiters to ensure that the ``plain'' version will be 
-in a comment for those modes, also.  
+delimiters to ensure that the ``plain'' version will be
+in a comment for those modes, also.
 See @ref{Customizing Embedded Mode} to see how to change the ``plain''
-formula delimiters. 
+formula delimiters.
 
 There are several notations which Calc's parser for ``big''
 formatted formulas can't yet recognize.  In particular, it can't
@@ -31178,7 +31178,7 @@
 on it in order to get it to notice the new annotation.
 
 Two more mode-recording modes selectable by @kbd{m R} are available
-which are also available outside of Embedded mode.  
+which are also available outside of Embedded mode.
 (@pxref{General Mode Commands}.) They are @code{Save},  in which mode
 settings are recorded permanently in your Calc init file (the file given
 by the variable @code{calc-settings-file}, typically @file{~/.emacs.d/calc.el})
@@ -31195,11 +31195,11 @@
 
 @noindent
 You can modify Embedded mode's behavior by setting various Lisp
-variables described here.  These variables are customizable 
+variables described here.  These variables are customizable
 (@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable}
 or @kbd{M-x edit-options} to adjust a variable on the fly.
 (Another possibility would be to use a file-local variable annotation at
-the end of the file; 
+the end of the file;
 @pxref{File Variables, , Local Variables in Files, emacs, the Emacs manual}.)
 Many of the variables given mentioned here can be set to depend on the
 major mode of the editing buffer (@pxref{Customizing Calc}).
@@ -31334,7 +31334,7 @@
 annotation itself.  But this is the string that is inserted before
 the opening bracket when Calc adds an annotation on its own.
 The default is @code{"% "}, but may be different for different major
-modes. 
+modes.
 
 @vindex calc-embedded-close-mode
 The @code{calc-embedded-close-mode} variable is a string which
@@ -31459,7 +31459,7 @@
 (If the command you give implies a function, the function will be saved,
 and if the function has any display formats, those will be saved, but
 not the other way around:  Saving a function will not save any commands
-or key bindings associated with the function.) 
+or key bindings associated with the function.)
 
 @kindex Z E
 @pindex calc-user-define-edit
@@ -31542,7 +31542,7 @@
 @cindex Keyboard macros, editing
 The @kbd{Z E} (@code{calc-user-define-edit}) command on a key that has
 been defined by a keyboard macro tries to use the @code{edmacro} package
-edit the macro.  Type @kbd{C-c C-c} to finish editing and update 
+edit the macro.  Type @kbd{C-c C-c} to finish editing and update
 the definition stored on the key, or, to cancel the edit, kill the
 buffer with @kbd{C-x k}.
 The special characters @code{RET}, @code{LFD}, @code{TAB}, @code{SPC},
@@ -31552,7 +31552,7 @@
 copied verbatim into the keyboard macro.  Basically, the notation is the
 same as is used in all of this manual's examples, except that the manual
 takes some liberties with spaces: When we say @kbd{' [1 2 3] @key{RET}},
-we take it for granted that it is clear we really mean 
+we take it for granted that it is clear we really mean
 @kbd{' [1 @key{SPC} 2 @key{SPC} 3] @key{RET}}.
 
 @kindex C-x * m
@@ -31823,7 +31823,7 @@
 subsequent calculations.)  This command allows your keyboard macros to
 accept numbers or formulas as interactive input.
 
-As an example, 
+As an example,
 @kbd{2 @key{RET} "Power: " @key{RET} Z # 3 @key{RET} ^} will prompt for
 input with ``Power: '' in the minibuffer, then return 2 to the provided
 power.  (The response to the prompt that's given, 3 in this example,
@@ -31900,7 +31900,7 @@
 use the same name as the command name but without the @samp{calc-}
 prefix.  (If this is of the form @samp{User-m}, the hyphen is removed so
 it won't be taken for a minus sign in algebraic formulas.)
-This is the name you will use if you want to enter your 
+This is the name you will use if you want to enter your
 new function in an algebraic formula.  Suppose we enter @kbd{yow @key{RET}}.
 Then the new function can be invoked by pushing two numbers on the
 stack and typing @kbd{z m} or @kbd{x spam}, or by entering the algebraic
@@ -32695,7 +32695,7 @@
 @end ignore
 @tindex mysin
 A somewhat limited sine function could be defined as follows, using the
-well-known Taylor series expansion for 
+well-known Taylor series expansion for
 @texline @math{\sin x}:
 @infoline @samp{sin(x)}:
 
@@ -35241,7 +35241,7 @@
 @end example
 
 @noindent
-in your .emacs file.  
+in your .emacs file.
 (@xref{Key Bindings,,Customizing Key Bindings,emacs,
 The GNU Emacs Manual}, for more information on binding keys.)
 A convenient way to start Calc is with @kbd{C-x * *}; to make it equally
@@ -35269,7 +35269,7 @@
 @defvar calc-settings-file
 The variable @code{calc-settings-file} holds the file name in
 which commands like @kbd{m m} and @kbd{Z P} store ``permanent''
-definitions.  
+definitions.
 If @code{calc-settings-file} is not your user init file (typically
 @file{~/.emacs}) and if the variable @code{calc-loaded-settings-file} is
 @code{nil}, then Calc will automatically load your settings file (if it
@@ -35314,7 +35314,7 @@
 determine what language should be used.  (This can be overridden using
 Calc's mode changing commands, @xref{Mode Settings in Embedded Mode}.)
 The variable @code{calc-language-alist} consists of a list of pairs of
-the form  @code{(@var{MAJOR-MODE} . @var{LANGUAGE})}; for example, 
+the form  @code{(@var{MAJOR-MODE} . @var{LANGUAGE})}; for example,
 @code{(latex-mode . latex)} is one such pair.  If Calc embedded is
 activated in a buffer whose major mode is @var{MAJOR-MODE}, it will set itself
 to use the language @var{LANGUAGE}.
@@ -35342,7 +35342,7 @@
 regular expression, and when activating embedded formulas with
 @kbd{C-x * a}, it will tell Calc that what follows is a formula to be
 activated.  (Calc also uses other patterns to find formulas, such as
-@samp{=>} and @samp{:=}.)  
+@samp{=>} and @samp{:=}.)
 
 The default pattern is @code{"%Embed\n\\(% .*\n\\)*"}, which checks
 for @samp{%Embed} followed by any number of lines beginning with
@@ -35367,7 +35367,7 @@
     (texinfo-mode . "@@c Embed\n\\(@@c .*\n\\)*"))
 @end example
 Any major modes added to @code{calc-embedded-announce-formula-alist}
-should also be added to @code{calc-embedded-open-close-plain-alist} 
+should also be added to @code{calc-embedded-open-close-plain-alist}
 and @code{calc-embedded-open-close-mode-alist}.
 @end defvar
 
@@ -35378,7 +35378,7 @@
 The variables @code{calc-embedded-open-formula} and
 @code{calc-embedded-close-formula} control the region that Calc will
 activate as a formula when Embedded mode is entered with @kbd{C-x * e}.
-They are regular expressions; 
+They are regular expressions;
 Calc normally scans backward and forward in the buffer for the
 nearest text matching these regular expressions to be the ``formula
 delimiters''.
@@ -35403,7 +35403,7 @@
 set @code{calc-embedded-open-formula} and
 @code{calc-embedded-close-formula} to different regular
 expressions depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-FORMULA-REGEXP}
 @var{CLOSE-FORMULA-REGEXP})}, and its default value is
 @code{nil}.
@@ -35422,7 +35422,7 @@
 The variable @code{calc-embedded-word-regexp-alist} is used to
 set @code{calc-embedded-word-regexp} to a different regular
 expression depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{WORD-REGEXP})}, and its default value is
 @code{nil}.
 @end defvar
@@ -35437,8 +35437,8 @@
 expressions, because Calc must be able to write these string into a
 buffer as well as to recognize them.
 
-The default string for @code{calc-embedded-open-plain} is 
-@code{"%%% "}, note the trailing space.  The default string for 
+The default string for @code{calc-embedded-open-plain} is
+@code{"%%% "}, note the trailing space.  The default string for
 @code{calc-embedded-close-plain} is @code{" %%%\n"}, without
 the trailing newline here, the first line of a Big mode formula
 that followed might be shifted over with respect to the other lines.
@@ -35447,7 +35447,7 @@
 set @code{calc-embedded-open-plain} and
 @code{calc-embedded-close-plain} to different strings
 depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-PLAIN-STRING}
 @var{CLOSE-PLAIN-STRING})}, and its default value is
 @example
@@ -35490,7 +35490,7 @@
 set @code{calc-embedded-open-new-formula} and
 @code{calc-embedded-close-new-formula} to different strings
 depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-NEW-FORMULA-STRING}
 @var{CLOSE-NEW-FORMULA-STRING})}, and its default value is
 @code{nil}.
@@ -35508,7 +35508,7 @@
 
 The default value of @code{calc-embedded-open-mode} is @code{"% "}
 and the default value of @code{calc-embedded-close-mode} is
-@code{"\n"}.  
+@code{"\n"}.
 If you change the value of @code{calc-embedded-close-mode}, it is a good
 idea still to end with a newline so that mode annotations will appear on
 lines by themselves.
@@ -35517,7 +35517,7 @@
 set @code{calc-embedded-open-mode} and
 @code{calc-embedded-close-mode} to different strings
 expressions depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-MODE-STRING}
 @var{CLOSE-MODE-STRING})}, and its default value is
 @example
@@ -35548,7 +35548,7 @@
 
 The default value of @code{calc-lu-power-reference} is @code{"mW"}
 and the default value of @code{calc-lu-field-reference} is
-@code{"20 uPa"}.  
+@code{"20 uPa"}.
 @end defvar
 
 @defvar calc-note-threshold
@@ -35564,15 +35564,15 @@
 @defvarx calc-selected-face
 @defvarx calc-nonselected-face
 See @ref{Displaying Selections}.@*
-The variable @code{calc-highlight-selections-with-faces} 
+The variable @code{calc-highlight-selections-with-faces}
 determines how selected sub-formulas are distinguished.
-If @code{calc-highlight-selections-with-faces} is nil, then 
+If @code{calc-highlight-selections-with-faces} is nil, then
 a selected sub-formula is distinguished either by changing every
 character not part of the sub-formula with a dot or by changing every
-character in the sub-formula with a @samp{#} sign.  
+character in the sub-formula with a @samp{#} sign.
 If @code{calc-highlight-selections-with-faces} is t,
 then a selected sub-formula is distinguished either by displaying the
-non-selected portion of the formula with @code{calc-nonselected-face} 
+non-selected portion of the formula with @code{calc-nonselected-face}
 or by displaying the selected sub-formula with
 @code{calc-nonselected-face}.
 @end defvar
@@ -36651,9 +36651,9 @@
 
 @c 20
 @item
-With a prefix argument of 1, take a single 
+With a prefix argument of 1, take a single
 @texline @var{n}@math{\times2}
-@infoline @mathit{@var{N}x2} 
+@infoline @mathit{@var{N}x2}
 matrix from the stack instead of two separate data vectors.
 
 @c 21
@@ -36754,7 +36754,7 @@
 
 @c 30
 @item
-Editing occurs in a separate buffer.  Press @kbd{C-c C-c} (or 
+Editing occurs in a separate buffer.  Press @kbd{C-c C-c} (or
 @key{LFD}, or in some cases @key{RET}) to finish the edit, or kill the
 buffer with @kbd{C-x k} to cancel the edit.  The @key{LFD} key prevents evaluation
 of the result of the edit.
@@ -36854,7 +36854,7 @@
 @item
 The variable is replaced by the formula shown on the right.  The
 Inverse flag reverses the order of the operands, e.g., @kbd{I s - x}
-assigns 
+assigns
 @texline @math{x \coloneq a-x}.
 @infoline @expr{x := a-x}.
 

=== modified file 'doc/misc/cc-mode.texi'
--- doc/misc/cc-mode.texi	2011-11-17 17:40:48 +0000
+++ doc/misc/cc-mode.texi	2011-11-20 07:30:16 +0000
@@ -912,7 +912,7 @@
 function beginnings or ends inside the current declaration scope, it
 will search the enclosing scopes.  If you want @ccmode to recognize
 functions only at the top level@footnote{this was @ccmode{}'s
-behavior prior to version 5.32.}, set @code{c-defun-tatic} to
+behavior prior to version 5.32.}, set @code{c-defun-tactic} to
 @code{t}.
 
 These functions are analogous to the Emacs built-in commands

=== modified file 'doc/misc/faq.texi'
--- doc/misc/faq.texi	2011-11-17 17:40:48 +0000
+++ doc/misc/faq.texi	2011-11-20 07:30:16 +0000
@@ -627,7 +627,7 @@
 files named @file{etc/refcards/@var{lang}-refcard.*}, where @var{lang}
 is a two-letter code of the language.  For example, the German version
 of the reference card is in the files @file{etc/refcards/de-refcard.tex}
-and @file{etc/recards/de-refcard.pdf}.
+and @file{etc/refcards/de-refcard.pdf}.
 
 @item
 There are many other commands in Emacs for getting help and

=== modified file 'doc/misc/gnus.texi'
--- doc/misc/gnus.texi	2011-11-20 02:29:42 +0000
+++ doc/misc/gnus.texi	2011-11-20 07:30:16 +0000
@@ -25471,7 +25471,7 @@
 
 Write @code{spam-blackbox-register-routine} and
 @code{spam-blackbox-unregister-routine} using the bogofilter
-register/unregister routines as a start, or other restister/unregister
+register/unregister routines as a start, or other register/unregister
 routines more appropriate to Blackbox, if Blackbox can
 register/unregister spam and ham.
 

=== modified file 'etc/NEWS.1-17'
--- etc/NEWS.1-17	2011-11-19 09:18:31 +0000
+++ etc/NEWS.1-17	2011-11-20 07:30:16 +0000
@@ -775,7 +775,7 @@
 
 `help-form' is expected at all times to contain either `nil'
 or an expression to be executed when C-h is typed (overriding
-teh definition of C-h as a command).  `minibuffer-help-form'
+the definition of C-h as a command).  `minibuffer-help-form'
 can be used to provide a different default way of handling
 C-h while in the minibuffer.
 
@@ -1870,7 +1870,7 @@
 
 * The variable global-minor-modes is used to display
  strings in the mode line of all buffers.  It should be
- a list of elements thaht are conses whose cdrs are strings
+ a list of elements that are conses whose cdrs are strings
  to be displayed.  This complements the variable
  minor-modes, which has the same effect but has a separate
  value in each buffer.

=== modified file 'etc/NEWS.18'
--- etc/NEWS.18	2011-11-20 02:29:42 +0000
+++ etc/NEWS.18	2011-11-20 07:30:16 +0000
@@ -1303,7 +1303,7 @@
 
 The default value of this variable is `nil', because usually it is
 useful to have the uid of a file change according to who edited it
-last.  I recommend thet this variable be left normally `nil' and
+last.  I recommend that this variable be left normally `nil' and
 changed with a local variables list in those particular files where
 the uid needs to be preserved.
 

=== modified file 'etc/NEWS.19'
--- etc/NEWS.19	2011-11-20 03:48:53 +0000
+++ etc/NEWS.19	2011-11-20 07:30:16 +0000
@@ -5484,7 +5484,7 @@
 ** M-x revert-buffer no longer offers to revert from a recent auto-save
 file unless you give it a prefix argument.  Otherwise it always
 reverts from the real file regardless of whether there has been an
-auto-save since thenm.  (Reverting from the auto-save file is no longer
+auto-save since then.  (Reverting from the auto-save file is no longer
 very useful now that the undo capacity is larger.)
 
 ** M-x recover-file no longer turns off Auto Save mode when it reads

=== modified file 'etc/THE-GNU-PROJECT'
--- etc/THE-GNU-PROJECT	2007-09-21 22:50:37 +0000
+++ etc/THE-GNU-PROJECT	2011-11-20 07:30:16 +0000
@@ -762,7 +762,7 @@
    Those of us who value free software for freedom's sake will stay with
    free software anyway. We will manage to get work done without the
    patented features. But those who value free software because they
-   expect it to be techically superior are likely to call it a failure
+   expect it to be technically superior are likely to call it a failure
    when a patent holds it back. Thus, while it is useful to talk about the
    practical effectiveness of the "cathedral" model of development (1),
    and the reliability and power of some free software, we must not stop

=== modified file 'leim/quail/sgml-input.el'
--- leim/quail/sgml-input.el	2011-01-26 08:36:39 +0000
+++ leim/quail/sgml-input.el	2011-11-20 07:30:16 +0000
@@ -916,7 +916,7 @@
   ("&theta;" ?\θ) ;; GREEK SMALL LETTER THETA
   ("&Theta;" ?\Θ) ;; GREEK CAPITAL LETTER THETA
   ("&thetas;" ?\θ) ;; GREEK SMALL LETTER THETA
-  ("&thetasyLsymbol;" ?\ϑ) ;; GREEK THETA SYMBOL
+  ("&thetasym;" ?\ϑ) ;; GREEK THETA SYMBOL
   ("&thetav;" ?\ϑ) ;; GREEK THETA SYMBOL
   ("&THgr;" ?\Θ) ;; GREEK CAPITAL LETTER THETA
   ("&thgr;" ?\θ) ;; GREEK SMALL LETTER THETA

=== modified file 'lisp/allout.el'
--- lisp/allout.el	2011-11-20 03:48:53 +0000
+++ lisp/allout.el	2011-11-20 07:30:16 +0000
@@ -612,7 +612,7 @@
 the comment-start string, with an '_' appended, for `allout-primary-bullet'.
 
 String values are used as literals, not regular expressions, so
-do not escape any regulare-expression characters.
+do not escape any regular-expression characters.
 
 Value t means to first check for assoc value in `allout-mode-leaders'
 alist, then use comment-start string, if any, then use default (`.').

=== modified file 'lisp/cedet/ede/generic.el'
--- lisp/cedet/ede/generic.el	2011-11-19 09:18:31 +0000
+++ lisp/cedet/ede/generic.el	2011-11-20 07:30:16 +0000
@@ -359,7 +359,7 @@
 (defun ede-generic-new-autoloader (internal-name external-name
 						 projectfile class)
   "Add a new EDE Autoload instance for identifying a generic project.
-INTERNAL-NAME is a long name that identifies thsi project type.
+INTERNAL-NAME is a long name that identifies this project type.
 EXTERNAL-NAME is a shorter human readable name to describe the project.
 PROJECTFILE is a file name that identifies a project of this type to EDE, such as
 a Makefile, or SConstruct file.

=== modified file 'lisp/cedet/ede/pconf.el'
--- lisp/cedet/ede/pconf.el	2011-11-14 20:23:26 +0000
+++ lisp/cedet/ede/pconf.el	2011-11-20 07:30:16 +0000
@@ -82,7 +82,7 @@
 		      (directory-file-name
 		       (ede-subproject-relative-path sp top-level-project-local)))))
 	    (when (string= dir "./") (setq dir ""))
-	    ;; Use concat, because expand-file-name removes the relativeness.
+	    ;; Use concat, because expand-file-name removes the relativity.
 	    (concat dir "Makefile") )))))
     ;;
     ;; NOTE TO SELF.  TURN THIS INTO THE OFFICIAL LIST

=== modified file 'lisp/cedet/ede/project-am.el'
--- lisp/cedet/ede/project-am.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/ede/project-am.el	2011-11-20 07:30:16 +0000
@@ -284,7 +284,7 @@
 		(progn (forward-line -1)
 		       (end-of-line)
 		       (insert "\n"))
-	      ;; If the above search fails, thats ok.  We'd just want to be at
+	      ;; If the above search fails, that's ok.  We'd just want to be at
 	      ;; point-min anyway.
 	      )
 	    (makefile-insert-macro (car (cdr (cdr ntype))))))

=== modified file 'lisp/cedet/semantic/analyze.el'
--- lisp/cedet/semantic/analyze.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/semantic/analyze.el	2011-11-20 07:30:16 +0000
@@ -161,7 +161,7 @@
 (defclass semantic-analyze-context-return (semantic-analyze-context)
   () ; No extra data.
   "Analysis class for return data.
-Return data methods identify the requred type by the return value
+Return data methods identify the required type by the return value
 of the parent function.")
 
 ;;; METHODS

=== modified file 'lisp/cedet/semantic/bovine/c.el'
--- lisp/cedet/semantic/bovine/c.el	2011-11-20 03:48:53 +0000
+++ lisp/cedet/semantic/bovine/c.el	2011-11-20 07:30:16 +0000
@@ -954,7 +954,7 @@
 			     (nth 1 (car names)) ; name
 			     "typedef"
 			     (semantic-tag-type-members tag)
-			     ;; parent is just tbe name of what
+			     ;; parent is just the name of what
 			     ;; is passed down as a tag.
 			     (list
 			      (semantic-tag-name

=== modified file 'lisp/cedet/semantic/complete.el'
--- lisp/cedet/semantic/complete.el	2011-11-20 02:29:42 +0000
+++ lisp/cedet/semantic/complete.el	2011-11-20 07:30:16 +0000
@@ -1478,7 +1478,7 @@
 	 (tag (cdr nt))
 	 (table (car nt))
 	)
-    ;; If we fail to normalize, resete.
+    ;; If we fail to normalize, reset.
     (when (not tag) (setq table rtable tag rtag))
     ;; Do the focus.
     (let ((buf (or (semantic-tag-buffer tag)

=== modified file 'lisp/cedet/semantic/db-javascript.el'
--- lisp/cedet/semantic/db-javascript.el	2011-11-20 02:29:42 +0000
+++ lisp/cedet/semantic/db-javascript.el	2011-11-20 07:30:16 +0000
@@ -137,7 +137,7 @@
 
 (defmethod semanticdb-get-tags ((table semanticdb-table-javascript ))
   "Return the list of tags belonging to TABLE."
-  ;; NOTE: Omniscient databases probably don't want to keep large tabes
+  ;; NOTE: Omniscient databases probably don't want to keep large tables
   ;;       lolly-gagging about.  Keep internal Emacs tables empty and
   ;;       refer to alternate databases when you need something.
   semanticdb-javascript-tags)

=== modified file 'lisp/cedet/semantic/edit.el'
--- lisp/cedet/semantic/edit.el	2011-11-20 03:48:53 +0000
+++ lisp/cedet/semantic/edit.el	2011-11-20 07:30:16 +0000
@@ -649,7 +649,7 @@
                     parent-tag (aref tmp 2))
               ;; We can calculate parse begin/end by checking
               ;; out what is in TAGS.  The one near start is
-              ;; always first.  Make sure the reprase includes
+              ;; always first.  Make sure the reparse includes
               ;; the `whitespace' around the snarfed tags.
               ;; Since cache-list is positioned properly, use it
               ;; to find that boundary.
@@ -707,7 +707,7 @@
       ;; since that is how the multi-tag parser works.  Grab
       ;; the reparse symbol from the first of the returned tags.
       ;;
-      ;; Feb '06 - If repase-symbol is nil, then they are top level
+      ;; Feb '06 - If reparse-symbol is nil, then they are top level
       ;;     tags.  (I'm guessing.)  Is this right?
       (setq reparse-symbol
             (semantic--tag-get-property (car (or tags cache-list))

=== modified file 'lisp/cedet/semantic/fw.el'
--- lisp/cedet/semantic/fw.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/semantic/fw.el	2011-11-20 07:30:16 +0000
@@ -251,7 +251,7 @@
 
 (defmacro semantic-exit-on-input (symbol &rest forms)
   "Using SYMBOL as an argument to `throw', execute FORMS.
-If FORMS includes a call to `semantic-thow-on-input', then
+If FORMS includes a call to `semantic-throw-on-input', then
 if a user presses any key during execution, this form macro
 will exit with the value passed to `semantic-throw-on-input'.
 If FORMS completes, then the return value is the same as `progn'."

=== modified file 'lisp/cedet/semantic/scope.el'
--- lisp/cedet/semantic/scope.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/semantic/scope.el	2011-11-20 07:30:16 +0000
@@ -303,7 +303,7 @@
 		   (miniscope (semantic-scope-cache "mini"))
 		   ptag)
 
-	      ;; Find the next entry in the refereneced type for
+	      ;; Find the next entry in the referenced type for
 	      ;; our function, and append to return list till our
 	      ;; returnlist is empty.
 	      (while snlist

=== modified file 'lisp/cedet/semantic/tag.el'
--- lisp/cedet/semantic/tag.el	2011-11-20 02:29:42 +0000
+++ lisp/cedet/semantic/tag.el	2011-11-20 07:30:16 +0000
@@ -919,7 +919,7 @@
   "Return a filename representation of TAG.
 The default action is to return the `semantic-tag-name'.
 Some languages do not use full filenames in their include statements.
-Override this method to translate the code represenation
+Override this method to translate the code representation
 into a filename.  (A relative filename if necessary.)
 
 See `semantic-dependency-tag-file' to expand an include

=== modified file 'lisp/cedet/srecode/document.el'
--- lisp/cedet/srecode/document.el	2011-11-19 09:18:31 +0000
+++ lisp/cedet/srecode/document.el	2011-11-20 07:30:16 +0000
@@ -698,7 +698,7 @@
 				 (cdr (car al)))))
 	    (setq al nil)))
       (setq al (cdr al)))
-    ;; add tailers to names which are obviously returning something.
+    ;; add trailers to names which are obviously returning something.
     (if tailit
 	(progn
 	  (setq al srecode-document-autocomment-return-last-alist)

=== modified file 'lisp/comint.el'
--- lisp/comint.el	2011-11-20 02:29:42 +0000
+++ lisp/comint.el	2011-11-20 07:30:16 +0000
@@ -1980,7 +1980,7 @@
               ;; The point should float after any insertion we do.
 	      (saved-point (copy-marker (point) t)))
 
-	  ;; We temporarly remove any buffer narrowing, in case the
+	  ;; We temporarily remove any buffer narrowing, in case the
 	  ;; process mark is outside of the restriction
 	  (save-restriction
 	    (widen)

=== modified file 'lisp/dframe.el'
--- lisp/dframe.el	2011-11-20 02:29:42 +0000
+++ lisp/dframe.el	2011-11-20 07:30:16 +0000
@@ -82,7 +82,7 @@
 ;;       c) If successful (your -frame variable has a value), call
 ;;          timer setup if applicable.
 ;;   your-frame-reposition- -- Function to call from after-create-hook to
-;;     reposition your frame with `dframe-repsoition-frame'.
+;;     reposition your frame with `dframe-reposition-frame'.
 ;;   your-mode -- Set up the major mode of the buffer for your app.
 ;;     Set these variables: dframe-track-mouse-function,
 ;;                          dframe-help-echo-function,
@@ -726,7 +726,7 @@
   (if timeout
       (add-to-list 'dframe-client-functions fn)
     (setq dframe-client-functions (delete fn dframe-client-functions)))
-  ;; Now decided what to do about the timout.
+  ;; Now decided what to do about the timeout.
   (if (or
        ;; We have a timer, restart the timer with the new time.
        timeout

=== modified file 'lisp/emacs-lisp/avl-tree.el'
--- lisp/emacs-lisp/avl-tree.el	2011-05-27 22:58:29 +0000
+++ lisp/emacs-lisp/avl-tree.el	2011-11-20 07:30:16 +0000
@@ -206,7 +206,7 @@
 
 Return cons cell (SHRUNK . DATA), where SHRUNK is t if the
 height of the tree has shrunk and nil otherwise, and DATA is
-the releted data."
+the related data."
   (let ((br (avl-tree--node-branch root branch)))
     (cond
      ;; DATA not in tree.

=== modified file 'lisp/emacs-lisp/elint.el'
--- lisp/emacs-lisp/elint.el	2011-11-19 09:18:31 +0000
+++ lisp/emacs-lisp/elint.el	2011-11-20 07:30:16 +0000
@@ -335,7 +335,7 @@
 Is measured in buffer-modified-ticks and is local in linted buffers.")
 
 ;; This is a minor optimization.  It is local to every buffer, and so
-;; does not prevent recursive requirs.  It does not list the requires
+;; does not prevent recursive requires.  It does not list the requires
 ;; of requires.
 (defvar elint-features nil
   "List of all libraries this buffer has required, or that have been provided.")

=== modified file 'lisp/emulation/viper-init.el'
--- lisp/emulation/viper-init.el	2011-01-25 04:08:28 +0000
+++ lisp/emulation/viper-init.el	2011-11-20 07:30:16 +0000
@@ -205,7 +205,7 @@
 
 (viper-deflocalvar viper-insert-diehard-minor-mode nil
   "Minor mode that simulates Vi very closely.
-Not recommened, except for the novice user.")
+Not recommended, except for the novice user.")
 
 (viper-deflocalvar viper-insert-kbd-minor-mode nil
 "Minor mode for Ex command macros Insert state.
@@ -679,7 +679,7 @@
   :group 'viper-search)
 
 (defcustom viper-search-scroll-threshold 2
-  "*If search lands within this threshnold from the window top/bottom,
+  "*If search lands within this threshold from the window top/bottom,
 the window will be scrolled up or down appropriately, to reveal context.
 If you want Viper search to behave as usual in Vi, set this variable to a
 negative number."

=== modified file 'lisp/erc/ChangeLog.01'
--- lisp/erc/ChangeLog.01	2011-11-20 03:48:53 +0000
+++ lisp/erc/ChangeLog.01	2011-11-20 07:30:16 +0000
@@ -93,7 +93,7 @@
 
 	* erc.el 1.166:
 	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
-	We narrow-to-region now, thats much cleaner.
+	We narrow-to-region now, that's much cleaner.
 	* rename erc-fill-region to erc-fill and change the autoload
 	** You'll probably need to restart Emacs
 
@@ -221,7 +221,7 @@
 	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
 	* New variable: erc-reuse-buffers default to t.
 	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same,
-	  then one can assume thats the same channel/query target again.
+	  then one can assume that's the same channel/query target again.
 
 2001-11-23  Mario Lang  <mlang@delysid.org>
 
@@ -415,7 +415,7 @@
 	* erc.el 1.104: only some code beautification
 
 	* erc-imenu.el 1.2:
-	remove add-hook call, thats done in erc.el now for autoloadability
+	remove add-hook call, that's done in erc.el now for autoloadability
 
 	* erc.el 1.103: * Make erc-imenu autoloadable
 

=== modified file 'lisp/ezimage.el'
--- lisp/ezimage.el	2011-11-17 09:09:20 +0000
+++ lisp/ezimage.el	2011-11-20 07:30:16 +0000
@@ -239,7 +239,7 @@
     ("[ ]" . ezimage-page)
     ("{+}" . ezimage-box-plus)
     ("{-}" . ezimage-box-minus)
-    ;; Some vaguely representitive entries
+    ;; Some vaguely representative entries
     ("*" . ezimage-checkout)
     ("#" . ezimage-object)
     ("!" . ezimage-object-out-of-date)

=== modified file 'lisp/faces.el'
--- lisp/faces.el	2011-11-15 07:55:13 +0000
+++ lisp/faces.el	2011-11-20 07:30:16 +0000
@@ -1925,7 +1925,7 @@
 	  (progn
 	    ;; Initialize faces from face spec and custom theme.
 	    (face-spec-recalc face frame)
-	    ;; X resouces for the default face are applied during
+	    ;; X resources for the default face are applied during
 	    ;; `x-create-frame'.
 	    (and (not (eq face 'default)) window-system-p
 		 (make-face-x-resource-internal face frame))

=== modified file 'lisp/follow.el'
--- lisp/follow.el	2011-11-19 09:18:31 +0000
+++ lisp/follow.el	2011-11-20 07:30:16 +0000
@@ -562,7 +562,7 @@
 ;;
 ;; Almost like the real thing, except when the cursor ends up outside
 ;; the top or bottom...  In our case however, we end up outside the
-;; window and hence we are recenterd.  Should we let `recenter' handle
+;; window and hence we are recentered.  Should we let `recenter' handle
 ;; the point position we would never leave the selected window.  To do
 ;; it ourselves we would need to do our own redisplay, which is easier
 ;; said than done.  (Why didn't I do a real display abstraction from

=== modified file 'lisp/font-lock.el'
--- lisp/font-lock.el	2011-11-11 10:04:08 +0000
+++ lisp/font-lock.el	2011-11-20 07:30:16 +0000
@@ -981,7 +981,7 @@
 ;; rules one way and C code another.  Neat!
 ;;
 ;; A further reason to use the fontification indirection feature is when the
-;; default syntactual fontification, or the default fontification in general,
+;; default syntactic fontification, or the default fontification in general,
 ;; is not flexible enough for a particular major mode.  For example, perhaps
 ;; comments are just too hairy for `font-lock-fontify-syntactically-region' to
 ;; cope with.  You need to write your own version of that function, e.g.,

=== modified file 'lisp/gnus/gnus-group.el'
--- lisp/gnus/gnus-group.el	2011-10-03 23:27:29 +0000
+++ lisp/gnus/gnus-group.el	2011-11-20 07:30:16 +0000
@@ -1361,7 +1361,7 @@
 					; We list groups with unread articles
 		       (and gnus-list-groups-with-ticked-articles
 			    (cdr (assq 'tick (gnus-info-marks info))))
-					; And groups with tickeds
+					; And groups with ticked articles
 		       ;; Check for permanent visibility.
 		       (and gnus-permanently-visible-groups
 			    (string-match gnus-permanently-visible-groups

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2011-11-18 08:31:02 +0000
+++ lisp/gnus/gnus-sum.el	2011-11-20 07:30:16 +0000
@@ -1657,7 +1657,7 @@
 
 This variable is a list of FUNCTION or (REGEXP . FUNCTION).  If item
 is FUNCTION, FUNCTION will be apply to all newsgroups.  If item is a
-\(REGEXP . FUNCTION), FUNCTION will be only apply to thes newsgroups
+\(REGEXP . FUNCTION), FUNCTION will be applied only to the newsgroups
 whose names match REGEXP.
 
 For example:

=== modified file 'lisp/gnus/message.el'
--- lisp/gnus/message.el	2011-11-17 09:09:20 +0000
+++ lisp/gnus/message.el	2011-11-20 07:30:16 +0000
@@ -7167,7 +7167,7 @@
 
 (defun message-wash-subject (subject)
   "Remove junk like \"Re:\", \"(fwd)\", etc. added to subject string SUBJECT.
-Previous forwarders, replyers, etc. may add it."
+Previous forwarders, repliers, etc. may add it."
   (with-temp-buffer
     (insert subject)
     (goto-char (point-min))

=== modified file 'lisp/gnus/nntp.el'
--- lisp/gnus/nntp.el	2011-08-21 09:39:07 +0000
+++ lisp/gnus/nntp.el	2011-11-20 07:30:16 +0000
@@ -1681,7 +1681,7 @@
         ;; for the first available article.  Obviously, a client can
         ;; use that entry to avoid making unnecessary requests.  The
         ;; only problem is for a client that assumes that the response
-        ;; will always be within the requested ranage.  For such a
+        ;; will always be within the requested range.  For such a
         ;; client, we can get N copies of the same entry (one for each
         ;; XOVER command sent to the server).
 

=== modified file 'lisp/gnus/smime.el'
--- lisp/gnus/smime.el	2011-11-15 07:55:13 +0000
+++ lisp/gnus/smime.el	2011-11-20 07:30:16 +0000
@@ -180,7 +180,7 @@
 (defcustom smime-certificate-directory "~/Mail/certs/"
   "*Directory containing other people's certificates.
 It should contain files named to the X.509 hash of the certificate,
-and the files themself should be in PEM format."
+and the files themselves should be in PEM format."
 ;The S/MIME library provide simple functionality for fetching
 ;certificates into this directory, so there is no need to populate it
 ;manually.

=== modified file 'lisp/image-dired.el'
--- lisp/image-dired.el	2011-10-30 01:56:03 +0000
+++ lisp/image-dired.el	2011-11-20 07:30:16 +0000
@@ -469,7 +469,7 @@
 If non-nil, using `image-dired-next-line-and-display' and
 `image-dired-previous-line-and-display' will leave a trail of thumbnail
 images in the thumbnail buffer.  If you enable this and want to clean
-the thumbnail buffer because it is filled with too many thumbmnails,
+the thumbnail buffer because it is filled with too many thumbnails,
 just call `image-dired-display-thumb' to display only the image at point.
 This value can be toggled using `image-dired-toggle-append-browsing'."
   :type 'boolean
@@ -1605,7 +1605,7 @@
        (setq thumb-name (image-dired-thumb-name curr-file))
        ;; If the user overrides the exist check, we must clear the
        ;; image cache so that if the user wants to display the
-       ;; thumnail, it is not fetched from cache.
+       ;; thumbnail, it is not fetched from cache.
        (if arg
            (clear-image-cache))
        (if (or (not (file-exists-p thumb-name))
@@ -2043,7 +2043,7 @@
      files)))
 
 (defun image-dired-display-next-thumbnail-original ()
-  "In thubnail buffer, move to next thumbnail and display the image."
+  "In thumbnail buffer, move to next thumbnail and display the image."
   (interactive)
   (image-dired-forward-image)
   (image-dired-display-thumbnail-original-image))

=== modified file 'lisp/info-xref.el'
--- lisp/info-xref.el	2011-11-18 08:31:02 +0000
+++ lisp/info-xref.el	2011-11-20 07:30:16 +0000
@@ -413,7 +413,7 @@
    (unless (boundp 'viper-mode)
      (setq viper-mode nil))  ;; avoid viper.el ask about viperizing
    (unless (boundp 'gnus-registry-install)
-     (setq gnus-registry-install nil))  ;; avoid gnus-registery.el querying
+     (setq gnus-registry-install nil))  ;; avoid gnus-registry.el querying
 
    (mapatoms
     (lambda (symbol)

=== modified file 'lisp/international/titdic-cnv.el'
--- lisp/international/titdic-cnv.el	2011-11-17 09:09:20 +0000
+++ lisp/international/titdic-cnv.el	2011-11-20 07:30:16 +0000
@@ -1179,7 +1179,7 @@
       (setq tail (cdr tail)))))
 
 (defun batch-miscdic-convert ()
-  "Run `miscdic-convert' on the files remaing on the command line.
+  "Run `miscdic-convert' on the files remaining on the command line.
 Use this from the command line, with `-batch';
 it won't work in an interactive Emacs.
 If there's an argument \"-dir\", the next argument specifies a directory

=== modified file 'lisp/language/thai-util.el'
--- lisp/language/thai-util.el	2011-01-25 04:08:28 +0000
+++ lisp/language/thai-util.el	2011-11-20 07:30:16 +0000
@@ -124,7 +124,7 @@
 	   (?ใ vowel-base "VOWEL SIGN SARA MAI MUAN")			; 0xE3
 	   (?ไ vowel-base "VOWEL SIGN SARA MAI MALAI")			; 0xE4
 	   (?ๅ vowel-base "LAK KHANG YAO")				; 0xE5
-	   (?ๆ special "MAI YAMOK (repetion)")				; 0xE6
+	   (?ๆ special "MAI YAMOK (repetition)")			; 0xE6
 	   (?็ sign-upper "VOWEL SIGN MAI TAI KHU N/S-T")		; 0xE7
 	   (?่ tone "TONE MAI EK N/S-T")				; 0xE8
 	   (?้ tone "TONE MAI THO N/S-T")				; 0xE9

=== modified file 'lisp/loadhist.el'
--- lisp/loadhist.el	2011-11-17 09:09:20 +0000
+++ lisp/loadhist.el	2011-11-20 07:30:16 +0000
@@ -133,7 +133,7 @@
     font-lock-unfontify-region-function
     kill-buffer-query-functions kill-emacs-query-functions
     lisp-indent-function mouse-position-function
-    redisplaylay-end-trigger-functions suspend-tty-functions
+    redisplay-end-trigger-functions suspend-tty-functions
     temp-buffer-show-function window-scroll-functions
     window-size-change-functions write-contents-functions
     write-file-functions write-region-annotate-functions)

=== modified file 'lisp/mail/feedmail.el'
--- lisp/mail/feedmail.el	2011-11-20 03:48:53 +0000
+++ lisp/mail/feedmail.el	2011-11-20 07:30:16 +0000
@@ -1010,7 +1010,7 @@
 
 
 (defcustom feedmail-ask-before-queue-reprompt "FQM: Please type q, i, d, or e; or ? for help [%s]: "
-  "A string which will be used for repompting after invalid input.
+  "A string which will be used for reprompting after invalid input.
 If it contains a \"%s\", that will be replaced with the value of
 `feedmail-ask-before-queue-default'."
   :group 'feedmail-queue

=== modified file 'lisp/mpc.el'
--- lisp/mpc.el	2011-11-14 20:23:26 +0000
+++ lisp/mpc.el	2011-11-20 07:30:16 +0000
@@ -1589,7 +1589,7 @@
 (defvar mpc--changed-selection)
 
 (defun mpc-reorder (&optional nodeactivate)
-  "Reorder entries based on thre currently active selections.
+  "Reorder entries based on the currently active selections.
 I.e. split the current browser buffer into a first part containing the
 entries included in the selection, then a separator, and then the entries
 not included in the selection.

=== modified file 'lisp/net/tramp-cmds.el'
--- lisp/net/tramp-cmds.el	2011-07-14 01:40:30 +0000
+++ lisp/net/tramp-cmds.el	2011-11-20 07:30:16 +0000
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This package provides all interactive commands which are releated
+;; This package provides all interactive commands which are related
 ;; to Tramp.
 
 ;;; Code:

=== modified file 'lisp/net/tramp-gw.el'
--- lisp/net/tramp-gw.el	2011-01-25 04:08:28 +0000
+++ lisp/net/tramp-gw.el	2011-11-20 07:30:16 +0000
@@ -178,7 +178,7 @@
 	   (tramp-file-name-host gw-vec)))
 	 ;; Declare the SOCKS server to be used.
 	 (socks-server
-	  (list "Tramp tempory socks server list"
+	  (list "Tramp temporary socks server list"
 		;; Host name.
 		(tramp-file-name-real-host gw-vec)
 		;; Port number.

=== modified file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	2011-11-20 02:29:42 +0000
+++ lisp/net/tramp-sh.el	2011-11-20 07:30:16 +0000
@@ -4905,7 +4905,7 @@
 
 (defun tramp-get-inline-coding (vec prop size)
   "Return the coding command related to PROP.
-PROP is either `remote-encoding', `remode-decoding',
+PROP is either `remote-encoding', `remote-decoding',
 `local-encoding' or `local-decoding'.
 
 SIZE is the length of the file to be coded.  Depending on SIZE,

=== modified file 'lisp/notifications.el'
--- lisp/notifications.el	2011-10-24 08:02:02 +0000
+++ lisp/notifications.el	2011-11-20 07:30:16 +0000
@@ -163,7 +163,7 @@
                  only URI schema supported right now) or a name
                  in a freedesktop.org-compliant icon theme.
  :sound-file     The path to a sound file to play when the notification pops up.
- :sound-name     A themeable named sound from the freedesktop.org sound naming
+ :sound-name     A themable named sound from the freedesktop.org sound naming
                  specification to play when the notification pops up.
                  Similar to icon-name,only for sounds. An example would
                  be \"message-new-instant\".

=== modified file 'lisp/org/org-capture.el'
--- lisp/org/org-capture.el	2011-11-20 02:29:42 +0000
+++ lisp/org/org-capture.el	2011-11-20 07:30:16 +0000
@@ -1449,7 +1449,7 @@
       (goto-char (point-min))
       (while (looking-at "[ \t]*\n") (replace-match ""))
       (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
-      ;; Return the expanded tempate and kill the temporary buffer
+      ;; Return the expanded template and kill the temporary buffer
       (untabify (point-min) (point-max))
       (set-buffer-modified-p nil)
       (prog1 (buffer-string) (kill-buffer (current-buffer))))))

=== modified file 'lisp/org/org-list.el'
--- lisp/org/org-list.el	2011-11-17 17:40:48 +0000
+++ lisp/org/org-list.el	2011-11-20 07:30:16 +0000
@@ -3008,7 +3008,7 @@
 
 Alternatively, each parameter can also be a form returning
 a string.  These sexp can use keywords `counter' and `depth',
-reprensenting respectively counter associated to the current
+representing respectively counter associated to the current
 item, and depth of the current sub-list, starting at 0.
 Obviously, `counter' is only available for parameters applying to
 items."

=== modified file 'lisp/org/org-table.el'
--- lisp/org/org-table.el	2011-11-20 03:48:53 +0000
+++ lisp/org/org-table.el	2011-11-20 07:30:16 +0000
@@ -2641,7 +2641,7 @@
 	    (prog1 (org-trim (org-table-get-field c1))
 	      (if highlight (org-table-highlight-rectangle (point) (point)))))
 	;; A range, return a vector
-	;; First sort the numbers to get a regular ractangle
+	;; First sort the numbers to get a regular rectangle
 	(if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
 	(if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
 	(if corners-only

=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el	2011-11-20 02:29:42 +0000
+++ lisp/progmodes/cc-engine.el	2011-11-20 07:30:16 +0000
@@ -893,7 +893,7 @@
 			  ((eq sym 'while)
 			   ;; Is this a real while, or a do-while?
 			   ;; The next `when' triggers unless we are SURE that
-			   ;; the `while' is not the tailend of a `do-while'.
+			   ;; the `while' is not the tail end of a `do-while'.
 			   (when (or (not pptok)
 				     (memq (char-after pptok) delims)
 				     ;; The following kludge is to prevent
@@ -9784,7 +9784,7 @@
 	  (c-beginning-of-statement-1 containing-sexp)
 	  (c-add-stmt-syntax 'statement nil t containing-sexp paren-state))
 
-	 ;;CASE 5N: We are at a tompmost continuation line and the only
+	 ;;CASE 5N: We are at a topmost continuation line and the only
 	 ;;preceding items are annotations.
 	 ((and (c-major-mode-is 'java-mode)
 	       (setq placeholder (point))

=== modified file 'lisp/progmodes/cperl-mode.el'
--- lisp/progmodes/cperl-mode.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/cperl-mode.el	2011-11-20 07:30:16 +0000
@@ -1277,7 +1277,7 @@
 	  "----"
 	  ["Ispell PODs" cperl-pod-spell
 	   ;; Better not to update syntaxification here:
-	   ;; debugging syntaxificatio can be broken by this???
+	   ;; debugging syntaxification can be broken by this???
 	   (or
 	    (get-text-property (point-min) 'in-pod)
 	    (< (progn

=== modified file 'lisp/ps-print.el'
--- lisp/ps-print.el	2011-09-20 10:18:55 +0000
+++ lisp/ps-print.el	2011-11-20 07:30:16 +0000
@@ -5372,9 +5372,9 @@
 KIND is a valid value of `ps-n-up-filling'.
 XCOL YCOL are the relative position for the next column.
 XLIN YLIN are the relative position for the beginning of next line.
-REPEAT is the number of repetions for external loop.
-END is the number of repetions for internal loop and also the number of pages in
-    a row.
+REPEAT is the number of repetitions for external loop.
+END is the number of repetitions for internal loop and also the number
+    of pages in a row.
 XSTART YSTART are the relative position for the first page in a sheet.")
 
 

=== modified file 'lisp/startup.el'
--- lisp/startup.el	2011-11-14 06:27:12 +0000
+++ lisp/startup.el	2011-11-20 07:30:16 +0000
@@ -943,7 +943,7 @@
   (normal-erase-is-backspace-setup-frame)
 
   ;; Register default TTY colors for the case the terminal hasn't a
-  ;; terminal init file.  We do this regardles of whether the terminal
+  ;; terminal init file.  We do this regardless of whether the terminal
   ;; supports colors or not and regardless the current display type,
   ;; since users can connect to color-capable terminals and also
   ;; switch color support on or off in mid-session by setting the

=== modified file 'lisp/textmodes/reftex-cite.el'
--- lisp/textmodes/reftex-cite.el	2011-11-19 09:18:31 +0000
+++ lisp/textmodes/reftex-cite.el	2011-11-20 07:30:16 +0000
@@ -76,7 +76,7 @@
   (get 'reftex-default-bibliography :reftex-expanded))
 
 (defun reftex-bib-or-thebib ()
-  ;; Tests if BibTeX or \begin{tehbibliography} should be used for the
+  ;; Tests if BibTeX or \begin{thebibliography} should be used for the
   ;; citation
   ;; Find the bof of the current file
   (let* ((docstruct (symbol-value reftex-docstruct-symbol))

=== modified file 'lisp/thumbs.el'
--- lisp/thumbs.el	2011-11-20 02:29:42 +0000
+++ lisp/thumbs.el	2011-11-20 07:30:16 +0000
@@ -235,7 +235,7 @@
       (setq dirsize (- dirsize (car (cdar files-list))))
       (setq files-list (cdr files-list)))))
 
-;; Check the thumbsnail directory size and clean it if necessary.
+;; Check the thumbnail directory size and clean it if necessary.
 (when thumbs-thumbsdir-auto-clean
   (thumbs-cleanup-thumbsdir))
 

=== modified file 'lisp/vc/ediff-mult.el'
--- lisp/vc/ediff-mult.el	2011-02-12 23:40:43 +0000
+++ lisp/vc/ediff-mult.el	2011-11-20 07:30:16 +0000
@@ -2164,7 +2164,7 @@
 ;; If meta-buf doesn't exist, it is created.  In that case, id doesn't have a
 ;; parent meta-buf
 ;; Check if META-BUF exists before calling this function
-;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
+;; Optional MUST-REDRAW, if non-nil, would force redrawing of the whole meta
 ;; buffer.  Otherwise, it will just go over the buffer and update activity marks
 ;; and session status.
 ;; SESSION-NUMBER, if specified, says which session caused the update.

=== modified file 'lisp/vc/vc-dispatcher.el'
--- lisp/vc/vc-dispatcher.el	2011-10-10 17:52:03 +0000
+++ lisp/vc/vc-dispatcher.el	2011-11-20 07:30:16 +0000
@@ -103,7 +103,7 @@
 ;;
 ;; When the client mode adds a local vc-mode-line-hook to a buffer, it
 ;; will be called with the buffer file name as argument whenever the
-;; dispatcher resynchs the buffer.
+;; dispatcher resyncs the buffer.
 
 ;; To do:
 ;;

=== modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el	2011-10-20 21:01:45 +0000
+++ lisp/vc/vc.el	2011-11-20 07:30:16 +0000
@@ -2690,7 +2690,7 @@
       (substring rev 0 index))))
 
 (defun vc-default-responsible-p (backend file)
-  "Indicate whether BACKEND is reponsible for FILE.
+  "Indicate whether BACKEND is responsible for FILE.
 The default is to return nil always."
   nil)
 

=== modified file 'lwlib/xlwmenu.c'
--- lwlib/xlwmenu.c	2011-11-18 08:31:02 +0000
+++ lwlib/xlwmenu.c	2011-11-20 07:30:16 +0000
@@ -113,7 +113,7 @@
 <KeyUp>:          key()\n\
 ";
 
-/* FIXME: Space should toggle toggleable menu item but not remove the menu
+/* FIXME: Space should toggle togglable menu item but not remove the menu
    so you can toggle the next one without entering the menu again.  */
 
 /* FIXME: Should ESC close one level of menu structure or the complete menu?  */

=== modified file 'src/ChangeLog.11'
--- src/ChangeLog.11	2011-11-20 03:48:53 +0000
+++ src/ChangeLog.11	2011-11-20 07:30:16 +0000
@@ -7199,7 +7199,7 @@
 
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
-	* xfns.c (Fx_create_frame): Don't consult X resouces when setting
+	* xfns.c (Fx_create_frame): Don't consult X resources when setting
 	menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
 	tool-bar-mode, which are now set using these X resources at
 	startup, to determine the defaults (Bug#2249).
@@ -29136,7 +29136,7 @@
 
 	* lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER):
 	* lread.c (defvar_per_buffer):
-	* abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c.
+	* abbrev.c (syms_of_abbrev) <local-abbrev-table>: Move to buffer.c.
 
 	* window.c (candidate_window_p): Only consider as visible frames that
 	are on the same terminal.

=== modified file 'src/ccl.c'
--- src/ccl.c	2011-11-20 02:29:42 +0000
+++ src/ccl.c	2011-11-20 07:30:16 +0000
@@ -826,7 +826,7 @@
    : (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code))))
 
 /* Encode character C by some of charsets in CHARSET_LIST.  Set ID to
-   the id of the used charset, ENCODED to the resulf of encoding.
+   the id of the used charset, ENCODED to the result of encoding.
    Assume that we can use the variable `charset'.  */
 
 #define CCL_ENCODE_CHAR(c, charset_list, id, encoded)		\

=== modified file 'src/fontset.c'
--- src/fontset.c	2011-11-20 02:29:42 +0000
+++ src/fontset.c	2011-11-20 07:30:16 +0000
@@ -905,7 +905,7 @@
 
 
 /* Return ID of face suitable for displaying character C on frame F.
-   FACE must be reazlied for ASCII characters in advance.  Called from
+   FACE must be realized for ASCII characters in advance.  Called from
    the macro FACE_FOR_CHAR.  */
 
 int

=== modified file 'src/gtkutil.c'
--- src/gtkutil.c	2011-11-20 02:29:42 +0000
+++ src/gtkutil.c	2011-11-20 07:30:16 +0000
@@ -2363,7 +2363,7 @@
    HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
    POP_UP_P is non-zero if we shall create a popup menu.
    MENU_BAR_P is non-zero if we shall create a menu bar.
-   ADD_TEAROFF_P is non-zero if we shall add a teroff menu item.  Ignored
+   ADD_TEAROFF_P is non-zero if we shall add a tearoff menu item.  Ignored
    if MENU_BAR_P is non-zero.
    TOPMENU is the topmost GtkWidget that others shall be placed under.
    It may be NULL, in that case we create the appropriate widget

=== modified file 'src/sound.c'
--- src/sound.c	2011-11-14 23:59:56 +0000
+++ src/sound.c	2011-11-20 07:30:16 +0000
@@ -267,7 +267,7 @@
      read from the start of a sound file.  */
   char *header;
 
-  /* Number of bytes raed from sound file.  This is always <=
+  /* Number of bytes read from sound file.  This is always <=
      MAX_SOUND_HEADER_BYTES.  */
   int header_size;
 

=== modified file 'src/sysdep.c'
--- src/sysdep.c	2011-10-25 04:27:47 +0000
+++ src/sysdep.c	2011-11-20 07:30:16 +0000
@@ -1663,7 +1663,7 @@
       sys_siglist[SIGQUIT] = "Quit";
 # endif
 # ifdef SIGRETRACT
-      sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode";
+      sys_siglist[SIGRETRACT] = "Need to relinquish monitor mode";
 # endif
 # ifdef SIGSAK
       sys_siglist[SIGSAK] = "Secure attention";

=== modified file 'src/xfns.c'
--- src/xfns.c	2011-11-20 02:29:42 +0000
+++ src/xfns.c	2011-11-20 07:30:16 +0000
@@ -5914,7 +5914,7 @@
   x_gtk_whole_detached_tool_bar = 0;
 
   DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips,
-    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used.
+    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used.
 Otherwise use Emacs own tooltip implementation.
 When using Gtk+ tooltips, the tooltip face is not used.  */);
   x_gtk_use_system_tooltips = 1;
------------------------------------------------------------
revno: 106445
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sun 2011-11-20 14:37:46 +0800
message:
  * lisp/window.el (replace-buffer-in-windows): Restore interactive spec.
  
  (Probably inadvertently removed when converting to Lisp.)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-20 06:29:57 +0000
+++ lisp/ChangeLog	2011-11-20 06:37:46 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Chong Yidong  <cyd@gnu.org>
+
+	* window.el (replace-buffer-in-windows): Restore interactive spec.
+
 2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* electric.el (electric-indent-mode): Fix last change (too optimistic).

=== modified file 'lisp/window.el'
--- lisp/window.el	2011-11-20 02:29:42 +0000
+++ lisp/window.el	2011-11-20 06:37:46 +0000
@@ -2920,6 +2920,7 @@
 
 This function removes the buffer denoted by BUFFER-OR-NAME from
 all window-local buffer lists."
+  (interactive "bBuffer to replace: ")
   (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
------------------------------------------------------------
revno: 106444
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sun 2011-11-20 01:29:57 -0500
message:
  * lisp/electric.el (electric-indent-mode): Fix last change (too optimistic).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-20 04:33:36 +0000
+++ lisp/ChangeLog	2011-11-20 06:29:57 +0000
@@ -1,5 +1,7 @@
 2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* electric.el (electric-indent-mode): Fix last change (too optimistic).
+
 	* emacs-lisp/bytecomp.el: Silence obsolete warnings more reliably.
 	(byte-compile-global-not-obsolete-vars): New var.
 	(byte-compile-check-variable, byte-compile-make-obsolete-variable):

=== modified file 'lisp/electric.el'
--- lisp/electric.el	2011-11-11 15:55:24 +0000
+++ lisp/electric.el	2011-11-20 06:29:57 +0000
@@ -260,15 +260,23 @@
 in `electric-indent-chars'."
   :global t
   :group 'electricity
-  (if electric-indent-mode
-      (add-hook 'post-self-insert-hook
-                #'electric-indent-post-self-insert-function
-                ;; post-self-insert-hooks interact in non-trivial ways.
-                ;; It turns out that electric-indent-mode generally works
-                ;; better last.
-                'append)
-    (remove-hook 'post-self-insert-hook
-                 #'electric-indent-post-self-insert-function)))
+  (if (not electric-indent-mode)
+      (remove-hook 'post-self-insert-hook
+                   #'electric-indent-post-self-insert-function)
+    ;; post-self-insert-hooks interact in non-trivial ways.
+    ;; It turns out that electric-indent-mode generally works better if run
+    ;; late, but still before blink-paren.
+    (add-hook 'post-self-insert-hook
+              #'electric-indent-post-self-insert-function
+              'append)
+    ;; FIXME: Ugly!
+    (let ((bp (memq #'blink-paren-post-self-insert-function
+                    (default-value 'post-self-insert-hook))))
+      (when (memq #'electric-indent-post-self-insert-function bp)
+        (setcar bp #'electric-indent-post-self-insert-function)
+        (setcdr bp (cons #'blink-paren-post-self-insert-function
+                         (delq #'electric-indent-post-self-insert-function
+                               (cdr bp))))))))
 
 ;; Electric pairing.
------------------------------------------------------------
revno: 106443
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2011-11-19 23:34:32 -0500
message:
  * src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
  Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-20 03:48:53 +0000
+++ src/ChangeLog	2011-11-20 04:34:32 +0000
@@ -1,3 +1,8 @@
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
+	Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* casetab.c (Fset_case_table):

=== modified file 'src/fileio.c'
--- src/fileio.c	2011-11-20 02:29:42 +0000
+++ src/fileio.c	2011-11-20 04:34:32 +0000
@@ -62,7 +62,7 @@
 
 #ifdef DOS_NT
 /* On Windows, drive letters must be alphabetic - on DOS, the Netware
-   redirector allows the six letters between 'Z' and 'a' as well. */
+   redirector allows the six letters between 'Z' and 'a' as well.  */
 #ifdef MSDOS
 #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
 #endif
@@ -3686,6 +3686,7 @@
       int this_count = SPECPDL_INDEX ();
       int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
       Lisp_Object conversion_buffer;
+      struct gcpro gcpro1;
 
       conversion_buffer = code_conversion_save (1, multibyte);
 
@@ -3706,7 +3707,7 @@
 	{
 	  /* We read one bunch by one (READ_BUF_SIZE bytes) to allow
 	     quitting while reading a huge while.  */
-	  /* try is reserved in some compilers (Microsoft C) */
+	  /* `try'' is reserved in some compilers (Microsoft C).  */
 	  EMACS_INT trytry = min (total - how_much,
 				  READ_BUF_SIZE - unprocessed);
------------------------------------------------------------
revno: 106442
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Sat 2011-11-19 23:33:36 -0500
message:
  * lisp/emacs-lisp/bytecomp.el: Silence obsolete warnings more reliably.
  (byte-compile-global-not-obsolete-vars): New var.
  (byte-compile-check-variable, byte-compile-make-obsolete-variable):
  Use it.
  (byte-compile-warn-obsolete): Align text with the one in *Help*.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-20 03:48:53 +0000
+++ lisp/ChangeLog	2011-11-20 04:33:36 +0000
@@ -1,3 +1,11 @@
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/bytecomp.el: Silence obsolete warnings more reliably.
+	(byte-compile-global-not-obsolete-vars): New var.
+	(byte-compile-check-variable, byte-compile-make-obsolete-variable):
+	Use it.
+	(byte-compile-warn-obsolete): Align text with the one in *Help*.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/cwarn.el (cwarn-is-enabled, cwarn-font-lock-keywords):

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2011-11-20 02:29:42 +0000
+++ lisp/emacs-lisp/bytecomp.el	2011-11-20 04:33:36 +0000
@@ -359,10 +359,12 @@
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil
-  "If non-nil, a list of variables that shouldn't be reported as obsolete.")
+  "List of variables that shouldn't be reported as obsolete.")
+(defvar byte-compile-global-not-obsolete-vars nil
+  "Global list of variables that shouldn't be reported as obsolete.")
 
 (defvar byte-compile-not-obsolete-funcs nil
-  "If non-nil, a list of functions that shouldn't be reported as obsolete.")
+  "List of functions that shouldn't be reported as obsolete.")
 
 (defcustom byte-compile-generate-call-tree nil
   "Non-nil means collect call-graph information when compiling.
@@ -1113,7 +1115,7 @@
       (unless (and funcp (memq symbol byte-compile-not-obsolete-funcs))
 	(byte-compile-warn "`%s' is an obsolete %s%s%s" symbol
 			   (if funcp "function" "variable")
-			   (if asof (concat " (as of Emacs " asof ")") "")
+			   (if asof (concat " (as of " asof ")") "")
 			   (cond ((stringp instead)
 				  (concat "; " instead))
 				 (instead
@@ -3030,6 +3032,7 @@
 	((let ((od (get var 'byte-obsolete-variable)))
            (and od
                 (not (memq var byte-compile-not-obsolete-vars))
+                (not (memq var byte-compile-global-not-obsolete-vars))
                 (or (case (nth 1 od)
                       (set (not (eq access-type 'reference)))
                       (get (eq access-type 'reference))
@@ -4116,7 +4119,7 @@
 (byte-defop-compiler-1 make-obsolete-variable)
 (defun byte-compile-make-obsolete-variable (form)
   (when (eq 'quote (car-safe (nth 1 form)))
-    (push (nth 1 (nth 1 form)) byte-compile-not-obsolete-vars))
+    (push (nth 1 (nth 1 form)) byte-compile-global-not-obsolete-vars))
   (byte-compile-normal-call form))
 
 (defun byte-compile-defvar (form)
------------------------------------------------------------
revno: 106441
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Sun 2011-11-20 04:48:53 +0100
message:
  Fix typos.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2011-11-15 17:37:37 +0000
+++ ChangeLog	2011-11-20 03:48:53 +0000
@@ -689,7 +689,7 @@
 	* autogen/Makefile.in: Add auto-updated generated files.
 	* autogen.sh: No longer a no-op, now it tests for autotools
 	and runs them as necessary.
-	* configure.in: Defaule maintainer-mode to on.
+	* configure.in: Default maintainer-mode to on.
 	* aclocal.m4, configure, lib/Makefile.in: Remove files.
 
 2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9711,7 +9711,7 @@
 	paths.h.in, Makefile.in in src.
 
 	* configure: Delete .tmp files before creating them; don't bother
-	trying to make final targets writeable first, since it won't
+	trying to make final targets writable first, since it won't
 	matter to move-if-change.
 
 1992-05-19  Jim Blandy  (jimb@pogo.cs.oberlin.edu)

=== modified file 'admin/CPP-DEFINES'
--- admin/CPP-DEFINES	2011-06-15 14:11:04 +0000
+++ admin/CPP-DEFINES	2011-11-20 03:48:53 +0000
@@ -48,7 +48,7 @@
 subprocesses    System can use subprocesses (for M-x shell for example).  Defined by default, only MSDOS undefines it.
 USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int.
 
-** System specific macros, decribed in detail in src/s/template.h
+** System specific macros, described in detail in src/s/template.h
 CLASH_DETECTION
 COFF
 FIRST_PTY_LETTER
@@ -58,7 +58,7 @@
 SEPCHAR
 SYSTEM_TYPE
 
-** Machine specific macros, decribed in detail in src/m/template.h
+** Machine specific macros, described in detail in src/m/template.h
 VIRT_ADDR_VARIES
 
 ** Misc macros

=== modified file 'admin/notes/multi-tty'
--- admin/notes/multi-tty	2011-11-20 02:29:42 +0000
+++ admin/notes/multi-tty	2011-11-20 03:48:53 +0000
@@ -521,7 +521,7 @@
 
 ** Very strange bug: visible-bell does not work on secondary
    terminals in xterm and konsole.  The screen does flicker a bit,
-   but it's so quick it isn't noticable.
+   but it's so quick it isn't noticeable.
 
    (Update: This is probably some problem with padding or whatnot on
    the secondary terminals.)

=== modified file 'autogen/install-sh'
--- autogen/install-sh	2011-03-31 04:24:03 +0000
+++ autogen/install-sh	2011-11-20 03:48:53 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.02; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -347,7 +347,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in

=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2011-11-19 11:11:38 +0000
+++ doc/lispref/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,8 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* compile.texi (Compiler Errors):
+	* help.texi (Help Functions): Fix typos.
+
 2011-11-19  Chong Yidong  <cyd@gnu.org>
 
 	* windows.texi (Splitting Windows): Clarify role of window

=== modified file 'doc/lispref/compile.texi'
--- doc/lispref/compile.texi	2011-05-29 22:41:06 +0000
+++ doc/lispref/compile.texi	2011-11-20 03:48:53 +0000
@@ -528,7 +528,7 @@
 inside @var{body}.
 
 We recommend that you use this construct around the smallest
-possible piece of code, to avoid missing possible warnings other than one
+possible piece of code, to avoid missing possible warnings other than
 one you intend to suppress.
 @end defspec
 

=== modified file 'doc/lispref/help.texi'
--- doc/lispref/help.texi	2011-07-15 18:43:23 +0000
+++ doc/lispref/help.texi	2011-11-20 03:48:53 +0000
@@ -653,7 +653,7 @@
 clicks on the @samp{Back} or @samp{Forward} buttons.  Most commands
 that use the @samp{*Help*} buffer should invoke this function before
 clearing the buffer.  The @var{item} argument should have the form
-@code{(@var{funtion} . @var{args})}, where @var{funtion} is a function
+@code{(@var{function} . @var{args})}, where @var{function} is a function
 to call, with argument list @var{args}, to regenerate the help buffer.
 The @var{interactive-p} argument is non-@code{nil} if the calling
 command was invoked interactively; in that case, the stack of items

=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2011-11-16 17:47:25 +0000
+++ doc/misc/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,12 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* gnus-coding.texi (Gnus Maintenance Guide):
+	Rename from "Gnus Maintainance Guide".
+
+	* ede.texi (ede-compilation-program, ede-compiler, ede-linker):
+	* eieio.texi (Customizing):
+	* gnus-news.texi: Fix typos.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* org.texi (Agenda commands, Exporting Agenda Views): Fix typos.

=== modified file 'doc/misc/ede.texi'
--- doc/misc/ede.texi	2011-11-15 07:55:13 +0000
+++ doc/misc/ede.texi	2011-11-20 03:48:53 +0000
@@ -3526,7 +3526,7 @@
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 
@@ -3634,7 +3634,7 @@
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 
@@ -3782,7 +3782,7 @@
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 

=== modified file 'doc/misc/eieio.texi'
--- doc/misc/eieio.texi	2011-02-19 19:40:59 +0000
+++ doc/misc/eieio.texi	2011-11-20 03:48:53 +0000
@@ -1212,9 +1212,9 @@
 This would be the best way to make your objects persistent when using
 in-place editing.
 
-@section Widget extention
+@section Widget extension
 
-When widgets are being created, one new widget extention has been added,
+When widgets are being created, one new widget extension has been added,
 called the @code{:slotofchoices}.  When this occurs in a widget
 definition, all elements after it are removed, and the slot is specifies
 is queried and converted into a series of constants.

=== modified file 'doc/misc/gnus-coding.texi'
--- doc/misc/gnus-coding.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/gnus-coding.texi	2011-11-20 03:48:53 +0000
@@ -1,7 +1,7 @@
 \input texinfo
 
 @setfilename gnus-coding
-@settitle Gnus Coding Style and Maintainance Guide
+@settitle Gnus Coding Style and Maintenance Guide
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex pg cp
@@ -45,7 +45,7 @@
 
 @ifnottex
 @node Top
-@top Gnus Coding Style and Maintainance Guide
+@top Gnus Coding Style and Maintenance Guide
 This manual describes @dots{}
 
 @insertcopying 
@@ -53,7 +53,7 @@
 
 @menu
 * Gnus Coding Style:: Gnus Coding Style
-* Gnus Maintainance Guide:: Gnus Maintainance Guide
+* Gnus Maintenance Guide:: Gnus Maintenance Guide
 @end menu
 
 @c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader}
@@ -250,8 +250,8 @@
 XEmacs 21.1 and up.
 @end itemize
 
-@node Gnus Maintainance Guide
-@chapter Gnus Maintainance Guide
+@node Gnus Maintenance Guide
+@chapter Gnus Maintenance Guide
 
 @section Stable and development versions
 

=== modified file 'doc/misc/gnus-news.texi'
--- doc/misc/gnus-news.texi	2011-11-20 02:29:42 +0000
+++ doc/misc/gnus-news.texi	2011-11-20 03:48:53 +0000
@@ -107,7 +107,7 @@
 @itemize @bullet
 
 @item
-Symbols like @code{gcc-self} now has the same precedence rules in
+Symbols like @code{gcc-self} now have the same precedence rules in
 @code{gnus-parameters} as other ``real'' variables: The last match
 wins instead of the first match.
 

=== modified file 'etc/MH-E-NEWS'
--- etc/MH-E-NEWS	2011-09-20 04:51:59 +0000
+++ etc/MH-E-NEWS	2011-11-20 03:48:53 +0000
@@ -2666,7 +2666,7 @@
 remember key bindings.
 
 Added new sub-keymaps for folder commands, sequence commands,
-extraction commands, and digest commands which begin with with F, S,
+extraction commands, and digest commands which begin with F, S,
 X, and D, respectively. These sub-keymaps allowed some consistency
 (e.g., especially with l(ist) and k(ill)).
 

=== modified file 'etc/NEWS'
--- etc/NEWS	2011-11-19 09:18:31 +0000
+++ etc/NEWS	2011-11-20 03:48:53 +0000
@@ -147,7 +147,7 @@
 
 **** The variable `smtpmail-starttls-credentials' has been removed.
 
-If you had that set, then then you need to put
+If you had that set, then you need to put
 
   machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
 

=== modified file 'etc/NEWS.19'
--- etc/NEWS.19	2011-11-20 02:29:42 +0000
+++ etc/NEWS.19	2011-11-20 03:48:53 +0000
@@ -1828,7 +1828,7 @@
 containing an open brace just after a case/default label.
 
 *** New variable, c-progress-interval, which controls minibuffer update
-message displays during long re-indention.  This is a new feature
+message displays during long re-indentation.  This is a new feature
 which prints percentage complete messages at specified intervals.
 
 ** Makefile mode changes.

=== modified file 'etc/NEWS.21'
--- etc/NEWS.21	2011-11-16 17:47:25 +0000
+++ etc/NEWS.21	2011-11-20 03:48:53 +0000
@@ -1678,7 +1678,7 @@
 entire directory tree.
 
 The new user option `vc-cvs-use-edit' indicates whether VC should call
-"cvs edit" to make files writeable; it defaults to `t'.  (This option
+"cvs edit" to make files writable; it defaults to `t'.  (This option
 is only meaningful if the CVSREAD variable is set, or if files are
 "watched" by other developers.)
 

=== modified file 'etc/NEWS.22'
--- etc/NEWS.22	2011-01-26 08:36:39 +0000
+++ etc/NEWS.22	2011-11-20 03:48:53 +0000
@@ -3356,7 +3356,7 @@
 *** The new commands `speedbar-expand-line-descendants' and
 `speedbar-contract-line-descendants', bound to `[' and `]'
 respectively, expand and contract the line under cursor with all of
-its descendents.
+its descendants.
 
 *** The new user option `speedbar-use-tool-tips-flag', if non-nil,
 means to display tool-tips for speedbar items.

=== modified file 'lib/sha256.c'
--- lib/sha256.c	2011-06-21 08:45:39 +0000
+++ lib/sha256.c	2011-11-20 03:48:53 +0000
@@ -51,7 +51,7 @@
 
 /*
   Takes a pointer to a 256 bit block of data (eight 32 bit ints) and
-  intializes it to the start constants of the SHA256 algorithm.  This
+  initializes it to the start constants of the SHA256 algorithm.  This
   must be called before using hash in the call to sha256_hash
 */
 void

=== modified file 'lib/sha512.c'
--- lib/sha512.c	2011-06-21 08:45:39 +0000
+++ lib/sha512.c	2011-11-20 03:48:53 +0000
@@ -58,7 +58,7 @@
 
 /*
   Takes a pointer to a 512 bit block of data (eight 64 bit ints) and
-  intializes it to the start constants of the SHA512 algorithm.  This
+  initializes it to the start constants of the SHA512 algorithm.  This
   must be called before using hash in the call to sha512_hash
 */
 void

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,10 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* progmodes/cwarn.el (cwarn-is-enabled, cwarn-font-lock-keywords):
+	* progmodes/pascal.el (electric-pascal-equal):
+	* textmodes/reftex-dcr.el (reftex-view-crossref-from-bibtex):
+	* xml.el (xml-substitute-special): Fix typos.
+
 2011-11-20  Glenn Morris  <rgm@gnu.org>
 
 	* mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.

=== modified file 'lisp/ChangeLog.10'
--- lisp/ChangeLog.10	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.10	2011-11-20 03:48:53 +0000
@@ -374,7 +374,7 @@
 	the function is advised in cc-defs.  However, that advice
 	doesn't help if the autoloads are updated in an old (X)Emacs
 	with this version of CC Mode, but I believe it's unlikely that
-	anyone does that when CC Mode isn't distributed with with it.
+	anyone does that when CC Mode isn't distributed with it.
 
 	* progmodes/cc-defs.el (add-to-list): Add advice to get the
 	optional third append argument in older (X)Emacsen.
@@ -2440,7 +2440,7 @@
 
 	* gdb-ui.el (gud-gdba-command-name): Use -noasync option for Gdb
 	with MS windows.
-	(gdb-display-end): Only make buffer writeable temporarily.
+	(gdb-display-end): Only make buffer writable temporarily.
 	Move "View" submenu up one level.
 
 2003-05-21  Nick Roberts  <nick@nick.uklinux.net>
@@ -9827,7 +9827,7 @@
 	(uniquify-delay-rationalize-file-buffer-names): Remove useless check.
 	(kill-buffer-hook): Don't change globally.
 
-2002-09-27  Stefan Monnier  <monnier@cs.yale.edu>.
+2002-09-27  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* calc/calc.el (calc-bug-address, calc-scan-for-dels, calc-stack)
 	(calc-stack-top, calc-always-load-extensions)
@@ -20778,7 +20778,7 @@
 	* Makefile.in (distclean): Remove Makefile in the build
 	directory, not in the source directory.
 
-2001-12-21  Simon Josefsson  <jas@extundo.com>.
+2001-12-21  Simon Josefsson  <jas@extundo.com>
 
 	* mail/smtpmail.el (smtpmail-send-queued-mail):
 	Use with-temp-buffer instead of find-file-noselect, and bind

=== modified file 'lisp/ChangeLog.13'
--- lisp/ChangeLog.13	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.13	2011-11-20 03:48:53 +0000
@@ -14943,7 +14943,7 @@
 2007-07-05  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* Makefile.in (bootstrap-prepare): When copying from
-	ldefs-boot.el, make sure loaddefs.el is writeable.
+	ldefs-boot.el, make sure loaddefs.el is writable.
 
 	(bootstrap-prepare): Make $(lisp)/ps-print.el
 	and $(lisp)/emacs-lisp/cl-loaddefs.el writable, as well.

=== modified file 'lisp/ChangeLog.15'
--- lisp/ChangeLog.15	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.15	2011-11-20 03:48:53 +0000
@@ -13225,7 +13225,7 @@
 2010-02-04  Michael Albinus  <michael.albinus@gmx.de>
 
 	* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
-	`dired-uncache' for every elemnt which is an absolute file name.
+	`dired-uncache' for every element which is an absolute file name.
 
 	* net/tramp.el (tramp-handle-dired-uncache): When DIR is not a
 	directory, handle its directory component.

=== modified file 'lisp/ChangeLog.2'
--- lisp/ChangeLog.2	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.2	2011-11-20 03:48:53 +0000
@@ -3788,7 +3788,7 @@
 
 1986-06-17  Richard M. Stallman  (rms@prep)
 
-	* nroff-mode.el: Add elements to nrofff-brace-table.
+	* nroff-mode.el: Add elements to nroff-brace-table.
 
 1986-06-16  Richard M. Stallman  (rms@prep)
 

=== modified file 'lisp/ChangeLog.3'
--- lisp/ChangeLog.3	2011-02-28 01:07:29 +0000
+++ lisp/ChangeLog.3	2011-11-20 03:48:53 +0000
@@ -1905,7 +1905,7 @@
 
 	* Makefile: Created.  This exists mainly so developers elsewhere
 	can unlock the lisp files to accept an update tar, then relock
-	them without locking the few that should stay writeable.
+	them without locking the few that should stay writable.
 
 	* solar.el, ange-ftp.el: Corrected Keywords header
 

=== modified file 'lisp/ChangeLog.8'
--- lisp/ChangeLog.8	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.8	2011-11-20 03:48:53 +0000
@@ -5516,7 +5516,7 @@
 1999-04-08  Andre Spiegel  <spiegel@inf.fu-berlin.de>
 
 	* vc.el (vc-backend-revert): For CVS files that were made
-	writeable with "cvs edit", call "cvs unedit" to undo that.
+	writable with "cvs edit", call "cvs unedit" to undo that.
 
 1999-04-08  Dave Love  <fx@gnu.org>
 

=== modified file 'lisp/ChangeLog.9'
--- lisp/ChangeLog.9	2011-11-20 02:29:42 +0000
+++ lisp/ChangeLog.9	2011-11-20 03:48:53 +0000
@@ -8638,7 +8638,7 @@
 2000-11-15  Gerd Moellmann  <gerd@gnu.org>
 
 	* faces.el (face-set-after-frame-default):
-	If `inhibit-default-face-x-resources' is bound, don't intialize the
+	If `inhibit-default-face-x-resources' is bound, don't initialize the
 	default face from X resources.
 
 2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>

=== modified file 'lisp/allout.el'
--- lisp/allout.el	2011-11-20 02:29:42 +0000
+++ lisp/allout.el	2011-11-20 03:48:53 +0000
@@ -170,7 +170,7 @@
   ;; the function value keymap of allout-mode-map is used in
   ;; minor-mode-map-alist - update it:
   (fset allout-mode-map allout-mode-map-value))
-;;;_  * intialize the mode map:
+;;;_  * initialize the mode map:
 ;; ensure that allout-mode-map has some setting even if allout-mode hasn't
 ;; been invoked:
 (allout-compose-and-institute-keymap)

=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2011-11-16 12:34:47 +0000
+++ lisp/cedet/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,27 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cedet-cscope.el (cedet-cscope-version-check):
+	* cedet-global.el (cedet-global-min-version)
+	(cedet-gnu-global-version-check):
+	* cedet.el (cedet-version):
+	* data-debug.el (data-debug-prev, data-debug-contract-current-line):
+	* ede.el (ede-buffer-belongs-to-project-p, ede-auto-add-to-target)
+	(ede-new, ede-invoke-method, project-edit-file-target, project-rescan)
+	(ede-add-project-to-global-list, ede-map-all-subprojects):
+	* inversion.el (inversion-check-version):
+	* mode-local.el (mode-local-map-file-buffers, define-child-mode)
+	(define-overloadable-function):
+	* pulse.el (pulse-flag, pulse):
+	* semantic.el (semantic-elapsed-time, semantic-parse-region)
+	(navigate-menu):
+	* ede/proj-comp.el (ede-compilation-program):
+	* semantic/debug.el (semantic-debug-parser-go)
+	(semantic-debug-parser-fail, semantic-debug-parser-quit)
+	(semantic-debug-parser-abort):
+	* semantic/idle.el (semantic-idle-core-handler):
+	* semantic/bovine/debug.el (semantic-bovine-debug-error-frame):
+	Fix typos.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* semantic/lex.el (semantic-lex-tokens):

=== modified file 'lisp/cedet/cedet-cscope.el'
--- lisp/cedet/cedet-cscope.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/cedet-cscope.el	2011-11-20 03:48:53 +0000
@@ -135,8 +135,8 @@
 
 (defun cedet-cscope-version-check (&optional noerror)
   "Check the version of the installed CScope command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if CScope isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if CScope isn't available,
 return nil."
   (interactive)
   (require 'inversion)

=== modified file 'lisp/cedet/cedet-files.el'
--- lisp/cedet/cedet-files.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/cedet-files.el	2011-11-20 03:48:53 +0000
@@ -83,7 +83,7 @@
 	  (setq file (concat driveletter ":"
 			     (substring file (match-end 1))))))
 
-      ;; Handle the \\file\name nomenclature on some windows boxes.
+      ;; Handle the \\file\name nomenclature on some Windows boxes.
       (when (string-match "^!" file)
 	(setq file (concat "//" (substring file 1)))))
     file))

=== modified file 'lisp/cedet/cedet-global.el'
--- lisp/cedet/cedet-global.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/cedet-global.el	2011-11-20 03:48:53 +0000
@@ -27,7 +27,7 @@
 (declare-function inversion-check-version "inversion")
 
 (defvar cedet-global-min-version "5.0"
-  "Minimum version of GNU global required.")
+  "Minimum version of GNU Global required.")
 
 (defcustom cedet-global-command "global"
   "Command name for the GNU Global executable."
@@ -131,8 +131,8 @@
 
 (defun cedet-gnu-global-version-check (&optional noerror)
   "Check the version of the installed GNU Global command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)

=== modified file 'lisp/cedet/cedet-idutils.el'
--- lisp/cedet/cedet-idutils.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/cedet-idutils.el	2011-11-20 03:48:53 +0000
@@ -84,7 +84,7 @@
 
 (defun cedet-idutils-fnid-call (flags)
   "Call ID Utils fnid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET fnid*"))
 	(cd default-directory)
 	)
@@ -112,7 +112,7 @@
 
 (defun cedet-idutils-mkid-call (flags)
   "Call ID Utils mkid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET mkid*"))
 	(cd default-directory)
 	)
@@ -163,8 +163,8 @@
 
 (defun cedet-idutils-version-check (&optional noerror)
   "Check the version of the installed ID Utils command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)

=== modified file 'lisp/cedet/cedet.el'
--- lisp/cedet/cedet.el	2011-11-11 10:04:08 +0000
+++ lisp/cedet/cedet.el	2011-11-20 03:48:53 +0000
@@ -75,7 +75,7 @@
 This is used by `semantic-mode' and `global-ede-mode'.")
 
 (defun cedet-version ()
-  "Display all active versions of CEDET and Dependent packages.
+  "Display all active versions of CEDET and dependent packages.
 
 The PACKAGE column is the name of a given package from CEDET.
 
@@ -85,7 +85,7 @@
 FILE VERSION is the version number found in the source file
 for the specified PACKAGE.
 
-LOADED VERSION is the version of PACKAGE current loaded in Emacs
+LOADED VERSION is the version of PACKAGE currently loaded in Emacs
 memory and (presumably) running in this Emacs instance.  Value is X
 if the package has not been loaded."
   (interactive)

=== modified file 'lisp/cedet/data-debug.el'
--- lisp/cedet/data-debug.el	2011-11-15 07:55:13 +0000
+++ lisp/cedet/data-debug.el	2011-11-20 03:48:53 +0000
@@ -916,7 +916,7 @@
   (skip-chars-forward " *-><[]" (point-at-eol)))
 
 (defun data-debug-prev ()
-  "Go to the next line in the Ddebug buffer."
+  "Go to the previous line in the Ddebug buffer."
   (interactive)
   (forward-line -1)
   (beginning-of-line)
@@ -972,7 +972,7 @@
 
 (defun data-debug-contract-current-line ()
   "Contract the current line (if possible).
-Do nothing if already expanded."
+Do nothing if already contracted."
   (when (and (data-debug-current-line-expanded-p)
 	     ;; Don't contract if the current line is not expandable.
 	     (get-text-property (point) 'ddebug-function))

=== modified file 'lisp/cedet/ede.el'
--- lisp/cedet/ede.el	2011-11-14 23:59:56 +0000
+++ lisp/cedet/ede.el	2011-11-20 03:48:53 +0000
@@ -214,7 +214,7 @@
     (and obj (obj-of-class-p obj ede-target))))
 
 (defun ede-buffer-belongs-to-project-p ()
-  "Return non-nil if this buffer belongs to at least one target."
+  "Return non-nil if this buffer belongs to at least one project."
   (if (or (null ede-object) (consp ede-object)) nil
     (obj-of-class-p ede-object ede-project)))
 
@@ -243,7 +243,7 @@
 	      ede-obj (if (listp ede-object) ede-object (list ede-object)))
 	;; First, collect the build items from the project
 	(setq newmenu (append newmenu (ede-menu-items-build obj t)))
-	;; Second, Declare the current target menu items
+	;; Second, declare the current target menu items
 	(if (and ede-obj (ede-menu-obj-of-class-p ede-target))
 	    (while ede-obj
 	      (setq newmenu (append newmenu
@@ -264,7 +264,7 @@
 	  (setq targets (cdr targets)))
 	;; Fourth, build sub projects.
 	;; -- nerp
-	;; Fifth, Add make distribution
+	;; Fifth, add make distribution
 	(append newmenu (list [ "Make distribution" ede-make-dist t ]))
 	)))))
 
@@ -512,7 +512,7 @@
   "Look for a target that wants to own the current file.
 Follow the preference set with `ede-auto-add-method' and get the list
 of objects with the `ede-want-file-p' method."
-  (if ede-object (error "Ede-object already defined for %s" (buffer-name)))
+  (if ede-object (error "ede-object already defined for %s" (buffer-name)))
   (if (or (eq ede-auto-add-method 'never)
 	  (ede-ignore-file (buffer-file-name)))
       nil
@@ -566,7 +566,7 @@
     (ede-load-project-file (file-name-directory file))))
 
 (defun ede-new (type &optional name)
-  "Create a new project starting of project type TYPE.
+  "Create a new project starting from project type TYPE.
 Optional argument NAME is the name to give this project."
   (interactive
    (list (completing-read "Project Type: "
@@ -642,7 +642,7 @@
 
 (defun ede-invoke-method (sym &rest args)
   "Invoke method SYM on the current buffer's project object.
-ARGS are additional arguments to pass to method sym."
+ARGS are additional arguments to pass to method SYM."
   (if (not ede-object)
       (error "Cannot invoke %s for %s" (symbol-name sym)
 	     (buffer-name)))
@@ -815,7 +815,7 @@
   (error "remove-file not supported by %s" (object-name ot)))
 
 (defmethod project-edit-file-target ((ot ede-target))
-  "Edit the target OT associated w/ this file."
+  "Edit the target OT associated with this file."
   (find-file (oref (ede-current-project) file)))
 
 (defmethod project-new-target ((proj ede-project) &rest args)
@@ -857,7 +857,7 @@
   (error "Dist-files is not supported by %s" (object-name this)))
 
 (defmethod project-rescan ((this ede-project))
-  "Rescan the EDE proj project THIS."
+  "Rescan the EDE project THIS."
   (error "Rescanning a project is not supported by %s" (object-name this)))
 
 (defun ede-ecb-project-paths ()
@@ -879,7 +879,7 @@
   (when (not proj)
     (error "No project created to add to master list"))
   (when (not (eieio-object-p proj))
-    (error "Attempt to add Non-object to master project list"))
+    (error "Attempt to add non-object to master project list"))
   (when (not (obj-of-class-p proj ede-project-placeholder))
     (error "Attempt to add a non-project to the ede projects list"))
   (add-to-list 'ede-projects proj)
@@ -1157,7 +1157,7 @@
   (mapcar proc (oref this subproj)))
 
 (defmethod ede-map-all-subprojects ((this ede-project) allproc)
-  "For object THIS, execute PROC on THIS and  all subprojects.
+  "For object THIS, execute PROC on THIS and all subprojects.
 This function also applies PROC to sub-sub projects.
 See also `ede-map-subprojects'."
   (apply 'append

=== modified file 'lisp/cedet/ede/proj-comp.el'
--- lisp/cedet/ede/proj-comp.el	2011-11-14 21:00:24 +0000
+++ lisp/cedet/ede/proj-comp.el	2011-11-20 03:48:53 +0000
@@ -97,8 +97,8 @@
    (objectextention :initarg :objectextention
 		    :type string
 		    :documentation
-		    "A string which is the extention used for object files.
-For example, C code uses .o on unix, and Emacs Lisp uses .elc.")
+		    "A string which is the extension used for object files.
+For example, C code uses .o on Unix, and Emacs Lisp uses .elc.")
    )
   "A program used to compile or link a program via a Makefile.
 Contains everything needed to output code into a Makefile, or autoconf

=== modified file 'lisp/cedet/inversion.el'
--- lisp/cedet/inversion.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/inversion.el	2011-11-20 03:48:53 +0000
@@ -216,14 +216,14 @@
 	)))
 
 (defun inversion-check-version (version incompatible-version
-					minimum &rest reserved)
+                                minimum &rest reserved)
   "Check that a given version meets the minimum requirement.
 VERSION, INCOMPATIBLE-VERSION and MINIMUM are of similar format to
 return entries of `inversion-decode-version', or a classic version
 string.	 INCOMPATIBLE-VERSION can be nil.
 RESERVED arguments are kept for a later use.
 Return:
-- nil if everything is ok
+- nil if everything is ok.
 - 'outdated if VERSION is less than MINIMUM.
 - 'incompatible if VERSION is not backward compatible with MINIMUM.
 - t if the check failed."
@@ -374,7 +374,7 @@
       (with-temp-buffer
 	;; The 3000 is a bit arbitrary, but should cut down on
 	;; fileio as version info usually is at the very top
-	;; of a file.  AFter a long commentary could be bad.
+	;; of a file.  After a long commentary could be bad.
 	(insert-file-contents-literally file nil 0 3000)
 	(goto-char (point-min))
 	(when (re-search-forward (format tag package 'version) nil t)

=== modified file 'lisp/cedet/mode-local.el'
--- lisp/cedet/mode-local.el	2011-11-15 00:54:19 +0000
+++ lisp/cedet/mode-local.el	2011-11-20 03:48:53 +0000
@@ -36,7 +36,7 @@
 ;;
 ;; You should use a mode-local variable or override to allow extension
 ;; only if you expect a mode author to provide that extension.  If a
-;; user might wish to customize a give variable or function then
+;; user might wish to customize a given variable or function then
 ;; the existing customization mechanism should be used.
 
 ;; To Do:
@@ -55,7 +55,7 @@
 FUNCTION does not have arguments; when it is entered `current-buffer'
 is the currently selected file buffer.
 If optional argument PREDICATE is non nil, only select file buffers
-for which the function PREDICATE return non-nil.
+for which the function PREDICATE returns non-nil.
 If optional argument BUFFERS is non-nil, it is a list of buffers to
 walk through.  It defaults to `buffer-list'."
   (dolist (b (or buffers (buffer-list)))
@@ -146,7 +146,7 @@
   (mode-local-map-mode-buffers #'activate-mode-local-bindings mode))
 
 (defmacro define-child-mode (mode parent &optional docstring)
-  "Make major mode MODE inherits behavior from PARENT mode.
+  "Make major mode MODE inherit behavior from PARENT mode.
 DOCSTRING is optional and not used.
 To work properly, this should be put after PARENT mode local variables
 definition."
@@ -523,11 +523,11 @@
       result)))
 
 (defmacro define-overloadable-function (name args docstring &rest body)
-  "Define a new function, as with `defun' which can be overloaded.
+  "Define a new function, as with `defun', which can be overloaded.
 NAME is the name of the function to create.
 ARGS are the arguments to the function.
 DOCSTRING is a documentation string to describe the function.  The
-docstring will automatically had details about its overload symbol
+docstring will automatically have details about its overload symbol
 appended to the end.
 BODY is code that would be run when there is no override defined.  The
 default is to call the function `NAME-default' with the appropriate

=== modified file 'lisp/cedet/pulse.el'
--- lisp/cedet/pulse.el	2011-11-18 08:31:02 +0000
+++ lisp/cedet/pulse.el	2011-11-20 03:48:53 +0000
@@ -36,7 +36,7 @@
 ;;
 ;; `pulse-momentary-highlight-one-line' - Pulse a single line at POINT.
 ;; `pulse-momentary-highlight-region' - Pulse a region.
-;; `pulse-momentary-highlight-overlay' - Pulse an overlay
+;; `pulse-momentary-highlight-overlay' - Pulse an overlay.
 ;;      These three functions will just blink the specified area if
 ;;      the version of Emacs you are using doesn't support pulsing.
 ;;
@@ -65,7 +65,7 @@
 If the value is nil, highlight with an unchanging color until a
 key is pressed.
 If the value is `never', do no coloring at all.
-Any other value means to the default pulsing behavior.
+Any other value means to do the default pulsing behavior.
 
 If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then
 this flag is ignored."
@@ -163,7 +163,7 @@
 
 (defun pulse (&optional face)
   "Pulse the colors on our highlight face.
-If optional FACE is provide, reset the face to FACE color,
+If optional FACE is provided, reset the face to FACE color,
 instead of `pulse-highlight-start-face'.
 Be sure to call `pulse-reset-face' after calling pulse."
   (unwind-protect

=== modified file 'lisp/cedet/semantic.el'
--- lisp/cedet/semantic.el	2011-11-15 07:55:13 +0000
+++ lisp/cedet/semantic.el	2011-11-20 03:48:53 +0000
@@ -344,7 +344,7 @@
     ;; don't go along for the ride.
     (add-hook 'clone-indirect-buffer-hook 'semantic-clear-toplevel-cache
 	      nil t)
-    ;; Specify that this function has done it's work.  At this point
+    ;; Specify that this function has done its work.  At this point
     ;; we can consider that semantic is active in this buffer.
     (setq semantic-new-buffer-fcn-was-run t)
     ;; Here are some buffer local variables we can initialize ourselves
@@ -378,7 +378,7 @@
 
 (defun semantic-elapsed-time (start end)
   "Copied from elp.el.  Was `elp-elapsed-time'.
-Argument START and END bound the time being calculated."
+Arguments START and END bound the time being calculated."
   (float-time (time-subtract end start)))
 
 (defun bovinate (&optional clear)
@@ -431,7 +431,7 @@
 
 Optional arguments:
 NONTERMINAL is the rule to start parsing at.
-DEPTH specifies the lexical depth to descend for parser that use
+DEPTH specifies the lexical depth to descend for parsers that use
 lexical analysis as their first step.
 RETURNONERROR specifies that parsing should stop on the first
 unmatched syntax encountered.  When nil, parsing skips the syntax,
@@ -960,7 +960,7 @@
     '("--"))
   (define-key navigate-menu [senator-go-to-up-reference]
     '(menu-item "Parent Tag" senator-go-to-up-reference
-		:help "Navigate up one reference by tag."))
+		:help "Navigate up one reference by tag"))
   (define-key navigate-menu [senator-next-tag]
     '(menu-item "Next Tag" senator-next-tag
 		:help "Go to the next tag"))
@@ -971,7 +971,7 @@
   ;; Top level menu items:
   (define-key cedet-menu-map [semantic-force-refresh]
     '(menu-item "Reparse Buffer" semantic-force-refresh
-		:help "Force a full reparse of the current buffer."
+		:help "Force a full reparse of the current buffer"
 		:visible semantic-mode))
   (define-key cedet-menu-map [semantic-edit-menu]
     `(menu-item "Edit Tags" ,edit-menu

=== modified file 'lisp/cedet/semantic/bovine/c.el'
--- lisp/cedet/semantic/bovine/c.el	2011-11-19 09:18:31 +0000
+++ lisp/cedet/semantic/bovine/c.el	2011-11-20 03:48:53 +0000
@@ -1591,7 +1591,7 @@
 	(setq tagreturn (cons (semantic-tag-type (car (semanticdb-find-result-nth tmp idx))) tagreturn))
 	(setq idx (1+ idx)))
       )
-    ;; Use the encompased types around point to also look for using statements.
+    ;; Use the encompassed types around point to also look for using statements.
     ;;(setq tagreturn (cons "bread_name" tagreturn))
     (while (cdr tagsaroundpoint)  ; don't search the last one
       (setq tmp (semantic-find-tags-by-class 'using (semantic-tag-components (car tagsaroundpoint))))

=== modified file 'lisp/cedet/semantic/bovine/debug.el'
--- lisp/cedet/semantic/bovine/debug.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/semantic/bovine/debug.el	2011-11-20 03:48:53 +0000
@@ -114,7 +114,7 @@
 	      :documentation
 	      "An error condition caught in an action.")
    )
-  "Debugger frame representaion of a lisp error thrown during parsing.")
+  "Debugger frame representation of a lisp error thrown during parsing.")
 
 (defun semantic-create-bovine-debug-error-frame (condition)
   "Create an error frame for bovine debugger.

=== modified file 'lisp/cedet/semantic/db-typecache.el'
--- lisp/cedet/semantic/db-typecache.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/db-typecache.el	2011-11-20 03:48:53 +0000
@@ -368,7 +368,7 @@
 		  (semanticdb-typecache-merge-streams
 		   incstream
 		   ;; Getting the cache from this table will also cause this
-		   ;; file to update its cache from its decendents.
+		   ;; file to update its cache from its descendants.
 		   ;;
 		   ;; In theory, caches are only built for most includes
 		   ;; only once (in the loop before this one), so this ends

=== modified file 'lisp/cedet/semantic/debug.el'
--- lisp/cedet/semantic/debug.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/semantic/debug.el	2011-11-20 03:48:53 +0000
@@ -519,22 +519,22 @@
   )
 
 (defmethod semantic-debug-parser-go ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'go)
   )
 
 (defmethod semantic-debug-parser-fail ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'fail)
   )
 
 (defmethod semantic-debug-parser-quit ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'quit)
   )
 
 (defmethod semantic-debug-parser-abort ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'abort)
   )
 

=== modified file 'lisp/cedet/semantic/edit.el'
--- lisp/cedet/semantic/edit.el	2011-11-20 02:29:42 +0000
+++ lisp/cedet/semantic/edit.el	2011-11-20 03:48:53 +0000
@@ -549,7 +549,7 @@
                       ;; is not the first change for this
                       ;; iteration, and it starts before the end
                       ;; of current parse region, then it is
-                      ;; encompased within the bounds of tags
+                      ;; encompassed within the bounds of tags
                       ;; modified by the previous iteration's
                       ;; change.
                       (< (semantic-overlay-start (car changes))

=== modified file 'lisp/cedet/semantic/idle.el'
--- lisp/cedet/semantic/idle.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/semantic/idle.el	2011-11-20 03:48:53 +0000
@@ -245,7 +245,7 @@
         ;; services.  Stop on keypress.
 
 	;; NOTE ON COMMENTED SAFE HERE
-	;; We used to not execute the services if the buffer wsa
+	;; We used to not execute the services if the buffer was
 	;; unparseable.  We now assume that they are lexically
 	;; safe to do, because we have marked the buffer unparseable
 	;; if there was a problem.
@@ -254,11 +254,11 @@
 	  (save-excursion
 	    (semantic-throw-on-input 'idle-queue)
 	    (when semantic-idle-scheduler-verbose-flag
-	      (message "IDLE: execture service %s..." service))
+	      (message "IDLE: execute service %s..." service))
 	    (semantic-safe (format "Idle Service Error %s: %%S" service)
 	      (funcall service))
 	    (when semantic-idle-scheduler-verbose-flag
-	      (message "IDLE: execture service %s...done" service))
+	      (message "IDLE: execute service %s...done" service))
 	    )))
 	;;)
       ;; Finally loop over remaining buffers, trying to update them as

=== modified file 'lisp/cedet/semantic/symref/list.el'
--- lisp/cedet/semantic/symref/list.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/semantic/symref/list.el	2011-11-20 03:48:53 +0000
@@ -24,7 +24,7 @@
 ;; Provide a simple user facing API to finding symbol references.
 ;;
 ;; This UI is the base of some refactoring tools.  For any refactor,
-;; the user will execture [FIXME what?] `semantic-symref' in a tag.
+;; the user will execute `semantic-symref' in a tag.
 ;; Once that data is collected, the output will be listed in a buffer.
 ;; In the output buffer, the user can then initiate different
 ;; refactoring operations.
@@ -103,7 +103,7 @@
     (when (not res) (error "No references found"))
     (semantic-symref-result-get-tags res t)
     (message "Gathering References...done")
-    ;; Build a refrences buffer.
+    ;; Build a references buffer.
     (let ((buff (get-buffer-create
 		 (format "*Symref %s" str)))
 	  )

=== modified file 'lisp/cedet/srecode/dictionary.el'
--- lisp/cedet/srecode/dictionary.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/srecode/dictionary.el	2011-11-20 03:48:53 +0000
@@ -437,7 +437,7 @@
 ;;; COMPOUND VALUE METHODS
 ;;
 ;; Compound values must provide at least the toString method
-;; for use in converting the compound value into sometehing insertable.
+;; for use in converting the compound value into something insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
 				      function

=== modified file 'lisp/emacs-lisp/ert.el'
--- lisp/emacs-lisp/ert.el	2011-11-14 20:23:26 +0000
+++ lisp/emacs-lisp/ert.el	2011-11-20 03:48:53 +0000
@@ -392,7 +392,7 @@
          ;; compiling doesn't depend on cl and thus doesn't need an
          ;; environment arg for `macroexpand'.
          (if (fboundp 'cl-macroexpand)
-             ;; Suppress warning about run-time call to cl funtion: we
+             ;; Suppress warning about run-time call to cl function: we
              ;; only call it if it's fboundp.
              (with-no-warnings
                (cl-macroexpand form (and (boundp 'cl-macro-environment)

=== modified file 'lisp/emacs-lisp/package.el'
--- lisp/emacs-lisp/package.el	2011-10-29 03:42:12 +0000
+++ lisp/emacs-lisp/package.el	2011-11-20 03:48:53 +0000
@@ -277,7 +277,7 @@
   :version "24.1")
 
 ;; The value is precomputed in finder-inf.el, but don't load that
-;; until it's needed (i.e. when `package-intialize' is called).
+;; until it's needed (i.e. when `package-initialize' is called).
 (defvar package--builtins nil
   "Alist of built-in packages.
 The actual value is initialized by loading the library

=== modified file 'lisp/erc/ChangeLog'
--- lisp/erc/ChangeLog	2011-11-14 21:00:24 +0000
+++ lisp/erc/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc-log.el (erc-logging-enabled): Fix typo.
+
 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.

=== modified file 'lisp/erc/ChangeLog.01'
--- lisp/erc/ChangeLog.01	2011-11-20 02:29:42 +0000
+++ lisp/erc/ChangeLog.01	2011-11-20 03:48:53 +0000
@@ -399,7 +399,7 @@
 
 	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
 	* My additions to that idea merged in too
-	Basicly, this is a major rewrite, if you are scared and want avoid problems,
+	Basically, this is a major rewrite, if you are scared and want avoid problems,
 	stay at your current version. It seems fairly stable though.
 	That changed? erc-buffer-name handling was completely rewritten,
 	and erc-buffer-list local variable handling removed.

=== modified file 'lisp/erc/ChangeLog.03'
--- lisp/erc/ChangeLog.03	2011-11-20 02:29:42 +0000
+++ lisp/erc/ChangeLog.03	2011-11-20 03:48:53 +0000
@@ -838,7 +838,7 @@
 	* erc.el 1.510:
 	erc-log-channels: removed; set the directory to start logging
 	(erc-directory-writeable-p): create directory if it doesn't exist, check if
-	    it's writeable
+	    it's writable
 	(erc-logging-enabled): don't reference erc-log-channels
 
 2003-04-07  Damien Elmes  <erc@repose.cx>
@@ -1556,7 +1556,7 @@
 
 	* erc.el 1.426: This is the "everything is suddenly broken!" release
 	You know, this is CVS, you can still go back, and wait until the transition
-	is finished, but here is patch one, which basicly breaks every command
+	is finished, but here is patch one, which basically breaks every command
 	which is typed on the prompt.
 	Hit me, we can still revert, but something needs to be done about this.
 	* (erc-extract-command-from-line): intern-soft the function here.

=== modified file 'lisp/erc/erc-backend.el'
--- lisp/erc/erc-backend.el	2011-11-13 07:48:23 +0000
+++ lisp/erc/erc-backend.el	2011-11-20 03:48:53 +0000
@@ -1432,7 +1432,7 @@
         (when (string= cmd "PRIVMSG")
           (erc-auto-query proc parsed))))))
 
-;; FIXME: need clean way of specifiying extra hooks in
+;; FIXME: need clean way of specifying extra hooks in
 ;; define-erc-response-handler.
 (add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query)
 

=== modified file 'lisp/erc/erc-log.el'
--- lisp/erc/erc-log.el	2011-11-20 02:29:42 +0000
+++ lisp/erc/erc-log.el	2011-11-20 03:48:53 +0000
@@ -314,7 +314,7 @@
   "Return non-nil if logging is enabled for BUFFER.
 If BUFFER is nil, the value of `current-buffer' is used.
 Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
-is writeable (it will be created as necessary) and
+is writable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value."
   (and erc-log-channels-directory
        (or (functionp erc-log-channels-directory)

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2011-11-20 02:29:42 +0000
+++ lisp/gnus/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* mm-util.el (mm-charset-after): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* gnus-sum.el (gnus-summary-make-menu-bar):
@@ -2849,7 +2853,7 @@
 
 2011-01-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	* shr.el (shr-expand-newlines): Proof of concept implemantation of boxy
+	* shr.el (shr-expand-newlines): Proof of concept implementation of boxy
 	backgrounds.
 	(shr-expand-newlines): Switch to using overlays to enable kill'n'yank
 	in a more sensible manner.
@@ -19398,7 +19402,7 @@
 	* gnus-group.el (gnus-group-get-new-news-this-group):
 	Don't update info that isn't there.
 
-2004-06-29  Ilya N. Golubev  <gin@mo.msk.ru>.
+2004-06-29  Ilya N. Golubev  <gin@mo.msk.ru>
 
 	* mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251
 	entry.

=== modified file 'lisp/gnus/ChangeLog.2'
--- lisp/gnus/ChangeLog.2	2011-11-20 02:29:42 +0000
+++ lisp/gnus/ChangeLog.2	2011-11-20 03:48:53 +0000
@@ -2111,7 +2111,7 @@
 	* gnus-srvr.el (gnus-browse-foreign-server): Parse garbage NNTP
 	groups correctly.
 
-2003-06-06  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>.
+2003-06-06  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>
 
 	* message.el (message-fetch-field): Augment documentation to state
 	the narrowed-to-headers restriction.
@@ -6816,7 +6816,7 @@
 	downloaded variable if we're in an uncovered group.
 
 	* gnus-agent.el (gnus-agent-downloaded-article-face): Change the
-	font to soemthing less noticeable.
+	font to something less noticeable.
 	(gnus-agent-group-covered-p): New function.
 
 2002-12-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -6972,7 +6972,7 @@
 	* gnus-agent.el (gnus-agent-check-overview-buffer): Make debugger
 	print message on entry.
 
-2002-11-25  Kevin Greiner  <kgreiner@xpediantsolutions.com>.
+2002-11-25  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
 	* gnus-range.el (gnus-range-difference): New function.
 	* gnus-sum.el (gnus-summary-insert-old-articles): Use it.
@@ -7964,7 +7964,7 @@
 	(mml2015-pgg-encrypt): New functions.
 	(defvar, autoload): Prevent byte-compile warnings.
 
-2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
+2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
 	* gnus-art.el (article-strip-banner): Check for the existence of
 	from header.
@@ -8097,7 +8097,7 @@
 
 	* gnus-sum.el (gnus-summary-next-group): Semi-exit only when needed.
 
-2002-09-12  John Paul Wallington  <jpw@shootybangbang.com>.
+2002-09-12  John Paul Wallington  <jpw@shootybangbang.com>
 
 	* gnus.el (gnus-visual, gnus-meta): Fix typo.
 
@@ -8111,7 +8111,7 @@
 	(nnimap-split-rule): Doc fix.
 	(nnimap-request-expire-articles): Cleanup code.
 
-2002-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
+2002-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
 	* gnus-art.el (gnus-article-address-banner-alist): New option.
 	(article-strip-banner): Refer the above option to split banners of
@@ -8205,7 +8205,7 @@
 	(gnus-group-fetch-control): New function.
 	Add them to the keymap and menu.  Require mm-url.
 
-2002-08-30  Alex Schroeder  <alex@emacswiki.org>.
+2002-08-30  Alex Schroeder  <alex@emacswiki.org>
 
 	* gnus-mlspl.el (gnus-group-split-fancy): Doc fix.
 
@@ -8270,7 +8270,7 @@
 
 	* gnus-util.el (gnus-select-frame-set-input-focus): New function.
 
-2002-08-20  $B>.4X(B $B5HB'(B (KOSEKI Yoshinori)  <kose@meadowy.org>.
+2002-08-20  $B>.4X(B $B5HB'(B (KOSEKI Yoshinori)  <kose@meadowy.org>
 
 	* message.el (message-set-auto-save-file-name): Add support for
 	the Cygwin Emacs; the system-type is `cygwin'.
@@ -8396,7 +8396,7 @@
 	* nnimap.el (nnimap-split-articles): Do not call nnmail-fetch-field
 	when splitting malformed messages without message-id.
 
-2002-07-28  Niklas Morberg  <niklas.morberg@axis.com>.
+2002-07-28  Niklas Morberg  <niklas.morberg@axis.com>
 
 	* nnweb.el (nnweb-type, nnweb-type-definition)
 	(nnweb-gmane-create-mapping, nnweb-gmane-wash-article)
@@ -8440,18 +8440,18 @@
 	nnmail-expiry-target to 'delete, so that absolute deletion
 	happens when absolute deletion is requested.
 
-2002-07-21  Nevin Kapur  <nevin@jhu.edu>.
+2002-07-21  Nevin Kapur  <nevin@jhu.edu>
 
 	* nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting
 	headers as empty headers.
 
-2002-07-21  Jochen Hein  <jochen@jochen.org>.
+2002-07-21  Jochen Hein  <jochen@jochen.org>
 
 	* gnus-art.el (gnus-emphasis-alist): Add strikethrough and
 	correct typo.
 	(gnus-emphasis-strikethru): New face.
 
-2002-07-20  Jason Merrill  <jason@redhat.com>.
+2002-07-20  Jason Merrill  <jason@redhat.com>
 
 	* nnfolder.el (nnfolder-retrieve-headers): Avoid searching the
 	entire file for each of a sequence of missing articles.
@@ -9879,7 +9879,7 @@
 	(rfc2047-decode-region): Don't unfold.  Let
 	gnus-article-treat-unfold-headers do it.
 
-2002-02-07  Matt Armstrong  <matt@lickey.com>.
+2002-02-07  Matt Armstrong  <matt@lickey.com>
 
 	* message.el (message-mode): Set local-abbrev-table.
 
@@ -13226,7 +13226,7 @@
 	(gnus-topic-catchup-articles): New function.  Suggested by Robin
 	S. Socha <robin-dated-1001857693.185e29@socha.net>.
 
-2001-09-27 11:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>.
+2001-09-27 11:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>
 
 	* gnus-ems.el (gnus-article-display-xface): Insert xface after
 	previous ones.
@@ -13977,7 +13977,7 @@
 	* mml.el (mml-menu): Changed name to "Attachments".
 
 	* mm-decode.el (mm-destroy-postponed-undisplay-list): Only message
-	when there is something to detroy.
+	when there is something to destroy.
 
 2001-05-21 17:11:46  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

=== modified file 'lisp/gnus/mm-util.el'
--- lisp/gnus/mm-util.el	2011-06-30 02:53:07 +0000
+++ lisp/gnus/mm-util.el	2011-11-20 03:48:53 +0000
@@ -956,7 +956,7 @@
 
 (defun mm-charset-after (&optional pos)
   "Return charset of a character in current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.
 If the charset is `composition', return the actual one."
   (let ((char (char-after pos)) charset)

=== modified file 'lisp/international/mule.el'
--- lisp/international/mule.el	2011-11-15 17:37:37 +0000
+++ lisp/international/mule.el	2011-11-20 03:48:53 +0000
@@ -1572,7 +1572,7 @@
 ;; character in CHARSET is encoded using extended segment.  In the
 ;; latter case, a character in CHARSET is encoded using normal ISO2022
 ;; designation sequence.  If a character is not in any of CHARSETs, it
-;; is encoded using UTF-8 encoding extention.
+;; is encoded using UTF-8 encoding extension.
 
 (defun ctext-non-standard-encodings-table ()
   (let* ((table (append ctext-non-standard-encodings
@@ -1656,7 +1656,7 @@
 		      (insert 2)))
 		;; Encode this range as characters in CHARSET.
 		(put-text-property last-pos (point) 'charset charset))
-	    ;; Encode this range using UTF-8 encoding extention.
+	    ;; Encode this range using UTF-8 encoding extension.
 	    (encode-coding-region last-pos (point) 'mule-utf-8)
 	    (save-excursion
 	      (goto-char last-pos)

=== modified file 'lisp/mail/feedmail.el'
--- lisp/mail/feedmail.el	2011-11-19 09:18:31 +0000
+++ lisp/mail/feedmail.el	2011-11-20 03:48:53 +0000
@@ -2261,9 +2261,9 @@
   (while (string-match feedmail-queue-slug-suspect-regexp slug) (setq slug (replace-match "-" nil nil slug)))
   ;; collapse multiple hyphens to one
   (while (string-match "--+" slug) (setq slug (replace-match "-" nil nil slug)))
-  ;; for tidyness, peel off leading hyphens
+  ;; for tidiness, peel off leading hyphens
   (if (string-match "^-*" slug) (setq slug (replace-match "" nil nil slug)))
-  ;; for tidyness, peel off trailing hyphens
+  ;; for tidiness, peel off trailing hyphens
   (if (string-match "-*$" slug) (setq slug (replace-match "" nil nil slug)))
   slug
   )

=== modified file 'lisp/mail/rmail.el'
--- lisp/mail/rmail.el	2011-11-20 02:23:48 +0000
+++ lisp/mail/rmail.el	2011-11-20 03:48:53 +0000
@@ -4504,7 +4504,7 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3aa9747bf925bd2cd450f4b1f9c7cd03")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\

=== modified file 'lisp/mail/smtpmail.el'
--- lisp/mail/smtpmail.el	2011-10-09 01:44:43 +0000
+++ lisp/mail/smtpmail.el	2011-11-20 03:48:53 +0000
@@ -975,7 +975,7 @@
 	  (subst-char-in-region (point-min) (point-max)  9 ?  t) ; tab     --> blank
 
 	  (goto-char (point-min))
-	  ;; tidyness in case hook is not robust when it looks at this
+	  ;; tidiness in case hook is not robust when it looks at this
 	  (while (re-search-forward "[ \t]+" header-end t) (replace-match " "))
 
 	  (goto-char (point-min))

=== modified file 'lisp/mh-e/ChangeLog'
--- lisp/mh-e/ChangeLog	2011-11-16 12:34:47 +0000
+++ lisp/mh-e/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,8 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* mh-utils.el (mh-folder-list): Fix typo.
+	(mh-children-p): Move part of the docstring to a comment.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* mh-search.el (mh-pick-parse-search-buffer): Fix typo.

=== modified file 'lisp/mh-e/ChangeLog.1'
--- lisp/mh-e/ChangeLog.1	2011-11-17 17:40:48 +0000
+++ lisp/mh-e/ChangeLog.1	2011-11-20 03:48:53 +0000
@@ -10944,7 +10944,7 @@
 2001-11-21  Peter S Galbraith  <psg@debian.org>
 
 	* mh-comp.el (mh-reply-show-message-p): The setting of this
-	variable determines whether the MH show-buffer is diplayed with
+	variable determines whether the MH show-buffer is displayed with
 	the current message when using mh-reply without a prefix argument.
 	Set it to nil if you already include the message automatically in
 	your draft using "repl: -filter repl.filter" in your ~/.mh_profile

=== modified file 'lisp/mh-e/mh-utils.el'
--- lisp/mh-e/mh-utils.el	2011-07-10 22:33:06 +0000
+++ lisp/mh-e/mh-utils.el	2011-11-20 03:48:53 +0000
@@ -484,18 +484,18 @@
   folder)
 
 (defmacro mh-children-p (folder)
-  "Return t if FOLDER from sub-folders cache has children.
-The car of folder is the name, and the cdr is either t or some
-sort of count that I do not understand. It's too small to be the
-number of messages in the sub-folders and too large to be the
-number of sub-folders. XXX"
+  "Return t if FOLDER from sub-folders cache has children."
+;; The car of folder is the name, and the cdr is either t or some
+;; sort of count that I do not understand. It's too small to be the
+;; number of messages in the sub-folders and too large to be the
+;; number of sub-folders. XXX"
   `(if (cdr ,folder)
        t
      nil))
 
 ;;;###mh-autoload
 (defun mh-folder-list (folder)
-  "Return FOLDER and its descendents.
+  "Return FOLDER and its descendants.
 FOLDER may have a + prefix. Returns a list of strings without the
 + prefix. If FOLDER is nil, then all folders are considered. For
 example, if your Mail directory only contains the folders +inbox,

=== modified file 'lisp/nxml/xsd-regexp.el'
--- lisp/nxml/xsd-regexp.el	2011-01-25 04:08:28 +0000
+++ lisp/nxml/xsd-regexp.el	2011-11-20 03:48:53 +0000
@@ -49,7 +49,7 @@
 ;; Unicode character means a character in one of the Mule charsets
 ;; ascii, latin-iso8859-1, mule-unicode-0100-24ff,
 ;; mule-unicode-2500-33ff, mule-unicode-e000-ffff, eight-bit-control
-;; or a character translateable to such a character (i.e a character
+;; or a character translatable to such a character (i.e a character
 ;; for which `encode-char' will return non-nil).
 ;;
 ;; Using unify-8859-on-decoding-mode is probably a good idea here

=== modified file 'lisp/org/ChangeLog'
--- lisp/org/ChangeLog	2011-11-19 09:18:31 +0000
+++ lisp/org/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* org-table.el (org-table-line-to-dline): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* org-agenda.el (org-agenda-add-entry-text-descriptive-links)
@@ -6185,8 +6189,8 @@
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-indent.el (org-indent-add-properties):
-	Use `with-silent-modificatons'.
-	(org-indent-remove-properties): Use `with-silent-modificatons'.
+	Use `with-silent-modifications'.
+	(org-indent-remove-properties): Use `with-silent-modifications'.
 
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -13637,7 +13641,7 @@
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-remove-empty-overlays-at)
-	(org-clean-visibility-after-subtree-move): New functons.
+	(org-clean-visibility-after-subtree-move): New functions.
 	(org-move-subtree-down): Simplify cleanup of display.
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -15201,7 +15205,7 @@
 
 	* org-exp.el (org-export-as-html): Use IDs in the correct way.
 
-	* org.el (org-uuidgen-p): New funtion.
+	* org.el (org-uuidgen-p): New function.
 
 	* org-agenda.el (org-agenda-fontify-priorities): New default value
 	`cookies'.
@@ -17067,7 +17071,7 @@
 	(org-file-apps-defaults-macosx): Let PostScript files be opened by
 	preview.
 	(org-time-stamp-inactive): Call `org-time-stamp'.
-	(org-time-stamp): New argument `inactive'.  Also edit inacive
+	(org-time-stamp): New argument `inactive'.  Also edit inactive
 	stamps.  Convert time stamp type.
 	(org-open-file): Interpret the `default' value for the `command'
 	in `org-file-apps'.

=== modified file 'lisp/org/org-table.el'
--- lisp/org/org-table.el	2011-11-20 02:29:42 +0000
+++ lisp/org/org-table.el	2011-11-20 03:48:53 +0000
@@ -1302,7 +1302,7 @@
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matching dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely the reference was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))

=== modified file 'lisp/progmodes/cc-langs.el'
--- lisp/progmodes/cc-langs.el	2011-11-20 02:29:42 +0000
+++ lisp/progmodes/cc-langs.el	2011-11-20 03:48:53 +0000
@@ -221,7 +221,7 @@
     ;;
     ;; OPS either has the structure of `c-operators', is a single
     ;; group in `c-operators', or is a plain list of operators.
-    ;; 
+    ;;
     ;; OPGROUP-FILTER specifies how to select the operator groups.  It
     ;; can be t to choose all groups, a list of group type symbols
     ;; (such as 'prefix) to accept, or a function which will be called

=== modified file 'lisp/progmodes/cfengine.el'
--- lisp/progmodes/cfengine.el	2011-09-25 11:52:53 +0000
+++ lisp/progmodes/cfengine.el	2011-11-20 03:48:53 +0000
@@ -24,7 +24,7 @@
 ;;; Commentary:
 
 ;; Provides support for editing GNU Cfengine files, including
-;; font-locking, Imenu and indention, but with no special keybindings.
+;; font-locking, Imenu and indentation, but with no special keybindings.
 
 ;; The CFEngine 3.x support doesn't have Imenu support but patches are
 ;; welcome.

=== modified file 'lisp/progmodes/cwarn.el'
--- lisp/progmodes/cwarn.el	2011-01-26 08:36:39 +0000
+++ lisp/progmodes/cwarn.el	2011-11-20 03:48:53 +0000
@@ -210,16 +210,16 @@
 
 (defun cwarn-is-enabled (mode &optional feature)
   "Non-nil if CWarn FEATURE is enabled for MODE.
-feature is an atom representing one construction to highlight.
+FEATURE is an atom representing one construction to highlight.
 
 Check if any feature is enabled for MODE if no feature is specified.
 
 The valid features are described by the variable
 `cwarn-font-lock-feature-keywords-alist'."
-  (let ((mode-configuraion (assq mode cwarn-configuration)))
-    (and mode-configuraion
+  (let ((mode-configuration (assq mode cwarn-configuration)))
+    (and mode-configuration
 	 (or (null feature)
-	     (let ((list-or-t (nth 1 mode-configuraion)))
+	     (let ((list-or-t (nth 1 mode-configuration)))
 	       (or (eq list-or-t t)
 		   (if (eq (car-safe list-or-t) 'not)
 		       (not (memq feature (cdr list-or-t)))
@@ -235,7 +235,7 @@
     (eq (char-after) ?#)))
 
 (defun cwarn-font-lock-keywords (addp)
-  "Install/Remove keywords into current buffer.
+  "Install/remove keywords into current buffer.
 If ADDP is non-nil, install else remove."
   (dolist (pair cwarn-font-lock-feature-keywords-alist)
     (let ((feature (car pair))

=== modified file 'lisp/progmodes/ebnf-dtd.el'
--- lisp/progmodes/ebnf-dtd.el	2011-01-26 08:36:39 +0000
+++ lisp/progmodes/ebnf-dtd.el	2011-11-20 03:48:53 +0000
@@ -515,7 +515,7 @@
 ;; -----
 ;;
 ;; At moment, only the `<!ELEMENT' generates a syntactic chart.  The
-;; `<!ATTLIST', `<!NOTATION' and `<!ENTITY' are syntacticly checked but they
+;; `<!ATTLIST', `<!NOTATION' and `<!ENTITY' are syntactically checked but they
 ;; don't generate a syntactic chart.
 ;;
 ;; Besides the syntax above, ebnf-dtd also accepts a `pure' dtd file.  An

=== modified file 'lisp/progmodes/idlwave.el'
--- lisp/progmodes/idlwave.el	2011-11-15 07:55:13 +0000
+++ lisp/progmodes/idlwave.el	2011-11-20 03:48:53 +0000
@@ -5789,7 +5789,7 @@
     (setq idlwave-idlwave_routine_info-compiled t))
 
   ;; Restore if necessary.  Must use execute to hide lame routine_info
-  ;; errors on undefinded routine
+  ;; errors on undefined routine
   (idlwave-shell-send-command
    (format "if execute(\"_v=routine_info('idlwave_routine_info',/SOURCE)\") eq 0 then restore,'%s' else if _v.path eq '' then restore,'%s'"
 	   idlwave-shell-temp-rinfo-save-file

=== modified file 'lisp/progmodes/pascal.el'
--- lisp/progmodes/pascal.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/pascal.el	2011-11-20 03:48:53 +0000
@@ -427,7 +427,7 @@
       (pascal-indent-command))))
 
 (defun electric-pascal-equal ()
-  "Insert `=', and do indention if within type declaration."
+  "Insert `=', and do indentation if within type declaration."
   (interactive)
   (insert last-command-event)
   (if (eq (car (pascal-calculate-indent)) 'declaration)

=== modified file 'lisp/term/iris-ansi.el'
--- lisp/term/iris-ansi.el	2011-11-19 09:18:31 +0000
+++ lisp/term/iris-ansi.el	2011-11-20 03:48:53 +0000
@@ -136,8 +136,8 @@
 
     (define-key map "\e[Z" [?\S-\t])
     (define-key map "\e[072q" [?\C-\t])
-    ;; This only works if you remove the M-TAB keyring from the system.4Dwmrc
-    ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
+    ;; This only works if you remove the M-TAB keybinding from the system.4Dwmrc
+    ;; or your ~/.4Dwmrc, if you use the 4Dwm window manager.
     (define-key map "\e[073q" [?\M-\t])
 
     (define-key map "\e[074q" [?\M-q])

=== modified file 'lisp/term/rxvt.el'
--- lisp/term/rxvt.el	2011-11-19 09:18:31 +0000
+++ lisp/term/rxvt.el	2011-11-20 03:48:53 +0000
@@ -118,7 +118,7 @@
     ;; function keys F11->F42 from the termcap/terminfo information.  On
     ;; a PC-style keyboard these keys correspond to
     ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The
-    ;; code here subsitutes the corresponding definitions in
+    ;; code here substitutes the corresponding definitions in
     ;; function-key-map.  This substitution is needed because if a key
     ;; definition if found in function-key-map, there are no further
     ;; lookups in other keymaps.

=== modified file 'lisp/textmodes/artist.el'
--- lisp/textmodes/artist.el	2011-11-17 09:09:20 +0000
+++ lisp/textmodes/artist.el	2011-11-20 03:48:53 +0000
@@ -2338,7 +2338,7 @@
 	  5
 	6))))
 
-;; Some inline funtions for creating, setting and reading
+;; Some inline functions for creating, setting and reading
 ;; members of a coordinate
 ;;
 

=== modified file 'lisp/textmodes/reftex-dcr.el'
--- lisp/textmodes/reftex-dcr.el	2011-11-17 09:09:20 +0000
+++ lisp/textmodes/reftex-dcr.el	2011-11-20 03:48:53 +0000
@@ -361,7 +361,7 @@
   "View location in a LaTeX document which cites the BibTeX entry at point.
 Since BibTeX files can be used by many LaTeX documents, this function
 prompts upon first use for a buffer in RefTeX mode.  To reset this
-link to a document, call the function with with a prefix arg.
+link to a document, call the function with a prefix arg.
 Calling this function several times find successive citation locations."
   (interactive "P")
   (when arg

=== modified file 'lisp/vc/vc-mtn.el'
--- lisp/vc/vc-mtn.el	2011-01-25 04:08:28 +0000
+++ lisp/vc/vc-mtn.el	2011-11-20 03:48:53 +0000
@@ -299,7 +299,7 @@
       ids)))
 
 (defun vc-mtn-revision-completion-table (files)
-  ;; TODO: Implement completion for for selectors
+  ;; TODO: Implement completion for selectors
   ;; TODO: Implement completion for composite selectors.
   (lexical-let ((files files))
     ;; What about using `files'?!?  --Stef

=== modified file 'lisp/xml.el'
--- lisp/xml.el	2011-11-14 23:59:56 +0000
+++ lisp/xml.el	2011-11-20 03:48:53 +0000
@@ -756,7 +756,7 @@
 ;;*******************************************************************
 
 (defun xml-substitute-special (string)
-  "Return STRING, after subsituting entity references."
+  "Return STRING, after substituting entity references."
   ;; This originally made repeated passes through the string from the
   ;; beginning, which isn't correct, since then either "&amp;amp;" or
   ;; "&#38;amp;" won't DTRT.

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-20 03:19:22 +0000
+++ src/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,8 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* casetab.c (Fset_case_table):
+	* charset.c (Fcharset_after): Fix typos.
+
 2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Standardize on VIRT_ADDR_VARIES behavior (Bug#10042).

=== modified file 'src/ChangeLog.11'
--- src/ChangeLog.11	2011-11-20 02:29:42 +0000
+++ src/ChangeLog.11	2011-11-20 03:48:53 +0000
@@ -6604,9 +6604,9 @@
 	* keyboard.c (input_available_signal): Declare.
 	(kbd_buffer_nr_stored): New function.
 	(kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
-	more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
+	more than KBD_BUFFER_SIZE/2, stop reading input (Bug#6571).
 	(kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
-	returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
+	returns less than KBD_BUFFER_SIZE/4, resume reading input (Bug#6571).
 	(tty_read_avail_input): If input is on hold, return.
 	Don't read more that free slots in kbd_buffer (Bug#6571).
 
@@ -7683,7 +7683,7 @@
 
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
-	* fileio.c (Fdelete_file): Change interative spec to use
+	* fileio.c (Fdelete_file): Change interactive spec to use
 	`read-file-name' like in `find-file-read-args' where the default
 	value is `default-directory' instead of `buffer-file-name'.
 	http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
@@ -11923,7 +11923,7 @@
 
 	* process.c (status_notify): Don't perform redisplay.
 	(Fdelete_process, list_processes_1, process_send_signal):
-	Expliticly perform redisplay.
+	Explicitly perform redisplay.
 	(wait_reading_process_output): Always check process status, but
 	don't perform redisplay unless DO_DISPLAY is non-zero (Bug#2930).
 
@@ -25081,7 +25081,7 @@
 	* keymap.c (describe_vector): Handle default value of a char table.
 
 	* fontset.c (fontset_face): Handle fallback fonts correctly.
-	(Ffontset_info): Return infomation about fallback fonts.
+	(Ffontset_info): Return information about fallback fonts.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
@@ -30892,7 +30892,7 @@
 2007-06-14  Jason Rumney  <jasonr@gnu.org>
 
 	* w32.c (get_process_times_fn): New function pointer.
-	(globals_of_w32): Intialize it if present in kernel32.dll.
+	(globals_of_w32): Initialize it if present in kernel32.dll.
 	(w32_get_internal_run_time): New function.
 
 	* editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it.

=== modified file 'src/ChangeLog.3'
--- src/ChangeLog.3	2011-11-20 02:29:42 +0000
+++ src/ChangeLog.3	2011-11-20 03:48:53 +0000
@@ -6089,7 +6089,7 @@
 	shrink below the minimum, this code would only try to delete it if
 	it had a parent.  Well, even if the window doesn't have a parent,
 	you want Fdelete_window to signal an error, since you're trying to
-	resize one of the undeleteable windows into nothingness.  So call
+	resize one of the undeletable windows into nothingness.  So call
 	Fdelete_window even if the window doesn't have a parent.
 
 	* window.c (MINSIZE): Add kludge so that the minibuffer is always

=== modified file 'src/ChangeLog.7'
--- src/ChangeLog.7	2011-11-20 02:29:42 +0000
+++ src/ChangeLog.7	2011-11-20 03:48:53 +0000
@@ -5774,7 +5774,7 @@
 
 	(w32_initialize): Set input mode.  Use w32_msg_worker instead
 	of windows_msg_worker.  Dynamically link proportional scroll bar
-	functions and intialize proportional scroll bar variables.
+	functions and initialize proportional scroll bar variables.
 	(syms_of_w32term): DEFVAR new variables.
 
 	* w32term.h (w32_output): New fields menubar_widget, menubar_active,

=== modified file 'src/ChangeLog.8'
--- src/ChangeLog.8	2011-11-20 02:29:42 +0000
+++ src/ChangeLog.8	2011-11-20 03:48:53 +0000
@@ -2723,7 +2723,7 @@
 	(CURSOR_FACE_ID, MOUSE_FACE_ID): New.
 
 	* xfaces.c (Qscroll_bar, Qcursor, Qborder, Qmouse): New.
-	(syms_of_xfaces): Intialize new symbols.
+	(syms_of_xfaces): Initialize new symbols.
 
 	* fns.c (Fmakehash): Take one argument, test, make all the
 	rest keyword arguments.
@@ -9227,7 +9227,7 @@
 	* xdisp.c (store_frame_title_char): New function to store a
 	single character for the frame title with re-allocation of
 	frame_title_buf.
-	(init_xdisp): Intialize frame_title_.* variables to null.
+	(init_xdisp): Initialize frame_title_.* variables to null.
 
 	* dispnew.c (quit_error_check): Removed.
 
@@ -12321,7 +12321,7 @@
 	(enumfont_t): Remove unused head pointer.
 	(enum_font_cb2): Dereference elfLogFont.
 	(w32_list_bdf_fonts): New function.
-	(w32_list_fonts): Use one_w32_dispay_info instead of insisting on
+	(w32_list_fonts): Use one_w32_display_info instead of insisting on
 	valid frame.  Remove MessageBox.  Support BDF fonts.
 	(Fw32_find_bdf_fonts): New function.
 	(syms_of_w32fns): Add Vw32_bdf_filename_alist and

=== modified file 'src/bidi.c'
--- src/bidi.c	2011-10-20 16:37:10 +0000
+++ src/bidi.c	2011-11-20 03:48:53 +0000
@@ -51,7 +51,7 @@
 
    A note about references to UAX#9 rules: if the reference says
    something like "X9/Retaining", it means that you need to refer to
-   rule X9 and to its modifications decribed in the "Implementation
+   rule X9 and to its modifications described in the "Implementation
    Notes" section of UAX#9, under "Retaining Format Codes".  */
 
 #include <config.h>

=== modified file 'src/buffer.c'
--- src/buffer.c	2011-11-19 09:18:31 +0000
+++ src/buffer.c	2011-11-20 03:48:53 +0000
@@ -4400,7 +4400,7 @@
 
 static int mmap_page_size;
 
-/* 1 means mmap has been intialized.  */
+/* 1 means mmap has been initialized.  */
 
 static int mmap_initialized_p;
 

=== modified file 'src/casetab.c'
--- src/casetab.c	2011-06-24 21:25:22 +0000
+++ src/casetab.c	2011-11-20 03:48:53 +0000
@@ -95,7 +95,7 @@
  any two characters that are related by case-conversion have the same
  canonical equivalent character; it may be nil, in which case it is
  deduced from DOWNCASE and UPCASE.
-EQUIVALENCES is a map that cyclicly permutes each equivalence class
+EQUIVALENCES is a map that cyclically permutes each equivalence class
  (of characters with the same canonical equivalent); it may be nil,
  in which case it is deduced from CANONICALIZE.  */)
   (Lisp_Object table)

=== modified file 'src/charset.c'
--- src/charset.c	2011-11-14 21:00:24 +0000
+++ src/charset.c	2011-11-20 03:48:53 +0000
@@ -2082,7 +2082,7 @@
 DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0,
        doc: /*
 Return charset of a character in the current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.  */)
   (Lisp_Object pos)
 {

=== modified file 'src/dispextern.h'
--- src/dispextern.h	2011-11-19 08:39:42 +0000
+++ src/dispextern.h	2011-11-20 03:48:53 +0000
@@ -2649,11 +2649,11 @@
   void (*flush_display) (struct frame *f);
 
   /* Flush the display of frame F if non-NULL.  This is called
-     during redisplay, and should be NULL on systems which flushes
+     during redisplay, and should be NULL on systems which flush
      automatically before reading input.  */
   void (*flush_display_optional) (struct frame *f);
 
-  /* Clear the mouse hightlight in window W, if there is any.  */
+  /* Clear the mouse highlight in window W, if there is any.  */
   void (*clear_window_mouse_face) (struct window *w);
 
   /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on

=== modified file 'src/frame.c'
--- src/frame.c	2011-11-18 09:36:59 +0000
+++ src/frame.c	2011-11-20 03:48:53 +0000
@@ -374,7 +374,7 @@
 
     /* Use set_window_buffer, not Fset_window_buffer, and don't let
        hooks be run by it.  The reason is that the whole frame/window
-       arrangement is not yet fully intialized at this point.  Windows
+       arrangement is not yet fully initialized at this point.  Windows
        don't have the right size, glyph matrices aren't initialized
        etc.  Running Lisp functions at this point surely ends in a
        SEGV.  */
@@ -1712,7 +1712,7 @@
 }
 
 /* Update the display_time slot of the buffers shown in WINDOW
-   and all its descendents.  */
+   and all its descendants.  */
 
 static void
 make_frame_visible_1 (Lisp_Object window)

=== modified file 'src/search.c'
--- src/search.c	2011-09-18 15:20:30 +0000
+++ src/search.c	2011-11-20 03:48:53 +0000
@@ -1892,7 +1892,7 @@
 			       || CHAR_HEAD_P (cursor[1]))
 			      && (CHAR_HEAD_P (cursor[0])
 				  /* Check if this is the last byte of
-				     a translable character.  */
+				     a translatable character.  */
 				  || (translate_prev_byte1 == cursor[-1]
 				      && (CHAR_HEAD_P (translate_prev_byte1)
 					  || (translate_prev_byte2 == cursor[-2]
@@ -1991,7 +1991,7 @@
 			   || CHAR_HEAD_P (ptr[1]))
 			  && (CHAR_HEAD_P (ptr[0])
 			      /* Check if this is the last byte of a
-				 translable character.  */
+				 translatable character.  */
 			      || (translate_prev_byte1 == ptr[-1]
 				  && (CHAR_HEAD_P (translate_prev_byte1)
 				      || (translate_prev_byte2 == ptr[-2]

=== modified file 'src/xterm.c'
--- src/xterm.c	2011-11-19 09:18:31 +0000
+++ src/xterm.c	2011-11-20 03:48:53 +0000
@@ -8765,7 +8765,7 @@
   pending_event_wait.f = f;
   pending_event_wait.eventtype = eventtype;
 
-  /* Set timeout to 0.1 second.  Hopefully not noticable.
+  /* Set timeout to 0.1 second.  Hopefully not noticeable.
      Maybe it should be configurable.  */
   EMACS_SET_SECS_USECS (tmo, 0, 100000);
   EMACS_GET_TIME (tmo_at);

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2011-11-16 17:47:25 +0000
+++ test/ChangeLog	2011-11-20 03:48:53 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cedet/semantic-utest-c.el (semantic-utest-c-comparisons): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* automated/icalendar-tests.el (icalendar-tests--get-ical-event)

=== modified file 'test/cedet/semantic-utest-c.el'
--- test/cedet/semantic-utest-c.el	2011-01-25 04:08:28 +0000
+++ test/cedet/semantic-utest-c.el	2011-11-20 03:48:53 +0000
@@ -28,7 +28,7 @@
 (defvar semantic-utest-c-comparisons
   '( ("testsppreplace.c" . "testsppreplaced.c")
      )
-  "List of files to parse and compare against eachother.")
+  "List of files to parse and compare against each other.")
 
 ;;; Code:
 ;;;###autoload
------------------------------------------------------------
revno: 106440 [merge]
fixes bug(s): http://debbugs.gnu.org/10042
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sat 2011-11-19 19:19:22 -0800
message:
  Standardize on VIRT_ADDR_VARIES behavior.
  
  Otherwise, valgrind does not work on some platforms.
  Problem reported by Andreas Schwab in
  <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
  * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
  is set, removing the need for VIRT_ADDRESS_VARIES.
  (PURE_P): Use a more-efficient implementation that needs just one
  comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
  number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
  to 4 (xorl, subq, cmpq, setbe).
  * alloc.c (pure): Always extern now, since that's the
  VIRT_ADDR_VARIES behavior.
  (PURE_POINTER_P): Use a single comparison, not two, for
  consistency with the new puresize.h.
  * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
  * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
  Remove VIRT_ADDR_VARIES no longer needed.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-19 15:50:23 +0000
+++ src/ChangeLog	2011-11-20 03:19:22 +0000
@@ -1,3 +1,23 @@
+2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Standardize on VIRT_ADDR_VARIES behavior (Bug#10042).
+	Otherwise, valgrind does not work on some platforms.
+	Problem reported by Andreas Schwab in
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
+	* puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
+	is set, removing the need for VIRT_ADDRESS_VARIES.
+	(PURE_P): Use a more-efficient implementation that needs just one
+	comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
+	number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
+	to 4 (xorl, subq, cmpq, setbe).
+	* alloc.c (pure): Always extern now, since that's the
+	VIRT_ADDR_VARIES behavior.
+	(PURE_POINTER_P): Use a single comparison, not two, for
+	consistency with the new puresize.h.
+	* lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
+	* m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
+	Remove VIRT_ADDR_VARIES no longer needed.
+
 2011-11-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)

=== modified file 'src/alloc.c'
--- src/alloc.c	2011-11-15 17:37:37 +0000
+++ src/alloc.c	2011-11-20 03:07:02 +0000
@@ -203,9 +203,6 @@
    remapping on more recent systems because this is less important
    nowadays than in the days of small memories and timesharing.  */
 
-#ifndef VIRT_ADDR_VARIES
-static
-#endif
 EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure
 
@@ -222,10 +219,7 @@
 /* Value is non-zero if P points into pure space.  */
 
 #define PURE_POINTER_P(P)					\
-     (((PNTR_COMPARISON_TYPE) (P)				\
-       < (PNTR_COMPARISON_TYPE) ((char *) purebeg + pure_size))	\
-      && ((PNTR_COMPARISON_TYPE) (P)				\
-	  >= (PNTR_COMPARISON_TYPE) purebeg))
+  ((uintptr_t) (P) - (uintptr_t) purebeg <= pure_size)
 
 /* Index in pure at which next pure Lisp object will be allocated.. */
 

=== modified file 'src/lisp.h'
--- src/lisp.h	2011-11-19 09:18:31 +0000
+++ src/lisp.h	2011-11-20 03:07:02 +0000
@@ -1877,9 +1877,6 @@
     CHECK_NATNUM (tmp);			\
     XSETCDR ((x), tmp);			\
   } while (0)
-
-/* Cast pointers to this type to compare them.  */
-#define PNTR_COMPARISON_TYPE uintptr_t
 
 /* Define a built-in function for calling from Lisp.
  `lname' should be the name to give the function in Lisp,

=== modified file 'src/m/ibms390.h'
--- src/m/ibms390.h	2011-02-16 01:35:20 +0000
+++ src/m/ibms390.h	2011-11-10 08:14:27 +0000
@@ -17,11 +17,6 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
+/* This file is a placeholder -- it does not contain any definitions.
+   At some point we should probably fix this by removing the file
+   and removing all uses of it.  */

=== modified file 'src/m/intel386.h'
--- src/m/intel386.h	2011-01-31 23:54:50 +0000
+++ src/m/intel386.h	2011-11-10 08:14:27 +0000
@@ -19,7 +19,6 @@
 
 
 #ifdef WINDOWSNT
-#define VIRT_ADDR_VARIES
 #define DATA_START 	get_data_start ()
 #endif
 
@@ -28,4 +27,3 @@
 /* we cannot get the maximum address for brk */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
-

=== modified file 'src/m/template.h'
--- src/m/template.h	2011-02-16 01:35:20 +0000
+++ src/m/template.h	2011-11-10 08:14:27 +0000
@@ -21,14 +21,6 @@
    does not define it automatically.
    Ones defined so far include m68k and many others */
 
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
-
 /* After adding support for a new machine, modify the large case
    statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to

=== modified file 'src/puresize.h'
--- src/puresize.h	2011-06-09 19:08:29 +0000
+++ src/puresize.h	2011-11-10 08:14:27 +0000
@@ -75,21 +75,7 @@
 
 /* Define PURE_P.  */
 
-#ifdef VIRT_ADDR_VARIES
-/* For machines where text and data can go anywhere
-   in virtual memory.  */
-
 extern EMACS_INT pure[];
 
 #define PURE_P(obj) \
- ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
-  && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
-
-#else /* not VIRT_ADDR_VARIES */
-
-extern char my_edata[];
-
-#define PURE_P(obj) \
-  ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
-
-#endif /* VIRT_ADDRESS_VARIES */
+  ((uintptr_t) XPNTR (obj) - (uintptr_t) pure <= PURESIZE)

=== modified file 'src/s/cygwin.h'
--- src/s/cygwin.h	2011-03-17 05:15:08 +0000
+++ src/s/cygwin.h	2011-11-10 08:14:27 +0000
@@ -91,9 +91,6 @@
    why it needed to be changed.  */
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* Virtual addresses of pure and impure space can vary, as on Windows.  */
-#define VIRT_ADDR_VARIES
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always

=== modified file 'src/s/hpux10-20.h'
--- src/s/hpux10-20.h	2011-11-11 23:17:16 +0000
+++ src/s/hpux10-20.h	2011-11-14 04:35:22 +0000
@@ -100,14 +100,6 @@
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
 #undef _FILE_OFFSET_BITS
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
 
 /* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000
------------------------------------------------------------
revno: 106439
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sat 2011-11-19 18:29:42 -0800
message:
  Spelling fixes.
diff:
=== modified file 'admin/notes/multi-tty'
--- admin/notes/multi-tty	2011-11-19 09:18:31 +0000
+++ admin/notes/multi-tty	2011-11-20 02:29:42 +0000
@@ -585,7 +585,7 @@
 -- other-frame should cycle through the frames on the `current'
    terminal only.
 
-   (Done, by trivially modifiying next_frame and prev_frame.)
+   (Done, by trivially modifying next_frame and prev_frame.)
 
 -- Support different terminal sizes.
 

=== modified file 'admin/nt/README-ftp-server'
--- admin/nt/README-ftp-server	2011-11-15 18:08:38 +0000
+++ admin/nt/README-ftp-server	2011-11-20 02:29:42 +0000
@@ -254,7 +254,7 @@
 
   Another valuable source of information and help which should not be
   overlooked is the various Usenet news groups dedicated to Emacs.
-  These are particuarly good for help with general issues which aren't
+  These are particularly good for help with general issues which aren't
   specific to the Windows port of Emacs.  The main news groups to use
   for seeking help are:
 

=== modified file 'doc/lispref/display.texi'
--- doc/lispref/display.texi	2011-10-18 01:42:28 +0000
+++ doc/lispref/display.texi	2011-11-20 02:29:42 +0000
@@ -4546,7 +4546,7 @@
 @c FIXME how is this priority determined?
 loader will be used in practice depends on the priority of the loaders).
 @c FIXME why are these uppercase when image-types is lower-case?
-@c FIXME what are the possibe options?  Are these actually file extensions?
+@c FIXME what are the possible options?  Are these actually file extensions?
 For example, if you never want to use the ImageMagick loader to use
 JPEG files, add @code{JPG} to this list.
 

=== modified file 'doc/lispref/frames.texi'
--- doc/lispref/frames.texi	2011-11-14 06:27:12 +0000
+++ doc/lispref/frames.texi	2011-11-20 02:29:42 +0000
@@ -953,7 +953,7 @@
 The @code{alpha} frame parameter can also be a cons cell
 @code{(@samp{active} . @samp{inactive})}, where @samp{active} is the
 opacity of the frame when it is selected, and @samp{inactive} is the
-opactity when it is not selected.
+opacity when it is not selected.
 @end table
 
 The following frame parameters are semi-obsolete in that they are

=== modified file 'doc/lispref/spellfile'
--- doc/lispref/spellfile	2011-11-19 09:18:31 +0000
+++ doc/lispref/spellfile	2011-11-20 02:29:42 +0000
@@ -529,7 +529,6 @@
 pointm
 pos
 preallocate
-predicale
 preload
 prepend
 prepended

=== modified file 'doc/misc/autotype.texi'
--- doc/misc/autotype.texi	2011-02-19 19:40:59 +0000
+++ doc/misc/autotype.texi	2011-11-20 02:29:42 +0000
@@ -156,7 +156,7 @@
 Skeletons}).  The point (@pxref{(emacs)Point}) is left at the next
 interesting spot in the skeleton instead.
 
-  A negative prefix means to do something similar with that many precedingly
+  A negative prefix means to do something similar with that many previously
 marked interregions (@pxref{(emacs)Mark}).  In the simplest case, if you type
 @kbd{M--} just before issuing the skeleton command, that will wrap the
 skeleton around the current region, just like a positive argument would have

=== modified file 'doc/misc/calc.texi'
--- doc/misc/calc.texi	2011-10-13 02:50:58 +0000
+++ doc/misc/calc.texi	2011-11-20 02:29:42 +0000
@@ -10666,7 +10666,7 @@
 float that is entered in a radix other that 10 will be converted to
 decimal, the number that Calc stores may not be exactly the number that
 was entered, it will be the closest decimal approximation given the
-current precison.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
+current precision.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
 is a floating-point number whose digits are in the specified radix.
 Note that the @samp{.}  is more aptly referred to as a ``radix point''
 than as a decimal point in this case.  The number @samp{8#123.4567} is

=== modified file 'doc/misc/gnus-news.texi'
--- doc/misc/gnus-news.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/gnus-news.texi	2011-11-20 02:29:42 +0000
@@ -107,7 +107,7 @@
 @itemize @bullet
 
 @item
-Symbols like @code{gcc-self} now has the same presedence rules in
+Symbols like @code{gcc-self} now has the same precedence rules in
 @code{gnus-parameters} as other ``real'' variables: The last match
 wins instead of the first match.
 

=== modified file 'doc/misc/gnus.texi'
--- doc/misc/gnus.texi	2011-11-19 09:18:31 +0000
+++ doc/misc/gnus.texi	2011-11-20 02:29:42 +0000
@@ -21228,7 +21228,7 @@
 AND, OR, and NOT are supported, and parentheses can be used to control
 operator precedence, e.g. (emacs OR xemacs) AND linux. Note that
 operators must be written with all capital letters to be
-recognised. Also preceding a term with a - sign is equivalent to NOT
+recognized. Also preceding a term with a - sign is equivalent to NOT
 term.
 
 @item Automatic AND queries
@@ -21273,7 +21273,7 @@
 AND, OR, NOT (or AND NOT), and XOR are supported, and brackets can be
 used to control operator precedence, e.g. (emacs OR xemacs) AND linux.
 Note that operators must be written with all capital letters to be
-recognised.
+recognized.
 
 @item Required and excluded terms
 + and - can be used to require or exclude terms, e.g. football -american

=== modified file 'doc/misc/semantic.texi'
--- doc/misc/semantic.texi	2011-11-17 09:09:20 +0000
+++ doc/misc/semantic.texi	2011-11-20 02:29:42 +0000
@@ -421,7 +421,7 @@
 C++ using statements.
 
 @item semanticdb-typecache.el
-The typecache is part of @code{semanticdb}, but is used primarilly by
+The typecache is part of @code{semanticdb}, but is used primarily by
 the analyzer to look up datatypes and complex names.  The typecache is
 bound across source files and builds a master lookup table for data
 type names.

=== modified file 'doc/misc/tramp.texi'
--- doc/misc/tramp.texi	2011-11-14 23:59:56 +0000
+++ doc/misc/tramp.texi	2011-11-20 02:29:42 +0000
@@ -3180,7 +3180,7 @@
  '("^/xy" . "@trampfn{ssh, news, news.my.domain, /opt/news/etc/}"))
 @end lisp
 
-This shortens the file openening command to @kbd{C-x C-f /xy
+This shortens the file opening command to @kbd{C-x C-f /xy
 @key{RET}}.  The disadvantage is, again, that you cannot edit the file
 name, because the expansion happens after entering the file name only.
 

=== modified file 'etc/ERC-NEWS'
--- etc/ERC-NEWS	2011-11-15 07:55:13 +0000
+++ etc/ERC-NEWS	2011-11-20 02:29:42 +0000
@@ -1279,7 +1279,7 @@
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require
-  you to change your current erc initialisation code a bit, if you
+  you to change your current erc initialization code a bit, if you
   have some existing customizations.  On the other hand, this change
   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of

=== modified file 'etc/NEWS.18'
--- etc/NEWS.18	2011-01-25 04:08:28 +0000
+++ etc/NEWS.18	2011-11-20 02:29:42 +0000
@@ -519,7 +519,7 @@
 
 ** C-x p now disabled.
 
-The command C-x p, a nonrecomended command which narrows to the current
+The command C-x p, a nonrecommended command which narrows to the current
 page, is now initially disabled like C-x n.
 
 * Dealing with files.
@@ -1620,4 +1620,3 @@
 Local variables:
 mode: text
 end:
-

=== modified file 'etc/NEWS.19'
--- etc/NEWS.19	2011-11-16 17:47:25 +0000
+++ etc/NEWS.19	2011-11-20 02:29:42 +0000
@@ -4288,7 +4288,7 @@
 controlling whether to restrict possible completions to only files
 that are executable (`shell-command-execonly').
 
-The input history is initialised from the file name given in the
+The input history is initialized from the file name given in the
 variable `shell-input-ring-file-name'--normally `.history' in your
 home directory.
 

=== modified file 'etc/gnus/news-server.ast'
--- etc/gnus/news-server.ast	2010-03-23 07:29:49 +0000
+++ etc/gnus/news-server.ast	2011-11-20 02:29:42 +0000
@@ -7,7 +7,7 @@
 @validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?"))
 @result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
-Usenet news is usually read from your Internet service prodider's news
+Usenet news is usually read from your Internet service provider's news
 server.  If you don't know the name of this server, contact your ISP.
 
 As a guess, the name of the server might be news.yourisp.com.
@@ -61,4 +61,3 @@
 @c End:
 
 @c arch tag is missing
-

=== modified file 'etc/srecode/test.srt'
--- etc/srecode/test.srt	2011-01-25 04:08:28 +0000
+++ etc/srecode/test.srt	2011-11-20 02:29:42 +0000
@@ -81,7 +81,7 @@
 ----
 
 template inlinetext
-"Insert text that has no nelines"
+"Insert text that has no newlines"
 ----
  *In the middle* 
 ----

=== modified file 'leim/quail/ipa.el'
--- leim/quail/ipa.el	2011-11-15 07:55:13 +0000
+++ leim/quail/ipa.el	2011-11-20 02:29:42 +0000
@@ -183,7 +183,7 @@
 	 "˚"])	;; +Unexploded modifier			U+02DA
  ("<r>" "ʳ")	;; +Rhotacized modifier			U+02B3
  ("<w>" "ʷ")	;; +Labialized modifier			U+02B7
- ("<?>" "ʱ")	;; +Murmured modififer			U+02B1
+ ("<?>" "ʱ")	;; +Murmured modifier			U+02B1
 
  ("b<trl>" "ʙ")	;; Bilabial trill			U+0299
  ("b`" "ɓ")	;; Bilabial implosive			U+0253
@@ -465,8 +465,8 @@
  ("_}" "̚")	;; No audible release			U+031A
  ;; ` is alternatively; retroflexion in consonants
  ("`" "˞")	;; Rhotacization in vowels		U+02DE
- ("_~" "̃")	;; Nasalisation				U+0303
- ("~" "̃")	;; Nasalisation				U+0303
+ ("_~" "̃")	;; Nasalization				U+0303
+ ("~" "̃")	;; Nasalization				U+0303
  ("_A" "̘")	;; Advanced tongue root			U+0318
  ("_a" "̺")	;; Apical				U+033A
  ("_B" "̏")	;; Extra low tone			U+030F

=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2011-11-17 17:40:48 +0000
+++ lib-src/ChangeLog	2011-11-20 02:29:42 +0000
@@ -2032,7 +2032,7 @@
 	* etags.c [ETAGS_REGEXPS]: Now is unconditionally defined.
 	[LONG_OPTIONS]: Changed to NO_LONG_OPTIONS, which is undefined.
 	(Objc_suffixes): Suggest using --lang=c for full help.
-	(C_entries): Initialise savetoken to 0 to shut up the compiler.
+	(C_entries): Initialize savetoken to 0 to shut up the compiler.
 
 2006-07-20  Andreas Schwab  <schwab@suse.de>
 
@@ -2738,7 +2738,7 @@
 	(add_regex, regex_tag_multiline, readline): Use it.
 	(main): Free some global structures.
 	(fdesc): New member `written'.
-	(readline, process_file): Initialise it.
+	(readline, process_file): Initialize it.
 	(put_entries): Set it.
 	(main): Use it to create entries for files without tags.
 	(total_size_of_entries): Do not count invalid tags.
@@ -2849,7 +2849,7 @@
 	(find_entries): Rewind unconditionally.
 	(find_entries): Do not call language functions directly, now calls
 	itself.
-	(find_entries): Do general initialisations here.
+	(find_entries): Do general initializations here.
 	(CNL_SAVE_DEFINEDEF, C_entries, LOOP_ON_INPUT_LINES, F_getit)
 	(Ada_getit, Pascal_functions, Pascal_functions)
 	(prolog_skip_comment): Do not do them here.
@@ -3085,7 +3085,7 @@
 	(TeX_commands): Name tags.  Correction of old disabled code.
 
 	* etags.c (curfiledir, curtagfname): New global variables.
-	(process_file): Initialise them.
+	(process_file): Initialize them.
 	(readline): Canonicalize the name found in #line directive.
 
 2002-03-06  Jason Rumney  <jasonr@gnu.org>
@@ -3175,7 +3175,7 @@
 	(L_getit): Simplify by using get_tag.
 	(Perl_functions, Postscript_functions, erlang_attribute): Use the
 	modified LOOKING_AT.
-	(notinname): Remove '[' and added ')' to the recognised chars.
+	(notinname): Remove '[' and added ')' to the recognized chars.
 	(LOOKING_AT, get_tag, PHP_functions): Use notinname.
 	(Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
 	Clarified, using strneq or notinname.
@@ -3242,7 +3242,7 @@
 	(Scheme_functions, Texinfo_nodes): Use it.
 	(Perl_functions): Use strneq.
 	(prolog_pred): Rename to prolog_pr.
-	(prolog_pr): Recognise Prolog rules in addition to predicates.
+	(prolog_pr): Recognize Prolog rules in addition to predicates.
 	[ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent
 	unmodified compile, as Cygwin's regex.h is incompatible with us.
 	[!HAVE_CONFIG_H] [!__STDC__]: #define const as the empty string.
@@ -3516,7 +3516,7 @@
 	* etags.c (enum sym_type): New label st_C_template.
 	(gperf input): Use it for switching to C++ from C.
 	(consider_token): Do it.
-	(C_entries): Initialise typdefcblev to quiet compilers.
+	(C_entries): Initialize typdefcblev to quiet compilers.
 	[!HAVE_CONFIG_H] [!__STDC__]: #define static as nothing.
 
 2001-02-22  Andrew Innes  <andrewi@gnu.org>
@@ -3967,7 +3967,7 @@
 
 	* etags.c (C_entries, consider_token): C++ `operator' now is
 	tagged in most cases.
-	As before, :: is not recognised if surrounded by spaces.
+	As before, :: is not recognized if surrounded by spaces.
 
 	* etags.c (relative_filename): Account for DOS file names such
 	that is impossible to make one relative to another.
@@ -4576,7 +4576,7 @@
 	* etags.c (C_entries): Use "." instead of "::" for Java.
 	(consider_token): is_func renamed to is_func_or_var.
 	(C_entries): is_func renamed to funorvar.
-	(C_entries): Initialise tok.named.
+	(C_entries): Initialize tok.named.
 	(sym_type, C_stab_entry, consider_token): st_C_ignore is used to
 	get rid of "import", "package" and "friend".
 	(fvdef): Rename from funcdef.  Also some constants renamed.
@@ -4630,7 +4630,7 @@
 	(lang_names): Add Java.
 	(sym_type): Add st_C_javastruct for Java.
 	(C_stab_entry): Add `extends' and `implements' keywords.
-	(consider_token, C_entries): Recognise Java structures.
+	(consider_token, C_entries): Recognize Java structures.
 
 1997-05-12  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
@@ -4678,7 +4678,7 @@
 
 	* etags.c (xnew): Add support for debugging with chkmalloc.
 	(error): Use this instead of printf whenever possible.
-	(main): Only call xnew after having initialised progname.
+	(main): Only call xnew after having initialized progname.
 	(substitute): Bad memory corruption error corrected.
 
 1997-04-08  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
@@ -5596,8 +5596,8 @@
 
 1995-02-22  Francesco Potortì  (pot@cnuce.cnr.it)
 
-	* etags.c (C_entries): token_saved removed.  Initialise tok.valid and
-	savetok.valid.  Mark token as valid when it is initialised.
+	* etags.c (C_entries): token_saved removed.  Initialize tok.valid and
+	savetok.valid.  Mark token as valid when it is initialized.
 	(make_tag): Make token only if token is valid and reset validity.
 	(CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved.
 	(TOKEN): Add a new member: valid.
@@ -5609,15 +5609,15 @@
 
 1995-02-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
-	* etags.c (C_entries): Initialise the new members of TOKEN.
+	* etags.c (C_entries): Initialize the new members of TOKEN.
 	(C_entries): Do not allocate a new space for each token found by
 	consider_token.  Let make_tag do that instead.
 	(make_tag): Since now TOKEN has memory of where it is taken from,
 	this new macro substitutes both make_tag_from_new_lb and
 	make_tag_from_oth_lb.  All callers changed.
 	(TOKEN): Add linepos and buffer members.
-	(main): Initialise token_str.
-	(lang_extensions): Recognise .c++ and .h++ as C++ file suffixes.
+	(main): Initialize token_str.
+	(lang_extensions): Recognize .c++ and .h++ as C++ file suffixes.
 	(token_str): New global variable used by C_entries.
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
@@ -5626,7 +5626,7 @@
 
 1995-02-01  Francesco Potortì  (pot@cnuce.cnr.it)
 
-	* etags.c (pfnote): Initialise been_warned in the node.
+	* etags.c (pfnote): Initialize been_warned in the node.
 	(C_entries): Remove a speed hack for the sake of clarity.
 
 1995-01-18  Francesco Potortì  (pot@cnuce.cnr.it)
@@ -5911,8 +5911,8 @@
 
 1994-09-29  Francesco Potortì  (pot@cnuce.cnr.it)
 
-	* etags.c (C_entries): Recognise typedef of ANSI style functions.
-	(C_entries): Recognise #define inside a struct.
+	* etags.c (C_entries): Recognize typedef of ANSI style functions.
+	(C_entries): Recognize #define inside a struct.
 	(C_entries): ANSI tells that preprocessor commands do not have to
 	start on the first column.
 	(print_help): Documentation corrected for -d and -D.
@@ -6026,7 +6026,7 @@
 
 1994-07-08  Dave Love  (d.love@dl.ac.uk)
 
-	* etags.c (takeprec): Recognise `character*(*) function'.
+	* etags.c (takeprec): Recognize `character*(*) function'.
 
 1994-07-08  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -6219,7 +6219,7 @@
 	TeX_functions, Prolog_functions.
 	(inf): No more a global variable.
 	(C_entries): Take 2nd parameter `inf' instead of using the global one.
-	(find_entries): Add the cp1 var for optimisation.
+	(find_entries): Add the cp1 var for optimization.
 	(find_entries): Add more suffixes for assembler files.
 	(Asm_funcs): Now finds labels even without an ending colon.
 
@@ -6247,7 +6247,7 @@
 	functions added to compute filenames in tags files.
 	(process_file): Filenames in tags file are relative to the
 	directory where the tags file is (useful with the -o option).
-	(main): Initialise the outfiledir var.
+	(main): Initialize the outfiledir var.
 	(TYPEDST): Add the `tignore' value.
 	(C_entries): Corrected various small bugs.
 
@@ -6553,7 +6553,7 @@
 
 1993-09-20  Francesco Potortì  (pot@fly)
 
-	* etags.c (C_entries): is_func is initialised here instead of in
+	* etags.c (C_entries): is_func is initialized here instead of in
 	consider_token for the sake of the yacc rules section.
 	(C_entries): Now class, struct, enum, union and typedef produce
 	named tags.
@@ -6607,7 +6607,7 @@
 
 1993-08-04  Francesco Potortì  (pot@spiff.gnu.ai.mit.edu)
 
-	* etags.c (L_isdef, L_isquote, L_getit): Small optimisations.
+	* etags.c (L_isdef, L_isquote, L_getit): Small optimizations.
 	(L_funcs): The (foo::defmumble stuff now should work.
 	(consider_token): Function returned random value--corrected.
 	(C_entries): Corrected == versus = typo.
@@ -6629,7 +6629,7 @@
 	(C_entries, consider_token): Make use of fignore.
 	(consider_token): Reset funcdef when next_token_is_func: when in
 	ctags mode makes DEFVAR and others work better.
-	(L_isquote): Function that recognises the "(quote" string.
+	(L_isquote): Function that recognizes the "(quote" string.
 	(L_getit): Ignore quoting via "'" or "(quote".  Useful for defalias.
 
 1993-07-29  Paul Eggert  (eggert@twinsun.com)
@@ -6976,7 +6976,7 @@
 	(TOKEN): Member linestart removed.
 	(linepos, prev_linepos, lb1): Deleted.
 	(main): Call initbuffer on lbs array instead of lb1.
-	(init): Remove the initialisation of the logical _gd array.
+	(init): Remove the initialization of the logical _gd array.
 	(find_entries): A .sa suffix means assembler file.
 	(C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
 	All C state machines rewritten.

=== modified file 'lib-src/etags.c'
--- lib-src/etags.c	2011-11-19 09:18:31 +0000
+++ lib-src/etags.c	2011-11-20 02:29:42 +0000
@@ -1862,10 +1862,10 @@
 
   assert (parser != NULL);
 
-  /* Generic initialisations before reading from file. */
+  /* Generic initializations before reading from file. */
   linebuffer_setlen (&filebuf, 0); /* reset the file buffer */
 
-  /* Generic initialisations before parsing file with readline. */
+  /* Generic initializations before parsing file with readline. */
   lineno = 0;		       /* reset global line number */
   charno = 0;		       /* reset global char number */
   linecharno = 0;	       /* reset global char number of line start */
@@ -1895,7 +1895,7 @@
  *  4. the character, if any, immediately after NAME in LINESTART must
  *     also be a character in NONAM.
  *
- * The implementation uses the notinname() macro, which recognises the
+ * The implementation uses the notinname() macro, which recognizes the
  * characters stored in the string `nonam'.
  * etags.el needs to use the same characters that are in NONAM.
  */
@@ -3057,7 +3057,7 @@
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
 	      token.offset+token.length+1, token.lineno, token.linepos);
   else if (DEBUG)
-    {				  /* this branch is optimised away if !DEBUG */
+    {				  /* this branch is optimized away if !DEBUG */
       make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
 		token_name.len + 17, isfun, token.line,
 		token.offset+token.length+1, token.lineno, token.linepos);
@@ -3304,7 +3304,7 @@
 		  if (c == ':' && *lp == ':' && begtoken (lp[1]))
 		    /* This handles :: in the middle,
 		       but not at the beginning of an identifier.
-		       Also, space-separated :: is not recognised. */
+		       Also, space-separated :: is not recognized. */
 		    {
 		      if (c_ext & C_AUTO) /* automatic detection of C++ */
 			c_ext = (c_ext | C_PLPL) & ~C_AUTO;
@@ -5900,7 +5900,7 @@
       if (!rp->multi_line)
 	continue;		/* skip normal regexps */
 
-      /* Generic initialisations before parsing file from memory. */
+      /* Generic initializations before parsing file from memory. */
       lineno = 1;		/* reset global line number */
       charno = 0;		/* reset global char number */
       linecharno = 0;		/* reset global char number of line start */

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-20 02:23:48 +0000
+++ lisp/ChangeLog	2011-11-20 02:29:42 +0000
@@ -3033,7 +3033,7 @@
 	more people.
 
 	* cus-edit.el (custom-file): When running under emacs -q, always
-	refuse to save the customisations, even if the .emacs file doesn't
+	refuse to save the customizations, even if the .emacs file doesn't
 	exist.
 
 	* info.el: Remove the `Info-beginning-of-buffer' function

=== modified file 'lisp/ChangeLog.10'
--- lisp/ChangeLog.10	2011-11-19 09:18:31 +0000
+++ lisp/ChangeLog.10	2011-11-20 02:29:42 +0000
@@ -1036,13 +1036,13 @@
 
 2003-06-29  Nick Roberts  <nick@nick.uklinux.net>
 
-	* gdb-ui.el (gdb-display-number-end): Don't re-initialise local
+	* gdb-ui.el (gdb-display-number-end): Don't re-initialize local
 	variables to preserve array slices.
 	(gdb-array-slice): Rename gdb-mouse-array-slice.
 	(gdb-array-slice): Interactive function bound to "\r" for text
 	terminals.
 	(gdb-view-source): Rename gdb-view-source-function.
-	Set uninitialised variables (defvars) to nil.
+	Set uninitialized variables (defvars) to nil.
 
 2003-06-29  Kai Großjohann  <kai.grossjohann@gmx.net>
 
@@ -2149,7 +2149,7 @@
 
 2003-05-25  Kevin Ryde  <user42@zip.com.au>
 
-	* info-look.el (autoconf-mode setups): Recognise AH_ and AU_ entries
+	* info-look.el (autoconf-mode setups): Recognize AH_ and AU_ entries
 	in "(autoconf)Autoconf Macro Index".  Add "(autoconf)M4 Macro Index"
 	and "(autoconf)Autotest Macro Index".  Remove duplicate copy of
 	"(automake)Macro and Variable Index".  Keep automake after all
@@ -14917,7 +14917,7 @@
 
 2002-05-14  Francesco Potortì  <pot@gnu.org>
 
-	* shell.el (shell-mode): Make second part of initialisation
+	* shell.el (shell-mode): Make second part of initialization
 	depend on whether comint-input-ring is empty, rather than depend
 	on it being nil.
 
@@ -22669,7 +22669,7 @@
 
 	Suggested by Kalle Olavi Niemitalo <kon@iki.fi>:
 
-	* vc-hooks.el (vc-error-occured): Backquotified.
+	* vc-hooks.el (vc-error-occurred): Backquotified.
 	(vc-file-prop-obarray): Use prime length for better efficiency.
 
 	* vc.el (vc-clear-context): Fill obarray with 0, not nil.

=== modified file 'lisp/ChangeLog.12'
--- lisp/ChangeLog.12	2011-11-17 17:40:48 +0000
+++ lisp/ChangeLog.12	2011-11-20 02:29:42 +0000
@@ -2823,7 +2823,7 @@
 2007-01-01  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-engine.el (c-guess-basic-syntax, case 5N):
-	Check the format of c-state-cache is valid for an optimisation before
+	Check the format of c-state-cache is valid for an optimization before
 	using it.
 
 	* progmodes/cc-engine.el (c-guess-basic-syntax): New case 5Q "we
@@ -2840,11 +2840,11 @@
 	* progmodes/cc-cmds.el (c-context-line-break): Don't indent the
 	new line after an escaped EOL in a string.
 
-	* progmodes/cc-engine.el (c-forward-label): Recognise "foo:" as a
+	* progmodes/cc-engine.el (c-forward-label): Recognize "foo:" as a
 	label when it directly follows "else", "do", ....
 
 	* progmodes/cc-engine.el (c-backward-<>-arglist): Tolerate empty
-	angle brackets (as seen in "explicit specialisations" of C++
+	angle brackets (as seen in "explicit specializations" of C++
 	templates).
 
 	* progmodes/cc-vars.el (c-indentation-style): Mention c-file-style
@@ -2871,7 +2871,7 @@
 	* progmodes/cc-cmds.el (c-electric-slash): Extend the handling of
 	clean-up comment-close-slash also to work when there's a comment
 	terminator on the line.
-	(c-beginning-of-defun, c-end-of-defun): Refactor and optimise
+	(c-beginning-of-defun, c-end-of-defun): Refactor and optimize
 	these for large arg - only take account of top level {..}, except
 	for initial and final adjustments.  M-- C-M-[ae] now go to the
 	right defuns when the starting point is between defuns.  They use
@@ -3257,7 +3257,7 @@
 
 2006-12-17  Alan Mackenzie  <acm@muc.de>
 
-	* emacs-lisp/lisp.el (beginning-of-defun-raw): Optimise (for
+	* emacs-lisp/lisp.el (beginning-of-defun-raw): Optimize (for
 	speed) the case when open-paren-in-column-0-is-defun-start is nil.
 	Based on code by Martin Rudalics.
 
@@ -4124,7 +4124,7 @@
 2006-11-15  Simon Marshall  <simon@gnu.org>
 
 	* progmodes/cc-fonts.el (c-font-lock-declarators): Use c-at-toplevel-p
-	to recognise "T t()" as a function declaration, rather than a
+	to recognize "T t()" as a function declaration, rather than a
 	variable instantiation, iff at the top-level or inside a class
 	declaration.  Suggested by Feng Li <fengli@gmail.com>.
 
@@ -8722,7 +8722,7 @@
 
 	* progmodes/gdb-ui.el (gdb-same-frame): New option.
 	(gud-old-arrow, gdb-frame-begin, gdb-printing): New variables.
-	(gdb-init-1): Initialise them.
+	(gdb-init-1): Initialize them.
 	(gdb-starting): Reset gdb-printing.
 	(gdb-starting): Save value of gud-overlay-arrow-position.
 	(gdb-frame-begin): Set gdb-frame-begin, gdb-printing.
@@ -10937,7 +10937,7 @@
 
 2006-04-10  Nick Roberts  <nickrob@snap.net.nz>
 
-	* progmodes/gdb-ui.el (gdb-init-1): Re-initialise gdb-main-file to nil.
+	* progmodes/gdb-ui.el (gdb-init-1): Re-initialize gdb-main-file to nil.
 	(gdb-get-version): Make it work for pre "interpreter mi" (GDB 5.3?).
 	(gdb-setup-windows): Put something in source window if we can't find
 	the source file.
@@ -16153,7 +16153,7 @@
 	much cruft in cc-awk.el, cc-cmds.el and cc-engine.el to clear out.
 	* progmodes/cc-cmds.el:
 	(c-ascertain-adjacent-literal): In the backwards direction, now
-	recognises AWK regexp delimiters as string delimiters.
+	recognizes AWK regexp delimiters as string delimiters.
 	(c-after-statement-terminator-p): Adapt for virtual semicolons;
 	check more rigorously for "end of macro".
 	(c-back-over-illiterals, c-forward-over-illiterals): Adapt for
@@ -16280,7 +16280,7 @@
 
 	* progmodes/cc-cmds.el, cc-styles.el, cc-vars.el: New variables
 	c-string-par-start/separate c-sentence-end-with-esc-eol,
-	initialised in c-setup-paragraph-variables, used in string
+	initialized in c-setup-paragraph-variables, used in string
 	scanning subroutines of c-beginning-of-statement.
 
 	* progmodes/cc-cmds.el (c-electric-brace): Don't delete a comment
@@ -22315,7 +22315,7 @@
 	* ibuf-ext.el (ibuffer-auto-update-changed):
 	Use `frame-or-buffer-changed-p' to check whether we need to update.
 	(ibuffer-auto-mode): Don't advise `get-buffer-create' and
-	`kill-buffer'.  Initialise `ibuffer-auto-buffers-changed'
+	`kill-buffer'.  Initialize `ibuffer-auto-buffers-changed'
 	as a `frame-or-buffer-changed-p' state vector instead.
 
 2005-08-27  Romain Francoise  <romain@orebokech.com>

=== modified file 'lisp/ChangeLog.13'
--- lisp/ChangeLog.13	2011-11-17 17:40:48 +0000
+++ lisp/ChangeLog.13	2011-11-20 02:29:42 +0000
@@ -36,7 +36,7 @@
 2008-02-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* ps-print.el: Some face attributes (like :strike-through) were not
-	being recognised.  Reported by Leo <sdl.web@gmail.com>.
+	being recognized.  Reported by Leo <sdl.web@gmail.com>.
 	(ps-print-version): New version 7.3.2.
 	(ps-screen-to-bit-face): Fix code.  Call ps-face-strikeout-p,
 	ps-face-overline-p and ps-face-box-p functions.
@@ -4137,7 +4137,7 @@
 2008-01-14  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-engine.el (c-guess-basic-syntax): Prevent a macro
-	call inside a struct being recognised as a K&R argument.
+	call inside a struct being recognized as a K&R argument.
 
 2008-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -12544,7 +12544,7 @@
 	a weird set-buffer&prog1 combination.
 
 	* emacs-lisp/byte-opt.el (byte-optimize-if): Move `progn' out of the
-	test so as to optimise cases where the `progn's result is constant.
+	test so as to optimize cases where the `progn's result is constant.
 
 2007-08-23  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
@@ -13845,7 +13845,7 @@
 2007-07-24  Alan Mackenzie  <acm@muc.de>
 
 	* emacs-lisp/bytecomp.el (byte-compile-from-buffer):
-	Initialise byte-compile-unresolved-functions before rather than
+	Initialize byte-compile-unresolved-functions before rather than
 	after a compilation.
 	(byte-compile-unresolved-functions): Amplify doc string.
 
@@ -15917,7 +15917,7 @@
 	* help-mode.el (help-xref-forward-stack)
 	(help-xref-stack-forward-item, help-forward-label): New variables.
 	(help-forward): New button type.
-	(help-setup-xref): Initialise help-xref-forward-stack.
+	(help-setup-xref): Initialize help-xref-forward-stack.
 	(help-make-xrefs): Add forward button, if appropriate.
 	(help-xref-go-back): Push item on forward stack.
 	(help-xref-go-forward, help-go-forward): New functions.

=== modified file 'lisp/ChangeLog.14'
--- lisp/ChangeLog.14	2011-11-19 09:18:31 +0000
+++ lisp/ChangeLog.14	2011-11-20 02:29:42 +0000
@@ -14189,7 +14189,7 @@
 2008-04-19  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-thread-indicator): New variable.
-	(gdb-init-1): Initialise it.
+	(gdb-init-1): Initialize it.
 	(gdb-annotation-rules): New entry for "new-thread".
 	(gdb-thread-identification): New function to customize
 	mode-line-buffer-identification.
@@ -15994,11 +15994,11 @@
 2008-04-02  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-cmds.el (c-defun-name, c-cpp-define-name):
-	New optimised functions to get the name of the current defun/macro.
+	New optimized functions to get the name of the current defun/macro.
 
 	* add-log.el (add-log-current-defun): Move the functionality which
 	gets the current function name for C like modes to cc-cmds.el,
-	thus optimising for speed.
+	thus optimizing for speed.
 
 2008-04-02  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -19392,7 +19392,7 @@
 	* progmodes/cc-mode.el (c-basic-common-init): C and ObjC now use
 	syntax-table text properties.
 	(c-common-init): Call language specific before/after-change
-	functions at mode initialisation.
+	functions at mode initialization.
 	(c-new-BEG, c-new-END, c-old-BOM, c-old-EOM): New variables.
 	(c-extend-region-for-CPP, c-neutralize-CPP-line)
 	(c-neutralize-syntax-in-CPP): New functions.

=== modified file 'lisp/ChangeLog.15'
--- lisp/ChangeLog.15	2011-11-19 09:18:31 +0000
+++ lisp/ChangeLog.15	2011-11-20 02:29:42 +0000
@@ -2790,7 +2790,7 @@
 	* net/tramp-gw.el:
 	* net/tramp-imap.el:
 	* net/tramp-sh.el:
-	* net/tramp-smb.el: Add tramp-autoload cookie for initialisation
+	* net/tramp-smb.el: Add tramp-autoload cookie for initialization
 	code of `tramp-default-method-alist' and `tramp-default-user-alist'.
 
 2010-12-29  Karl Fogel  <kfogel@red-bean.com>
@@ -7632,7 +7632,7 @@
 	(post-self-insert-hook): Use it.
 
 	* emacs-lisp/pcase.el (pcase-split-memq):
-	Fix overenthusiastic optimisation.
+	Fix overenthusiastic optimization.
 	(pcase-u1): Handle the case of a lambda pred.
 
 2010-08-31  Kenichi Handa  <handa@m17n.org>
@@ -9381,7 +9381,7 @@
 
 	Fix an indentation bug:
 
-	* progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END.
+	* progmodes/cc-mode.el (c-common-init): Initialize c-new-BEG/END.
 	(c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account
 	of existing values.
 
@@ -14596,7 +14596,7 @@
 2009-12-05  Kevin Ryde  <user42@zip.com.au>
 
 	* textmodes/sgml-mode.el (sgml-lexical-context):
-	Recognise comment-start-skip to comment-end-skip as comment (Bug#4781).
+	Recognize comment-start-skip to comment-end-skip as comment (Bug#4781).
 
 2009-12-05  Juri Linkov  <juri@jurta.org>
 

=== modified file 'lisp/ChangeLog.2'
--- lisp/ChangeLog.2	2011-11-19 09:18:31 +0000
+++ lisp/ChangeLog.2	2011-11-20 02:29:42 +0000
@@ -2190,7 +2190,7 @@
 1986-12-15  Richard Mlynarik  (mly@prep)
 
 	* fortran.el:
-	Initialise fortran-mode-abbrev-table correctly.
+	Initialize fortran-mode-abbrev-table correctly.
 
 	* fortran.el:
 	fortran-comment-indent-char should be a character (a fixnum), not

=== modified file 'lisp/ChangeLog.4'
--- lisp/ChangeLog.4	2011-01-25 04:08:28 +0000
+++ lisp/ChangeLog.4	2011-11-20 02:29:42 +0000
@@ -2462,7 +2462,7 @@
 1994-03-03  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
 	* cmuscheme.el (inferior-scheme-mode): Removed unnecessary
-	initialisation of comint-input-sentinel.
+	initialization of comint-input-sentinel.
 
 	* shell.el (shell-dynamic-complete-functions): New variable.
 	(shell-mode): Use it to set comint-dynamic-complete-functions.
@@ -4958,7 +4958,7 @@
 1993-11-08  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
 	* comint.el (comint-preinput-scroll-to-bottom): Added
-	comint-magic-space to list of commands recognised as inserting.
+	comint-magic-space to list of commands recognized as inserting.
 
 	* comint.el (comint-output-filter): Corrected check for killed
 	buffer.
@@ -5202,7 +5202,7 @@
 
 	* comint.el (comint-last-output-start): New variable to record
 	where most recent process output started from.
-	(comint-mode): Initialise it.
+	(comint-mode): Initialize it.
 	(comint-output-filter): Set it.
 
 	* comint.el (comint-previous-matching-input-string): Moved to
@@ -5220,7 +5220,7 @@
 	they move within the buffer rather than do input.
 
 	* comint.el (comint-send-input, comint-after-pmark-p)
-	(comint-kill-input, comint-proc-query): Removed serialisation of
+	(comint-kill-input, comint-proc-query): Removed serialization of
 	obtaining the process mark's marker-position.
 
 	* comint.el, shell.el: Commented out comint/shell-load-hooks.
@@ -8952,4 +8952,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'lisp/ChangeLog.5'
--- lisp/ChangeLog.5	2011-11-16 17:47:25 +0000
+++ lisp/ChangeLog.5	2011-11-20 02:29:42 +0000
@@ -6165,7 +6165,7 @@
 
 1994-10-05  Simon Marshall  <Simon.Marshall@mail.esrin.esa.it>
 
-	* comint.el (comint-check-proc): Recognise `open'.
+	* comint.el (comint-check-proc): Recognize `open'.
 	(comint-exec): Use open-network-stream if command is a cons pair.
 
 	* font-lock.el (compilation-mode-font-lock-keywords,
@@ -6954,7 +6954,7 @@
 
 1994-09-19  Francesco Potortì  <pot@cnuce.cnr.it>
 
-	* rlogin.el (rlogin): Recognise the `-l user' option to rlogin and
+	* rlogin.el (rlogin): Recognize the `-l user' option to rlogin and
 	let comint and ange-ftp know about the correct home directory.
 
 1994-09-19  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -9280,4 +9280,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'lisp/ChangeLog.6'
--- lisp/ChangeLog.6	2011-07-14 01:09:00 +0000
+++ lisp/ChangeLog.6	2011-11-20 02:29:42 +0000
@@ -1491,9 +1491,9 @@
 
 1996-04-16  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
-	* vc.el (vc-comment-ring): Initialise using make-ring.
-	(vc-clear-context): Initialise vc-comment-ring using make-ring.
-	(vc-finish-logentry): Don't initialise vc-comment-ring here.
+	* vc.el (vc-comment-ring): Initialize using make-ring.
+	(vc-clear-context): Initialize vc-comment-ring using make-ring.
+	(vc-finish-logentry): Don't initialize vc-comment-ring here.
 
 1996-04-15  Eric Ding  <ericding@mit.edu>
 
@@ -3055,7 +3055,7 @@
 	(font-lock-mode): Use them.  Doc fix.
 	Don't make font-lock-fontified buffer local here.
 	(font-lock-set-defaults): Do it here.
-	(font-lock-compile-keyword): New function.  Recognise `eval' keywords.
+	(font-lock-compile-keyword): New function.  Recognize `eval' keywords.
 	(font-lock-compile-keywords): Use it.
 	(global-font-lock-mode): New command for Global Font Lock mode.
 	(font-lock-global-modes): New variable.
@@ -8038,4 +8038,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'lisp/ChangeLog.8'
--- lisp/ChangeLog.8	2011-11-16 17:47:25 +0000
+++ lisp/ChangeLog.8	2011-11-20 02:29:42 +0000
@@ -6259,7 +6259,7 @@
 	* sql.el: Added keywords from `finder-by-keyword'.
 	(sql-mode): Made sql-buffer a local variable, changed the
 	documentation: removed instructions to add *.sql files to
-	auto-mode-alist, added documentation for having mutliple SQL
+	auto-mode-alist, added documentation for having multiple SQL
 	buffers sending their stuff to different SQLi buffers, each
 	running a different process.
 	(sql-postgres): Quoted *SQL* in doc string.
@@ -6270,7 +6270,7 @@
 	(sql-sybase): Quoted *SQL* in doc string, added comma.
 	(sql-oracle): Likewise.
 	(sql-interactive-mode): Added extensive documentation for having
-	mutliple SQL buffers sending their stuff to different SQLi
+	multiple SQL buffers sending their stuff to different SQLi
 	buffers, each running a different process.
 	(sql-buffer): Changed doc from *SQL* to SQLi.
 	(sql-get-login): Doc fix.

=== modified file 'lisp/ChangeLog.9'
--- lisp/ChangeLog.9	2011-11-17 17:40:48 +0000
+++ lisp/ChangeLog.9	2011-11-20 02:29:42 +0000
@@ -40,7 +40,7 @@
 2001-10-17  Francesco Potortì  <pot@gnu.org>
 
 	* comint.el (comint-password-prompt-regexp): Make it less
-	restrictive, letting comint recognise OpenSSH2 passphrase prompts.
+	restrictive, letting comint recognize OpenSSH2 passphrase prompts.
 
 2001-10-17  John Wiegley  <johnw@gnu.org>
 

=== modified file 'lisp/allout.el'
--- lisp/allout.el	2011-11-17 17:40:48 +0000
+++ lisp/allout.el	2011-11-20 02:29:42 +0000
@@ -825,7 +825,7 @@
 (defcustom allout-encrypt-unencrypted-on-saves t
   "If non-nil, topics pending encryption are encrypted during buffer saves.
 
-This provents file-system exposure of un-encrypted contents of
+This prevents file-system exposure of un-encrypted contents of
 items marked for encryption.
 
 When non-nil, if the topic currently being edited is decrypted,
@@ -2283,7 +2283,7 @@
 determine whether or not this one is determined to be aberrant.
 
 If true, then the allout-recent-* settings are calibrated on the
-offspring that qaulifies it as aberrant, ie with depth that
+offspring that qualifies it as aberrant, ie with depth that
 exceeds the topic by more than one."
 
   ;; This is most clearly understood when considering standard-prefix-leader

=== modified file 'lisp/autorevert.el'
--- lisp/autorevert.el	2011-10-19 12:54:24 +0000
+++ lisp/autorevert.el	2011-11-20 02:29:42 +0000
@@ -77,7 +77,7 @@
 ;;   M-x global-auto-revert-mode RET
 ;;
 ;; To activate Global Auto-Revert Mode every time Emacs is started
-;; customise the option `global-auto-revert-mode' or the following
+;; customize the option `global-auto-revert-mode' or the following
 ;; line could be added to your ~/.emacs:
 ;;   (global-auto-revert-mode 1)
 ;;

=== modified file 'lisp/calc/calc-bin.el'
--- lisp/calc/calc-bin.el	2011-01-25 04:08:28 +0000
+++ lisp/calc/calc-bin.el	2011-11-20 02:29:42 +0000
@@ -291,7 +291,7 @@
 	  (if (eq (car-safe b) 'mod)
 	      (if (equal mod (nth 2 b))
 		  (setq b (nth 1 b))
-		(math-reject-arg b "*Inconsistent modulos"))))
+		(math-reject-arg b "*Inconsistent modulus"))))
       (setq mod (nth 2 b)
 	    b (nth 1 b)))
     (if (Math-messy-integerp mod)
@@ -303,9 +303,9 @@
 	  (if w
 	      (if (/= w bits)
 		  (calc-record-why
-		   "*Warning: Modulo inconsistent with word size"))
+		   "*Warning: Modulus inconsistent with word size"))
 	    (setq w bits))
-	(calc-record-why "*Warning: Modulo is not a power of 2"))
+	(calc-record-why "*Warning: Modulus is not a power of 2"))
       (math-make-mod (if b
 			 (funcall f a b w)
 		       (funcall f a w))

=== modified file 'lisp/calc/calc-poly.el'
--- lisp/calc/calc-poly.el	2011-01-25 04:08:28 +0000
+++ lisp/calc/calc-poly.el	2011-11-20 02:29:42 +0000
@@ -419,7 +419,7 @@
 	(list 'frac 1 denom))
     1))
 
-;;; Compute the GCD of two monovariate polynomial lists.
+;;; Compute the GCD of two univariate polynomial lists.
 ;;; Knuth section 4.6.1, algorithm C.
 (defun math-poly-gcd-coefs (u v)
   (let ((d (math-poly-gcd (math-poly-gcd-list u)

=== modified file 'lisp/calendar/diary-lib.el'
--- lisp/calendar/diary-lib.el	2011-06-25 22:33:29 +0000
+++ lisp/calendar/diary-lib.el	2011-11-20 02:29:42 +0000
@@ -147,7 +147,7 @@
 Nil means there are no comments.  The diary does not display
 parts of entries that are inside comments.  You can use comments
 for whatever you like, e.g. for meta-data that packages such as
-`appt.el' can use.  Comments may not span mutliple lines, and there
+`appt.el' can use.  Comments may not span multiple lines, and there
 can be only one comment on any line.
 See also `diary-comment-end'."
   :version "24.1"

=== modified file 'lisp/calendar/todo-mode.el'
--- lisp/calendar/todo-mode.el	2011-11-15 07:55:13 +0000
+++ lisp/calendar/todo-mode.el	2011-11-20 02:29:42 +0000
@@ -61,14 +61,14 @@
 ;;
 ;;      The TODO list file has a special format and some auxiliary
 ;;      information, which will be added by the todo-show function if
-;;      it attempts to visit an un-initialised file.  Hence it is
+;;      it attempts to visit an un-initialized file.  Hence it is
 ;;      recommended to use the todo-show function for the first time,
-;;      in order to initialise the file, but it is not necessary
+;;      in order to initialize the file, but it is not necessary
 ;;      afterwards.
 ;;
 ;;      As these commands are quite long to type, I would recommend
 ;;      the addition of two bindings to your to your global keymap.  I
-;;      personally have the following in my initialisation file:
+;;      personally have the following in my initialization file:
 ;;
 ;;          (global-set-key "\C-ct" 'todo-show)  ; switch to TODO buffer
 ;;	    (global-set-key "\C-ci" 'todo-insert-item) ; insert new item

=== modified file 'lisp/cedet/semantic/bovine/el.el'
--- lisp/cedet/semantic/bovine/el.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/bovine/el.el	2011-11-20 02:29:42 +0000
@@ -863,7 +863,7 @@
 In Emacs Lisp, a prototype for something may start (autoload ...).
 This is certainly not expected if this is used to display a summary.
 Make up something else.  When we go to write something that needs
-a real Emacs Lisp protype, we can fix it then."
+a real Emacs Lisp prototype, we can fix it then."
   (let ((class (semantic-tag-class tag))
 	(name (semantic-format-tag-name tag parent color))
 	)

=== modified file 'lisp/cedet/semantic/complete.el'
--- lisp/cedet/semantic/complete.el	2011-11-17 17:40:48 +0000
+++ lisp/cedet/semantic/complete.el	2011-11-20 02:29:42 +0000
@@ -1025,7 +1025,7 @@
   ((obj semantic-collector-abstract) prefix)
   "For OBJ, do whatepsace completion based on PREFIX.
 This implies that if there are two completions, one matching
-the test \"preifx\\>\", and one not, the one matching the full
+the test \"prefix\\>\", and one not, the one matching the full
 word version of PREFIX will be chosen, and that text returned.
 This function requires that `semantic-collector-calculate-completions'
 has been run first."

=== modified file 'lisp/cedet/semantic/db-javascript.el'
--- lisp/cedet/semantic/db-javascript.el	2011-01-26 08:36:39 +0000
+++ lisp/cedet/semantic/db-javascript.el	2011-11-20 02:29:42 +0000
@@ -151,7 +151,7 @@
 
 ;;; Usage
 ;;
-;; Unlike other tables, an omniscent database does not need to
+;; Unlike other tables, an omniscient database does not need to
 ;; be associated with a path.  Use this routine to always add ourselves
 ;; to a search list.
 (define-mode-local-override semanticdb-find-translate-path javascript-mode

=== modified file 'lisp/cedet/semantic/db.el'
--- lisp/cedet/semantic/db.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/db.el	2011-11-20 02:29:42 +0000
@@ -636,7 +636,7 @@
   (when (featurep 'semantic/lex-spp)
     (oset table lexical-table (semantic-lex-spp-save-table)))
 
-  ;; Incremental parser doesn't mokey around with this.
+  ;; Incremental parser doesn't monkey around with this.
   (oset table unmatched-syntax semantic-unmatched-syntax-cache)
 
   ;; Synchronize the index

=== modified file 'lisp/cedet/semantic/edit.el'
--- lisp/cedet/semantic/edit.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/edit.el	2011-11-20 02:29:42 +0000
@@ -392,7 +392,7 @@
 	      ;; There are no tags left, and all tags originally
 	      ;; found are encompassed by the change.  Setup our list
 	      ;; from the cache
-	      (setq list-to-search semantic--buffer-cache);; We have a tag ouside the list.  Check for
+	      (setq list-to-search semantic--buffer-cache);; We have a tag outside the list.  Check for
 	    ;; We know we have a parent because it would
 	    ;; completely cover the change.  A tag can only
 	    ;; do that if it is a parent after we get here.

=== modified file 'lisp/cedet/semantic/imenu.el'
--- lisp/cedet/semantic/imenu.el	2011-11-14 21:00:24 +0000
+++ lisp/cedet/semantic/imenu.el	2011-11-20 02:29:42 +0000
@@ -368,7 +368,7 @@
                      semantic-imenu-expandable-tag-classes)
 	       children
                )
-          ;; to keep an homogeneous menu organisation, type menu items
+          ;; to keep an homogeneous menu organization, type menu items
           ;; always have a sub-menu with at least the *definition*
           ;; item (even if the tag has no type components)
 	  (progn

=== modified file 'lisp/cedet/semantic/lex.el'
--- lisp/cedet/semantic/lex.el	2011-11-16 12:34:47 +0000
+++ lisp/cedet/semantic/lex.el	2011-11-20 02:29:42 +0000
@@ -1362,11 +1362,11 @@
     ))
 
 (define-lex-simple-regex-analyzer semantic-lex-open-paren
-  "Detect and create an open parenthisis token."
+  "Detect and create an open parenthesis token."
   "\\s(" 'open-paren 0  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth)))
 
 (define-lex-simple-regex-analyzer semantic-lex-close-paren
-  "Detect and create a close paren token."
+  "Detect and create a close parenthesis token."
   "\\s)" 'close-paren 0 (setq semantic-lex-current-depth (1- semantic-lex-current-depth)))
 
 (define-lex-regex-analyzer semantic-lex-string

=== modified file 'lisp/cedet/semantic/tag.el'
--- lisp/cedet/semantic/tag.el	2011-01-25 04:08:28 +0000
+++ lisp/cedet/semantic/tag.el	2011-11-20 02:29:42 +0000
@@ -1162,7 +1162,7 @@
        (semantic-tag-components-with-overlays tag)))))
 
 (defun semantic--tag-unlink-cache-from-buffer ()
-  "Convert all tags in the current cache to use overlay proxys.
+  "Convert all tags in the current cache to use overlay proxies.
 This function is for internal use only."
   (require 'semantic)
   (semantic--tag-unlink-list-from-buffer

=== modified file 'lisp/cedet/semantic/texi.el'
--- lisp/cedet/semantic/texi.el	2011-11-19 09:18:31 +0000
+++ lisp/cedet/semantic/texi.el	2011-11-20 02:29:42 +0000
@@ -262,7 +262,7 @@
       (let ((parenthetical (semantic-up-context-default))
 	    )
 	(when (not parenthetical)
-	  ;; We are in parenthises.  Are they the types of parens
+	  ;; We are in parentheses.  Are they the types of parens
 	  ;; belonging to a texinfo construct?
 	  (forward-word -1)
 	  (when (looking-at "@\\w+{")

=== modified file 'lisp/cedet/srecode/ctxt.el'
--- lisp/cedet/srecode/ctxt.el	2011-11-14 23:59:56 +0000
+++ lisp/cedet/srecode/ctxt.el	2011-11-20 02:29:42 +0000
@@ -64,7 +64,7 @@
      \"comment\"  - In a comment in a block of code
      -- these items show up at the end of the context list. --
      \"public\", \"protected\", \"private\" -
-                  In or near a section of public/pritected/private entries.
+                  In or near a section of public/protected/private entries.
   \"code\" - In a block of code.
      \"string\" - In a string in a block of code
      \"comment\"  - In a comment in a block of code

=== modified file 'lisp/cedet/srecode/find.el'
--- lisp/cedet/srecode/find.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/srecode/find.el	2011-11-20 02:29:42 +0000
@@ -238,7 +238,7 @@
 	   (tabs (when mt (oref mt :tables)))
 	   )
       (while tabs
-	;; Exclude templates for a perticular application.
+	;; Exclude templates for a particular application.
 	(when (and (not (oref (car tabs) :application))
 		   (srecode-template-table-in-project-p (car tabs)))
 	  (maphash (lambda (key temp)

=== modified file 'lisp/comint.el'
--- lisp/comint.el	2011-11-14 23:59:56 +0000
+++ lisp/comint.el	2011-11-20 02:29:42 +0000
@@ -2568,7 +2568,7 @@
 	   ;; First usage; initialize to a marker
 	   (setq comint-insert-previous-argument-last-start-pos
 		 (make-marker)))))
-  ;; Make sure we're not in the prompt, and add a beginning space if necess.
+  ;; Make sure we're not in the prompt, and add a beginning space if necessary.
   (if (<= (point) (comint-line-beginning-position))
       (comint-bol)
     (just-one-space))

=== modified file 'lisp/dframe.el'
--- lisp/dframe.el	2011-11-11 10:04:08 +0000
+++ lisp/dframe.el	2011-11-20 02:29:42 +0000
@@ -96,7 +96,7 @@
 ;;   dframe-track-mouse, dframe-help-echo-function --
 ;;    These variables need to be set to functions that display info
 ;;    based on the mouse's position.
-;;   Text propert 'help-echo, set to `dframe-help-echo', which will
+;;   Text property 'help-echo, set to `dframe-help-echo', which will
 ;;    call `dframe-help-echo-function'.
 ;;   Have a `-click' function, it can call `dframe-quick-mouse' for
 ;;    positioning.  If the variable `dframe-power-click' is non-nil,
@@ -136,7 +136,7 @@
 is not useful to the user.")
 
 (defcustom dframe-update-speed
-  (if (featurep 'xemacs) 2		; 1 is too obrusive in XEmacs
+  (if (featurep 'xemacs) 2		; 1 is too obtrusive in XEmacs
     1)
   "Idle time in seconds needed before dframe will update itself.
 Updates occur to allow dframe to display directory information

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2011-11-17 09:09:20 +0000
+++ lisp/emacs-lisp/bytecomp.el	2011-11-20 02:29:42 +0000
@@ -2195,7 +2195,7 @@
 	   (byte-compile-keep-pending form)))))
 
 ;; Functions and variables with doc strings must be output separately,
-;; so make-docfile can recognise them.  Most other things can be output
+;; so make-docfile can recognize them.  Most other things can be output
 ;; as byte-code.
 
 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload)

=== modified file 'lisp/emacs-lisp/checkdoc.el'
--- lisp/emacs-lisp/checkdoc.el	2011-10-20 00:26:14 +0000
+++ lisp/emacs-lisp/checkdoc.el	2011-11-20 02:29:42 +0000
@@ -2118,7 +2118,7 @@
 	      ;; Find out how we spell-check this word.
 	      (if (or
 		   ;; All caps w/ option th, or s tacked on the end
-		   ;; for pluralization or numberthness.
+		   ;; for pluralization or number.
 		   (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word)
 		   (looking-at "}") ; a keymap expression
 		   )

=== modified file 'lisp/emacs-lisp/eieio-base.el'
--- lisp/emacs-lisp/eieio-base.el	2011-11-14 20:23:26 +0000
+++ lisp/emacs-lisp/eieio-base.el	2011-11-20 02:29:42 +0000
@@ -178,7 +178,7 @@
 ;; calculate path names relative to a given instance.  This will
 ;; make the saved object location independent by converting all file
 ;; references to be relative to the directory the object is saved to.
-;; You must call `eieio-peristent-path-relative' on each file name
+;; You must call `eieio-persistent-path-relative' on each file name
 ;; saved in your object.
 (defclass eieio-persistent ()
   ((file :initarg :file

=== modified file 'lisp/emulation/edt-mapper.el'
--- lisp/emulation/edt-mapper.el	2011-01-25 04:08:28 +0000
+++ lisp/emulation/edt-mapper.el	2011-11-20 02:29:42 +0000
@@ -151,7 +151,7 @@
 ;;; Logic in simple.el maps some of these unassigned function keys to
 ;;; ordinary typing keys.  Where this is the case, a call to
 ;;; read-key-sequence, below, does not return the name of the function
-;;; key pressd by the user but, instead, it returns the name of the
+;;; key pressed by the user but, instead, it returns the name of the
 ;;; key to which it has been mapped.  It needs to know the name of the
 ;;; key pressed by the user. As a workaround, we assign a function to
 ;;; each of the unassigned function keys of interest, here.  These

=== modified file 'lisp/emulation/viper-ex.el'
--- lisp/emulation/viper-ex.el	2011-01-25 04:08:28 +0000
+++ lisp/emulation/viper-ex.el	2011-11-20 02:29:42 +0000
@@ -259,7 +259,7 @@
 (defvar ex-addresses nil)
 
 ;; This flag is supposed to be set only by `#', `print', and `list',
-;; none of which is implemented.  So, it and the pices of the code it
+;; none of which is implemented.  So, it and the pieces of the code it
 ;; controls are dead weight.  We keep it just in case this might be
 ;; needed in the future.
 (defvar ex-flag nil)

=== modified file 'lisp/emulation/viper-mous.el'
--- lisp/emulation/viper-mous.el	2011-01-25 04:08:28 +0000
+++ lisp/emulation/viper-mous.el	2011-11-20 02:29:42 +0000
@@ -95,7 +95,7 @@
 
 ;; remembers prefix argument to pass along to commands invoked by second
 ;; click.
-;; This is needed because in Emacs (not XEmacs), assigning to preix-arg
+;; This is needed because in Emacs (not XEmacs), assigning to prefix-arg
 ;; causes Emacs to count the second click as if it was a single click
 (defvar viper-global-prefix-argument nil)
 

=== modified file 'lisp/erc/ChangeLog.01'
--- lisp/erc/ChangeLog.01	2011-11-15 00:54:19 +0000
+++ lisp/erc/ChangeLog.01	2011-11-20 02:29:42 +0000
@@ -912,7 +912,7 @@
 	fixed one occurrence of a setq with only one argument (XEmacs didn't like that)
 
 	* erc.el 1.28:
-	Added erc-next-line-add-newlines customisation possibility.
+	Added erc-next-line-add-newlines customization possibility.
 
 	* erc.el 1.27:
 	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
@@ -940,8 +940,7 @@
 
 	* erc.el 1.21: typo
 
-	* erc.el 1.20: ommit
-	:wq
+	* erc.el 1.20: omit
 
 2001-07-06  Alex Schroeder  <alex@gnu.org>
 

=== modified file 'lisp/erc/ChangeLog.02'
--- lisp/erc/ChangeLog.02	2011-11-15 00:54:19 +0000
+++ lisp/erc/ChangeLog.02	2011-11-20 02:29:42 +0000
@@ -343,7 +343,7 @@
 2002-12-14  Damien Elmes  <erc@repose.cx>
 
 	* erc.el 1.361:
-	last-peers: initialise to a cons. thanks to Francis Litterio
+	last-peers: initialize to a cons. thanks to Francis Litterio
 	    <franl@world.std.com> for the patch
 
 	* erc.el 1.360:
@@ -2616,4 +2616,3 @@
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-

=== modified file 'lisp/erc/ChangeLog.03'
--- lisp/erc/ChangeLog.03	2011-11-15 17:37:37 +0000
+++ lisp/erc/ChangeLog.03	2011-11-20 02:29:42 +0000
@@ -1425,7 +1425,7 @@
 	reference argument directly - no string matching
 
 	* erc.el 1.445 (erc-extract-command-from-line):
-	hmm, thinko in the canonicalisation. should
+	hmm, thinko in the canonicalization. should
 	    be fixed
 
 2003-01-16  Francis Litterio  <franl@users.sourceforge.net>

=== modified file 'lisp/erc/erc-log.el'
--- lisp/erc/erc-log.el	2011-01-25 04:08:28 +0000
+++ lisp/erc/erc-log.el	2011-11-20 02:29:42 +0000
@@ -50,7 +50,7 @@
 ;;       erc-log-write-after-send t
 ;;       erc-log-write-after-insert t)
 ;;
-;; If you only want to save logs for some buffers, customise the
+;; If you only want to save logs for some buffers, customize the
 ;; variable `erc-enable-logging'.
 
 ;; How it works:
@@ -450,4 +450,3 @@
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-

=== modified file 'lisp/erc/erc-match.el'
--- lisp/erc/erc-match.el	2011-01-25 04:08:28 +0000
+++ lisp/erc/erc-match.el	2011-11-20 02:29:42 +0000
@@ -36,7 +36,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-;; Customisation:
+;; Customization:
 
 (defgroup erc-match nil
   "Keyword and Friend/Foe/... recognition.
@@ -633,4 +633,3 @@
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-

=== modified file 'lisp/erc/erc-track.el'
--- lisp/erc/erc-track.el	2011-10-20 00:26:14 +0000
+++ lisp/erc/erc-track.el	2011-11-20 02:29:42 +0000
@@ -1040,7 +1040,7 @@
 		   ((oldest leastactive)
 		    (- (length erc-modified-channels-alist) arg))
 		   (t (1- arg))))
-    ;; normalise out of range user input
+    ;; normalize out of range user input
     (cond ((>= offset (length erc-modified-channels-alist))
 	   (setq offset (1- (length erc-modified-channels-alist))))
 	  ((< offset 0)
@@ -1075,4 +1075,3 @@
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-

=== modified file 'lisp/erc/erc.el'
--- lisp/erc/erc.el	2011-11-19 09:18:31 +0000
+++ lisp/erc/erc.el	2011-11-20 02:29:42 +0000
@@ -5797,7 +5797,7 @@
   "Give information about the nickname at `point'.
 
 If called interactively, give a human readable message in the
-minibuffer.  If called programatically, return the corresponding
+minibuffer.  If called programmatically, return the corresponding
 entry of `channel-members'."
   (interactive)
   (require 'thingatpt)

=== modified file 'lisp/eshell/em-pred.el'
--- lisp/eshell/em-pred.el	2011-05-23 17:57:17 +0000
+++ lisp/eshell/em-pred.el	2011-11-20 02:29:42 +0000
@@ -173,7 +173,7 @@
 
 FILE ATTRIBUTES:
   l[+-]N                 +/-/= N links
-  a[Mwhms][+-](N|'FILE') access time +/-/= N mnths/weeks/hours/mins/secs
+  a[Mwhms][+-](N|'FILE') access time +/-/= N months/weeks/hours/mins/secs
 			 (days if unspecified) if FILE specified,
 			 use as comparison basis; so a+'file.c'
 			 shows files accessed before file.c was

=== modified file 'lisp/eshell/em-term.el'
--- lisp/eshell/em-term.el	2011-03-05 04:11:05 +0000
+++ lisp/eshell/em-term.el	2011-11-20 02:29:42 +0000
@@ -24,7 +24,7 @@
 ;; At the moment, eshell is stream-based in its interactive input and
 ;; output.  This means that full-screen commands, such as "vi" or
 ;; "lynx", will not display correctly.  These are therefore thought of
-;; as "visual" programs.  In order to run these progrem under Emacs,
+;; as "visual" programs.  In order to run these programs under Emacs,
 ;; Eshell uses the term.el package, and invokes them in a separate
 ;; buffer, giving the illusion that Eshell itself is allowing these
 ;; visual processes to execute.

=== modified file 'lisp/files.el'
--- lisp/files.el	2011-11-14 20:23:26 +0000
+++ lisp/files.el	2011-11-20 02:29:42 +0000
@@ -5790,7 +5790,7 @@
 
          ;; vc dired listings provide the state or blanks between file
          ;; permissions and date.  The state is always surrounded by
-         ;; parantheses:
+         ;; parentheses:
          ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el
          ;; This is not supported yet.
     (purecopy (concat "\\([0-9][BkKMGTPEZY]? " iso

=== modified file 'lisp/foldout.el'
--- lisp/foldout.el	2011-01-25 04:08:28 +0000
+++ lisp/foldout.el	2011-11-20 02:29:42 +0000
@@ -111,9 +111,9 @@
 ;; setup a lot easier.
 ;;
 ;; folding.el by Jamie Lokier <u90jl@ecs.ox.ac.uk> supports folding by
-;; recognising special marker text in you file.
+;; recognizing special marker text in you file.
 ;;
-;; c-outline.el (by me) provides outline-mode support to recognise `C'
+;; c-outline.el (by me) provides outline-mode support to recognize `C'
 ;; statements as outline headings, so with foldout you can have a folding `C'
 ;; code editor without having to put in start- and end-of-fold markers.  This
 ;; is a real winner!

=== modified file 'lisp/font-core.el'
--- lisp/font-core.el	2011-10-19 12:54:24 +0000
+++ lisp/font-core.el	2011-11-20 02:29:42 +0000
@@ -210,7 +210,7 @@
 ;; A few people have hassled in the past for a way to make it easier to turn on
 ;; Font Lock mode, without the user needing to know for which modes s/he has to
 ;; turn it on, perhaps the same way hilit19.el/hl319.el does.  I've always
-;; balked at that way, as I see it as just re-moulding the same problem in
+;; balked at that way, as I see it as just re-molding the same problem in
 ;; another form.  That is; some person would still have to keep track of which
 ;; modes (which may not even be distributed with Emacs) support Font Lock mode.
 ;; The list would always be out of date.  And that person might have to be me.

=== modified file 'lisp/forms.el'
--- lisp/forms.el	2011-04-19 13:44:55 +0000
+++ lisp/forms.el	2011-11-20 02:29:42 +0000
@@ -1295,7 +1295,7 @@
   )
 
 (defun forms--mode-menu-ro (map)
-;;; Menu initialisation
+;;; Menu initialization
 ;  (define-key map [menu-bar] (make-sparse-keymap))
   (define-key map [menu-bar forms]
     (cons "Forms" (make-sparse-keymap "Forms")))
@@ -1341,7 +1341,7 @@
   (put 'forms-delete-record 'menu-enable '(not forms-read-only))
 )
 (defun forms--mode-menu-edit (map)
-;;; Menu initialisation
+;;; Menu initialization
 ;  (define-key map [menu-bar] (make-sparse-keymap))
   (define-key map [menu-bar forms]
     (cons "Forms" (make-sparse-keymap "Forms")))

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2011-11-16 17:47:25 +0000
+++ lisp/gnus/ChangeLog	2011-11-20 02:29:42 +0000
@@ -332,7 +332,7 @@
 	decoding nnimap groups.
 
 	* gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the
-	newsrc file.  It doesn't seem like an important optimisation any more.
+	newsrc file.  It doesn't seem like an important optimization any more.
 
 2011-09-10  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
@@ -985,7 +985,7 @@
 	* nnimap.el (nnimap-process-expiry-targets): Say what target we're
 	expiring articles to.
 
-	* mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4
+	* mm-util.el (mm-charset-to-coding-system): Recognize all ANSI.x3.4
 	variations as ASCII (bug#5458).
 
 2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
@@ -4504,7 +4504,7 @@
 
 2010-10-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* shr.el (shr-tag-span): Drop colorisation of regions since we don't
+	* shr.el (shr-tag-span): Drop colorization of regions since we don't
 	control the background color.
 	(shr-tag-img): Ignore very small web bug type images.
 	(shr-put-image): Add help-echo alt texts to the images.
@@ -11860,7 +11860,7 @@
 
 	* message.el (message-font-lock-keywords): Use message-header-xheader
 	face for "X-Foo", its apparent intended purpose.  Move "X-" pattern
-	ahead of the anything pattern, to get it recognised.
+	ahead of the anything pattern, to get it recognized.
 
 2007-05-12  Michaël Cadilhac  <michael@cadilhac.name>
 
@@ -14905,7 +14905,7 @@
 	(nnweb-request-list): Don't list bogus groups.  There can only be one.
 	(nnweb-request-create-group): Don't use ARGS.
 	(nnweb-possibly-change-server, nnweb-request-group): Remove some
-	initialisations.  Let nnoo do the work.
+	initializations.  Let nnoo do the work.
 
 2006-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 

=== modified file 'lisp/gnus/ChangeLog.2'
--- lisp/gnus/ChangeLog.2	2011-11-17 17:40:48 +0000
+++ lisp/gnus/ChangeLog.2	2011-11-20 02:29:42 +0000
@@ -10428,7 +10428,7 @@
 	* mml-sec.el (mml-secure-message-encrypt-smime): New.
 	* mml-sec.el (mml-secure-message-encrypt-pgp): New.
 	* mml-sec.el (mml-secure-message-encrypt-pgpmime): New.
-	* mml.el (mml-parse-1): Added code to recognise the secure tag and
+	* mml.el (mml-parse-1): Added code to recognize the secure tag and
 	convert it to either a part or multipart depending on if there are
 	other parts in the message.
 	* mml.el (mml-mode-map): Changed default sign/encrypt keybindings

=== modified file 'lisp/gnus/gnus-agent.el'
--- lisp/gnus/gnus-agent.el	2011-11-19 09:18:31 +0000
+++ lisp/gnus/gnus-agent.el	2011-11-20 02:29:42 +0000
@@ -3232,7 +3232,7 @@
 
 	 ;; Convert the keep lists to elements that look like (article#
 	 ;; nil keep_flag nil) then append it to the expanded dlist
-	 ;; These statements are sorted by ascending precidence of the
+	 ;; These statements are sorted by ascending precedence of the
 	 ;; keep_flag.
 	 (setq dlist (nconc dlist
 			    (mapcar (lambda (e)

=== modified file 'lisp/gnus/nndiary.el'
--- lisp/gnus/nndiary.el	2011-11-17 09:09:20 +0000
+++ lisp/gnus/nndiary.el	2011-11-20 02:29:42 +0000
@@ -55,7 +55,7 @@
 
 ;; * nnoo. NNDiary is very similar to nnml. This makes the idea of using nnoo
 ;;   (to derive nndiary from nnml) natural. However, my experience with nnoo
-;;   is that for reasonably complex back ends like this one, noo is a burden
+;;   is that for reasonably complex back ends like this one, nnoo is a burden
 ;;   rather than an help. It's tricky to use, not everything can be inherited,
 ;;   what can be inherited and when is not very clear, and you've got to be
 ;;   very careful because a little mistake can fuck up your other back ends,
@@ -1320,7 +1320,7 @@
       (or minute (setq minute 59))
       (or hour (setq hour 23))
       ;; I'll just compute all possible values and test them by decreasing
-      ;; order until one succeeds. This is probably quide rude, but I got
+      ;; order until one succeeds. This is probably quite rude, but I got
       ;; bored in finding a good algorithm for doing that ;-)
       ;; ### FIXME: remove identical entries.
       (let ((dom-list (nth 2 sched))

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2011-11-03 19:28:45 +0000
+++ lisp/gnus/nnimap.el	2011-11-20 02:29:42 +0000
@@ -1035,7 +1035,7 @@
 				 ((eq action 'set) ""))
 				(mapconcat #'identity flags " ")))))))
 	;; Wait for the last command to complete to avoid later
-	;; syncronisation problems with the stream.
+	;; synchronization problems with the stream.
 	(when sequence
 	  (nnimap-wait-for-response sequence))))))
 

=== modified file 'lisp/gnus/nnmairix.el'
--- lisp/gnus/nnmairix.el	2011-11-19 09:18:31 +0000
+++ lisp/gnus/nnmairix.el	2011-11-20 02:29:42 +0000
@@ -333,7 +333,7 @@
   "Use only the registry for determining original group(s).
 If set to t, nnmairix will only use the registry for determining
 the original group(s) of an article (which is also necessary for
-propapagting marks).  If set to nil, it will also try to determine
+propagating marks).  If set to nil, it will also try to determine
 the group from an additional mairix search which might be slow
 when propagating lots of marks."
   :version "23.1"

=== modified file 'lisp/htmlfontify.el'
--- lisp/htmlfontify.el	2011-11-19 09:18:31 +0000
+++ lisp/htmlfontify.el	2011-11-20 02:29:42 +0000
@@ -1,4 +1,4 @@
-;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks
+;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks
 
 ;; Copyright (C) 2002-2003, 2009-2011  Free Software Foundation, Inc.
 
@@ -10,7 +10,7 @@
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
 ;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-05
-;; Description: htmlise a buffer/source tree with optional hyperlinks
+;; Description: htmlize a buffer/source tree with optional hyperlinks
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
 ;; Compatibility: Emacs23, Emacs22
 ;; Incompatibility: Emacs19, Emacs20, Emacs21
@@ -1576,7 +1576,7 @@
       (delete-overlay rovl))
     (copy-to-buffer html-buffer (point-min) (point-max))
     (set-buffer     html-buffer)
-    ;; rip out props that could interfere with our htmlisation of the buffer:
+    ;; rip out props that could interfere with our htmlization of the buffer:
     (remove-text-properties (point-min) (point-max) hfy-ignored-properties)
     ;; Apply overlay invisible spec
     (setq orig-ovls
@@ -2026,13 +2026,13 @@
         (hash-entry nil) (tag-string nil) (tag-line   nil)
         (tag-point  nil) (new-entry  nil) (etags-file nil))
 
-    ;; (re)initialise the tag reverse map:
+    ;; (re)initialize the tag reverse map:
     (if trmap-cache (setq trmap-hash (cadr trmap-cache))
       (setq trmap-hash (make-hash-table :test 'equal))
       (setq hfy-tags-rmap (list (list srcdir trmap-hash) hfy-tags-rmap)))
     (clrhash trmap-hash)
 
-    ;; (re)initialise the tag cache:
+    ;; (re)initialize the tag cache:
     (if cache-entry (setq cache-hash (cadr cache-entry))
       (setq cache-hash (make-hash-table :test 'equal))
       (setq hfy-tags-cache (list (list srcdir cache-hash) hfy-tags-cache)))

=== modified file 'lisp/international/characters.el'
--- lisp/international/characters.el	2011-11-19 09:18:31 +0000
+++ lisp/international/characters.el	2011-11-20 02:29:42 +0000
@@ -512,7 +512,7 @@
   ;; relating Unicode categories to Emacs syntax codes.
 
   ;; NBSP isn't semantically interchangeable with other whitespace chars,
-  ;; so it's more like punctation.
+  ;; so it's more like punctuation.
   (set-case-syntax ?  "." tbl)
   (set-case-syntax ?¡ "." tbl)
   (set-case-syntax ?¦ "_" tbl)

=== modified file 'lisp/international/ogonek.el'
--- lisp/international/ogonek.el	2011-01-25 04:08:28 +0000
+++ lisp/international/ogonek.el	2011-11-20 02:29:42 +0000
@@ -284,11 +284,11 @@
   :type 'character
   :group 'ogonek)
 (defcustom ogonek-prefix-from-encoding "iso8859-2"
-  "Encoding in the source file subject to prefixifation."
+  "Encoding in the source file subject to prefixation."
   :type ogonek-encoding-choices
   :group 'ogonek)
 (defcustom ogonek-prefix-to-encoding "iso8859-2"
-  "Encoding in the target file subject to deprefixifation."
+  "Encoding in the target file subject to deprefixation."
   :type ogonek-encoding-choices
   :group 'ogonek)
 

=== modified file 'lisp/iswitchb.el'
--- lisp/iswitchb.el	2011-11-15 17:37:37 +0000
+++ lisp/iswitchb.el	2011-11-20 02:29:42 +0000
@@ -122,7 +122,7 @@
 ;; t               IN          | INBOX
 ;; t               In          | [No match]
 
-;;; Customisation
+;;; Customization
 
 ;; See the User Variables section below for easy ways to change the
 ;; functionality of the program.  These are accessible using the

=== modified file 'lisp/mail/metamail.el'
--- lisp/mail/metamail.el	2011-01-25 04:08:28 +0000
+++ lisp/mail/metamail.el	2011-11-20 02:29:42 +0000
@@ -165,7 +165,7 @@
 	 (list (format "EMACS_VIEW_MODE=%d"
 		       (if (numberp viewmode) viewmode 1)))))
     (save-excursion
-      ;; Gee!  Metamail does not ouput to stdout if input comes from
+      ;; Gee!  Metamail does not output to stdout if input comes from
       ;; stdin.
       (let ((selective-display nil))	;Disable ^M to nl translation.
 	(write-region beg end metafile nil 'nomessage))

=== modified file 'lisp/menu-bar.el'
--- lisp/menu-bar.el	2011-11-16 17:47:25 +0000
+++ lisp/menu-bar.el	2011-11-20 02:29:42 +0000
@@ -445,7 +445,7 @@
     (define-key menu [props]
       `(menu-item ,(purecopy "Text Properties") facemenu-menu))
 
-    ;; ns-win.el said: Add spell for platorm consistency.
+    ;; ns-win.el said: Add spell for platform consistency.
     (if (featurep 'ns)
         (define-key menu [spell]
           `(menu-item ,(purecopy "Spell") ispell-menu-map)))

=== modified file 'lisp/mh-e/mh-mime.el'
--- lisp/mh-e/mh-mime.el	2011-07-12 03:25:46 +0000
+++ lisp/mh-e/mh-mime.el	2011-11-20 02:29:42 +0000
@@ -1399,7 +1399,7 @@
     ("mailto")          ; RFC1738 Electronic mail address
     ("news")            ; RFC1738 Usenet news
     ("nntp")            ; RFC1738 Usenet news using NNTP access
-    ("propspero")       ; RFC1738 Prospero Directory Service
+    ("prospero")        ; RFC1738 Prospero Directory Service
     ("telnet")          ; RFC1738 Telnet
     ("tftp")            ; RFC2046 Trivial File Transfer Protocol
     ("url")             ; RFC2017 URL scheme MIME access-type Protocol

=== modified file 'lisp/mouse-sel.el'
--- lisp/mouse-sel.el	2011-10-19 12:54:24 +0000
+++ lisp/mouse-sel.el	2011-11-20 02:29:42 +0000
@@ -60,7 +60,7 @@
 ;;
 ;; Thanks to KevinB@bartley.demon.co.uk for his useful input.
 ;;
-;;--- Customisation -------------------------------------------------------
+;;--- Customization -------------------------------------------------------
 ;;
 ;; * You may want to use none or more of following:
 ;;

=== modified file 'lisp/net/ange-ftp.el'
--- lisp/net/ange-ftp.el	2011-11-19 09:18:31 +0000
+++ lisp/net/ange-ftp.el	2011-11-20 02:29:42 +0000
@@ -46,7 +46,7 @@
 ;; Extended filename syntax:
 ;;
 ;; The default extended filename syntax is '/user@host:name', where the
-;; 'user@' part may be omitted.  This syntax can be customised to a certain
+;; 'user@' part may be omitted.  This syntax can be customized to a certain
 ;; extent by changing ange-ftp-name-format.  There are limitations.
 ;; The `host' part has an optional suffix `#port' which may be used to
 ;; specify a non-default port number for the connexion.
@@ -1665,7 +1665,7 @@
               (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
-            ;; seeing a propt, then the error was real.
+            ;; seeing a prompt, then the error was real.
             (delete-process proc)
             (setq ange-ftp-process-busy nil
                   ange-ftp-process-result-line ange-ftp-pending-error-line))))

=== modified file 'lisp/net/browse-url.el'
--- lisp/net/browse-url.el	2011-11-18 08:31:02 +0000
+++ lisp/net/browse-url.el	2011-11-20 02:29:42 +0000
@@ -138,7 +138,7 @@
 ;; M-x browse-url-of-dired-file RET
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Customisation (~/.emacs)
+;; Customization (~/.emacs)
 
 ;; To see what variables are available for customization, type
 ;; `M-x set-variable browse-url TAB'.  Better, use
@@ -190,7 +190,7 @@
 ;;
 ;;	(add-hook 'browse-url-of-file-hook 'browse-url-netscape-reload)
 
-;; You may also want to customise browse-url-netscape-arguments, e.g.
+;; You may also want to customize browse-url-netscape-arguments, e.g.
 ;;	(setq browse-url-netscape-arguments '("-install"))
 ;;
 ;; or similarly for the other browsers.

=== modified file 'lisp/net/newst-treeview.el'
--- lisp/net/newst-treeview.el	2011-11-15 17:37:37 +0000
+++ lisp/net/newst-treeview.el	2011-11-20 02:29:42 +0000
@@ -1793,7 +1793,7 @@
     result))
 
 (defun newsticker--group-remove-obsolete-feeds (group)
-  "Recursively remove obselete feeds from GROUP."
+  "Recursively remove obsolete feeds from GROUP."
   (let ((result nil)
         (urls (append newsticker-url-list newsticker-url-list-defaults)))
     (mapc (lambda (g)

=== modified file 'lisp/net/quickurl.el'
--- lisp/net/quickurl.el	2011-11-15 17:37:37 +0000
+++ lisp/net/quickurl.el	2011-11-20 02:29:42 +0000
@@ -201,7 +201,7 @@
   (listp (cdr url)))
 
 (defun quickurl-make-url (keyword url &optional comment)
-  "Create a URL from KEYWORD, URL and (optionaly) COMMENT."
+  "Create a URL from KEYWORD, URL and (optionally) COMMENT."
   (if (and comment (not (zerop (length comment))))
       (list keyword url comment)
     (cons keyword url)))

=== modified file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	2011-11-17 09:09:20 +0000
+++ lisp/net/tramp-sh.el	2011-11-20 02:29:42 +0000
@@ -5033,11 +5033,11 @@
 ;;   until the last but one hop via `start-file-process'.  Apply it
 ;;   also for ftp and smb.
 ;; * WIBNI if we had a command "trampclient"?  If I was editing in
-;;   some shell with root priviledges, it would be nice if I could
+;;   some shell with root privileges, it would be nice if I could
 ;;   just call
 ;;     trampclient filename.c
 ;;   as an editor, and the _current_ shell would connect to an Emacs
-;;   server and would be used in an existing non-priviledged Emacs
+;;   server and would be used in an existing non-privileged Emacs
 ;;   session for doing the editing in question.
 ;;   That way, I need not tell Emacs my password again and be afraid
 ;;   that it makes it into core dumps or other ugly stuff (I had Emacs

=== modified file 'lisp/net/tramp-smb.el'
--- lisp/net/tramp-smb.el	2011-09-18 11:26:15 +0000
+++ lisp/net/tramp-smb.el	2011-11-20 02:29:42 +0000
@@ -480,7 +480,7 @@
     ;; Dissect NAME.
     (with-parsed-tramp-file-name name nil
       ;; Tilde expansion if necessary.  We use the user name as share,
-      ;; which is offen the case in domains.
+      ;; which is often the case in domains.
       (when (string-match "\\`/?~\\([^/]*\\)" localname)
 	(setq localname
 	      (replace-match

=== modified file 'lisp/net/xesam.el'
--- lisp/net/xesam.el	2011-11-14 20:23:26 +0000
+++ lisp/net/xesam.el	2011-11-20 02:29:42 +0000
@@ -88,7 +88,7 @@
 ;;
 ;;   (setq xesam-query-type 'fulltext-query)
 ;;
-;; Another option to be customised is the number of hits to be
+;; Another option to be customized is the number of hits to be
 ;; presented at once.
 ;;
 ;;   (setq xesam-hits-per-page 50)

=== modified file 'lisp/org/org-agenda.el'
--- lisp/org/org-agenda.el	2011-11-16 17:47:25 +0000
+++ lisp/org/org-agenda.el	2011-11-20 02:29:42 +0000
@@ -1619,7 +1619,7 @@
 the icon should be displayed.
 FILE-OR-DATA either a file path or a string containing image data.
 
-The other fields can be omited safely if not needed:
+The other fields can be omitted safely if not needed:
 TYPE indicates the image type.
 DATA-P is a boolean indicating whether the FILE-OR-DATA string is
 image data.

=== modified file 'lisp/org/org-capture.el'
--- lisp/org/org-capture.el	2011-09-02 16:38:40 +0000
+++ lisp/org/org-capture.el	2011-11-20 02:29:42 +0000
@@ -372,7 +372,7 @@
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
 
 (defun org-capture-member (prop &optional local)
-  "Is PROP a preperty in `org-capture-plist'.
+  "Is PROP a property in `org-capture-plist'.
 When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."

=== modified file 'lisp/org/org-ctags.el'
--- lisp/org/org-ctags.el	2011-11-14 23:59:56 +0000
+++ lisp/org/org-ctags.el	2011-11-20 02:29:42 +0000
@@ -36,7 +36,7 @@
 ;; links to these 'tagged' destinations, allowing seamless navigation between
 ;; multiple org-mode files. Topics can be created in any org mode file and
 ;; will always be found by plain links from other files. Other file types
-;; recognised by ctags (source code files, latex files, etc) will also be
+;; recognized by ctags (source code files, latex files, etc) will also be
 ;; available as destinations for plain links, and similarly, org-mode links
 ;; will be available as tags from source files. Finally, the function
 ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using

=== modified file 'lisp/org/org-table.el'
--- lisp/org/org-table.el	2011-11-19 09:18:31 +0000
+++ lisp/org/org-table.el	2011-11-20 02:29:42 +0000
@@ -51,7 +51,7 @@
 (defvar orgtbl-after-send-table-hook nil
   "Hook for functions attaching to `C-c C-c', if the table is sent.
 This can be used to add additional functionality after the table is sent
-to the receiver position, othewise, if table is not sent, the functions
+to the receiver position, otherwise, if table is not sent, the functions
 are not run.")
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)

=== modified file 'lisp/play/5x5.el'
--- lisp/play/5x5.el	2011-11-19 09:18:31 +0000
+++ lisp/play/5x5.el	2011-11-20 02:29:42 +0000
@@ -579,7 +579,7 @@
     (let* (calc-command-flags
 	   (grid-size-squared (* 5x5-grid-size 5x5-grid-size))
 
-	   ;; targetv is the vector the origine of which is org="current
+	   ;; targetv is the vector the origin of which is org="current
 	   ;; grid" and the end of which is dest="all ones".
 	   (targetv
 	    (5x5-log

=== modified file 'lisp/printing.el'
--- lisp/printing.el	2011-11-16 17:47:25 +0000
+++ lisp/printing.el	2011-11-20 02:29:42 +0000
@@ -3692,7 +3692,7 @@
 	  "\n\n
 The printing interface buffer has the same functionality as the printing menu.
 The major difference is that the states (like sending PostScript generated to a
-file, n-up printing, etc.) are set and saved between priting buffer
+file, n-up printing, etc.) are set and saved between printing buffer
 activation.  Also, the landscape, duplex and tumble values are the same for
 PostScript file and directory/buffer/region/mode processing; using menu, there
 are different value sets for PostScript file and directory/buffer/region/mode

=== modified file 'lisp/progmodes/cc-awk.el'
--- lisp/progmodes/cc-awk.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/cc-awk.el	2011-11-20 02:29:42 +0000
@@ -231,7 +231,7 @@
 ;; to foul things up.
 (defconst c-awk-non-arith-op-bra-re
   "[[\(&=:!><,?;'~|]")
-;;   Matches an openeing BRAcket ,round or square, or any operator character
+;;   Matches an opening BRAcket, round or square, or any operator character
 ;; apart from +,-,/,*,%.  For the purpose at hand (detecting a / which is a
 ;; regexp bracket) these arith ops are unnecessary and a pain, because of "++"
 ;; and "--".

=== modified file 'lisp/progmodes/cc-cmds.el'
--- lisp/progmodes/cc-cmds.el	2011-11-15 17:37:37 +0000
+++ lisp/progmodes/cc-cmds.el	2011-11-20 02:29:42 +0000
@@ -2178,7 +2178,7 @@
 	   (end (1- (cdr range)))
 	   (here-filler		   ; matches WS and escaped newlines at point.
 	    "\\=\\([ \t\n\r\f]\\|\\\\[\n\r]\\)*")
-	   ;; Enhance paragraph-start and paragraph-separate also to recognise
+	   ;; Enhance paragraph-start and paragraph-separate also to recognize
 	   ;; blank lines terminated by escaped EOLs.  IT MAY WELL BE that
 	   ;; these values should be customizable user options, or something.
 	   (paragraph-start c-string-par-start)
@@ -2234,7 +2234,7 @@
   (save-match-data
     (let* ((here (point))
 	   last
-	   ;; Enhance paragraph-start and paragraph-separate to recognise
+	   ;; Enhance paragraph-start and paragraph-separate to recognize
 	   ;; blank lines terminated by escaped EOLs.
 	   (paragraph-start c-string-par-start)
 	   (paragraph-separate c-string-par-separate)

=== modified file 'lisp/progmodes/cc-defs.el'
--- lisp/progmodes/cc-defs.el	2011-11-14 20:23:26 +0000
+++ lisp/progmodes/cc-defs.el	2011-11-20 02:29:42 +0000
@@ -774,7 +774,7 @@
 ;; In addition to `c-at-vsemi-p-fn', a mode may need to supply a function for
 ;; `c-vsemi-status-unknown-p-fn'.  The macro `c-vsemi-status-unknown-p' is a
 ;; rather recondite kludge.  It exists because the function
-;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimisation,
+;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimization,
 ;; but `c-at-vsemi-p' might well need to call `c-beginning-of-statement-1' in
 ;; its calculations, thus potentially leading to infinite recursion.
 ;;
@@ -1249,7 +1249,7 @@
 ;; which introduces a CPP construct and every EOL (or EOB, or character
 ;; preceding //, etc.) which terminates it.  We can instantly "comment
 ;; out" all CPP constructs by giving `c-cpp-delimiter' a syntax-table
-;; propery '(14) (generic comment delimiter).
+;; property '(14) (generic comment delimiter).
 (defmacro c-set-cpp-delimiters (beg end)
   ;; This macro does a hidden buffer change.
   `(progn

=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/cc-engine.el	2011-11-20 02:29:42 +0000
@@ -2548,7 +2548,7 @@
 			c-state-cache)))
 	;; N.B.  This defsubst codes one method for the simple, normal case,
 	;; and a more sophisticated, slower way for the general case.  Don't
-	;; eliminate this defsubst - it's a speed optimisation.
+	;; eliminate this defsubst - it's a speed optimization.
 	(c-append-lower-brace-pair-to-state-cache (1- bra+1)))))
 
 (defun c-append-to-state-cache (from)
@@ -2788,7 +2788,7 @@
   ;;
   ;; This function must only be called only when (> `c-state-cache-good-pos'
   ;; HERE).  Usually the gap between CACHE-POS and HERE is large.  It is thus
-  ;; optimised to eliminate (or minimize) scanning between these two
+  ;; optimized to eliminate (or minimize) scanning between these two
   ;; positions.
   ;;
   ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where:
@@ -4233,9 +4233,9 @@
 ;; fails to take account of the change of the s-t property on the opening / to
 ;; "string", and reports that the { is within a string started by the second /.
 ;;
-;; The workaround for this is for the AWK Mode initialisation to switch the
+;; The workaround for this is for the AWK Mode initialization to switch the
 ;; defalias for c-in-literal to c-slow-in-literal.  This will slow down other
-;; cc-modes in XEmacs whenever an awk-buffer has been initialised.
+;; cc-modes in XEmacs whenever an awk-buffer has been initialized.
 ;;
 ;; (Alan Mackenzie, 2003/4/30).
 
@@ -4904,7 +4904,7 @@
 	    (setq cfd-prop-match nil))
 
 	(when (/= cfd-macro-end 0)
-	  ;; Restore limits if we did macro narrowment above.
+	  ;; Restore limits if we did macro narrowing above.
 	  (narrow-to-region (point-min) cfd-buffer-end)))
 
       (goto-char cfd-continue-pos)
@@ -7100,7 +7100,7 @@
   ;;   colon).  Currently (2006-03), this applies only to Objective C's
   ;;   keywords "@private", "@protected", and "@public".  Returns t.
   ;;
-  ;; One of the things which will NOT be recognised as a label is a bit-field
+  ;; One of the things which will NOT be recognized as a label is a bit-field
   ;; element of a struct, something like "int foo:5".
   ;;
   ;; The end of the label is taken to be just after the colon, or the end of
@@ -9582,7 +9582,7 @@
 	    (c-add-syntax 'inher-cont (c-point 'boi)))
 
 	   ;; CASE 5D.5: Continuation of the "expression part" of a
-	   ;; top level construct.  Or, perhaps, an unrecognised construct.
+	   ;; top level construct.  Or, perhaps, an unrecognized construct.
 	   (t
 	    (while (and (setq placeholder (point))
 			(eq (car (c-beginning-of-decl-1 containing-sexp))
@@ -9593,7 +9593,7 @@
 			(< (point) placeholder)))
 	    (c-add-stmt-syntax
 	     (cond
-	      ((eq (point) placeholder) 'statement) ; unrecognised construct
+	      ((eq (point) placeholder) 'statement) ; unrecognized construct
 	      ;; A preceding comma at the top level means that a
 	      ;; new variable declaration starts here.  Use
 	      ;; topmost-intro-cont for it, for consistency with

=== modified file 'lisp/progmodes/cc-fonts.el'
--- lisp/progmodes/cc-fonts.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/cc-fonts.el	2011-11-20 02:29:42 +0000
@@ -1040,7 +1040,7 @@
 	;; Inside the following "condition form", we move forward over the
 	;; declarator's identifier up as far as any opening bracket (for array
 	;; size) or paren (for parameters of function-type) or brace (for
-	;; array/struct initialisation) or "=" or terminating delimiter
+	;; array/struct initialization) or "=" or terminating delimiter
 	;; (e.g. "," or ";" or "}").
 	(and
 	    pos

=== modified file 'lisp/progmodes/cc-langs.el'
--- lisp/progmodes/cc-langs.el	2011-11-03 21:55:15 +0000
+++ lisp/progmodes/cc-langs.el	2011-11-20 02:29:42 +0000
@@ -772,7 +772,7 @@
   "Regexp matching the prefix of a cpp directive in the languages that
 normally use that macro preprocessor.  Tested at bol or at boi.
 Assumed to not contain any submatches or \\| operators."
-  ;; TODO (ACM, 2005-04-01).  Amend the following to recognise escaped NLs;
+  ;; TODO (ACM, 2005-04-01).  Amend the following to recognize escaped NLs;
   ;; amend all uses of c-opt-cpp-prefix which count regexp-depth.
   t "\\s *#\\s *"
   (java awk) nil)
@@ -1520,7 +1520,7 @@
 ;; end-of-defun-function will be set so that commands like
 ;; `mark-defun' and `narrow-to-defun' work right.  The key sequences
 ;; C-M-a and C-M-e are, however, bound directly to the CC Mode
-;; functions, allowing optimisation for large n.
+;; functions, allowing optimization for large n.
 (c-lang-defconst beginning-of-defun-function
   "Function to which beginning-of-defun-function will be set."
   t 'c-beginning-of-defun
@@ -2530,7 +2530,7 @@
        "\\.?[0-9]"
 
        "\\|"
-       ;; The nonambiguous operators from `prefix-ops'.
+       ;; The unambiguous operators from `prefix-ops'.
        (c-make-keywords-re nil
 	 (set-difference nonkeyword-prefix-ops in-or-postfix-ops
 			 :test 'string-equal))
@@ -2681,7 +2681,7 @@
 			       pos (match-end 0)))
 		       res))))
 
-  ;; Allow cpp operatios (where applicable).
+  ;; Allow cpp operations (where applicable).
   t (if (c-lang-const c-opt-cpp-prefix)
 	(set-difference (c-lang-const c-block-prefix-disallowed-chars)
 			'(?#))

=== modified file 'lisp/progmodes/cc-menus.el'
--- lisp/progmodes/cc-menus.el	2011-08-27 08:41:23 +0000
+++ lisp/progmodes/cc-menus.el	2011-11-20 02:29:42 +0000
@@ -66,7 +66,7 @@
 (defvar cc-imenu-c++-generic-expression
   `(
     ;; Try to match ::operator definitions first. Otherwise `X::operator new ()'
-    ;; will be incorrectly recognised as function `new ()' because the regexps
+    ;; will be incorrectly recognized as function `new ()' because the regexps
     ;; work by backtracking from the end of the definition.
     (nil
      ,(concat

=== modified file 'lisp/progmodes/cc-mode.el'
--- lisp/progmodes/cc-mode.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/cc-mode.el	2011-11-20 02:29:42 +0000
@@ -293,7 +293,7 @@
   ;; replaces `fill-paragraph' and does the adaption before calling
   ;; `fill-paragraph-function', and we have to mask comments etc
   ;; before that.  Also, `c-fill-paragraph' chains on to
-  ;; `fill-paragraph' and the value on `fill-parapgraph-function' to
+  ;; `fill-paragraph' and the value on `fill-paragraph-function' to
   ;; do the actual filling work.
   (substitute-key-definition 'fill-paragraph 'c-fill-paragraph
 			     c-mode-base-map global-map)
@@ -505,7 +505,7 @@
   ;; doesn't work with filladapt but it's better than nothing.
   (set (make-local-variable 'fill-paragraph-function) 'c-fill-paragraph)
 
-  ;; Initialise the cache of brace pairs, and opening braces/brackets/parens.
+  ;; Initialize the cache of brace pairs, and opening braces/brackets/parens.
   (c-state-cache-init)
 
   (when (or c-recognize-<>-arglists

=== modified file 'lisp/progmodes/etags.el'
--- lisp/progmodes/etags.el	2011-11-17 09:09:20 +0000
+++ lisp/progmodes/etags.el	2011-11-20 02:29:42 +0000
@@ -1191,7 +1191,7 @@
     ;; Note: there is a small inefficiency in find-buffer-visiting :
     ;;   truename is computed even if not needed. Not too sure about this
     ;;   but I suspect truename computation accesses the disk.
-    ;;   It is maybe a good idea to optimise this find-buffer-visiting.
+    ;;   It is maybe a good idea to optimize this find-buffer-visiting.
     ;; An alternative would be to use only get-file-buffer
     ;; but this looks less "sure" to find the buffer for the file.
     (while (and (not the-buffer) buffer-search-extensions)

=== modified file 'lisp/progmodes/gdb-mi.el'
--- lisp/progmodes/gdb-mi.el	2011-11-16 17:47:25 +0000
+++ lisp/progmodes/gdb-mi.el	2011-11-20 02:29:42 +0000
@@ -823,7 +823,7 @@
   (run-hooks 'gdb-mode-hook))
 
 (defun gdb-init-1 ()
-  ;; (re-)initialise
+  ;; (re-)initialize
   (setq gdb-selected-frame nil
 	gdb-frame-number nil
         gdb-thread-number nil

=== modified file 'lisp/progmodes/gud.el'
--- lisp/progmodes/gud.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/gud.el	2011-11-20 02:29:42 +0000
@@ -1168,7 +1168,7 @@
 ;; appears to indicate a breakpoint.  Then we prod the dbx sub-process
 ;; to output the information we want with a combination of the
 ;; `printf' and `file' commands as a pseudo marker which we can
-;; recognise next time through the marker-filter.  This would be like
+;; recognize next time through the marker-filter.  This would be like
 ;; the gdb marker but you can't get the file name without a newline...
 ;; Note that gud-remove won't work since Irix dbx expects a breakpoint
 ;; number rather than a line number etc.  Maybe this could be made to
@@ -1689,7 +1689,7 @@
 ;;    Run jdb (like this): jdb
 ;;
 ;; type any jdb switches followed by the name of the class you'd like to debug.
-;; Supply a fully qualfied classname (these do not have the ".class" extension)
+;; Supply a fully qualified classname (these don't have the ".class" extension)
 ;; for the name of the class to debug (e.g. "COM.the-kind.ddavies.CoolClass").
 ;; See the known problems section below for restrictions when specifying jdb
 ;; command line switches (search forward for '-classpath').

=== modified file 'lisp/progmodes/idlw-help.el'
--- lisp/progmodes/idlw-help.el	2011-11-19 09:18:31 +0000
+++ lisp/progmodes/idlw-help.el	2011-11-20 02:29:42 +0000
@@ -986,7 +986,7 @@
 be found.  TYPE is ignored.
 
 This function expects a more or less standard routine header.  In
-particlar it looks for the `NAME:' tag, either with a colon, or alone
+particular it looks for the `NAME:' tag, either with a colon, or alone
 on a line.  Then `NAME:' must be followed by the routine name on the
 same or the next line.  When KEYWORD is non-nil, looks first for a
 `KEYWORDS' section.  It is amazing how inconsistent this is through

=== modified file 'lisp/progmodes/inf-lisp.el'
--- lisp/progmodes/inf-lisp.el	2011-09-22 16:15:52 +0000
+++ lisp/progmodes/inf-lisp.el	2011-11-20 02:29:42 +0000
@@ -598,7 +598,7 @@
 	(error "No Lisp subprocess; see variable `inferior-lisp-buffer'"))))
 
 
-;;; Do the user's customisation...
+;;; Do the user's customization...
 ;;;===============================
 (defvar inferior-lisp-load-hook nil
   "This hook is run when the library `inf-lisp' is loaded.")

=== modified file 'lisp/progmodes/prolog.el'
--- lisp/progmodes/prolog.el	2011-11-15 07:55:13 +0000
+++ lisp/progmodes/prolog.el	2011-11-20 02:29:42 +0000
@@ -169,7 +169,7 @@
 ;;     package requirements.
 ;; Version 1.13:
 ;;  o  Removed the use of `map-char-table' in `prolog-build-case-strings'
-;;     which appears to cause prblems in (at least) Emacs 23.0.0.1.
+;;     which appears to cause problems in (at least) Emacs 23.0.0.1.
 ;;  o  Added if-then-else indentation + corresponding electric
 ;;     characters.  New customization: `prolog-electric-if-then-else-flag'
 ;;  o  Align support (requires `align').  New customization:
@@ -391,7 +391,7 @@
 
 (defcustom prolog-left-indent-regexp "\\(;\\|\\*?->\\)"
   "*Regexp for character sequences after which next line is indented.
-Next line after such a regexp is indented to the opening paranthesis level."
+Next line after such a regexp is indented to the opening parenthesis level."
   :group 'prolog-indentation
   :type 'regexp)
 

=== modified file 'lisp/progmodes/python.el'
--- lisp/progmodes/python.el	2011-11-17 17:40:48 +0000
+++ lisp/progmodes/python.el	2011-11-20 02:29:42 +0000
@@ -1122,7 +1122,7 @@
 
 ;;;; Imenu.
 
-;; For possibily speeding this up, here's the top of the ELP profile
+;; For possibly speeding this up, here's the top of the ELP profile
 ;; for rescanning pydoc.py (2.2k lines, 90kb):
 ;; Function Name                         Call Count  Elapsed Time  Average Time
 ;; ====================================  ==========  =============  ============

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- lisp/progmodes/vhdl-mode.el	2011-11-16 17:47:25 +0000
+++ lisp/progmodes/vhdl-mode.el	2011-11-20 02:29:42 +0000
@@ -16857,7 +16857,7 @@
 `vhdl-configuration-file-name': (new)
   Specify how the configuration file name is obtained.
 `vhdl-compose-configuration-name': (new)
-  Specify how the configuration name is optained.
+  Specify how the configuration name is obtained.
 `vhdl-compose-configuration-create-file': (new)
   Specify whether a new file should be created for a configuration.
 `vhdl-compose-configuration-hierarchical': (new)

=== modified file 'lisp/ps-mule.el'
--- lisp/ps-mule.el	2011-09-19 19:27:30 +0000
+++ lisp/ps-mule.el	2011-11-20 02:29:42 +0000
@@ -1010,7 +1010,7 @@
 	  ps-mule-external-libraries))
 
 (defun ps-mule-encode-header-string (string fonttag)
-  "Generate PostScript code for ploting STRING by font FONTTAG.
+  "Generate PostScript code for plotting STRING by font FONTTAG.
 FONTTAG should be a string \"/h0\", \"/h1\", \"/L0\", or \"/H0\".
 Any other value is treated as \"/H0\"."
   (with-temp-buffer

=== modified file 'lisp/repeat.el'
--- lisp/repeat.el	2011-06-25 18:21:00 +0000
+++ lisp/repeat.el	2011-11-20 02:29:42 +0000
@@ -26,7 +26,7 @@
 
 ;; Sometimes the fastest way to get something done is just to lean on a key;
 ;; moving forward through a series of words by leaning on M-f is an example.
-;; But 'forward-page is orthodoxily bound to C-x ], so moving forward through
+;; But 'forward-page is orthodoxly bound to C-x ], so moving forward through
 ;; several pages requires
 ;;   Loop until desired page is reached:
 ;;     Hold down control key with left pinkie.

=== modified file 'lisp/replace.el'
--- lisp/replace.el	2011-09-19 18:57:55 +0000
+++ lisp/replace.el	2011-11-20 02:29:42 +0000
@@ -1225,7 +1225,7 @@
 
     (with-current-buffer occur-buf
       (if (stringp nlines)
-	  (fundamental-mode) ;; This is for collect opeartion.
+	  (fundamental-mode) ;; This is for collect operation.
 	(occur-mode))
       (let ((inhibit-read-only t)
 	    ;; Don't generate undo entries for creation of the initial contents.

=== modified file 'lisp/ses.el'
--- lisp/ses.el	2011-11-17 09:09:20 +0000
+++ lisp/ses.el	2011-11-20 02:29:42 +0000
@@ -1315,7 +1315,7 @@
 	      (setq formula (cadr formula)))
 	  (if (eq (car-safe printer) 'ses-safe-printer)
 	      (setq printer (cadr printer)))
-	  ;; This is noticably faster than (format "%S %S %S %S %S")
+	  ;; This is noticeably faster than (format "%S %S %S %S %S")
 	  (setq text    (concat "(ses-cell "
 				(symbol-name sym)
 				" "
@@ -2720,7 +2720,7 @@
 relative references to neighboring cells.  This is best if the formulas
 generally refer to other cells within the yanked text.  You can use the C-u
 prefix to specify insertion without relocation, which is best when the
-formulas refer to cells outsite the yanked text.
+formulas refer to cells outside the yanked text.
 
 When inserting formulas, the text is treated as a string constant if it doesn't
 make sense as a sexp or would otherwise be considered a symbol.  Use 'sym to

=== modified file 'lisp/shell.el'
--- lisp/shell.el	2011-11-18 08:31:02 +0000
+++ lisp/shell.el	2011-11-20 02:29:42 +0000
@@ -89,7 +89,7 @@
 ;;         comint-strip-ctrl-m		Remove trailing ^Ms from output
 ;;
 ;; The shell mode hook is shell-mode-hook
-;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards
+;; comint-prompt-regexp is initialized to shell-prompt-pattern, for backwards
 ;; compatibility.
 
 ;; Read the rest of this file for more information.

=== modified file 'lisp/speedbar.el'
--- lisp/speedbar.el	2011-11-19 09:18:31 +0000
+++ lisp/speedbar.el	2011-11-20 02:29:42 +0000
@@ -471,7 +471,7 @@
  'trim - trim large directories to only show the last few.
  nil   - no trimming."
   :group 'speedbar
-  :type '(radio (const :tag "Span large directories over mutiple lines."
+  :type '(radio (const :tag "Span large directories over multiple lines."
 		       span)
 		(const :tag "Trim large directories to only show the last few."
 		       trim)

=== modified file 'lisp/term.el'
--- lisp/term.el	2011-11-17 17:40:48 +0000
+++ lisp/term.el	2011-11-20 02:29:42 +0000
@@ -2122,7 +2122,7 @@
   "Is point after the process output marker?"
   ;; Since output could come into the buffer after we looked at the point
   ;; but before we looked at the process marker's value, we explicitly
-  ;; serialise.  This is just because I don't know whether or not Emacs
+  ;; serialize.  This is just because I don't know whether or not Emacs
   ;; services input during execution of lisp commands.
   (let ((proc-pos (marker-position
 		   (process-mark (get-buffer-process (current-buffer))))))
@@ -3890,7 +3890,7 @@
   (goto-char (point-max))
   (recenter -1))
 
-;;; Do the user's customisation...
+;;; Do the user's customization...
 
 (defvar term-load-hook nil
   "This hook is run when term is loaded in.

=== modified file 'lisp/textmodes/bibtex.el'
--- lisp/textmodes/bibtex.el	2011-11-14 06:27:12 +0000
+++ lisp/textmodes/bibtex.el	2011-11-20 02:29:42 +0000
@@ -3595,7 +3595,7 @@
 (defun bibtex-autofill-entry ()
   "Try to fill fields of current BibTeX entry based on neighboring entries.
 The current entry must have a key.  Determine the neighboring entry
-\(previouse or next\) whose key is more similar to the key of the current
+\(previous or next\) whose key is more similar to the key of the current
 entry.  For all empty fields of the current entry insert the corresponding
 field contents of the neighboring entry.  Finally try to update the text
 based on the difference between the keys of the neighboring and the current

=== modified file 'lisp/textmodes/conf-mode.el'
--- lisp/textmodes/conf-mode.el	2011-11-13 07:48:23 +0000
+++ lisp/textmodes/conf-mode.el	2011-11-20 02:29:42 +0000
@@ -155,7 +155,7 @@
     (modify-syntax-entry ?/  ". 124" table)
     (modify-syntax-entry ?*  ". 23b" table)
     table)
-  "Syntax table in use in Java prperties buffers.")
+  "Syntax table in use in Java properties buffers.")
 
 (defvar conf-ppd-mode-syntax-table
   (let ((table (make-syntax-table conf-mode-syntax-table)))

=== modified file 'lisp/textmodes/table.el'
--- lisp/textmodes/table.el	2011-11-15 07:55:13 +0000
+++ lisp/textmodes/table.el	2011-11-20 02:29:42 +0000
@@ -5535,7 +5535,7 @@
    table-cell-info-lu-coordinate))
 
 (defun table--offset-coordinate (coordinate offset &optional negative)
-  "Return the offseted COORDINATE by OFFSET.
+  "Return the offset COORDINATE by OFFSET.
 When optional NEGATIVE is non-nil offsetting direction is negative."
   (cons (if negative (- (car coordinate) (car offset))
 	  (+ (car coordinate) (car offset)))

=== modified file 'lisp/thumbs.el'
--- lisp/thumbs.el	2011-11-15 07:55:13 +0000
+++ lisp/thumbs.el	2011-11-20 02:29:42 +0000
@@ -92,7 +92,7 @@
   :group 'thumbs)
 
 ;; Unfortunately Windows XP has a program called CONVERT.EXE in
-;; C:/WINDOWS/SYSTEM32/ for partioning NTFS system.  So Emacs
+;; C:/WINDOWS/SYSTEM32/ for partitioning NTFS systems.  So Emacs
 ;; can find the one in your ImageMagick directory, you need to
 ;; customize this value to the absolute filename.
 (defcustom thumbs-conversion-program

=== modified file 'lisp/url/url-dav.el'
--- lisp/url/url-dav.el	2011-11-15 17:37:37 +0000
+++ lisp/url/url-dav.el	2011-11-20 02:29:42 +0000
@@ -417,7 +417,7 @@
 Automatically creates an XML request body if TAG is non-nil.
 BODY is the XML document fragment to be enclosed by <TAG></TAG>.
 
-DEPTH is how deep the request should propogate.  Default is 0, meaning
+DEPTH is how deep the request should propagate.  Default is 0, meaning
 it should apply only to URL.  A negative number means to use
 `Infinity' for the depth.  Not all WebDAV servers support this depth
 though.

=== modified file 'lisp/vc/vc-arch.el'
--- lisp/vc/vc-arch.el	2011-07-03 01:15:38 +0000
+++ lisp/vc/vc-arch.el	2011-11-20 02:29:42 +0000
@@ -398,7 +398,7 @@
 	 (with-temp-buffer
 	   (insert-file-contents rej)
 	   (goto-char (point-min))
-	   (looking-at "Conflicts occured, diff3 conflict markers left in file\\.")))))
+	   (looking-at "Conflicts occurred, diff3 conflict markers left in file\\.")))))
 
 (defun vc-arch-delete-rej-if-obsolete ()
   "For use in `after-save-hook'."

=== modified file 'lisp/vc/vc-dir.el'
--- lisp/vc/vc-dir.el	2011-11-02 02:05:53 +0000
+++ lisp/vc/vc-dir.el	2011-11-20 02:29:42 +0000
@@ -1021,7 +1021,7 @@
                             (lambda (info)
 			      ;; The state for directory entries might
 			      ;; have been changed to 'up-to-date,
-			      ;; reset it, othewise it will be removed when doing 'x'
+			      ;; reset it, otherwise it will be removed when doing 'x'
 			      ;; next time.
 			      ;; FIXME: There should be a more elegant way to do this.
 			      (when (and (vc-dir-fileinfo->directory info)

=== modified file 'lisp/window.el'
--- lisp/window.el	2011-11-19 15:22:08 +0000
+++ lisp/window.el	2011-11-20 02:29:42 +0000
@@ -4950,7 +4950,7 @@
 
 (defun read-buffer-to-switch (prompt)
   "Read the name of a buffer to switch to, prompting with PROMPT.
-Return the neame of the buffer as a string.
+Return the name of the buffer as a string.
 
 This function is intended for the `switch-to-buffer' family of
 commands since these need to omit the name of the current buffer

=== modified file 'lisp/woman.el'
--- lisp/woman.el	2011-11-17 09:09:20 +0000
+++ lisp/woman.el	2011-11-20 02:29:42 +0000
@@ -2558,7 +2558,7 @@
      ;; ((looking-at "[te]") (setq c nil))   ; reject t(roff) and e(ven page)
      ((looking-at "[ntoe]")
       (setq c (memq (following-char) woman-if-conditions-true)))
-     ;; Unrecognised letter so reject:
+     ;; Unrecognized letter so reject:
      ((looking-at "[A-Za-z]") (setq c nil)
       (WoMan-warn "%s %s -- unrecognized condition name rejected!"
 		  request (match-string 0)))
@@ -3697,7 +3697,7 @@
                               (setq woman-request (match-string 1)))))
             ;; Delete request or macro name:
             (woman-delete-match 0))
-           ;; Unrecognised request:
+           ;; Unrecognized request:
            ((prog1 nil
               ;; (WoMan-warn ".%s request ignored!" woman-request)
               (WoMan-warn-ignored woman-request "ignored!")

=== modified file 'nt/runemacs.c'
--- nt/runemacs.c	2011-11-04 21:59:16 +0000
+++ nt/runemacs.c	2011-11-20 02:29:42 +0000
@@ -111,7 +111,7 @@
 #endif
 
   /* Append original arguments if any; first look for arguments we
-     recognise (-wait, -high, and -low), and apply them ourselves.  */
+     recognize (-wait, -high, and -low), and apply them ourselves.  */
   while (cmdline[0] == '-' || cmdline[0] == '/')
     {
       if (strncmp (cmdline+1, "wait", 4) == 0)

=== modified file 'src/ChangeLog.10'
--- src/ChangeLog.10	2011-11-17 17:40:48 +0000
+++ src/ChangeLog.10	2011-11-20 02:29:42 +0000
@@ -6387,7 +6387,7 @@
 2005-11-20  Nick Roberts  <nickrob@snap.net.nz>
 
 	* lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
-	this type is recognised when debugging.
+	this type is recognized when debugging.
 
 2005-11-19  Andreas Schwab  <schwab@suse.de>
 
@@ -13398,7 +13398,7 @@
 2004-07-04  John Paul Wallington  <jpw@gnu.org>
 
 	* fileio.c (read_file_name_completion_ignore_case): New variable.
-	(syms_of_fileio): Declare and initialise it.
+	(syms_of_fileio): Declare and initialize it.
 	(Fread_file_name): Bind `completion-ignore-case' to respect it.
 
 2004-07-03  Eli Zaretskii  <eliz@gnu.org>

=== modified file 'src/ChangeLog.11'
--- src/ChangeLog.11	2011-11-19 09:18:31 +0000
+++ src/ChangeLog.11	2011-11-20 02:29:42 +0000
@@ -5896,7 +5896,7 @@
 	* eval.c (Feval, Ffuncall): Use the new names.
 
 	* lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
-	(DEFUN): Add braces around the union initialisation and use ## to
+	(DEFUN): Add braces around the union initialization and use ## to
 	specify the right union alternative and avoid a cast.
 
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
@@ -9266,7 +9266,7 @@
 
 	Get rid of the direct_output optimizations.
 	* keyboard.c (nonundocount): Remove extern declaration.
-	(command_loop_1): Remove brittle optimisation for cheap and
+	(command_loop_1): Remove brittle optimization for cheap and
 	common operations.
 	* xdisp.c (redisplay_internal): Don't bother checking
 	redisplay_performed_directly_p any more.
@@ -12481,7 +12481,7 @@
 
 	* dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
 	xd_symbol_to_dbus_type.  With Solaris 2.11, it was said to compile
-	for hours, when optimzation is enabled.
+	for hours, when optimization is enabled.
 	(xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize)
 	(xd_read_message): Make them static.
 
@@ -16072,7 +16072,7 @@
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
 	* callproc.c (Fcall_process): Don't hold references to string data
-	across garbage collection.  Move initialisation of new_argv down
+	across garbage collection.  Move initialization of new_argv down
 	to avoid compiler bug.
 
 2008-09-07  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
@@ -19248,7 +19248,7 @@
 	* w32menu.c (Fx_popup_menu): Unwind protect while building menu.
 	(parse_single_submenu): Remove.
 	(digest_single_submenu): Remove.
-	(syms_of_w32menu): Don't initialise variables that have moved
+	(syms_of_w32menu): Don't initialize variables that have moved
 	to menu.c.
 	(set_frame_menubar): Sync with version in xmenu.c.
 	(w32_menu_show): Sync with xmenu_show in xmenu.c.
@@ -21290,7 +21290,7 @@
 	(CACHE_BLOCKSIZE): New constants.
 
 	* w32font.c (Qja, Qko, Qzh): New symbols.
-	(syms_of_w32font): Initialise them.
+	(syms_of_w32font): Initialize them.
 	(font_matches_spec): Use them to filter by language.
 	(recompute_cached_metrics): Remove function.
 	(compute_metrics, clear_cached_metrics): New functions.
@@ -29651,7 +29651,7 @@
 
 	* callproc.c (child_setup, getenv_internal): Use the
 	display-environment-variable and term-environment-variable frame params.
-	(set_initial_environment): Initialise Vprocess_environment.
+	(set_initial_environment): Initialize Vprocess_environment.
 
 	* config.in: Disable multi-keyboard support on a mac.
 
@@ -31298,7 +31298,7 @@
 	(term_mouse_highlight, term_mouse_movement, term_mouse_position)
 	(term_mouse_click, handle_one_term_event, Fterm_open_connection)
 	(Fterm_close_connection): New functions.
-	(term_init): Initialise mouse_face_window.
+	(term_init): Initialize mouse_face_window.
 
 2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
 

=== modified file 'src/ChangeLog.2'
--- src/ChangeLog.2	2011-11-14 20:23:26 +0000
+++ src/ChangeLog.2	2011-11-20 02:29:42 +0000
@@ -1152,7 +1152,7 @@
 
 1987-07-29  Richard Mlynarik  (mly@prep)
 
-	* lread.c (init_read): Initialise load_in_progress.
+	* lread.c (init_read): Initialize load_in_progress.
 
 1987-07-28  Richard M. Stallman  (rms@prep)
 
@@ -2251,7 +2251,7 @@
 1987-01-16  Richard Mlynarik  (mly@prep)
 
 	* xfns.c (Fx_set_{background,cursor,mouse}_color):
-	Initialise save_color.
+	Initialize save_color.
 
 	* fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
 	Delete/replace unused/conditionalised variables
@@ -3002,7 +3002,7 @@
 1986-11-18  Richard Mlynarik  (mly@prep)
 
 	* emacs.c (main):
-	Giving `inhibit_x_windows' an initialisation loses;
+	Giving `inhibit_x_windows' an initialization loses;
 	do it explicitly.
 
 	* xfns.c (Fx_rubber_band):
@@ -3291,7 +3291,7 @@
 1986-11-03  Richard Mlynarik  (mly@prep)
 
 	* xterm.c (stufflines):
-	Initialise signal mask.
+	Initialize signal mask.
 
 	* xterm.h:
 	Add definition of sigmask
@@ -3346,7 +3346,7 @@
 	New function.
 
 	* window.c (Fset_window_hscroll):
-	Don't inhibit redisplay optimisations if hscroll is same.
+	Don't inhibit redisplay optimizations if hscroll is same.
 
 	* ymakefile:
 	rm ../etc/DOC to avoid make-docfile overwriting any files which
@@ -3358,7 +3358,7 @@
 	VMS changes from Sasaki
 
 	* termcap.c (tgetent):
-	Make sure `indirect' initialised.
+	Make sure `indirect' initialized.
 
 	* xfns.c (grey_p and callers):
 	New function to compensate for ugly chauvinistic American
@@ -3496,7 +3496,7 @@
 	core-dump)
 
 	Dike out global-minor-modes.  This wasn't actually being used by
-	anything (due to a bug) and wasn't even being initialised!
+	anything (due to a bug) and wasn't even being initialized!
 	minor-mode-alist does what this thought it was doing.
 
 1986-10-11  Richard Mlynarik  (mly@prep)

=== modified file 'src/ChangeLog.3'
--- src/ChangeLog.3	2011-11-19 09:18:31 +0000
+++ src/ChangeLog.3	2011-11-20 02:29:42 +0000
@@ -9010,7 +9010,7 @@
 	* keyboard.c (cmd_error): If an error occurs before somebody has
 	provided a screen to print it on, print it to stderr and exit
 	Emacs.  Handle batch-mode errors with the same code.
-	* lisp.h (Qexternal_debugging_ouput): New extern declaration, for
+	* lisp.h (Qexternal_debugging_output): New extern declaration, for
 	use in cmd_error.
 
 	* screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix.

=== modified file 'src/ChangeLog.4'
--- src/ChangeLog.4	2011-11-15 17:37:37 +0000
+++ src/ChangeLog.4	2011-11-20 02:29:42 +0000
@@ -3656,7 +3656,7 @@
 
 	* m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible.
 	(HAVE_UNISTD_H): Deleted because configure takes care of it.
-	(C_SWITCH_MACHINE): Added optimisation options for gnu cc.
+	(C_SWITCH_MACHINE): Added optimization options for gnu cc.
 
 1993-12-17  Mike Long  (mike.long@analog.com)
 
@@ -5007,7 +5007,7 @@
 	Change display code to handle the `invisible' text property.
 	* dispnew.c (direct_output_for_insert): Fail if character
 	just inserted has text properties.
-	(direct_ouput_forward_char): Fail if moving near invisible chars.
+	(direct_output_forward_char): Fail if moving near invisible chars.
 	* indent.c (compute_motion): Compute correctly for invisible text.
 	(vmotion): Take care of invisible newlines.
 	* intervals.c (set_point): Ignore `invisible' property

=== modified file 'src/ChangeLog.5'
--- src/ChangeLog.5	2011-01-26 08:36:39 +0000
+++ src/ChangeLog.5	2011-11-20 02:29:42 +0000
@@ -3463,7 +3463,7 @@
 
 	* lisp.h (running_asynch_code): New global flag.
 	* emacs.c (running_asynch_code): New global flag.
-	(main): Initialise it.
+	(main): Initialize it.
 	* process.c (read_process_output, exec_sentinel): Set and
 	reset the running_asynch_code global flag and restore match data.
 

=== modified file 'src/ChangeLog.6'
--- src/ChangeLog.6	2011-11-17 17:40:48 +0000
+++ src/ChangeLog.6	2011-11-20 02:29:42 +0000
@@ -1182,7 +1182,7 @@
 	support in sys_select.
 
 	(term_ntproc): New function.
-	(init_ntproc): New function to initialise socket support and make
+	(init_ntproc): New function to initialize socket support and make
 	initial std handles non-inheritable.  Also ensure stdin, stdout
 	and stderr have valid handles so that pipes and sockets can't
 	inadvertently use fd 0, 1, or 2.
@@ -1440,7 +1440,7 @@
 	Correctly detect when default_directory is absolute.
 	Be strict when looking for MSDOS drive specifier; defer calling
 	getdefdir.  Ignore drive specifier if name now has UNC prefix.
-	Correctly recognise if name is not absolute when trying simple
+	Correctly recognize if name is not absolute when trying simple
 	method to expand; return original string if possible.
 	Skip dir sep after ~ or ~user.
 	Use getpwnam instead of HOME for ~user on NT.

=== modified file 'src/ChangeLog.7'
--- src/ChangeLog.7	2011-11-15 07:55:13 +0000
+++ src/ChangeLog.7	2011-11-20 02:29:42 +0000
@@ -10963,7 +10963,7 @@
 1996-08-28  Morten Welinder  <terra@diku.dk>
 
 	* minibuf.c (Vhistory_length, Qhistory_length): New variables.
-	(syms_of_minibuf): Register and initialise these.
+	(syms_of_minibuf): Register and initialize these.
 	(read_minibuf): Truncate history list if needed.
 
 1996-08-28  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>

=== modified file 'src/ChangeLog.8'
--- src/ChangeLog.8	2011-11-15 00:54:19 +0000
+++ src/ChangeLog.8	2011-11-20 02:29:42 +0000
@@ -13266,7 +13266,7 @@
 
 	* charset.c (Fchar_bytes): Doc fix.
 	(char_bytes): Fix returned value to match returned type.
-	(syms_of_charset): Fix type clash in initialisation of
+	(syms_of_charset): Fix type clash in initialization of
 	Vauto_fill_chars.
 
 1998-10-29  Geoff Voelker  <voelker@cs.washington.edu>
@@ -13429,7 +13429,7 @@
 	`x-list-fonts.c'.
 	(w32_get_font_info, w32_query_font, w32_find_ccl_program): New
 	functions for fontset support - adapted from x_ equivalents.
-	(syms_of_w32fns): New lisp variables initialised.  Function
+	(syms_of_w32fns): New lisp variables initialized.  Function
 	pointers for fontset.c set up.
 
 	* w32term.c: Include fontset.h.  Define codepage macros.

=== modified file 'src/ccl.c'
--- src/ccl.c	2011-11-17 09:09:20 +0000
+++ src/ccl.c	2011-11-20 02:29:42 +0000
@@ -47,7 +47,7 @@
 static Lisp_Object Qcode_conversion_map_id;
 
 /* Symbols of ccl program have this property, a value of the property
-   is an index for Vccl_protram_table. */
+   is an index for Vccl_program_table. */
 static Lisp_Object Qccl_program_idx;
 
 /* Table of registered CCL programs.  Each element is a vector of

=== modified file 'src/character.c'
--- src/character.c	2011-11-15 07:55:13 +0000
+++ src/character.c	2011-11-20 02:29:42 +0000
@@ -669,7 +669,7 @@
 }
 
 /* Parse unibyte string at STR of LEN bytes, and return the number of
-   bytes it may ocupy when converted to multibyte string by
+   bytes it may occupy when converted to multibyte string by
    `str_to_multibyte'.  */
 
 EMACS_INT

=== modified file 'src/character.h'
--- src/character.h	2011-07-19 00:42:24 +0000
+++ src/character.h	2011-11-20 02:29:42 +0000
@@ -596,7 +596,7 @@
    ? ASCII_CHAR_WIDTH (c)	\
    : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c))))
 
-/* If C is a variation selector, return the index numnber of the
+/* If C is a variation selector, return the index of the
    variation selector (1..256).  Otherwise, return 0.  */
 
 #define CHAR_VARIATION_SELECTOR_P(c)		\

=== modified file 'src/dbusbind.c'
--- src/dbusbind.c	2011-09-25 16:00:02 +0000
+++ src/dbusbind.c	2011-11-20 02:29:42 +0000
@@ -184,7 +184,7 @@
 #endif
 
 /* This was a macro.  On Solaris 2.11 it was said to compile for
-   hours, when optimzation is enabled.  So we have transferred it into
+   hours, when optimization is enabled.  So we have transferred it into
    a function.  */
 /* Determine the DBusType of a given Lisp symbol.  OBJECT must be one
    of the predefined D-Bus type symbols.  */

=== modified file 'src/fileio.c'
--- src/fileio.c	2011-11-19 09:18:31 +0000
+++ src/fileio.c	2011-11-20 02:29:42 +0000
@@ -338,7 +338,7 @@
 
   while (p != beg && !IS_DIRECTORY_SEP (p[-1])
 #ifdef DOS_NT
-	 /* only recognise drive specifier at the beginning */
+	 /* only recognize drive specifier at the beginning */
 	 && !(p[-1] == ':'
 	      /* handle the "/:d:foo" and "/:foo" cases correctly  */
 	      && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg))
@@ -401,7 +401,7 @@
 
   while (p != beg && !IS_DIRECTORY_SEP (p[-1])
 #ifdef DOS_NT
-	 /* only recognise drive specifier at beginning */
+	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':'
 	      /* handle the "/:d:foo" case correctly  */
 	      && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg))))

=== modified file 'src/fontset.c'
--- src/fontset.c	2011-11-15 07:55:13 +0000
+++ src/fontset.c	2011-11-20 02:29:42 +0000
@@ -1346,7 +1346,7 @@
 
    In FONTSET, set FONT_DEF in a fashion specified by ADD for
    characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE.
-   The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the
+   The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the
    new SCRIPT_RANGE_LIST is stored in ARG.
 
    If ASCII is nil, don't set FONT_DEF for ASCII characters.  It is

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2011-08-14 06:40:45 +0000
+++ src/ftfont.c	2011-11-20 02:29:42 +0000
@@ -272,7 +272,7 @@
     }
   else
     {
-      /* As this font is not scalable, parhaps this is a BDF or PCF
+      /* As this font is not scalable, perhaps this is a BDF or PCF
 	 font. */
       FT_Face ft_face;
 
@@ -730,7 +730,7 @@
 
   if ((n = FONT_SLANT_NUMERIC (spec)) >= 0
       && n < 100)
-    /* Fontconfig doesn't support reverse-italic/obligue.  */
+    /* Fontconfig doesn't support reverse-italic/oblique.  */
     return NULL;
 
   if (INTEGERP (AREF (spec, FONT_DPI_INDEX)))

=== modified file 'src/gtkutil.c'
--- src/gtkutil.c	2011-11-18 08:31:02 +0000
+++ src/gtkutil.c	2011-11-20 02:29:42 +0000
@@ -127,7 +127,7 @@
 
    Returns non-zero if display could be opened, zero if display could not
    be opened, and less than zero if the GTK version doesn't support
-   multipe displays.  */
+   multiple displays.  */
 
 void
 xg_display_open (char *display_name, Display **dpy)
@@ -4262,7 +4262,7 @@
 #endif
       gtk_tool_item_set_homogeneous (ti, FALSE);
 
-      /* Callback to save modifyer mask (Shift/Control, etc).  GTK makes
+      /* Callback to save modifier mask (Shift/Control, etc).  GTK makes
          no distinction based on modifiers in the activate callback,
          so we have to do it ourselves.  */
       g_signal_connect (wb, "button-release-event",

=== modified file 'src/image.c'
--- src/image.c	2011-11-19 09:18:31 +0000
+++ src/image.c	2011-11-20 02:29:42 +0000
@@ -7754,7 +7754,7 @@
     }
 
   /* Finally we are done manipulating the image.  Figure out the
-     resulting width/height and transfer ownerwship to Emacs.  */
+     resulting width/height and transfer ownership to Emacs.  */
   height = MagickGetImageHeight (image_wand);
   width = MagickGetImageWidth (image_wand);
 

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2011-11-19 09:18:31 +0000
+++ src/keyboard.c	2011-11-20 02:29:42 +0000
@@ -12100,7 +12100,7 @@
 Function key definitions that apply to all terminal devices should go
 here.  If a mapping is defined in both the current
 `local-function-key-map' binding and this variable, then the local
-definition will take precendence.  */);
+definition will take precedence.  */);
   Vfunction_key_map = Fmake_sparse_keymap (Qnil);
 
   DEFVAR_LISP ("key-translation-map", Vkey_translation_map,

=== modified file 'src/process.c'
--- src/process.c	2011-11-17 17:40:48 +0000
+++ src/process.c	2011-11-20 02:29:42 +0000
@@ -1414,7 +1414,7 @@
 	  val = XCDR (Vdefault_process_coding_system);
       }
     XPROCESS (proc)->encode_coding_system = val;
-    /* Note: At this momemnt, the above coding system may leave
+    /* Note: At this moment, the above coding system may leave
        text-conversion or eol-conversion unspecified.  They will be
        decided after we read output from the process and decode it by
        some coding system, or just before we actually send a text to

=== modified file 'src/w32.c'
--- src/w32.c	2011-11-18 08:31:02 +0000
+++ src/w32.c	2011-11-20 02:29:42 +0000
@@ -3057,7 +3057,7 @@
   unsigned hash;
 
   /* Get the truly canonical filename, if it exists.  (Note: this
-     doesn't resolve aliasing due to subst commands, or recognise hard
+     doesn't resolve aliasing due to subst commands, or recognize hard
      links.  */
   if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH))
     abort ();
@@ -5845,7 +5845,7 @@
 void
 init_ntproc (void)
 {
-  /* Initialise the socket interface now if available and requested by
+  /* Initialize the socket interface now if available and requested by
      the user by defining PRELOAD_WINSOCK; otherwise loading will be
      delayed until open-network-stream is called (w32-has-winsock can
      also be used to dynamically load or reload winsock).

=== modified file 'src/w32console.c'
--- src/w32console.c	2011-05-07 15:44:19 +0000
+++ src/w32console.c	2011-11-20 02:29:42 +0000
@@ -748,7 +748,7 @@
 	       doc: /* Non-nil means make terminal frames use the full screen buffer dimensions.
 This is desirable when running Emacs over telnet.
 A value of nil means use the current console window dimensions; this
-may be preferrable when working directly at the console with a large
+may be preferable when working directly at the console with a large
 scroll-back buffer.  */);
   w32_use_full_screen_buffer = 0;
 
@@ -757,4 +757,3 @@
   defsubr (&Sset_cursor_size);
   defsubr (&Sset_message_beep);
 }
-

=== modified file 'src/w32fns.c'
--- src/w32fns.c	2011-11-17 09:09:20 +0000
+++ src/w32fns.c	2011-11-20 02:29:42 +0000
@@ -2262,7 +2262,7 @@
                  some third party shell extensions can cause it to be used in
                  system dialogs, which causes a crash if it is not initialized.
                  This is a known bug in Windows, which was fixed long ago, but
-                 the patch for XP is not publically available until XP SP3,
+                 the patch for XP is not publicly available until XP SP3,
                  and older versions will never be patched.  */
               CoInitialize (NULL);
 	      w32_createwindow ((struct frame *) msg.wParam);
@@ -2880,7 +2880,7 @@
 		      key.dwControlKeyState = modifiers;
 
 		      add = w32_kbd_patch_key (&key);
-		      /* 0 means an unrecognised keycode, negative means
+		      /* 0 means an unrecognized keycode, negative means
 			 dead key.  Ignore both.  */
 		      while (--add >= 0)
 			{

=== modified file 'src/w32proc.c'
--- src/w32proc.c	2011-11-17 17:40:48 +0000
+++ src/w32proc.c	2011-11-20 02:29:42 +0000
@@ -122,12 +122,12 @@
 
   for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
     if (!CHILD_ACTIVE (cp))
-      goto Initialise;
+      goto Initialize;
   if (child_proc_count == MAX_CHILDREN)
     return NULL;
   cp = &child_procs[child_proc_count++];
 
- Initialise:
+ Initialize:
   memset (cp, 0, sizeof (*cp));
   cp->fd = -1;
   cp->pid = -1;
@@ -821,7 +821,7 @@
 
      The w32 GNU-based library from Cygnus doubles quotes to escape
      them, while MSVC uses backslash for escaping.  (Actually the MSVC
-     startup code does attempt to recognise doubled quotes and accept
+     startup code does attempt to recognize doubled quotes and accept
      them, but gets it wrong and ends up requiring three quotes to get a
      single embedded quote!)  So by default we decide whether to use
      quote or backslash as the escape character based on whether the

=== modified file 'src/w32term.c'
--- src/w32term.c	2011-11-19 09:18:31 +0000
+++ src/w32term.c	2011-11-20 02:29:42 +0000
@@ -5576,7 +5576,7 @@
      input focus anyway (so the window with focus will never be
      completely obscured) - if not, then just moving the mouse over it
      is sufficient to give it focus.  On Windows, the user must actually
-     click on the frame (preferrably the title bar so as not to move
+     click on the frame (preferably the title bar so as not to move
      point), which is more awkward.  Also, no other Windows program
      raises a window to the top but leaves another window (possibly now
      completely obscured) with input focus.
@@ -6164,7 +6164,7 @@
   dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE;
   ReleaseDC (NULL, hdc);
 
-  /* initialise palette with white and black */
+  /* initialize palette with white and black */
   {
     XColor color;
     w32_defined_color (0, "white", &color, 1);

=== modified file 'src/w32xfns.c'
--- src/w32xfns.c	2011-03-12 19:19:47 +0000
+++ src/w32xfns.c	2011-11-20 02:29:42 +0000
@@ -188,7 +188,7 @@
       }
 
       nQueue--;
-      /* Consolidate WM_PAINT messages to optimise redrawing.  */
+      /* Consolidate WM_PAINT messages to optimize redrawing.  */
       if (lpmsg->msg.message == WM_PAINT && nQueue)
         {
           int_msg * lpCur = lpHead;
@@ -441,4 +441,3 @@
 x_sync (void *f)
 {
 }
-

=== modified file 'src/window.h'
--- src/window.h	2011-11-16 10:10:40 +0000
+++ src/window.h	2011-11-20 02:29:42 +0000
@@ -268,7 +268,7 @@
     /* List of buffers re-shown in this window.  */
     Lisp_Object next_buffers;
 
-    /* An alist with parameteres.  */
+    /* An alist with parameters.  */
     Lisp_Object window_parameters;
 
     /* No Lisp data may follow below this point without changing

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2011-11-19 15:50:23 +0000
+++ src/xdisp.c	2011-11-20 02:29:42 +0000
@@ -1445,7 +1445,7 @@
 		     position is CHARPOS.  For the contingency that we
 		     didn't, and stopped at the first newline from the
 		     display string, move back over the glyphs
-		     prfoduced from the string, until we find the
+		     produced from the string, until we find the
 		     rightmost glyph not from the string.  */
 		  if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string))
 		    {
@@ -14109,7 +14109,7 @@
 	      || (STRINGP (g1->object)
 		  && (!NILP (Fget_char_property (make_number (g1->charpos),
 						Qcursor, g1->object))
-		      /* pevious candidate is from the same display
+		      /* previous candidate is from the same display
 			 string as this one, and the display string
 			 came from a text property */
 		      || (EQ (g1->object, glyph->object)
@@ -17020,7 +17020,7 @@
   last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w);
   if (last_unchanged_at_beg_row)
     {
-      /* Avoid starting to display in the moddle of a character, a TAB
+      /* Avoid starting to display in the middle of a character, a TAB
 	 for instance.  This is easier than to set up the iterator
 	 exactly, and it's not a frequent case, so the additional
 	 effort wouldn't really pay off.  */

=== modified file 'src/xfns.c'
--- src/xfns.c	2011-11-14 06:27:12 +0000
+++ src/xfns.c	2011-11-20 02:29:42 +0000
@@ -2962,7 +2962,7 @@
 
   if (NILP (font_param))
     {
-      /* System font should take precedendce over X resources.  We suggest this
+      /* System font should take precedence over X resources.  We suggest this
          regardless of font-use-system-font because .emacs may not have been
          read yet.  */
       const char *system_font = xsettings_get_system_font ();

=== modified file 'test/cedet/semantic-utest.el'
--- test/cedet/semantic-utest.el	2011-11-15 17:37:37 +0000
+++ test/cedet/semantic-utest.el	2011-11-20 02:29:42 +0000
@@ -170,7 +170,7 @@
 
 
 )
-;  "pyhon test case. notice that python is indentation sensitive
+;  "python test case. notice that python is indentation sensitive
 
 
 (defvar semantic-utest-Python-name-contents
------------------------------------------------------------
revno: 106438
fixes bug(s): http://debbugs.gnu.org/10077
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 18:23:48 -0800
message:
  Small rmail fixes.
  
  * lisp/mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.
  (rmail-insert-mime-forwarded-message-function, rmail-mime-feature):
  Doc fixes.
  (rmail-decode-mime-charset): Mark as obsolete.
  
  * lisp/mail/rmailsum.el (rmail-message-regexp-p-1):
  * lisp/mail/rmail.el (rmail-search-message, rmail-forward, rmail-resend):
  Before using mime functions, check they are set.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 23:34:40 +0000
+++ lisp/ChangeLog	2011-11-20 02:23:48 +0000
@@ -1,3 +1,14 @@
+2011-11-20  Glenn Morris  <rgm@gnu.org>
+
+	* mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.
+	(rmail-insert-mime-forwarded-message-function, rmail-mime-feature):
+	Doc fixes.
+	(rmail-decode-mime-charset): Mark as obsolete.
+
+	* mail/rmailsum.el (rmail-message-regexp-p-1):
+	* mail/rmail.el (rmail-search-message, rmail-forward, rmail-resend):
+	Before using mime functions, check they are set.  (Bug#10077)
+
 2011-11-19  Juri Linkov  <juri@jurta.org>
 
 	* info.el (Info-finder-find-node): Use `package--builtins' instead

=== modified file 'lisp/mail/rmail.el'
--- lisp/mail/rmail.el	2011-11-16 11:22:17 +0000
+++ lisp/mail/rmail.el	2011-11-20 02:23:48 +0000
@@ -638,8 +638,11 @@
   :version "23.3"
   :group 'rmail)
 
-(defvar rmail-enable-mime-composing t
-  "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
+(defcustom rmail-enable-mime-composing t
+  "If non-nil, use `rmail-insert-mime-forwarded-message-function' to forward."
+  :type 'boolean
+  :version "24.1"			; nil -> t
+  :group 'rmail)
 
 (defvar rmail-show-mime-function nil
   "Function of no argument called to show a decoded MIME message.
@@ -649,8 +652,8 @@
 ;;;###autoload
 (defvar rmail-insert-mime-forwarded-message-function nil
   "Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' or
-`rmail-enable-mime-composing' is non-nil.
+This function is called if `rmail-enable-mime' and
+`rmail-enable-mime-composing' are non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -681,12 +684,17 @@
 
 (defvar rmail-mime-feature 'rmailmm
   "Feature to require for MIME support in Rmail.
-When starting Rmail, if `rmail-enable-mime' is non-nil,
-this feature is required with `require'.
-
-The default value is `rmailmm'")
-
-;; FIXME this is unused.
+When starting Rmail, if `rmail-enable-mime' is non-nil, this
+feature is loaded with `require'.  The default value is `rmailmm'.
+
+The library should set the variable `rmail-show-mime-function'
+to an appropriate value, and optionally also set
+`rmail-search-mime-message-function',
+`rmail-search-mime-header-function',
+`rmail-insert-mime-forwarded-message-function', and
+`rmail-insert-mime-resent-message-function'.")
+
+;; FIXME this is unused since 23.1.
 (defvar rmail-decode-mime-charset t
   "*Non-nil means a message is decoded by MIME's charset specification.
 If this variable is nil, or the message has not MIME specification,
@@ -696,6 +704,9 @@
 ignored, and all the decoding work is done by a feature specified by
 the variable `rmail-mime-feature'.")
 
+(make-obsolete-variable 'rmail-decode-mime-charset
+			"it does nothing." "23.1")
+
 (defvar rmail-mime-charset-pattern
   (concat "^content-type:[ \t]*text/plain;"
 	  "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
@@ -3128,10 +3139,9 @@
   ;; This is adequate because its only caller, rmail-search,
   ;; unswaps the buffers.
   (goto-char (rmail-msgbeg msg))
-  (if rmail-enable-mime
-      (if rmail-search-mime-message-function
-          (funcall rmail-search-mime-message-function msg regexp)
-        (error "You must set `rmail-search-mime-message-function'"))
+  (if (and rmail-enable-mime
+	   rmail-search-mime-message-function)
+      (funcall rmail-search-mime-message-function msg regexp)
     (re-search-forward regexp (rmail-msgend msg) t)))
 
 (defvar rmail-search-last-regexp nil)
@@ -3798,7 +3808,8 @@
 	    ;; Insert after header separator--before signature if any.
 	    (rfc822-goto-eoh)
 	    (forward-line 1)
-	    (if (and rmail-enable-mime rmail-enable-mime-composing)
+	    (if (and rmail-enable-mime rmail-enable-mime-composing
+		     rmail-insert-mime-forwarded-message-function)
 		(prog1
 		    (funcall rmail-insert-mime-forwarded-message-function
 			     forward-buffer)
@@ -3854,10 +3865,9 @@
     (unwind-protect
 	(with-current-buffer tembuf
 	  ;;>> Copy message into temp buffer
-	  (if rmail-enable-mime
-              (if rmail-insert-mime-resent-message-function
+	  (if (and rmail-enable-mime
+		   rmail-insert-mime-resent-message-function)
                   (funcall rmail-insert-mime-resent-message-function mailbuf)
-                (error "You must set `rmail-insert-mime-resent-message-function'"))
 	    (insert-buffer-substring mailbuf))
 	  (goto-char (point-min))
 	  ;; Delete any Sender field, since that's not specifiable.

=== modified file 'lisp/mail/rmailsum.el'
--- lisp/mail/rmailsum.el	2011-11-14 09:22:45 +0000
+++ lisp/mail/rmailsum.el	2011-11-20 02:23:48 +0000
@@ -342,10 +342,9 @@
 (defun rmail-message-regexp-p-1 (msg regexp)
   ;; Search functions can expect to start from the beginning.
   (narrow-to-region (point) (save-excursion (search-forward "\n\n") (point)))
-  (if rmail-enable-mime
-      (if rmail-search-mime-header-function
-	  (funcall rmail-search-mime-header-function msg regexp (point))
-	(error "You must set `rmail-search-mime-header-function'"))
+  (if (and rmail-enable-mime
+	   rmail-search-mime-header-function)
+      (funcall rmail-search-mime-header-function msg regexp (point))
     (re-search-forward regexp nil t)))
 
 ;;;###autoload
------------------------------------------------------------
revno: 106437
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Sun 2011-11-20 01:34:40 +0200
message:
  * lisp/info.el (Info-finder-find-node): Use `package--builtins' instead
  of `package-alist'.  Use node names formed by the pattern "Keyword "
  and the keyword name.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 23:05:41 +0000
+++ lisp/ChangeLog	2011-11-19 23:34:40 +0000
@@ -1,3 +1,9 @@
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+	* info.el (Info-finder-find-node): Use `package--builtins' instead
+	of `package-alist'.  Use node names formed by the pattern "Keyword "
+	and the keyword name.
+
 2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* progmodes/sh-script.el (sh-assignment-regexp): Add entry for

=== modified file 'lisp/info.el'
--- lisp/info.el	2011-11-19 21:43:40 +0000
+++ lisp/info.el	2011-11-19 23:34:40 +0000
@@ -3403,7 +3403,7 @@
 (declare-function finder-unknown-keywords "finder" ())
 (declare-function lm-commentary "lisp-mnt" (&optional file))
 (defvar finder-keywords-hash)
-(defvar package-alist)                  ; finder requires package
+(defvar package--builtins)		; finder requires package
 
 (defun Info-finder-find-node (_filename nodename &optional _no-going-back)
   "Finder-specific implementation of `Info-find-node-2'."
@@ -3417,14 +3417,14 @@
     (insert "***************\n\n")
     (insert "* Menu:\n\n")
     (dolist (assoc (append '((all . "All package info")
-			     (unknown . "unknown keywords"))
+			     (unknown . "Unknown keywords"))
 			   finder-known-keywords))
       (let ((keyword (car assoc)))
 	(insert (format "* %s %s.\n"
 			(concat (symbol-name keyword) ": "
-				"kw:" (symbol-name keyword) ".")
+				"Keyword " (symbol-name keyword) ".")
 			(cdr assoc))))))
-   ((equal nodename "unknown")
+   ((equal nodename "Keyword unknown")
     ;; Display unknown keywords
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
 		    Info-finder-file nodename))
@@ -3434,24 +3434,29 @@
     (mapc
      (lambda (assoc)
        (insert (format "* %-14s %s.\n"
-		       (concat (symbol-name (car assoc)) "::")
+		       (concat (symbol-name (car assoc)) ": "
+			       "Keyword " (symbol-name (car assoc)) ".")
 		       (cdr assoc))))
      (finder-unknown-keywords)))
-   ((equal nodename "all")
+   ((equal nodename "Keyword all")
     ;; Display all package info.
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
 		    Info-finder-file nodename))
     (insert "Finder Package Info\n")
     (insert "*******************\n\n")
-    (dolist (package package-alist)
-      (insert (format "%s - %s\n"
-		      (format "*Note %s::" (nth 0 package))
-		      (nth 1 package)))))
-   ((string-match "\\`kw:" nodename)
+    (insert "* Menu:\n\n")
+    (let (desc)
+      (dolist (package package--builtins)
+	(setq desc (cdr-safe package))
+	(when (vectorp desc)
+	  (insert (format "* %-16s %s.\n"
+			  (concat (symbol-name (car package)) "::")
+			  (aref desc 2)))))))
+   ((string-match "\\`Keyword " nodename)
     (setq nodename (substring nodename (match-end 0)))
     ;; Display packages that match the keyword
     ;; or the list of keywords separated by comma.
-    (insert (format "\n\^_\nFile: %s,  Node: kw:%s,  Up: Top\n\n"
+    (insert (format "\n\^_\nFile: %s,  Node: Keyword %s,  Up: Top\n\n"
 		    Info-finder-file nodename))
     (insert "Finder Packages\n")
     (insert "***************\n\n")
@@ -3463,11 +3468,11 @@
 			       (split-string nodename ",[ \t\n]*" t)
 			     (list nodename))))
 	  hits desc)
-      (dolist (kw keywords)
-	(push (copy-tree (gethash kw finder-keywords-hash)) hits))
+      (dolist (keyword keywords)
+	(push (copy-tree (gethash keyword finder-keywords-hash)) hits))
       (setq hits (delete-dups (apply 'append hits)))
       (dolist (package hits)
-	(setq desc (cdr-safe (assq package package-alist)))
+	(setq desc (cdr-safe (assq package package--builtins)))
 	(when (vectorp desc)
 	  (insert (format "* %-16s %s.\n"
 			  (concat (symbol-name package) "::")
------------------------------------------------------------
revno: 106436
committer: Andreas Schwab <schwab@linux-m68k.org>
branch nick: emacs
timestamp: Sun 2011-11-20 00:05:41 +0100
message:
  * lisp/progmodes/sh-script.el (sh-assignment-regexp): Add entry for
  bash.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 21:43:40 +0000
+++ lisp/ChangeLog	2011-11-19 23:05:41 +0000
@@ -1,3 +1,8 @@
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* progmodes/sh-script.el (sh-assignment-regexp): Add entry for
+	bash.
+
 2011-11-19  Juri Linkov  <juri@jurta.org>
 
 	* info.el (Info-hide-note-references): Add `:set' tag to `defcustom'

=== modified file 'lisp/progmodes/sh-script.el'
--- lisp/progmodes/sh-script.el	2011-11-17 17:40:48 +0000
+++ lisp/progmodes/sh-script.el	2011-11-19 23:05:41 +0000
@@ -567,6 +567,7 @@
   '((csh . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*[-+*/%^]?=")
     ;; actually spaces are only supported in let/(( ... ))
     (ksh88 . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*\\([-+*/%&|~^]\\|<<\\|>>\\)?=")
+    (bash . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?\\+?=")
     (rc . "\\<\\([[:alnum:]_*]+\\)[ \t]*=")
     (sh . "\\<\\([[:alnum:]_]+\\)="))
   "Regexp for the variable name and what may follow in an assignment.
------------------------------------------------------------
revno: 106435
fixes bug(s): http://debbugs.gnu.org/9915
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Sat 2011-11-19 23:43:40 +0200
message:
  Don't kill the *info* buffer in `Info-revert-find-node'.
  Add `revert-buffer' to defcustom `Info-hide-node-references'.
  
  * lisp/info.el (Info-hide-note-references): Add `:set' tag to `defcustom'
  that calls `revert-buffer' on all Info buffers. 
  (Info-revert-find-node): Remove let-bindings `old-buffer-name',
  `old-history', `old-history-forward'.  Add let-binding
  `window-selected'.  Remove calls to `kill-buffer',
  `switch-to-buffer' and `Info-mode'.  Set `Info-current-file' to nil
  before calling `Info-find-node', so `Info-find-node-2' will reread
  the Info file.  Restore window positions only when `window-selected'
  is non-nil.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 21:03:12 +0000
+++ lisp/ChangeLog	2011-11-19 21:43:40 +0000
@@ -1,5 +1,17 @@
 2011-11-19  Juri Linkov  <juri@jurta.org>
 
+	* info.el (Info-hide-note-references): Add `:set' tag to `defcustom'
+	that calls `revert-buffer' on all Info buffers.  (Bug#9915)
+	(Info-revert-find-node): Remove let-bindings `old-buffer-name',
+	`old-history', `old-history-forward'.  Add let-binding
+	`window-selected'.  Remove calls to `kill-buffer',
+	`switch-to-buffer' and `Info-mode'.  Set `Info-current-file' to nil
+	before calling `Info-find-node', so `Info-find-node-2' will reread
+	the Info file.  Restore window positions only when `window-selected'
+	is non-nil.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
 	* isearch.el (isearch-lazy-highlight-new-loop):
 	Remove condition `(not isearch-error)'.  (Bug#9918)
 

=== modified file 'lisp/info.el'
--- lisp/info.el	2011-11-19 21:03:12 +0000
+++ lisp/info.el	2011-11-19 21:43:40 +0000
@@ -231,6 +231,12 @@
 		 (const :tag "Replace tag and hide reference" t)
 		 (const :tag "Hide tag and reference" hide)
 		 (other :tag "Only replace tag" tag))
+  :set (lambda (sym val)
+	 (set sym val)
+	 (dolist (buffer (buffer-list))
+	   (with-current-buffer buffer
+	     (when (eq major-mode 'Info-mode)
+	       (revert-buffer t t)))))
   :group 'info)
 
 (defcustom Info-refill-paragraphs nil
@@ -811,10 +817,6 @@
 	   (concat default-directory (buffer-name))))
   (Info-find-node-2 nil nodename))
 
-;; It's perhaps a bit nasty to kill the *info* buffer to force a re-read,
-;; but at least it keeps this routine (which is for makeinfo-buffer and
-;; Info-revert-buffer-function) out of the way of normal operations.
-;;
 (defun Info-revert-find-node (filename nodename)
   "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
 When *info* is already displaying FILENAME and NODENAME, the window position
@@ -822,27 +824,23 @@
   (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
   (let ((old-filename Info-current-file)
 	(old-nodename Info-current-node)
-	(old-buffer-name (buffer-name))
+	(window-selected (eq (selected-window) (get-buffer-window)))
 	(pcolumn      (current-column))
 	(pline        (count-lines (point-min) (line-beginning-position)))
 	(wline        (count-lines (point-min) (window-start)))
-	(old-history-forward Info-history-forward)
-	(old-history  Info-history)
 	(new-history  (and Info-current-file
 			   (list Info-current-file Info-current-node (point)))))
-    (kill-buffer (current-buffer))
-    (switch-to-buffer (or old-buffer-name "*info*"))
-    (Info-mode)
+    ;; When `Info-current-file' is nil, `Info-find-node-2' rereads the file.
+    (setq Info-current-file nil)
     (Info-find-node filename nodename)
-    (setq Info-history-forward old-history-forward)
-    (setq Info-history old-history)
     (if (and (equal old-filename Info-current-file)
 	     (equal old-nodename Info-current-node))
 	(progn
 	  ;; note goto-line is no good, we want to measure from point-min
-	  (goto-char (point-min))
-	  (forward-line wline)
-	  (set-window-start (selected-window) (point))
+	  (when window-selected
+	    (goto-char (point-min))
+	    (forward-line wline)
+	    (set-window-start (selected-window) (point)))
 	  (goto-char (point-min))
 	  (forward-line pline)
 	  (move-to-column pcolumn))
------------------------------------------------------------
revno: 106434
fixes bug(s): http://debbugs.gnu.org/9918
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Sat 2011-11-19 23:03:12 +0200
message:
  * lisp/isearch.el (isearch-lazy-highlight-new-loop):
  Remove condition `(not isearch-error)'. 
  
  * lisp/misearch.el (multi-isearch-search-fun): Add condition
  `(not bound)' to ignore lazy-highlighting search.
  Add the search-failed message "end of multi" when the end of
  multi-sequence is reached.  Uncapitalize the search-failed
  message "Repeat for next buffer".
  
  * lisp/info.el (Info-search): Add the search-failed message
  "end of the manual" when the end of the manual is reached
  in Isearch mode.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 20:14:56 +0000
+++ lisp/ChangeLog	2011-11-19 21:03:12 +0000
@@ -1,5 +1,20 @@
 2011-11-19  Juri Linkov  <juri@jurta.org>
 
+	* isearch.el (isearch-lazy-highlight-new-loop):
+	Remove condition `(not isearch-error)'.  (Bug#9918)
+
+	* misearch.el (multi-isearch-search-fun): Add condition
+	`(not bound)' to ignore lazy-highlighting search.
+	Add the search-failed message "end of multi" when the end of
+	multi-sequence is reached.  Uncapitalize the search-failed
+	message "Repeat for next buffer".
+
+	* info.el (Info-search): Add the search-failed message
+	"end of the manual" when the end of the manual is reached
+	in Isearch mode.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
 	* info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
 	Use non-destructive `remove' instead of `delete' because
 	`Info-history-list' stored to `Info-isearch-initial-history-list' in

=== modified file 'lisp/info.el'
--- lisp/info.el	2011-11-19 20:14:56 +0000
+++ lisp/info.el	2011-11-19 21:03:12 +0000
@@ -1846,7 +1846,9 @@
 		    (setq list nil)))
 	      (if found
 		  (message "")
-		(signal 'search-failed (list regexp))))
+		(signal 'search-failed (if isearch-mode
+					   (list regexp "end of the manual")
+					 (list regexp)))))
 	  (if (not found)
 	      (progn (Info-read-subfile osubfile)
 		     (goto-char opoint)

=== modified file 'lisp/isearch.el'
--- lisp/isearch.el	2011-11-19 19:59:37 +0000
+++ lisp/isearch.el	2011-11-19 21:03:12 +0000
@@ -2673,25 +2673,27 @@
     ;; something important did indeed change
     (lazy-highlight-cleanup t) ;kill old loop & remove overlays
     (setq isearch-lazy-highlight-error isearch-error)
-    (when (not isearch-error)
-      (setq isearch-lazy-highlight-start-limit beg
-	    isearch-lazy-highlight-end-limit end)
-      (setq isearch-lazy-highlight-window       (selected-window)
-            isearch-lazy-highlight-window-start (window-start)
-            isearch-lazy-highlight-window-end   (window-end)
-            isearch-lazy-highlight-start        (point)
-            isearch-lazy-highlight-end          (point)
-            isearch-lazy-highlight-wrapped      nil
-            isearch-lazy-highlight-last-string  isearch-string
-	    isearch-lazy-highlight-case-fold-search isearch-case-fold-search
-	    isearch-lazy-highlight-regexp       isearch-regexp
-	    isearch-lazy-highlight-space-regexp search-whitespace-regexp
-	    isearch-lazy-highlight-word         isearch-word
-	    isearch-lazy-highlight-forward      isearch-forward)
+    ;; It used to check for `(not isearch-error)' here, but actually
+    ;; lazy-highlighting might find matches to highlight even when
+    ;; `isearch-error' is non-nil.  (Bug#9918)
+    (setq isearch-lazy-highlight-start-limit beg
+	  isearch-lazy-highlight-end-limit end)
+    (setq isearch-lazy-highlight-window       (selected-window)
+	  isearch-lazy-highlight-window-start (window-start)
+	  isearch-lazy-highlight-window-end   (window-end)
+	  isearch-lazy-highlight-start        (point)
+	  isearch-lazy-highlight-end          (point)
+	  isearch-lazy-highlight-wrapped      nil
+	  isearch-lazy-highlight-last-string  isearch-string
+	  isearch-lazy-highlight-case-fold-search isearch-case-fold-search
+	  isearch-lazy-highlight-regexp       isearch-regexp
+	  isearch-lazy-highlight-space-regexp search-whitespace-regexp
+	  isearch-lazy-highlight-word         isearch-word
+	  isearch-lazy-highlight-forward      isearch-forward)
       (unless (equal isearch-string "")
 	(setq isearch-lazy-highlight-timer
 	      (run-with-idle-timer lazy-highlight-initial-delay nil
-				   'isearch-lazy-highlight-update))))))
+				   'isearch-lazy-highlight-update)))))
 
 (defun isearch-lazy-highlight-search ()
   "Search ahead for the next or previous match, for lazy highlighting.

=== modified file 'lisp/misearch.el'
--- lisp/misearch.el	2011-04-19 13:44:55 +0000
+++ lisp/misearch.el	2011-11-19 21:03:12 +0000
@@ -142,7 +142,7 @@
        ;; 1. First try searching in the initial buffer
        (let ((res (funcall search-fun string bound noerror)))
 	 ;; Reset wrapping for all-buffers pause after successful search
-	 (if (and res (eq multi-isearch-pause t))
+	 (if (and res (not bound) (eq multi-isearch-pause t))
 	     (setq multi-isearch-current-buffer nil))
 	 res)
        ;; 2. If the above search fails, start visiting next/prev buffers
@@ -173,8 +173,8 @@
 		   found)
 	       ;; Return nil when multi-isearch-next-buffer-current-function fails
 	       ;; (`with-current-buffer' raises an error for nil returned from it).
-	       (error nil))
-	   (signal 'search-failed (list string "Repeat for next buffer"))))))))
+	       (error (signal 'search-failed (list string "end of multi"))))
+	   (signal 'search-failed (list string "repeat for next buffer"))))))))
 
 (defun multi-isearch-wrap ()
   "Wrap the multiple buffers search when search is failed.
------------------------------------------------------------
revno: 106433
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Sat 2011-11-19 22:14:56 +0200
message:
  Replace `delete' with `remove' in info.el.
  
  * lisp/info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
  Use non-destructive `remove' instead of `delete' because
  `Info-history-list' stored to `Info-isearch-initial-history-list' in
  `Info-isearch-start' might need to be restored in `Info-isearch-end'.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 19:59:37 +0000
+++ lisp/ChangeLog	2011-11-19 20:14:56 +0000
@@ -1,5 +1,12 @@
 2011-11-19  Juri Linkov  <juri@jurta.org>
 
+	* info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
+	Use non-destructive `remove' instead of `delete' because
+	`Info-history-list' stored to `Info-isearch-initial-history-list' in
+	`Info-isearch-start' might need to be restored in `Info-isearch-end'.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
 	* isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
 	to nil instead of binding `search-ring' and `regexp-search-ring'.
 	(Bug#9185)

=== modified file 'lisp/info.el'
--- lisp/info.el	2011-11-14 23:59:56 +0000
+++ lisp/info.el	2011-11-19 20:14:56 +0000
@@ -1087,7 +1087,7 @@
                      ;; Add anchors to the history too
                      (setq Info-history-list
                            (cons new-history
-                                 (delete new-history Info-history-list))))
+                                 (remove new-history Info-history-list))))
                    (goto-char anchorpos))
                   ((numberp Info-point-loc)
                    (forward-line (- Info-point-loc 2))
@@ -1514,7 +1514,7 @@
 	;; Add a new unique history item to full history list
 	(let ((new-history (list Info-current-file Info-current-node)))
 	  (setq Info-history-list
-		(cons new-history (delete new-history Info-history-list)))
+		(cons new-history (remove new-history Info-history-list)))
 	  (setq Info-history-forward nil))
 	(if (not (eq Info-fontify-maximum-menu-size nil))
             (Info-fontify-node))
@@ -2153,7 +2153,7 @@
   (insert "Recently Visited Nodes\n")
   (insert "**********************\n\n")
   (insert "* Menu:\n\n")
-  (let ((hl (delete '("*History*" "Top") Info-history-list)))
+  (let ((hl (remove '("*History*" "Top") Info-history-list)))
     (while hl
       (let ((file (nth 0 (car hl)))
 	    (node (nth 1 (car hl))))
------------------------------------------------------------
revno: 106432
fixes bug(s): http://debbugs.gnu.org/9185
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Sat 2011-11-19 21:59:37 +0200
message:
  * lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
  to nil instead of binding `search-ring' and `regexp-search-ring'.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 19:49:56 +0000
+++ lisp/ChangeLog	2011-11-19 19:59:37 +0000
@@ -1,3 +1,9 @@
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+	* isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
+	to nil instead of binding `search-ring' and `regexp-search-ring'.
+	(Bug#9185)
+
 2011-11-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* simple.el (line-move): Force movement by logical lines for any

=== modified file 'lisp/isearch.el'
--- lisp/isearch.el	2011-11-15 17:37:37 +0000
+++ lisp/isearch.el	2011-11-19 19:59:37 +0000
@@ -1162,11 +1162,10 @@
 
 	  (unwind-protect
 	      (let* ((message-log-max nil)
-		     ;; Protect global value of search rings from updating
-		     ;; by `read-from-minibuffer'.  It should be updated only
-		     ;; by `isearch-update-ring' in `isearch-done', not here.
-		     (search-ring search-ring)
-		     (regexp-search-ring regexp-search-ring)
+		     ;; Don't add a new search string to the search ring here
+		     ;; in `read-from-minibuffer'. It should be added only
+		     ;; by `isearch-update-ring' called from `isearch-done'.
+		     (history-add-new-input nil)
 		     ;; Binding minibuffer-history-symbol to nil is a work-around
 		     ;; for some incompatibility with gmhist.
 		     (minibuffer-history-symbol))
------------------------------------------------------------
revno: 106431
fixes bug(s): http://debbugs.gnu.org/10076
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 21:49:56 +0200
message:
  Fix bug #10076 with vertical cursor motion in hscrolled windows.
  
   lisp/simple.el (line-move): Force movement by logical lines for any
   hscrolled window, not only when auto-hscroll-mode is on.
   (line-move-visual): Update doc string to that effect.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 13:13:48 +0000
+++ lisp/ChangeLog	2011-11-19 19:49:56 +0000
@@ -1,3 +1,9 @@
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* simple.el (line-move): Force movement by logical lines for any
+	hscrolled window, not only when auto-hscroll-mode is on.
+	(line-move-visual): Update doc string to that effect.  (Bug#10076)
+
 2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* language/european.el (macintosh): Define as alias for mac-roman.

=== modified file 'lisp/simple.el'
--- lisp/simple.el	2011-11-17 09:09:20 +0000
+++ lisp/simple.el	2011-11-19 19:49:56 +0000
@@ -4277,8 +4277,8 @@
 If nil, `line-move' moves point by logical lines.
 A non-nil setting of `goal-column' overrides the value of this variable
 and forces movement by logical lines.
-Disabling `auto-hscroll-mode' also overrides forces movement by logical
-lines when the window is horizontally scrolled."
+A window that is  horizontally scrolled also forces movement by logical
+lines."
   :type 'boolean
   :group 'editing-basics
   :version "23.1")
@@ -4358,12 +4358,10 @@
     (if (and line-move-visual
 	     ;; Display-based column are incompatible with goal-column.
 	     (not goal-column)
-	     ;; When auto-hscroll-mode is turned off and the text in
-	     ;; the window is scrolled to the left, display-based
-	     ;; motion doesn't make sense (because each logical line
-	     ;; occupies exactly one screen line).
-	     (not (and (null auto-hscroll-mode)
-		       (> (window-hscroll) 0))))
+	     ;; When the text in the window is scrolled to the left,
+	     ;; display-based motion doesn't make sense (because each
+	     ;; logical line occupies exactly one screen line).
+	     (not (> (window-hscroll) 0)))
 	(line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))
------------------------------------------------------------
revno: 106430
fixes bug(s): http://debbugs.gnu.org/10075
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 17:50:23 +0200
message:
  Fix bug #10075 with cursor drawing in an hscrolled window.
  
   src/xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
   (erase_phys_cursor, update_window_cursor, show_mouse_face)
   (cursor_in_mouse_face_p): If the cursor position is out of bounds,
   behave as if the cursor position were at the window margin.
   src/window.c (get_phys_cursor_glyph): If the window is hscrolled,
   and the cursor position is out of bounds, behave as if the cursor
   position were at the window margin.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-19 11:09:10 +0000
+++ src/ChangeLog	2011-11-19 15:50:23 +0000
@@ -1,3 +1,14 @@
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
+	(erase_phys_cursor, update_window_cursor, show_mouse_face)
+	(cursor_in_mouse_face_p): If the cursor position is out of bounds,
+	behave as if the cursor position were at the window margin.
+
+	* window.c (get_phys_cursor_glyph): If the window is hscrolled,
+	and the cursor position is out of bounds, behave as if the cursor
+	position were at the window margin.  (Bug#10075)
+
 2011-11-18  Chong Yidong  <cyd@gnu.org>
 
 	* window.c (Fwindow_combination_limit): Make first argument

=== modified file 'src/window.c'
--- src/window.c	2011-11-19 11:09:10 +0000
+++ src/window.c	2011-11-19 15:50:23 +0000
@@ -5773,13 +5773,30 @@
 {
   struct glyph_row *row;
   struct glyph *glyph;
-
-  if (w->phys_cursor.vpos >= 0
-      && w->phys_cursor.vpos < w->current_matrix->nrows
-      && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos),
-	  row->enabled_p)
-      && row->used[TEXT_AREA] > w->phys_cursor.hpos)
-    glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
+  int hpos = w->phys_cursor.hpos;
+
+  if (!(w->phys_cursor.vpos >= 0
+	&& w->phys_cursor.vpos < w->current_matrix->nrows))
+    return NULL;
+
+  row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos);
+  if (!row->enabled_p)
+    return NULL;
+
+  if (w->hscroll)
+    {
+      /* When the window is hscrolled, cursor hpos can legitimately be
+	 out of bounds, but we draw the cursor at the corresponding
+	 window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+	hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+	hpos = row->used[TEXT_AREA] - 1;
+    }
+
+  if (row->used[TEXT_AREA] > hpos
+      && 0 <= hpos)
+    glyph = row->glyphs[TEXT_AREA] + hpos;
   else
     glyph = NULL;
 

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2011-11-19 09:18:31 +0000
+++ src/xdisp.c	2011-11-19 15:50:23 +0000
@@ -24671,9 +24671,17 @@
 void
 x_write_glyphs (struct glyph *start, int len)
 {
-  int x, hpos;
+  int x, hpos, chpos = updated_window->phys_cursor.hpos;
 
   xassert (updated_window && updated_row);
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!updated_row->reversed_p && chpos < 0)
+    chpos = 0;
+  if (updated_row->reversed_p && chpos >= updated_row->used[TEXT_AREA])
+    chpos = updated_row->used[TEXT_AREA] - 1;
+
   BLOCK_INPUT;
 
   /* Write glyphs.  */
@@ -24688,8 +24696,8 @@
   if (updated_area == TEXT_AREA
       && updated_window->phys_cursor_on_p
       && updated_window->phys_cursor.vpos == output_cursor.vpos
-      && updated_window->phys_cursor.hpos >= hpos
-      && updated_window->phys_cursor.hpos < hpos + len)
+      && chpos >= hpos
+      && chpos < hpos + len)
     updated_window->phys_cursor_on_p = 0;
 
   UNBLOCK_INPUT;
@@ -25199,8 +25207,17 @@
     {
       int on_p = w->phys_cursor_on_p;
       int x1;
-      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
-			w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
+      int hpos = w->phys_cursor.hpos;
+
+      /* When the window is hscrolled, cursor hpos can legitimately be
+	 out of bounds, but we draw the cursor at the corresponding
+	 window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+	hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+	hpos = row->used[TEXT_AREA] - 1;
+
+      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA, hpos, hpos + 1,
 			hl, 0);
       w->phys_cursor_on_p = on_p;
 
@@ -25288,6 +25305,14 @@
        : (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA])))
     goto mark_cursor_off;
 
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!cursor_row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (cursor_row->reversed_p && hpos >= cursor_row->used[TEXT_AREA])
+    hpos = cursor_row->used[TEXT_AREA] - 1;
+
   /* If the cursor is in the mouse face area, redisplay that when
      we clear the cursor.  */
   if (! NILP (hlinfo->mouse_face_window)
@@ -25431,8 +25456,26 @@
      of being deleted.  */
   if (w->current_matrix)
     {
+      int hpos = w->phys_cursor.hpos;
+      int vpos = w->phys_cursor.vpos;
+      struct glyph_row *row;
+
+      if (vpos >= w->current_matrix->nrows
+	  || hpos >= w->current_matrix->matrix_w)
+	return;
+
+      row = MATRIX_ROW (w->current_matrix, vpos);
+
+      /* When the window is hscrolled, cursor hpos can legitimately be
+	 out of bounds, but we draw the cursor at the corresponding
+	 window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+	hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+	hpos = row->used[TEXT_AREA] - 1;
+
       BLOCK_INPUT;
-      display_and_set_cursor (w, on, w->phys_cursor.hpos, w->phys_cursor.vpos,
+      display_and_set_cursor (w, on, hpos, vpos,
 			      w->phys_cursor.x, w->phys_cursor.y);
       UNBLOCK_INPUT;
     }
@@ -25602,9 +25645,18 @@
       if (FRAME_WINDOW_P (f)
 	  && phys_cursor_on_p && !w->phys_cursor_on_p)
 	{
+	  int hpos = w->phys_cursor.hpos;
+
+	  /* When the window is hscrolled, cursor hpos can legitimately be
+	     out of bounds, but we draw the cursor at the corresponding
+	     window margin in that case.  */
+	  if (!row->reversed_p && hpos < 0)
+	    hpos = 0;
+	  if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+	    hpos = row->used[TEXT_AREA] - 1;
+
 	  BLOCK_INPUT;
-	  display_and_set_cursor (w, 1,
-				  w->phys_cursor.hpos, w->phys_cursor.vpos,
+	  display_and_set_cursor (w, 1, hpos, w->phys_cursor.vpos,
 				  w->phys_cursor.x, w->phys_cursor.y);
 	  UNBLOCK_INPUT;
 	}
@@ -25703,7 +25755,19 @@
 int
 cursor_in_mouse_face_p (struct window *w)
 {
-  return coords_in_mouse_face_p (w, w->phys_cursor.hpos, w->phys_cursor.vpos);
+  int hpos = w->phys_cursor.hpos;
+  int vpos = w->phys_cursor.vpos;
+  struct glyph_row *row = MATRIX_ROW (w->current_matrix, vpos);
+
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+    hpos = row->used[TEXT_AREA] - 1;
+
+  return coords_in_mouse_face_p (w, hpos, vpos);
 }
------------------------------------------------------------
revno: 106429
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 23:22:08 +0800
message:
  Change arg names of walk-windows etc from "proc" to "fun".
  They shouldn't be named "proc" since they are not processes.
  
  * lisp/window.el (walk-window-tree-1, walk-window-tree)
  (walk-window-subtree, walk-windows): Change argument name.
diff:
=== modified file 'lisp/window.el'
--- lisp/window.el	2011-11-19 10:53:05 +0000
+++ lisp/window.el	2011-11-19 15:22:08 +0000
@@ -246,51 +246,51 @@
 	(setq child (window-right child)))
       count))))
 
-(defun walk-window-tree-1 (proc walk-window-tree-window any &optional sub-only)
+(defun walk-window-tree-1 (fun walk-window-tree-window any &optional sub-only)
   "Helper function for `walk-window-tree' and `walk-window-subtree'."
   (let (walk-window-tree-buffer)
     (while walk-window-tree-window
       (setq walk-window-tree-buffer
 	    (window-buffer walk-window-tree-window))
       (when (or walk-window-tree-buffer any)
-	(funcall proc walk-window-tree-window))
+	(funcall fun walk-window-tree-window))
       (unless walk-window-tree-buffer
 	(walk-window-tree-1
-	 proc (window-left-child walk-window-tree-window) any)
+	 fun (window-left-child walk-window-tree-window) any)
 	(walk-window-tree-1
-	 proc (window-top-child walk-window-tree-window) any))
+	 fun (window-top-child walk-window-tree-window) any))
       (if sub-only
 	  (setq walk-window-tree-window nil)
 	(setq walk-window-tree-window
 	      (window-right walk-window-tree-window))))))
 
-(defun walk-window-tree (proc &optional frame any)
-  "Run function PROC on each live window of FRAME.
-PROC must be a function with one argument - a window.  FRAME must
+(defun walk-window-tree (fun &optional frame any)
+  "Run function FUN on each live window of FRAME.
+FUN must be a function with one argument - a window.  FRAME must
 be a live frame and defaults to the selected one.  ANY, if
-non-nil means to run PROC on all live and internal windows of
+non-nil means to run FUN on all live and internal windows of
 FRAME.
 
 This function performs a pre-order, depth-first traversal of the
-window tree.  If PROC changes the window tree, the result is
+window tree.  If FUN changes the window tree, the result is
 unpredictable."
   (let ((walk-window-tree-frame (window-normalize-frame frame)))
     (walk-window-tree-1
-     proc (frame-root-window walk-window-tree-frame) any)))
+     fun (frame-root-window walk-window-tree-frame) any)))
 
-(defun walk-window-subtree (proc &optional window any)
-  "Run function PROC on the subtree of windows rooted at WINDOW.
-WINDOW defaults to the selected window.  PROC must be a function
-with one argument - a window.  By default, run PROC only on live
+(defun walk-window-subtree (fun &optional window any)
+  "Run function FUN on the subtree of windows rooted at WINDOW.
+WINDOW defaults to the selected window.  FUN must be a function
+with one argument - a window.  By default, run FUN only on live
 windows of the subtree.  If the optional argument ANY is non-nil,
-run PROC on all live and internal windows of the subtree.  If
-WINDOW is live, run PROC on WINDOW only.
+run FUN on all live and internal windows of the subtree.  If
+WINDOW is live, run FUN on WINDOW only.
 
 This function performs a pre-order, depth-first traversal of the
-subtree rooted at WINDOW.  If PROC changes that tree, the result
+subtree rooted at WINDOW.  If FUN changes that tree, the result
 is unpredictable."
   (setq window (window-normalize-window window))
-  (walk-window-tree-1 proc window any t))
+  (walk-window-tree-1 fun window any t))
 
 (defun window-with-parameter (parameter &optional value frame any)
   "Return first window on FRAME with PARAMETER non-nil.
@@ -997,9 +997,9 @@
 	    (setq hor (cdr fcsb)))))
     (cons vert hor)))
 
-(defun walk-windows (proc &optional minibuf all-frames)
-  "Cycle through all live windows, calling PROC for each one.
-PROC must specify a function with a window as its sole argument.
+(defun walk-windows (fun &optional minibuf all-frames)
+  "Cycle through all live windows, calling FUN for each one.
+FUN must specify a function with a window as its sole argument.
 The optional arguments MINIBUF and ALL-FRAMES specify the set of
 windows to include in the walk.
 
@@ -1041,7 +1041,7 @@
     (when (framep all-frames)
       (select-window (frame-first-window all-frames) 'norecord))
     (dolist (walk-windows-window (window-list-1 nil minibuf all-frames))
-      (funcall proc walk-windows-window))))
+      (funcall fun walk-windows-window))))
 
 (defun window-point-1 (&optional window)
   "Return value of WINDOW's point.
@@ -3677,8 +3677,7 @@
      ((eq type 'leaf)
       ;; For a leaf window just add unprocessed entries to
       ;; `window-state-put-list'.
-      (setq window-state-put-list
-	    (cons (cons window state) window-state-put-list)))
+      (push (cons window state) window-state-put-list))
      ((memq type '(vc hc))
       (let* ((horizontal (eq type 'hc))
 	     (total (window-total-size window horizontal))
------------------------------------------------------------
revno: 106428
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 15:17:13 +0200
message:
  Add a coding cookie to subr.el.
diff:
=== modified file 'lisp/subr.el'
--- lisp/subr.el	2011-11-11 01:46:03 +0000
+++ lisp/subr.el	2011-11-19 13:17:13 +0000
@@ -1,4 +1,4 @@
-;;; subr.el --- basic lisp subroutines for Emacs
+;;; subr.el --- basic lisp subroutines for Emacs  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
------------------------------------------------------------
revno: 106427
committer: Andreas Schwab <schwab@linux-m68k.org>
branch nick: emacs
timestamp: Sat 2011-11-19 14:13:48 +0100
message:
  * language/european.el (macintosh): Define as alias for mac-roman.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 11:49:54 +0000
+++ lisp/ChangeLog	2011-11-19 13:13:48 +0000
@@ -1,3 +1,7 @@
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* language/european.el (macintosh): Define as alias for mac-roman.
+
 2011-11-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* mail/rmailmm.el (rmail-mime-display-header)

=== modified file 'lisp/language/european.el'
--- lisp/language/european.el	2011-11-14 06:27:12 +0000
+++ lisp/language/european.el	2011-11-19 13:13:48 +0000
@@ -613,6 +613,7 @@
   :mnemonic ?M
   :charset-list '(mac-roman)
   :mime-charset 'macintosh)
+(define-coding-system-alias 'macintosh 'mac-roman)
 
 (define-coding-system 'next
   "NeXTstep encoding"
------------------------------------------------------------
revno: 106426
fixes bug(s): http://debbugs.gnu.org/9520
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 13:49:54 +0200
message:
  Fix bug #9520 with MIME display toggling.
  
   lisp/mail/rmailmm.el (rmail-mime-display-header)
   (rmail-mime-display-tagline, rmail-mime-display-body): New defsubsts.
   (rmail-mime-entity-segment, rmail-mime-toggle-raw)
   (rmail-mime-toggle-hidden, rmail-mime-insert-text)
   (rmail-mime-insert-bulk, rmail-mime-insert-multipart)
   (rmail-mime-insert, rmail-mime-insert-tagline): Use them instead
   of a raw aref.
   (rmail-mime-entity-segment): To get past the tagline, move forward
   2 more lines, to account for the 2 empty lines that precede and
   follow the line with the buttons.
   (rmail-mime-update-tagline): Move one more line, to get past the
   empty line that follows the buttons in the tagline.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-19 10:53:05 +0000
+++ lisp/ChangeLog	2011-11-19 11:49:54 +0000
@@ -1,3 +1,18 @@
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* mail/rmailmm.el (rmail-mime-display-header)
+	(rmail-mime-display-tagline, rmail-mime-display-body): New defsubsts.
+	(rmail-mime-entity-segment, rmail-mime-toggle-raw)
+	(rmail-mime-toggle-hidden, rmail-mime-insert-text)
+	(rmail-mime-insert-bulk, rmail-mime-insert-multipart)
+	(rmail-mime-insert, rmail-mime-insert-tagline): Use them instead
+	of a raw aref.
+	(rmail-mime-entity-segment): To get past the tagline, move forward
+	2 more lines, to account for the 2 empty lines that precede and
+	follow the line with the buttons.
+	(rmail-mime-update-tagline): Move one more line, to get past the
+	empty line that follows the buttons in the tagline.  (Bug#9520)
+
 2011-11-19  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.el (window-max-delta-1, window-min-delta-1)

=== modified file 'lisp/mail/rmailmm.el'
--- lisp/mail/rmailmm.el	2011-11-15 23:36:54 +0000
+++ lisp/mail/rmailmm.el	2011-11-19 11:49:54 +0000
@@ -281,13 +281,20 @@
 
 (define-button-type 'rmail-mime-save 'action 'rmail-mime-save)
 
+;; Display options returned by rmail-mime-entity-display.
+;; Value is on of nil, t, raw.
+(defsubst rmail-mime-display-header (disp)  (aref disp 0))
+(defsubst rmail-mime-display-tagline (disp) (aref disp 1))
+(defsubst rmail-mime-display-body (disp)    (aref disp 2))
+
 (defun rmail-mime-entity-segment (pos &optional entity)
   "Return a vector describing the displayed region of a MIME-entity at POS.
 Optional 2nd argument ENTITY is the MIME-entity at POS.
 The value is a vector [INDEX HEADER TAGLINE BODY END], where
   INDEX: index into the returned vector indicating where POS is (1..3)
   HEADER: the position of the beginning of a header
-  TAGLINE: the position of the beginning of a tag line
+  TAGLINE: the position of the beginning of a tag line, including
+           the newline that precedes it
   BODY: the position of the beginning of a body
   END: the position of the end of the entity."
   (save-excursion
@@ -305,21 +312,32 @@
 	    (index 1)
 	    tagline-beg body-beg end)
 	(goto-char beg)
-	(if (aref current 0)
+	;; If the header is displayed, get past it to the tagline.
+	(if (rmail-mime-display-header current)
 	    (search-forward "\n\n" nil t))
 	(setq tagline-beg (point))
 	(if (>= pos tagline-beg)
 	    (setq index 2))
-	(if (aref current 1)
-	    (forward-line 1))
+	;; If the tagline is displayed, get past it to the body.
+	(if (rmail-mime-display-tagline current)
+	    ;; The next foward-line call must be in sync with how
+	    ;; `rmail-mime-insert-tagline' formats the tagline.  The
+	    ;; body begins after the empty line that ends the tagline.
+	    (forward-line 3))
 	(setq body-beg (point))
 	(if (>= pos body-beg)
 	    (setq index 3))
-	(if (aref current 2)
+	;; If the body is displayed, find its end.
+	(if (rmail-mime-display-body current)
 	    (let ((tag (aref (rmail-mime-entity-tagline entity) 0))
 		  tag2)
 	      (setq end (next-single-property-change beg 'rmail-mime-entity
 						     nil (point-max)))
+	      ;; `tag' is either an empty string or "/n" where n is
+	      ;; the number of the part of the multipart MIME message.
+	      ;; The loop below finds the next location whose
+	      ;; `rmail-mime-entity' property specifies a tag of a
+	      ;; different value.
 	      (while (and (< end (point-max))
 			  (setq entity (get-text-property end 'rmail-mime-entity)
 				tag2 (aref (rmail-mime-entity-tagline entity) 0))
@@ -367,7 +385,7 @@
 	 (segment (rmail-mime-entity-segment pos entity)))
     (if (or (eq state 'raw)
 	    (and (not state)
-		 (not (eq (aref current 0) 'raw))))
+		 (not (eq (rmail-mime-display-header current) 'raw))))
 	;; Enter the raw mode.
 	(rmail-mime-raw-mode entity)
       ;; Enter the shown mode.
@@ -389,7 +407,7 @@
 	   (entity (get-text-property pos 'rmail-mime-entity))
 	   (current (aref (rmail-mime-entity-display entity) 0))
 	   (segment (rmail-mime-entity-segment pos entity)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
 	  ;; Enter the hidden mode.
 	  (progn
 	    ;; If point is in the body part, move it to the tagline
@@ -430,12 +448,15 @@
   "Insert a tag line for MIME-entity ENTITY.
 ITEM-LIST is a list of strings or button-elements (list) to add
 to the tag line."
+  ;; Precede the tagline by an empty line to make it a separate
+  ;; paragraph, so that it is aligned to the left margin of the window
+  ;; even if preceded by a right-to-left paragraph.
   (insert "\n[")
   (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
     (if (> (length tag) 0) (insert (substring tag 1) ":")))
   (insert (car (rmail-mime-entity-type entity)) " ")
   (insert-button (let ((new (aref (rmail-mime-entity-display entity) 1)))
-		   (if (aref new 2) "Hide" "Show"))
+		   (if (rmail-mime-display-body new) "Hide" "Show"))
 		 :type 'rmail-mime-toggle
 		 'help-echo "mouse-2, RET: Toggle show/hide")
   (dolist (item item-list)
@@ -443,6 +464,9 @@
       (if (stringp item)
 	  (insert item)
 	(apply 'insert-button item))))
+  ;; Follow the tagline by an empty line to make it a separate
+  ;; paragraph, so that the paragraph direction of the following text
+  ;; is determined based on that text.
   (insert "]\n\n"))
 
 (defun rmail-mime-update-tagline (entity)
@@ -463,7 +487,9 @@
     (delete-region (button-start button) (point))
     (put-text-property (point) (button-end button) 'rmail-mime-entity entity)
     (restore-buffer-modified-p modified)
-    (forward-line 1)))
+    ;; The following call to forward-line must be in sync with how
+    ;; rmail-mime-insert-tagline formats the tagline.
+    (forward-line 2)))
 
 (defun rmail-mime-insert-header (header)
   "Decode and insert a MIME-entity header HEADER in the current buffer.
@@ -557,28 +583,32 @@
 	  (delete-region (point-min) (point-max))))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+	    (rmail-mime-display-header new))
 	(goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
 	  (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
 	  (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-	(if (or (not (aref current 1))
-		(eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+	    (rmail-mime-display-tagline new))
+	(if (or (not (rmail-mime-display-tagline current))
+		(eq (rmail-mime-display-body current)
+		    (rmail-mime-display-body new)))
 	    (forward-char (- (aref segment 3) (aref segment 2)))
 	  (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
 	  (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
 	  (rmail-mime-insert-tagline entity)))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+	    (rmail-mime-display-body new))
 	(forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
 	  (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
 	  (rmail-mime-insert-decoded-text entity)))
     (put-text-property beg (point) 'rmail-mime-entity entity)))
 
@@ -726,22 +756,25 @@
     (setq beg (point))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+	    (rmail-mime-display-header new))
 	(goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
 	  (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
 	  (rmail-mime-insert-header header)))
 
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-	(if (or (not (aref current 1))
-		(eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+	    (rmail-mime-display-tagline new))
+	(if (or (not (rmail-mime-display-tagline current))
+		(eq (rmail-mime-display-body current)
+		    (rmail-mime-display-body new)))
 	    (forward-char (- (aref segment 3) (aref segment 2)))
 	  (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
 	  (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
 	  (rmail-mime-insert-tagline
 	   entity
 	   " Save:"
@@ -764,11 +797,12 @@
 	   ;; 	     'image-data data))
 	   )))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+	    (rmail-mime-display-body new))
 	(forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
 	  (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
 	  (cond ((eq (cdr bulk-data) 'text)
 		 (rmail-mime-insert-decoded-text entity))
 		((cdr bulk-data)
@@ -978,27 +1012,31 @@
 	(beg (point))
 	(segment (rmail-mime-entity-segment (point) entity)))
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+	    (rmail-mime-display-header new))
 	(goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
 	  (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
 	  (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-	(if (or (not (aref current 1))
-		(eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+	    (rmail-mime-display-tagline new))
+	(if (or (not (rmail-mime-display-tagline current))
+		(eq (rmail-mime-display-body current)
+		    (rmail-mime-display-body new)))
 	    (forward-char (- (aref segment 3) (aref segment 2)))
 	  (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
 	  (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
 	  (rmail-mime-insert-tagline entity)))
 
     (put-text-property beg (point) 'rmail-mime-entity entity)
 
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+	    (rmail-mime-display-body new))
 	(forward-char (- (aref segment 4) (aref segment 3)))
       (dolist (child (rmail-mime-entity-children entity))
 	(rmail-mime-insert child)))
@@ -1228,7 +1266,7 @@
 available."
   (let ((current (aref (rmail-mime-entity-display entity) 0))
 	(new (aref (rmail-mime-entity-display entity) 1)))
-    (if (not (eq (aref new 0) 'raw))
+    (if (not (eq (rmail-mime-display-header new) 'raw))
 	;; Not a raw-mode.  Each handler should handle it.
 	(funcall (rmail-mime-entity-handler entity) entity)
       (let ((header (rmail-mime-entity-header entity))
@@ -1237,14 +1275,15 @@
 	    (beg (point))
 	    (segment (rmail-mime-entity-segment (point) entity)))
 	;; header
-	(if (eq (aref current 0) (aref new 0))
+	(if (eq (rmail-mime-display-header current)
+		(rmail-mime-display-header new))
 	    (goto-char (aref segment 2))
-	  (if (aref current 0)
+	  (if (rmail-mime-display-header current)
 	      (delete-char (- (aref segment 2) (aref segment 1))))
 	  (insert-buffer-substring rmail-mime-mbox-buffer
 				     (aref header 0) (aref header 1)))
 	;; tagline
-	(if (aref current 1)
+	(if (rmail-mime-display-tagline current)
 	    (delete-char (- (aref segment 3) (aref segment 2))))
 	;; body
 	(let ((children (rmail-mime-entity-children entity)))
@@ -1253,9 +1292,10 @@
 		(put-text-property beg (point) 'rmail-mime-entity entity)
 		(dolist (child children)
 		  (rmail-mime-insert child)))
-	    (if (eq (aref current 2) (aref new 2))
+	    (if (eq (rmail-mime-display-body current)
+		    (rmail-mime-display-body new))
 		(forward-char (- (aref segment 4) (aref segment 3)))
-	      (if (aref current 2)
+	      (if (rmail-mime-display-body current)
 		(delete-char (- (aref segment 4) (aref segment 3))))
 	      (insert-buffer-substring rmail-mime-mbox-buffer
 				       (aref body 0) (aref body 1))
------------------------------------------------------------
revno: 106425
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 19:11:38 +0800
message:
  More updates to Window chapter of Lisp manual.
  
  * doc/lispref/windows.texi (Splitting Windows): Clarify role of window
  parameters in split-window.  Shorten the example.
  (Deleting Windows): Rewrite intro to handle internal windows.  Fix
  delete-windows-on doc.
  (Selecting Windows): Copyedits.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2011-11-17 10:27:56 +0000
+++ doc/lispref/ChangeLog	2011-11-19 11:11:38 +0000
@@ -1,3 +1,11 @@
+2011-11-19  Chong Yidong  <cyd@gnu.org>
+
+	* windows.texi (Splitting Windows): Clarify role of window
+	parameters in split-window.  Shorten the example.
+	(Deleting Windows): Rewrite intro to handle internal windows.  Fix
+	delete-windows-on doc.
+	(Selecting Windows): Copyedits.
+
 2011-11-17  Martin Rudalics  <rudalics@gmx.at>
 
 	* windows.texi (Resizing Windows, Splitting Windows)

=== modified file 'doc/lispref/windows.texi'
--- doc/lispref/windows.texi	2011-11-17 10:27:56 +0000
+++ doc/lispref/windows.texi	2011-11-19 11:11:38 +0000
@@ -110,6 +110,7 @@
 @end defun
 
 @cindex selected window
+@cindex window selected within a frame
   In each frame, at any time, exactly one Emacs window is designated
 as @dfn{selected within the frame}.  For the selected frame, that
 window is called the @dfn{selected window}---the one in which most
@@ -774,22 +775,24 @@
 @var{window} is an internal window, the new window inherits the
 properties of the window selected within @var{window}'s frame.
 
-If the variable @code{ignore-window-parameters} is non-@code{nil}
-(@pxref{Window Parameters}), this function ignores window parameters.
-Otherwise, it consults the @code{split-window} parameter of
-@var{window}; if this is @code{t}, it splits the window disregarding
-any other window parameters.  If the @code{split-window} parameter
-specifies a function, that function is called with the arguments
-@var{window}, @var{size}, and @var{side} to split @var{window}, in
-lieu of the usual action of @code{split-window}.
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{split-window} window parameter is @code{t}, this function
+ignores all other window parameters.  Otherwise, if the value of the
+@code{split-window} window parameter is a function, that function is
+called with the arguments @var{window}, @var{size}, and @var{side}, in
+lieu of the usual action of @code{split-window}.  Otherwise, this
+function obeys the @code{window-atom} or @code{window-side} window
+parameter, if any.  @xref{Window Parameters}.
 @end deffn
 
-  As an example, we show a combination of @code{split-window} calls
-that yields the window configuration discussed in @ref{Windows and
-Frames}.  This example demonstrates splitting a live window as well as
-splitting an internal window.  We begin with a frame containing a
-single window (a live root window), which we denote by @var{W4}.
-Calling @code{(split-window W3)} yields this window configuration:
+  As an example, here is a sequence of @code{split-window} calls that
+yields the window configuration discussed in @ref{Windows and Frames}.
+This example demonstrates splitting a live window as well as splitting
+an internal window.  We begin with a frame containing a single window
+(a live root window), which we denote by @var{W4}.  Calling
+@code{(split-window W3)} yields this window configuration:
 
 @smallexample
 @group
@@ -841,9 +844,6 @@
 window @var{W3}.  A new internal window @var{W1} is created, becoming
 the new root window.
 
-  The following two options can be used to modify the operation of
-@code{split-window}.
-
 @defopt window-combination-resize
 If this variable is @code{nil}, @code{split-window} can only split a
 window (denoted by @var{window}) if @var{window}'s screen area is
@@ -854,18 +854,17 @@
 resize all windows that are part of the same combination as
 @var{window}, in order to accommodate the new window.  In particular,
 this may allow @code{split-window} to succeed even if @var{window} is
-a fixed-size window or too small to ordinarily split.
-
-Also if this variable is non-@code{nil}, subsequent resizing and
-deleting @var{window} will usually affect @emph{all} windows in
-@var{window}'s combination.
-
-The setting of this variable has no effect if
-@code{window-combination-limit} (see below) is non-@code{nil}.
+a fixed-size window or too small to ordinarily split.  Furthermore,
+subsequently resizing or deleting @var{window} may resize all other
+windows in its combination.
+
+This variable has no effect if @code{window-combination-limit} is
+non-@code{nil} (see below).
 @end defopt
 
-To illustrate the use of @code{window-combination-resize} consider the
-following window configuration:
+  To illustrate the effect of @code{window-combination-resize},
+consider the following window configuration:
+
 @smallexample
 @group
      ______________________________________
@@ -886,9 +885,10 @@
 @end group
 @end smallexample
 
-Splitting window @code{W3} with @code{window-combination-resize}
-@code{nil} produces a configuration where the size of @code{W2} remains
-unchanged:
+@noindent
+If @code{window-combination-resize} is @code{nil}, splitting window
+@code{W3} leaves the size of @code{W2} unchanged:
+
 @smallexample
 @group
      ______________________________________
@@ -909,8 +909,11 @@
 @end group
 @end smallexample
 
-Splitting @code{W3} with @code{window-combination-resize} non-@code{nil}
-instead steals the space for @code{W4} from both @code{W2} and @code{W3}:
+@noindent
+If @code{window-combination-resize} is non-@code{nil}, splitting
+@code{W3} instead leaves all three live windows with approximately the
+same height:
+
 @smallexample
 @group
      ______________________________________
@@ -932,302 +935,227 @@
 @end smallexample
 
 @defopt window-combination-limit
-If this variable is @code{nil}, @code{split-window} creates a new parent
-window if and only if the old window has no parent window or shall be
-split orthogonally to the combination it is part of.  If this variable
-is @code{t}, @code{split-window} always creates a new parent window.  If
-this variable is always @code{t}, a frame's window tree is a binary tree
-so every window but the frame's root window has exactly one sibling.
-Other values are reserved for future use.
-
-The value of this variable is also assigned to the combination-limit
-status of the new parent window.  The combination-limit status of any
-window can be retrieved via the function @code{window-combination-limit}
-and altered by the function @code{set-window-combination-limit}, see
-below.
+If the value of this variable is @code{t}, the @code{split-window}
+function always creates a new internal window.  If the value is
+@code{nil}, the new live window is allowed to share the existing
+parent window, if one exists, provided the split occurs in the same
+direction as the existing window combination (otherwise, a new
+internal window is created anyway).  The default is @code{nil}.  Other
+values are reserved for future use.
+
+Thus, if the value is always @code{t}, each window tree is a binary
+tree: each window except the root window has exactly one sibling.
+
+Furthermore, @code{split-window} calls
+@code{set-window-combination-limit} on the newly-created internal
+window, recording the current value of this variable.  This affects
+how the window tree is rearranged when the child windows are deleted
+(see below).
 @end defopt
 
-@defun window-combination-limit &optional window
-This function returns the combination-limit status of @var{window}.  The
-argument @var{window} can be any window and defaults to the selected
-one.  Note, however, that the combination-limit status is currently
-meaningful for internal windows only.
-
-@cindex combination-limit status
-The @dfn{combination-limit status} of a window specifies whether that
-window may be removed and its child windows recombined with that
-window's siblings when such a sibling's child window is deleted.  The
-combination-limit status is initially assigned by @code{split-window}
-from the current value of the variable @code{window-combination-limit}
-(see above) and can be reset by the function
-@code{set-window-combination-limit} (see below).
-
-If the return value is @code{nil}, child windows of @var{window} may be
-recombined with @var{window}'s siblings when a window gets deleted.  A
-return value of @code{nil} means that child windows of @var{window} are
-never (re-)combined with @var{window}'s siblings in such a case.
-@end defun
-
-@defun set-window-combination-limit window &optional status
-This functions sets the combination-limit status (see above) of
-@var{window} to @var{status}.  The argument @var{window} can be any
-window and defaults to the selected one.  Note that setting the
-combination-limit status is meaningful for internal windows only.  The
-return value is @var{status}.
-@end defun
-
-To illustrate the use of @code{window-combination-limit} consider the
-following configuration (throughout the following examples we shall
-assume that @code{window-combination-resize} invariantly is @code{nil}).
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-Splitting @code{W2} into two windows above each other with
-@code{window-combination-limit} equal @code{nil} will get you a
-configuration like:
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W4_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-If you now enlarge window @code{W4}, Emacs steals the necessary space
-from window @code{W3} resulting in a configuration like:
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||_________________W4_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-Deleting window @code{W4}, will return its space to @code{W2} as
-follows:
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-Hence, with respect to the initial configuration, window @code{W2} has
-grown at the expense of window @code{W3}.  If, however, in the initial
-configuration you had split @code{W2} with
-@code{window-combination-limit} bound to @code{t}, a new internal window
-@code{W5} would have been created as depicted below.
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    || __________________________________ ||
-    |||                                  |||
-    |||________________W2________________|||
-    || __________________________________ ||
-    |||                                  |||
-    |||________________W4________________|||
-    ||_________________W5_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-Enlarging @code{W4} would now have stolen the necessary space from
-@code{W2} instead of @code{W3} as
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    || __________________________________ ||
-    |||________________W2________________|||
-    || __________________________________ ||
-    |||                                  |||
-    |||                                  |||
-    |||________________W4________________|||
-    ||_________________W5_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
-
-and the subsequent deletion of @code{W4} would have restored the initial
-configuration.
-
-For interactive use, Emacs provides two commands which always split the
-selected window.
+@cindex window combination limit
+@defun set-window-combination-limit window status
+This functions sets the @dfn{combination limit} of the window
+@var{window} to @var{status}.  This value can be retrieved via the
+function @code{window-combination-limit}.  See below for its effects;
+note that it is only meaningful for internal windows.  The
+@code{split-window} function automatically calls this function,
+passing the value of the variable @code{window-combination-limit} as
+@var{status}.
+@end defun
+
+@defun window-combination-limit window
+This function returns the combination limit for @var{window}.
+
+The combination limit is meaningful only for an internal window.  If
+it is @code{nil}, then Emacs is allowed to automatically delete
+@var{window}, in response to a window deletion, in order to group the
+child windows of @var{window} with the child windows of one of its
+siblings to form a new window combination.  If the combination limit
+is @code{t}, the child windows of @var{window} are never automatically
+re-combined with its siblings'.
+@end defun
+
+  To illustrate the effect of @code{window-combination-limit},
+consider the following configuration (throughout this example, we will
+assume that @code{window-combination-resize} is @code{nil}):
+
+@smallexample
+@group
+     ______________________________________
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||                                    ||
+    ||                                    ||
+    ||                                    ||
+    ||                                    ||
+    ||_________________W2_________________||
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||_________________W3_________________||
+    |__________________W1__________________|
+
+@end group
+@end smallexample
+
+@noindent
+If @code{window-combination-limit} is @code{nil}, splitting @code{W2}
+into two windows, one above the other, yields
+
+@smallexample
+@group
+     ______________________________________
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||_________________W2_________________||
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||_________________W4_________________||
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||_________________W3_________________||
+    |__________________W1__________________|
+
+@end group
+@end smallexample
+
+@noindent
+The newly-created window, @code{W4}, shares the same internal window
+@code{W1}.  If @code{W4} is resized, it is allowed to resize the other
+live window, @code{W3}.
+
+  If @code{window-combination-limit} is @code{t}, splitting @code{W2}
+in the initial configuration would instead have produced this:
+
+@smallexample
+@group
+     ______________________________________
+    | ____________________________________ |
+    || __________________________________ ||
+    |||                                  |||
+    |||________________W2________________|||
+    || __________________________________ ||
+    |||                                  |||
+    |||________________W4________________|||
+    ||_________________W5_________________||
+    | ____________________________________ |
+    ||                                    ||
+    ||                                    ||
+    ||_________________W3_________________||
+    |__________________W1__________________|
+
+@end group
+@end smallexample
+
+@noindent
+A new internal window @code{W5} has been created; its children are
+@code{W2} and the new live window @code{W4}.  Now, @code{W2} is the
+only sibling of @code{W4}, so resizing @code{W4} will resize
+@code{W2}, leaving @code{W3} unaffected.
+
+  For interactive use, Emacs provides two commands which always split
+the selected window.  These call @code{split-window} internally.
+
+@deffn Command split-window-right &optional size
+This function splits the selected window into two side-by-side
+windows, putting the selected window on the left.  If @var{size} is
+positive, the left window gets @var{size} columns; if @var{size} is
+negative, the right window gets @minus{}@var{size} columns.
+@end deffn
 
 @deffn Command split-window-below &optional size
-This function splits the selected window into two windows, one above the
-other, leaving the upper of the two windows selected, with @var{size}
-lines.  (If @var{size} is negative, then the lower of the two windows
-gets @minus{}@var{size} lines and the upper window gets the rest, but
-the upper window is still the one selected.)  However, if
-@code{split-window-keep-point} (see below) is @code{nil}, then either
-window can be selected.
-
-   In other respects, this function is similar to @code{split-window}.
-In particular, the upper window is the original one and the return value
-is the new, lower window.
+This function splits the selected window into two windows, one above
+the other, leaving the upper window selected.  If @var{size} is
+positive, the upper window gets @var{size} lines; if @var{size} is
+negative, the lower window gets @minus{}@var{size} lines.
 @end deffn
 
 @defopt split-window-keep-point
-If this variable is non-@code{nil} (the default), then
+If the value of this variable is non-@code{nil} (the default),
 @code{split-window-below} behaves as described above.
 
-   If it is @code{nil}, then @code{split-window-below} adjusts point
-in each of the two windows to avoid scrolling.  (This is useful on
-slow terminals.)  It selects whichever window contains the screen line
-that point was previously on.  Other functions are not affected by
-this variable.
+If it is @code{nil}, @code{split-window-below} adjusts point in each
+of the two windows to minimize redisplay.  (This is useful on slow
+terminals.)  It selects whichever window contains the screen line that
+point was previously on.  Note that this only affects
+@code{split-window-below}, not the lower-level @code{split-window}
+function.
 @end defopt
 
-@deffn Command split-window-right &optional size
-This function splits the selected window into two windows
-side-by-side, leaving the selected window on the left with @var{size}
-columns.  If @var{size} is negative, the rightmost window gets
-@minus{}@var{size} columns, but the leftmost window still remains
-selected.
-@end deffn
-
-
 @node Deleting Windows
 @section Deleting Windows
 @cindex deleting windows
 
-A window remains visible on its frame unless you @dfn{delete} it by
-calling certain functions that delete windows.  A deleted window cannot
-appear on the screen, but continues to exist as a Lisp object until
-there are no references to it.  There is no way to cancel the deletion
-of a window aside from restoring a saved window configuration
-(@pxref{Window Configurations}).  Restoring a window configuration also
-deletes any windows that aren't part of that configuration.  Erroneous
-information may result from using a deleted window as if it were live.
+  @dfn{Deleting} a window removes it from the frame's window tree.  If
+the window is a live window, it disappears from the screen.  If the
+window is an internal window, its child windows are deleted too.
+
+  Even after a window is deleted, it continues to exist as a Lisp
+object, until there are no more references to it.  Window deletion can
+be reversed, by restoring a saved window configuration (@pxref{Window
+Configurations}).
 
 @deffn Command delete-window &optional window
-This function removes @var{window} from display and returns @code{nil}.
-The argument @var{window} can denote any window and defaults to the
-selected one.  An error is signaled if @var{window} is the only window
-on its frame.  Hence @var{window} must have at least one sibling window
-(@pxref{Windows and Frames}) in order to get deleted.  If @var{window}
-is the selected window on its frame, this function selects the most
-recently selected live window on that frame instead.
-
-If the variable @code{ignore-window-parameters} (@pxref{Window
-Parameters}) is non-@code{nil}, this function ignores all parameters of
-@var{window}.  Otherwise, if the @code{delete-window} parameter of
-@var{window} is @code{t}, it deletes the window disregarding other
-window parameters.  If the @code{delete-window} parameter specifies a
-function, that function is called with @var{window} as its sole
-argument.
-
-If @code{window-combination-resize} (@pxref{Splitting Windows}) is
-@code{nil}, the space @var{window} took up is given to its left sibling
-if such a window exists and to its right sibling otherwise.  If
-@code{window-combination-resize} is non-@code{nil}, the space of
-@var{window} is proportionally distributed among the remaining windows
-in the same combination.
+This function removes @var{window} from display and returns
+@code{nil}.  If @var{window} is omitted or @code{nil}, it defaults to
+the selected window.  If deleting the window would leave no more
+windows in the window tree (e.g. if it is the only live window in the
+frame), an error is signaled.
+
+By default, the space taken up by @var{window} is given to one of its
+adjacent sibling windows, if any.  However, if the variable
+@code{window-combination-resize} is non-@code{nil}, the space is
+proportionally distributed among any remaining windows in the window
+combination.  @xref{Splitting Windows}.
+
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{delete-window} window parameter is @code{t}, this function
+ignores all other window parameters.  Otherwise, if the value of the
+@code{delete-window} window parameter is a function, that function is
+called with the argument @var{window}, in lieu of the usual action of
+@code{delete-window}.  Otherwise, this function obeys the
+@code{window-atom} or @code{window-side} window parameter, if any.
+@xref{Window Parameters}.
 @end deffn
 
 @deffn Command delete-other-windows &optional window
-This function makes @var{window} fill its frame and returns @code{nil}.
-The argument @var{window} can denote an arbitrary window and defaults to
-the selected one.  Upon exit, @var{window} will be the selected window
-on its frame.
+This function makes @var{window} fill its frame, by deleting other
+windows as necessary.  If @var{window} is omitted or @code{nil}, it
+defaults to the selected window.  The return value is @code{nil}.
 
-If the variable @code{ignore-window-parameters} (@pxref{Window
-Parameters}) is non-@code{nil}, this function ignores all parameters of
-@var{window}.  Otherwise, if the @code{delete-other-windows} parameter
-of @var{window} equals @code{t}, it deletes all other windows
-disregarding any remaining window parameters.  If the
-@code{delete-other-windows} parameter of @var{window} specifies a
-function, it calls that function with @var{window} as its sole argument.
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{delete-other-windows} window parameter is @code{t}, this
+function ignores all other window parameters.  Otherwise, if the value
+of the @code{delete-other-windows} window parameter is a function,
+that function is called with the argument @var{window}, in lieu of the
+usual action of @code{delete-other-windows}.  Otherwise, this function
+obeys the @code{window-atom} or @code{window-side} window parameter,
+if any.  @xref{Window Parameters}.
 @end deffn
 
 @deffn Command delete-windows-on &optional buffer-or-name frame
-This function deletes all windows showing @var{buffer-or-name}.  If
-there are no windows showing @var{buffer-or-name}, it does nothing.
-The optional argument @var{buffer-or-name} may be a buffer or the name
-of an existing buffer and defaults to the current buffer.  Invoking
-this command on a minibuffer signals an error.
-
-The function @code{delete-windows-on} operates by calling
-@code{delete-window} for each window showing @var{buffer-or-name}.  If a
-frame has several windows showing different buffers, then those showing
-@var{buffer-or-name} are removed, and the other windows expand to fill
-the space.
-
-If all windows in some frame are showing @var{buffer-or-name} (including
-the case where there is only one window), then that frame is deleted
-provided there are other frames left.
-
-The optional argument @var{frame} specifies which frames to operate on.
-This function does not use it in quite the same way as the other
-functions which scan all live windows (@pxref{Cyclic Window Ordering});
-specifically, the values @code{t} and @code{nil} have the opposite of
-their meanings in the other functions.  Here are the full details:
+This function deletes all windows showing @var{buffer-or-name}, by
+calling @code{delete-window} on those windows.  @var{buffer-or-name}
+should be a buffer, or the name of a buffer; if omitted or @code{nil},
+it defaults to the current buffer.  If there are no windows showing
+the specified buffer, this function does nothing.  If the specified
+buffer is a minibuffer, an error is signaled.
+
+If there is a dedicated window showing the buffer, and that window is
+the only one on its frame, this function also deletes that frame if it
+is not the only frame on the terminal.
+
+The optional argument @var{frame} specifies which frames to operate
+on:
 
 @itemize @bullet
 @item @code{nil}
@@ -1241,34 +1169,37 @@
 @item A frame
 means operate on that frame.
 @end itemize
+
+Note that this argument does not have the same meaning as in other
+functions which scan all live windows (@pxref{Cyclic Window
+Ordering}).  Specifically, the values @code{t} and @code{nil} have the
+opposite of their meanings in those other functions.
 @end deffn
 
-
 @node Selecting Windows
 @section Selecting Windows
 @cindex selecting a window
 
 @defun select-window window &optional norecord
-This function makes @var{window} the selected window, see @ref{Basic
-Windows}.  Unless @var{window} already is the selected window, this also
-makes @var{window}'s buffer (@pxref{Buffers and Windows}) the current
-buffer.  Moreover, the cursor for selected windows will be displayed in
-@var{window} after the next redisplay.  This function returns
-@var{window}.
+This function makes @var{window} the selected window, as well as the
+window selected within its frame (@pxref{Basic Windows}).
+@var{window} must be a live winow.  Unless @var{window} already is the
+selected window, its buffer becomes the current buffer (@pxref{Buffers
+and Windows}).  The return value is @var{window}.
 
-Normally, @var{window}'s selected buffer is moved to the front of the
-buffer list (@pxref{The Buffer List}) and @var{window} becomes the most
-recently selected window.  But if the optional argument @var{norecord}
-is non-@code{nil}, the buffer list remains unchanged and @var{window}
-does not become the most recently selected one.
+By default, this function also moves @var{window}'s selected buffer to
+the front of the buffer list (@pxref{The Buffer List}), and makes
+@var{window} the most recently selected window.  However, if the
+optional argument @var{norecord} is non-@code{nil}, these additional
+actions are omitted.
 @end defun
 
 @cindex most recently selected windows
-The sequence of calls to @code{select-window} with a non-@code{nil}
+  The sequence of calls to @code{select-window} with a non-@code{nil}
 @var{norecord} argument determines an ordering of windows by their
 selection time.  The function @code{get-lru-window} can be used to
-retrieve the least recently selected live window in this ordering, see
-@ref{Cyclic Window Ordering}.
+retrieve the least recently selected live window (@pxref{Cyclic Window
+Ordering}).
 
 @defmac save-selected-window forms@dots{}
 This macro records the selected frame, as well as the selected window
@@ -1300,34 +1231,27 @@
 changed by this macro.
 @end defmac
 
-@cindex frame selected window
-@cindex window selected within frame
-Earlier (@pxref{Basic Windows}) we mentioned that at any time, exactly
-one window on any frame is selected within the frame.  The significance
-of this designation is that selecting the frame also selects this
-window.  Conversely, selecting a window for Emacs with
-@code{select-window} also makes that window selected within its frame.
-
-@defun frame-selected-window  &optional frame
-This function returns the window on @var{frame} that is selected within
-@var{frame}.  The optional argument @var{frame} must denote a live frame
-and defaults to the selected one.
+@defun frame-selected-window &optional frame
+This function returns the window on @var{frame} that is selected
+within that frame.  @var{frame} should be a live frame; if omitted or
+@code{nil}, it defaults to the selected frame.
 @end defun
 
 @defun set-frame-selected-window frame window &optional norecord
-This function sets the selected window of frame @var{frame} to
-@var{window}.  The argument @var{frame} must denote a live frame and
-defaults to the selected one.  If @var{frame} is the selected frame,
-this also makes @var{window} the selected window.  The argument
-@var{window} must denote a live window.  This function returns
-@var{window}.
-
-Optional argument @var{norecord} non-@code{nil} means to neither change
-the list of most recently selected windows (@pxref{Selecting Windows})
-nor the buffer list (@pxref{The Buffer List}).
+This function makes @code{window} the window selected within the frame
+@var{frame}.  @var{frame} should be a live frame; if omitted or
+@code{nil}, it defaults to the selected frame.  @var{window} should be
+a live window; if omitted or @code{nil}, it defaults to the selected
+window.
+
+If @var{frame} is the selected frame, this makes @var{window} the
+selected window.
+
+If the optional argument @var{norecord} is non-@code{nil}, this
+function does not alter the list of most recently selected windows,
+nor the buffer list.
 @end defun
 
-
 @node Cyclic Window Ordering
 @section Cyclic Ordering of Windows
 @cindex cyclic ordering of windows
------------------------------------------------------------
revno: 106424
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 19:09:10 +0800
message:
  * window.c (Fwindow_combination_limit): Make first arg non-optional
  since it is meaningless for live windows like the selected window.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-19 08:39:42 +0000
+++ src/ChangeLog	2011-11-19 11:09:10 +0000
@@ -1,3 +1,9 @@
+2011-11-18  Chong Yidong  <cyd@gnu.org>
+
+	* window.c (Fwindow_combination_limit): Make first argument
+	non-optional, since it is meaningless for live windows like the
+	selected window.
+
 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/window.c'
--- src/window.c	2011-11-17 12:16:44 +0000
+++ src/window.c	2011-11-19 11:09:10 +0000
@@ -465,10 +465,8 @@
   return decode_any_window (window)->prev;
 }
 
-DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0,
+DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
        doc: /* Return combination limit of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
 If the return value is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  A return value of t means that child windows of
 WINDOW are never \(re-)combined with WINDOW's siblings.  */)
@@ -479,8 +477,6 @@
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
        doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
 If STATUS is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  STATUS t means that child windows of WINDOW are
 never \(re-)combined with WINDOW's siblings.  Other values are reserved
------------------------------------------------------------
revno: 106423
committer: martin rudalics <rudalics@gmx.at>
branch nick: trunk
timestamp: Sat 2011-11-19 11:53:05 +0100
message:
  Prefix a few more internal functions with "window--".
  
  * window.el (window-max-delta-1, window-min-delta-1)
  (window-min-size-1, window-state-get-1, window-state-put-1)
  (window-state-put-2): Use "window--" prefix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-11-18 16:30:43 +0000
+++ lisp/ChangeLog	2011-11-19 10:53:05 +0000
@@ -1,3 +1,9 @@
+2011-11-19  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (window-max-delta-1, window-min-delta-1)
+	(window-min-size-1, window-state-get-1, window-state-put-1)
+	(window-state-put-2): Use "window--" prefix.
+
 2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/smie.el: Improve warnings and conflict detection.

=== modified file 'lisp/window.el'
--- lisp/window.el	2011-11-17 10:27:56 +0000
+++ lisp/window.el	2011-11-19 10:53:05 +0000
@@ -524,10 +524,10 @@
 windows may get as small as `window-safe-min-height' lines and
 `window-safe-min-width' columns.  IGNORE a window means ignore
 restrictions for that window only."
-  (window-min-size-1
+  (window--min-size-1
    (window-normalize-window window) horizontal ignore))
 
-(defun window-min-size-1 (window horizontal ignore)
+(defun window--min-size-1 (window horizontal ignore)
   "Internal function of `window-min-size'."
   (let ((sub (window-child window)))
     (if sub
@@ -538,13 +538,13 @@
 	      ;; the minimum sizes of its child windows.
 	      (while sub
 		(setq value (+ value
-			       (window-min-size-1 sub horizontal ignore)))
+			       (window--min-size-1 sub horizontal ignore)))
 		(setq sub (window-right sub)))
 	    ;; The minimum size of an ortho-combination is the maximum of
 	    ;; the minimum sizes of its child windows.
 	    (while sub
 	      (setq value (max value
-			       (window-min-size-1 sub horizontal ignore)))
+			       (window--min-size-1 sub horizontal ignore)))
 	      (setq sub (window-right sub))))
 	  value)
       (with-current-buffer (window-buffer window)
@@ -687,7 +687,7 @@
   (window--size-fixed-1
    (window-normalize-window window) horizontal))
 
-(defun window-min-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--min-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function for `window-min-delta'."
   (if (not (window-parent window))
       ;; If we can't go up, return zero.
@@ -723,7 +723,7 @@
 	    (setq sub (window-right sub))))
 	(if noup
 	    delta
-	  (window-min-delta-1 parent delta horizontal ignore trail))))))
+	  (window--min-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-min-delta (&optional window horizontal ignore trail noup nodown)
   "Return number of lines by which WINDOW can be shrunk.
@@ -757,7 +757,7 @@
     (cond
      (nodown
       ;; If NODOWN is t, try to recover the entire size of WINDOW.
-      (window-min-delta-1 window size horizontal ignore trail noup))
+      (window--min-delta-1 window size horizontal ignore trail noup))
      ((= size minimum)
       ;; If NODOWN is nil and WINDOW's size is already at its minimum,
       ;; there's nothing to recover.
@@ -765,10 +765,10 @@
      (t
       ;; Otherwise, try to recover whatever WINDOW is larger than its
       ;; minimum size.
-      (window-min-delta-1
+      (window--min-delta-1
        window (- size minimum) horizontal ignore trail noup)))))
 
-(defun window-max-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--max-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function of `window-max-delta'."
   (if (not (window-parent window))
       ;; Can't go up.  Return DELTA.
@@ -804,7 +804,7 @@
 	    delta
 	  ;; Else try with parent of WINDOW, passing the DELTA we
 	  ;; recovered so far.
-	  (window-max-delta-1 parent delta horizontal ignore trail))))))
+	  (window--max-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-max-delta (&optional window horizontal ignore trail noup nodown)
   "Return maximum number of lines WINDOW by which WINDOW can be enlarged.
@@ -840,7 +840,7 @@
       ;; size.
       0
     ;; WINDOW has no fixed size.
-    (window-max-delta-1 window 0 horizontal ignore trail noup)))
+    (window--max-delta-1 window 0 horizontal ignore trail noup)))
 
 ;; Make NOUP also inhibit the min-size check.
 (defun window--resizable (window delta &optional horizontal ignore trail noup nodown)
@@ -2039,8 +2039,8 @@
       ;; two windows we want to resize.
       (cond
        ((> delta 0)
-	(setq max-delta (window-max-delta-1 left 0 horizontal nil 'after))
-	(setq min-delta (window-min-delta-1 right (- delta) horizontal nil 'before))
+	(setq max-delta (window--max-delta-1 left 0 horizontal nil 'after))
+	(setq min-delta (window--min-delta-1 right (- delta) horizontal nil 'before))
 	(when (or (< max-delta delta) (> min-delta (- delta)))
 	  ;; We can't get the whole DELTA - move as far as possible.
 	  (setq delta (min max-delta (- min-delta))))
@@ -2062,8 +2062,8 @@
 	       (window-left-column right)
 	     (window-top-line right)))))
        ((< delta 0)
-	(setq max-delta (window-max-delta-1 right 0 horizontal nil 'before))
-	(setq min-delta (window-min-delta-1 left delta horizontal nil 'after))
+	(setq max-delta (window--max-delta-1 right 0 horizontal nil 'before))
+	(setq min-delta (window--min-delta-1 left delta horizontal nil 'after))
 	(when (or (< max-delta (- delta)) (> min-delta delta))
 	  ;; We can't get the whole DELTA - move as far as possible.
 	  (setq delta (max (- max-delta) min-delta)))
@@ -3570,7 +3570,7 @@
 (defvar window-state-ignored-parameters '(quit-restore)
   "List of window parameters ignored by `window-state-get'.")
 
-(defun window-state-get-1 (window &optional markers)
+(defun window--state-get-1 (window &optional markers)
   "Helper function for `window-state-get'."
   (let* ((type
 	  (cond
@@ -3625,7 +3625,7 @@
 	    (let (list)
 	      (setq window (window-child window))
 	      (while window
-		(setq list (cons (window-state-get-1 window markers) list))
+		(setq list (cons (window--state-get-1 window markers) list))
 		(setq window (window-right window)))
 	      (nreverse list)))))
     (append head tail)))
@@ -3664,12 +3664,12 @@
      ;; These are probably not needed.
      ,@(when (window-size-fixed-p window) `((fixed-height . t)))
      ,@(when (window-size-fixed-p window t) `((fixed-width . t))))
-   (window-state-get-1 window markers)))
+   (window--state-get-1 window markers)))
 
 (defvar window-state-put-list nil
   "Helper variable for `window-state-put'.")
 
-(defun window-state-put-1 (state &optional window ignore totals)
+(defun window--state-put-1 (state &optional window ignore totals)
   "Helper function for `window-state-put'."
   (let ((type (car state)))
     (setq state (cdr state))
@@ -3689,7 +3689,7 @@
 	  ;; real window that we want to fill with what we find here.
 	  (when (memq (car item) '(leaf vc hc))
 	    (if (assq 'last item)
-		;; The last child window.  Below `window-state-put-1'
+		;; The last child window.  Below `window--state-put-1'
 		;; will put into it whatever ITEM has in store.
 		(setq new nil)
 	      ;; Not the last child window, prepare for splitting
@@ -3730,11 +3730,11 @@
 
 	    ;; Now process the current window (either the one we've just
 	    ;; split or the last child of its parent).
-	    (window-state-put-1 item window ignore totals)
+	    (window--state-put-1 item window ignore totals)
 	    ;; Continue with the last window split off.
 	    (setq window new))))))))
 
-(defun window-state-put-2 (ignore)
+(defun window--state-put-2 (ignore)
   "Helper function for `window-state-put'."
   (dolist (item window-state-put-list)
     (let ((window (car item))
@@ -3860,11 +3860,11 @@
       ;; Work on the windows of a temporary buffer to make sure that
       ;; splitting proceeds regardless of any buffer local values of
       ;; `window-size-fixed'.  Release that buffer after the buffers of
-      ;; all live windows have been set by `window-state-put-2'.
+      ;; all live windows have been set by `window--state-put-2'.
       (with-temp-buffer
 	(set-window-buffer window (current-buffer))
-	(window-state-put-1 state window nil totals)
-	(window-state-put-2 ignore))
+	(window--state-put-1 state window nil totals)
+	(window--state-put-2 ignore))
       (window--check frame))))
 
 (defun display-buffer-record-window (type window buffer)
------------------------------------------------------------
revno: 106422
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sat 2011-11-19 01:18:31 -0800
message:
  Spelling fixes.
diff:
=== modified file 'Makefile.in'
--- Makefile.in	2011-09-26 21:30:18 +0000
+++ Makefile.in	2011-11-19 09:18:31 +0000
@@ -666,7 +666,7 @@
 ### Install LEIM files.  Although they are machine-independent, we
 ### have separate target here instead of including it in
 ### `install-arch-indep'.  People who extracted LEIM files after they
-### insalled Emacs itself can install only LEIM files by this target.
+### installed Emacs itself can install only LEIM files by this target.
 install-leim: leim/Makefile mkdir
 	cd leim; $(MAKE) install
 

=== modified file 'admin/notes/multi-tty'
--- admin/notes/multi-tty	2011-11-14 23:59:56 +0000
+++ admin/notes/multi-tty	2011-11-19 09:18:31 +0000
@@ -984,7 +984,7 @@
    wrt foreground/background process groups.)
 
 -- There is a flicker during the startup of `emacs -nw'; it's as if
-   the terminal is initialized, reset and then initialialized again.
+   the terminal is initialized, reset and then initialized again.
    Debug this.  (Hint: narrow_foreground_group is called twice during
    startup.)
 

=== modified file 'admin/unidata/unidata-gen.el'
--- admin/unidata/unidata-gen.el	2011-08-23 14:45:14 +0000
+++ admin/unidata/unidata-gen.el	2011-11-19 09:18:31 +0000
@@ -158,7 +158,7 @@
 ;; DEFAULT: the default value of the property.  It may have the form
 ;;   (VAL0 (FROM1 TO1 VAL1) ...) which indicates that the default
 ;;   value is VAL0 except for characters in the ranges specified by
-;;   FROMn and TOn (incusive).  The default value of characters
+;;   FROMn and TOn (inclusive).  The default value of characters
 ;;   between FROMn and TOn is VALn.
 ;; VAL-LIST: list of specially ordered property values
 

=== modified file 'doc/emacs/ack.texi'
--- doc/emacs/ack.texi	2011-11-14 23:59:56 +0000
+++ doc/emacs/ack.texi	2011-11-19 09:18:31 +0000
@@ -549,7 +549,7 @@
 languages, and wrote @file{ucs-normalize.el} for Unicode normalization.
 
 @item
-Taro Kawagishi implented the MD4 Message Digest Algorithm in Lisp; and
+Taro Kawagishi implemented the MD4 Message Digest Algorithm in Lisp; and
 wrote @file{ntlm.el} and @file{sasl-ntlm.el} for NT LanManager
 authentication support.
 

=== modified file 'doc/lispref/searching.texi'
--- doc/lispref/searching.texi	2011-08-16 07:53:33 +0000
+++ doc/lispref/searching.texi	2011-11-19 09:18:31 +0000
@@ -1213,7 +1213,7 @@
 
   Notice that all functions are allowed to overwrite the match data
 unless they're explicitly documented not to do so.  A consequence is
-that functions that are run implictly in the background
+that functions that are run implicitly in the background
 (@pxref{Timers}, and @ref{Idle Timers}) should likely save and restore
 the match data explicitly.
 

=== modified file 'doc/lispref/spellfile'
--- doc/lispref/spellfile	2011-11-17 17:40:48 +0000
+++ doc/lispref/spellfile	2011-11-19 09:18:31 +0000
@@ -376,7 +376,6 @@
 integerp
 intermixed
 ints
-inturned
 irreversibly
 jum
 keymapp

=== modified file 'doc/misc/dbus.texi'
--- doc/misc/dbus.texi	2011-11-15 07:55:13 +0000
+++ doc/misc/dbus.texi	2011-11-19 09:18:31 +0000
@@ -332,7 +332,7 @@
 @code{method}, @code{signal}, and @code{property} elements.  Unlike
 properties, which can change their values during lifetime of a D-Bus
 object, annotations are static.  Often they are used for code
-generators of D-Bus langugae bindings.  Example:
+generators of D-Bus language bindings.  Example:
 
 @example
 <annotation name="de.berlios.Pinot.GetStatistics" value="pinotDBus"/>

=== modified file 'doc/misc/dired-x.texi'
--- doc/misc/dired-x.texi	2011-05-14 20:04:07 +0000
+++ doc/misc/dired-x.texi	2011-11-19 09:18:31 +0000
@@ -476,7 +476,7 @@
 This Dired-X feature is obsolete as of Emacs 24.1.  The standard Emacs
 directory local variables mechanism (@pxref{Directory
 Variables,,,emacs,The Gnu Emacs manual}) replaces it.  For an example of
-the new mechanims, @pxref{Omitting Variables}.
+the new mechanisms, @pxref{Omitting Variables}.
 
 When Dired visits a directory, it looks for a file whose name is the
 value of variable @code{dired-local-variables-file} (default: @file{.dired}).

=== modified file 'doc/misc/eshell.texi'
--- doc/misc/eshell.texi	2011-11-14 23:59:56 +0000
+++ doc/misc/eshell.texi	2011-11-19 09:18:31 +0000
@@ -61,7 +61,7 @@
 @node Top, What is Eshell?, (dir), (dir)
 @top Eshell
 
-Eshell is a shell-like command interpretor
+Eshell is a shell-like command interpreter
 implemented in Emacs Lisp.  It invokes no external processes except for
 those requested by the user.  It is intended to be a functional
 replacement for command shells such as @command{bash}, @command{zsh},

=== modified file 'doc/misc/gnus.texi'
--- doc/misc/gnus.texi	2011-11-17 09:09:20 +0000
+++ doc/misc/gnus.texi	2011-11-19 09:18:31 +0000
@@ -30030,7 +30030,7 @@
 @subsection Score File Syntax
 
 Score files are meant to be easily parseable, but yet extremely
-mallable.  It was decided that something that had the same read syntax
+malleable.  It was decided that something that had the same read syntax
 as an Emacs Lisp list would fit that spec.
 
 Here's a typical score file:

=== modified file 'doc/misc/message.texi'
--- doc/misc/message.texi	2011-03-18 13:45:04 +0000
+++ doc/misc/message.texi	2011-11-19 09:18:31 +0000
@@ -2120,7 +2120,7 @@
 
 @item message-directory
 @vindex message-directory
-Directory used by many mailey things.  The default is @file{~/Mail/}.
+Directory used by many mailish things.  The default is @file{~/Mail/}.
 All other mail file variables are derived from @code{message-directory}.
 
 @item message-auto-save-directory

=== modified file 'etc/NEWS'
--- etc/NEWS	2011-11-17 10:27:56 +0000
+++ etc/NEWS	2011-11-19 09:18:31 +0000
@@ -417,7 +417,7 @@
 
 +++
 *** New commands `maximize-window' and `minimize-window'.
-These maximize and minize the size of a window within its frame.
+These maximize and minimize the size of a window within its frame.
 
 +++
 *** New commands `switch-to-prev-buffer' and `switch-to-next-buffer'.
@@ -1126,7 +1126,7 @@
 
 +++
 *** The new option `frame-auto-hide-function' lets you choose between
-iconfying or deleting a frame when burying a buffer shown in a dedicated
+iconifying or deleting a frame when burying a buffer shown in a dedicated
 frame or quitting a window showing a buffer in a frame of its own.
 
 ** Completion

=== modified file 'etc/NEWS.1-17'
--- etc/NEWS.1-17	2011-11-18 08:31:02 +0000
+++ etc/NEWS.1-17	2011-11-19 09:18:31 +0000
@@ -1382,7 +1382,7 @@
  specify the tag table file name initially, or to switch
  to a new tag table.
 
-* If truncate-partial-width-windows is non-nil (as it intially is),
+* If truncate-partial-width-windows is non-nil (as it initially is),
  all windows less than the full screen width (that is,
  made by side-by-side splitting) truncate lines rather than continuing
  them.
@@ -2019,7 +2019,7 @@
 * save-buffers-kill-emacs is now on C-x C-c
  while C-x C-z does suspend-emacs.  This is to make
  C-x C-c like the normal Unix meaning of C-c
- and C-x C-z linke the normal Unix meaning of C-z.
+ and C-x C-z like the normal Unix meaning of C-z.
 
 * M-ESC (eval-expression) is now a disabled command by default.
  This prevents users who type ESC ESC accidentally from

=== modified file 'leim/quail/cyrillic.el'
--- leim/quail/cyrillic.el	2011-11-15 07:55:13 +0000
+++ leim/quail/cyrillic.el	2011-11-19 09:18:31 +0000
@@ -608,7 +608,7 @@
 ;; layout.  In fact, Microsoft shipped for a while a layout that was lacking
 ;; two characters, precisely the "GHE_WITH_UPTURN" and the apostrophe.  The
 ;; latest versions of Windows software do have the "GHE_WITH_UPTURN" in the
-;; ukrainian keyborad layout but the apostrophe is still not there, whereas
+;; ukrainian keyboard layout but the apostrophe is still not there, whereas
 ;; there is one letter, "Cyrillic_YO", not used in ukrainian.  Ukrainians
 ;; normally replace the "Cyrillic_YO" by the apostrophe sign and live
 ;; happily with this little change.  [See "ukrainian-computer" below.]

=== modified file 'lib-src/etags.c'
--- lib-src/etags.c	2011-11-16 17:47:25 +0000
+++ lib-src/etags.c	2011-11-19 09:18:31 +0000
@@ -326,7 +326,7 @@
   struct re_pattern_buffer *pat; /* the compiled pattern */
   struct re_registers regs;	/* re registers */
   bool error_signaled;		/* already signaled for this regexp */
-  bool force_explicit_name;	/* do not allow implict tag name */
+  bool force_explicit_name;	/* do not allow implicit tag name */
   bool ignore_case;		/* ignore case when matching */
   bool multi_line;		/* do a multi-line match on the whole file */
 } regexp;

=== modified file 'lisp/ChangeLog.10'
--- lisp/ChangeLog.10	2011-11-16 17:47:25 +0000
+++ lisp/ChangeLog.10	2011-11-19 09:18:31 +0000
@@ -11680,7 +11680,7 @@
 2002-08-27  Francesco Potortì  <pot@gnu.org>
 
 	* net/ange-ftp.el (ange-ftp-skip-msgs): Skip the 530 response
-	given by vsFTPd when accessed with a kerberised FTP client.
+	given by vsFTPd when accessed with a kerberized FTP client.
 
 2002-08-27  Richard M. Stallman  <rms@gnu.org>
 

=== modified file 'lisp/ChangeLog.14'
--- lisp/ChangeLog.14	2011-11-17 17:40:48 +0000
+++ lisp/ChangeLog.14	2011-11-19 09:18:31 +0000
@@ -13629,7 +13629,7 @@
 	(completion-emacs22-try-completion): Place cursor after the /, as was
 	done in Emacs-22's minibuffer-complete-word.
 	Fix bug reported by David Hansen <david.hansen@gmx.net>.
-	(completion-emacs22-try-completion): Merge all mergeable text rather
+	(completion-emacs22-try-completion): Merge all mergable text rather
 	than just /.
 	(completion-pcm--delim-wild-regex): New var.
 	(completion-pcm-word-delimiters): New custom.

=== modified file 'lisp/ChangeLog.15'
--- lisp/ChangeLog.15	2011-11-17 17:40:48 +0000
+++ lisp/ChangeLog.15	2011-11-19 09:18:31 +0000
@@ -2796,7 +2796,7 @@
 2010-12-29  Karl Fogel  <kfogel@red-bean.com>
 
 	* saveplace.el (save-place-alist-to-file): Save list sorted and
-	pretty-printed, so that it is mergeable by line-based text merging,
+	pretty-printed, so that it is mergable by line-based text merging,
 	as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
 
 2010-12-28  Ken Manheimer  <ken.manheimer@gmail.com>
@@ -5376,7 +5376,7 @@
 
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* newcomment.el (comment-dwim): Fix the intentation in the doc string.
+	* newcomment.el (comment-dwim): Fix the indentation in the doc string.
 
 2010-10-21  Michael Albinus  <michael.albinus@gmx.de>
 

=== modified file 'lisp/ChangeLog.2'
--- lisp/ChangeLog.2	2011-01-25 04:08:28 +0000
+++ lisp/ChangeLog.2	2011-11-19 09:18:31 +0000
@@ -1960,7 +1960,7 @@
 	window for it.
 
 	* terminal.el (te-filter):
-	Save/restore point from te-saved-point to minimise the lossage
+	Save/restore point from te-saved-point to minimize the lossage
 	vandals can inflict.
 
 1987-01-09  Richard M. Stallman  (rms@prep)
@@ -4008,4 +4008,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'lisp/allout-widgets.el'
--- lisp/allout-widgets.el	2011-11-17 17:40:48 +0000
+++ lisp/allout-widgets.el	2011-11-19 09:18:31 +0000
@@ -1623,7 +1623,7 @@
 
       (set-buffer-modified-p was-modified)
       (goto-char steady-point)
-      ;; must null the marker or the buffer gets clogged with impedence:
+      ;; must null the marker or the buffer gets clogged with impedance:
       (set-marker steady-point nil)
 
       item-widget)))

=== modified file 'lisp/cedet/ede/generic.el'
--- lisp/cedet/ede/generic.el	2011-11-15 17:37:37 +0000
+++ lisp/cedet/ede/generic.el	2011-11-19 09:18:31 +0000
@@ -43,7 +43,7 @@
 ;;
 ;; Customization:
 ;;
-;; Since these projects are all so increadibly generic, a user will
+;; Since these projects are all so incredibly generic, a user will
 ;; need to configure some aspects of the project by hand.  In order to
 ;; enable this without configuring the project objects directly (which
 ;; are auto-generated) a special ede-generic-config object is defined to

=== modified file 'lisp/cedet/semantic/bovine/c.el'
--- lisp/cedet/semantic/bovine/c.el	2011-11-15 07:55:13 +0000
+++ lisp/cedet/semantic/bovine/c.el	2011-11-19 09:18:31 +0000
@@ -344,7 +344,7 @@
 		 (string= sym "0"))
 	    (and ifdef (not (semantic-lex-spp-symbol-p sym)))
 	    (and ifndef (semantic-lex-spp-symbol-p sym)))
-	;; The if indecates to skip this preprocessor section
+	;; The if indicates to skip this preprocessor section.
 	(let ((pt nil))
 	  ;; (message "%s %s yes" ift sym)
 	  (beginning-of-line)
@@ -650,7 +650,7 @@
 		(setq depth 0)
 
 		;; This is a copy of semantic-parse-region-default where we
-		;; are doing something special with the lexication of the
+		;; are doing something special with the lexing of the
 		;; contents of the semantic-list token.  Stuff not used by C
 		;; removed.
 		(let ((tokstream

=== modified file 'lisp/cedet/semantic/html.el'
--- lisp/cedet/semantic/html.el	2011-11-13 07:48:23 +0000
+++ lisp/cedet/semantic/html.el	2011-11-19 09:18:31 +0000
@@ -126,7 +126,7 @@
 NAME is the name of this section.
 MEMBERS is a list of semantic tags representing the elements that make
 up this section.
-LEVEL is the levelling level.
+LEVEL is the leveling level.
 START and END define the location of data described by the tag."
   (let ((anchorp (eq level 11)))
     (append (semantic-tag name

=== modified file 'lisp/cedet/semantic/lex-spp.el'
--- lisp/cedet/semantic/lex-spp.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/lex-spp.el	2011-11-19 09:18:31 +0000
@@ -1067,7 +1067,7 @@
 ;;
 ;; These analyzers help a language define how include files
 ;; are identified.  These are ONLY for languages that perform
-;; an actual textual includesion, and not for imports.
+;; an actual textual inclusion, and not for imports.
 ;;
 ;; This section is supposed to allow the macros from the headers to be
 ;; added to the local dynamic macro table, but that hasn't been

=== modified file 'lisp/cedet/semantic/sb.el'
--- lisp/cedet/semantic/sb.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/sb.el	2011-11-19 09:18:31 +0000
@@ -87,7 +87,7 @@
 ;;    @ type
 ;;    = default value
 ;;
-;;  +> keywrd Type
+;;  +> keyword Type
 ;;   +> type part
 ;;
 ;;  +>  -> click to see additional information

=== modified file 'lisp/cedet/semantic/tag-file.el'
--- lisp/cedet/semantic/tag-file.el	2011-11-11 23:17:16 +0000
+++ lisp/cedet/semantic/tag-file.el	2011-11-19 09:18:31 +0000
@@ -125,7 +125,7 @@
 	  (tag-fname nil))
       (cond ((semantic-tag-in-buffer-p tag)
 	     ;; If the tag has an overlay and buffer associated with it,
-	     ;; switch to that buffer so that we get the right override metohds.
+	     ;; switch to that buffer so that we get the right override methods.
 	     (set-buffer (semantic-tag-buffer tag)))
 	    ((semantic-tag-file-name tag)
 	     ;; If it didn't have a buffer, but does have a file

=== modified file 'lisp/cedet/semantic/texi.el'
--- lisp/cedet/semantic/texi.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/semantic/texi.el	2011-11-19 09:18:31 +0000
@@ -483,7 +483,7 @@
 ;; This section provides specialized access into texinfo files.
 ;; Because texinfo files often directly refer to functions and programs
 ;; it is useful to access the texinfo file from the C code for document
-;; maintainance.
+;; maintenance.
 (defun semantic-texi-associated-files (&optional buffer)
   "Find texinfo files associated with BUFFER."
   (save-excursion

=== modified file 'lisp/cedet/srecode/document.el'
--- lisp/cedet/srecode/document.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/srecode/document.el	2011-11-19 09:18:31 +0000
@@ -122,7 +122,7 @@
     ("read" . "Reads from")
     ("reset" . "Resets the parameters and returns")
     ("scan" . "Scans the ")
-    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("setup\\|init\\(ialize\\)?" . "Initializes the ")
     ("select" . "Chooses the ")
     ("send" . "Sends a")
     ("re?c\\(v\\|ieves?\\)" . "Receives a ")

=== modified file 'lisp/cedet/srecode/insert.el'
--- lisp/cedet/srecode/insert.el	2011-11-17 09:09:20 +0000
+++ lisp/cedet/srecode/insert.el	2011-11-19 09:18:31 +0000
@@ -946,7 +946,7 @@
 ;; It will first insert the included template, then insert the embedded
 ;; template wherever the $^$ in the included template was.
 ;;
-;; Since it uses dual inheretance, it will magically get the end-matching
+;; Since it uses dual inheritance, it will magically get the end-matching
 ;; behavior of #, with the including feature of >.
 ;;
 (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)

=== modified file 'lisp/color.el'
--- lisp/color.el	2011-02-21 06:03:36 +0000
+++ lisp/color.el	2011-11-19 09:18:31 +0000
@@ -28,7 +28,7 @@
 ;; complements, and computing CIEDE2000 color distances.
 ;;
 ;; Supported color representations include RGB (red, green, blue), HSV
-;; (hue, saturation, value), HSL (hue, saturation, luminence), sRGB,
+;; (hue, saturation, value), HSL (hue, saturation, luminance), sRGB,
 ;; CIE XYZ, and CIE L*a*b* color components.
 
 ;;; Code:

=== modified file 'lisp/dired.el'
--- lisp/dired.el	2011-11-17 11:22:38 +0000
+++ lisp/dired.el	2011-11-19 09:18:31 +0000
@@ -704,7 +704,7 @@
 
 (defun dired-file-name-at-point ()
   "Try to get a file name at point in the current dired buffer.
-This hook is inteneded to be put in `file-name-at-point-functions'."
+This hook is intended to be put in `file-name-at-point-functions'."
   (let ((filename (dired-get-filename nil t)))
     (when filename
       (if (file-directory-p filename)

=== modified file 'lisp/emacs-lisp/advice.el'
--- lisp/emacs-lisp/advice.el	2011-11-17 09:09:20 +0000
+++ lisp/emacs-lisp/advice.el	2011-11-19 09:18:31 +0000
@@ -1608,7 +1608,7 @@
 ;; fii
 ;;
 ;; Now we advise `fii' to use an optional second argument that controls the
-;; amount of incrementation. A list following the (optional) position
+;; amount of incrementing. A list following the (optional) position
 ;; argument of the advice will be interpreted as an argument list
 ;; specification. This means you cannot specify an empty argument list, and
 ;; why would you want to anyway?

=== modified file 'lisp/emacs-lisp/chart.el'
--- lisp/emacs-lisp/chart.el	2011-11-15 17:37:37 +0000
+++ lisp/emacs-lisp/chart.el	2011-11-19 09:18:31 +0000
@@ -169,7 +169,7 @@
 	      :initform t)
    (name-face :initarg :name-face
 	      :initform 'bold)
-   (labels-face :initarg :lables-face
+   (labels-face :initarg :labels-face
 		:initform 'italic)
    (chart :initarg :chart
 	  :initform nil)

=== modified file 'lisp/emacs-lisp/elint.el'
--- lisp/emacs-lisp/elint.el	2011-02-03 07:27:59 +0000
+++ lisp/emacs-lisp/elint.el	2011-11-19 09:18:31 +0000
@@ -296,7 +296,7 @@
   (elint-display-log)
   (elint-set-mode-line t)
   (mapc 'elint-top-form (elint-update-env))
-  ;; Tell the user we're finished.  This is terribly klugy: we set
+  ;; Tell the user we're finished.  This is terribly kludgy: we set
     ;; elint-top-form-logged so elint-log-message doesn't print the
     ;; ** top form ** header...
   (elint-set-mode-line)

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- lisp/emacs-lisp/lisp-mode.el	2011-09-18 20:43:20 +0000
+++ lisp/emacs-lisp/lisp-mode.el	2011-11-19 09:18:31 +0000
@@ -769,7 +769,7 @@
 Reset the `defvar' and `defcustom' variables to the initial value.
 Reinitialize the face according to the `defface' specification."
   ;; The code in edebug-defun should be consistent with this, but not
-  ;; the same, since this gets a macroexpended form.
+  ;; the same, since this gets a macroexpanded form.
   (cond ((not (listp form))
 	 form)
 	((and (eq (car form) 'defvar)

=== modified file 'lisp/emulation/viper.el'
--- lisp/emulation/viper.el	2011-05-24 03:37:31 +0000
+++ lisp/emulation/viper.el	2011-11-19 09:18:31 +0000
@@ -777,7 +777,7 @@
   (viper-unbind-mouse-search-key)
   (viper-unbind-mouse-insert-key)
   ;; In emacs, we have to advice handle-switch-frame
-  ;; This advice is undone earlier, when all advices matchine "viper-" are
+  ;; This advice is undone earlier, when all advices matching "viper-" are
   ;; deactivated.
   (if (featurep 'xemacs)
       (remove-hook 'mouse-leave-frame-hook 'viper-remember-current-frame))
@@ -1050,7 +1050,7 @@
 					 (memq 'down (event-modifiers (aref key 1)))))
 				(read-event))))))
     ) ; (if (featurep 'xemacs)
-  
+
   (if (featurep 'xemacs)
       ;; XEmacs
       (defadvice describe-key-briefly
@@ -1076,7 +1076,7 @@
 			       (prefix-numeric-value current-prefix-arg))
 			   1))))
     ) ; (if (featurep 'xemacs)
-  
+
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file: " nil default-directory)

=== modified file 'lisp/erc/erc.el'
--- lisp/erc/erc.el	2011-10-20 00:26:14 +0000
+++ lisp/erc/erc.el	2011-11-19 09:18:31 +0000
@@ -1569,7 +1569,7 @@
     ;; current ERC buffer.
     ;; if buf-name is taken by a different connection (or by something !erc)
     ;; then see if "buf-name/server" meets the same criteria
-    (dolist (candidate (list buf-name (concat buf-name "/" server))) 
+    (dolist (candidate (list buf-name (concat buf-name "/" server)))
       (if (and (not buffer-name)
                erc-reuse-buffers
                (get-buffer candidate)
@@ -4001,7 +4001,7 @@
        (not (string-match "^\C-a\\ACTION.*\C-a$" message))))
 
 (defun erc-format-privmessage (nick msg privp msgp)
-  "Format a PRIVMSG in an insertible fashion."
+  "Format a PRIVMSG in an insertable fashion."
   (let* ((mark-s (if msgp (if privp "*" "<") "-"))
 	 (mark-e (if msgp (if privp "*" ">") "-"))
 	 (str	 (format "%s%s%s %s" mark-s nick mark-e msg))

=== modified file 'lisp/eshell/em-alias.el'
--- lisp/eshell/em-alias.el	2011-03-05 04:11:05 +0000
+++ lisp/eshell/em-alias.el	2011-11-19 09:18:31 +0000
@@ -74,7 +74,7 @@
 ;; session, it is likely that they are experiencing a spelling
 ;; difficulty associated with a certain command.  To combat this,
 ;; Eshell will offer to automatically define an alias for that
-;; mispelled command, once a given tolerance threshold has been
+;; misspelled command, once a given tolerance threshold has been
 ;; reached.
 
 ;; Whenever the same bad command name is encountered

=== modified file 'lisp/eshell/em-glob.el'
--- lisp/eshell/em-glob.el	2011-05-23 17:57:17 +0000
+++ lisp/eshell/em-glob.el	2011-11-19 09:18:31 +0000
@@ -90,7 +90,7 @@
 
 (defcustom eshell-error-if-no-glob nil
   "If non-nil, it is an error for a glob pattern not to match.
- This mimcs the behavior of zsh if non-nil, but bash if nil."
+ This mimics the behavior of zsh if non-nil, but bash if nil."
   :type 'boolean
   :group 'eshell-glob)
 

=== modified file 'lisp/eshell/esh-util.el'
--- lisp/eshell/esh-util.el	2011-11-18 14:49:42 +0000
+++ lisp/eshell/esh-util.el	2011-11-19 09:18:31 +0000
@@ -81,7 +81,7 @@
 Numeric form is tested using the regular expression
 `eshell-number-regexp'.
 
-NOTE: If you find that numeric conversions are intefering with the
+NOTE: If you find that numeric conversions are interfering with the
 specification of filenames (for example, in calling `find-file', or
 some other Lisp function that deals with files, not numbers), add the
 following in your .emacs file:

=== modified file 'lisp/follow.el'
--- lisp/follow.el	2011-11-17 17:40:48 +0000
+++ lisp/follow.el	2011-11-19 09:18:31 +0000
@@ -87,7 +87,7 @@
 ;;   to turn it off.
 
 
-;; The command `follow-delete-other-windows-and-split' maximises the
+;; The command `follow-delete-other-windows-and-split' maximizes the
 ;; visible area of the current buffer.
 ;;
 ;; I recommend adding it, and `follow-mode', to hotkeys in the global

=== modified file 'lisp/gnus/gnus-agent.el'
--- lisp/gnus/gnus-agent.el	2011-11-17 17:40:48 +0000
+++ lisp/gnus/gnus-agent.el	2011-11-19 09:18:31 +0000
@@ -1368,7 +1368,7 @@
           ;; disable the set read each time this server is opened.
           ;; NOTE: Opening this group will restore the valid local
           ;; range but it will also expand the local range to
-          ;; incompass the new active range.
+          ;; encompass the new active range.
           (gnus-agent-set-local group agent-min (1- active-min)))))))
 
 (defun gnus-agent-save-group-info (method group active)

=== modified file 'lisp/gnus/gnus-dired.el'
--- lisp/gnus/gnus-dired.el	2011-01-25 04:08:28 +0000
+++ lisp/gnus/gnus-dired.el	2011-11-19 09:18:31 +0000
@@ -251,7 +251,7 @@
 	  (if (eq gnus-dired-mail-mode 'gnus-user-agent)
 	      (gnus-print-buffer)
 	    ;; FIXME:
-	    (error "MIME print only implemeted via Gnus")))
+	    (error "MIME print only implemented via Gnus")))
 	(ps-despool print-to))))
    ((file-symlink-p file-name)
      (error "File is a symlink to a nonexistent target"))

=== modified file 'lisp/gnus/mail-parse.el'
--- lisp/gnus/mail-parse.el	2011-01-25 04:08:28 +0000
+++ lisp/gnus/mail-parse.el	2011-11-19 09:18:31 +0000
@@ -22,7 +22,7 @@
 
 ;; This file contains wrapper functions for a wide range of mail
 ;; parsing functions.  The idea is that there are low-level libraries
-;; that impement according to various specs (RFC2231, DRUMS, USEFOR),
+;; that implement according to various specs (RFC2231, DRUMS, USEFOR),
 ;; but that programmers that want to parse some header (say,
 ;; Content-Type) will want to use the latest spec.
 ;;

=== modified file 'lisp/gnus/nnmail.el'
--- lisp/gnus/nnmail.el	2011-08-21 22:10:49 +0000
+++ lisp/gnus/nnmail.el	2011-11-19 09:18:31 +0000
@@ -1799,7 +1799,7 @@
 	 (i 0)
 	 (new 0)
 	 (total 0)
-	 incoming incomings source)
+	 source)
     (when (and (nnmail-get-value "%s-get-new-mail" method)
 	       sources)
       (while (setq source (pop sources))

=== modified file 'lisp/gnus/nnmairix.el'
--- lisp/gnus/nnmairix.el	2011-11-17 09:09:20 +0000
+++ lisp/gnus/nnmairix.el	2011-11-19 09:18:31 +0000
@@ -204,7 +204,7 @@
 (add-hook 'gnus-summary-mode-hook 'nnmairix-summary-mode-hook)
 
 ;; ;;;###autoload
-;; (defun nnmairix-initalize (&optional force)
+;; (defun nnmairix-initialize (&optional force)
 ;;   (interactive "P")
 ;;   (if (not (or (file-readable-p "~/.mairixrc")
 ;; 	       force))
@@ -512,7 +512,7 @@
        ;; Everything else is an error
        (t
 	(nnheader-report
-	 'nnmairix "Error running marix. See buffer %s for details"
+	 'nnmairix "Error running mairix. See buffer %s for details"
 	 nnmairix-mairix-output-buffer)
 	nil))))))
 

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2011-10-06 09:25:26 +0000
+++ lisp/gnus/shr.el	2011-11-19 09:18:31 +0000
@@ -53,17 +53,17 @@
   :group 'shr
   :type 'regexp)
 
-(defcustom shr-table-horizontal-line ? 
+(defcustom shr-table-horizontal-line ?
   "Character used to draw horizontal table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-vertical-line ? 
+(defcustom shr-table-vertical-line ?
   "Character used to draw vertical table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-corner ? 
+(defcustom shr-table-corner ?
   "Character used to draw table corners."
   :group 'shr
   :type 'character)
@@ -583,7 +583,7 @@
   "Return a function to display an image.
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
-START, and END.  Note that START and END should be merkers."
+START, and END.  Note that START and END should be markers."
   `(lambda (url start end)
      (when url
        (if (string-match "\\`cid:" url)

=== modified file 'lisp/gnus/sieve-manage.el'
--- lisp/gnus/sieve-manage.el	2011-03-08 14:26:05 +0000
+++ lisp/gnus/sieve-manage.el	2011-11-19 09:18:31 +0000
@@ -1,4 +1,4 @@
-;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
+;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp
 
 ;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 

=== modified file 'lisp/gnus/spam.el'
--- lisp/gnus/spam.el	2011-10-11 14:24:55 +0000
+++ lisp/gnus/spam.el	2011-11-19 09:18:31 +0000
@@ -156,7 +156,7 @@
   :group 'spam)
 
 (defcustom spam-autodetect-recheck-messages nil
-  "Should spam.el recheck all meessages when autodetecting?
+  "Should spam.el recheck all messages when autodetecting?
 Normally this is nil, so only unseen messages will be checked."
   :type 'boolean
   :group 'spam)

=== modified file 'lisp/help-mode.el'
--- lisp/help-mode.el	2011-09-07 14:40:27 +0000
+++ lisp/help-mode.el	2011-11-19 09:18:31 +0000
@@ -141,7 +141,7 @@
   'help-function 'describe-character-set
   'help-echo (purecopy "mouse-2, RET: describe this character set"))
 
-;; make some more ideosyncratic button types
+;; Make some more idiosyncratic button types.
 
 (define-button-type 'help-symbol
   :supertype 'help-xref

=== modified file 'lisp/hippie-exp.el'
--- lisp/hippie-exp.el	2011-01-25 04:08:28 +0000
+++ lisp/hippie-exp.el	2011-11-19 09:18:31 +0000
@@ -391,7 +391,7 @@
 	      lst)))
 
 ;; Check if current buffer matches any atom or regexp in LST.
-;; Atoms are interpreted as major modes, strings as regexps mathing the name.
+;; Atoms are interpreted as major modes, strings as regexps matching the name.
 (defun he-buffer-member (lst)
   (or (memq major-mode lst)
       (progn

=== modified file 'lisp/htmlfontify.el'
--- lisp/htmlfontify.el	2011-11-17 17:40:48 +0000
+++ lisp/htmlfontify.el	2011-11-19 09:18:31 +0000
@@ -1774,7 +1774,7 @@
           (split-string (shell-command-to-string hfy-find-cmd))) )
 
 ;; strip the filename off, return a directory name
-;; not a particularly thorough implementaion, but it will be
+;; not a particularly thorough implementation, but it will be
 ;; fed pretty carefully, so it should be Ok:
 (defun hfy-dirname (file)
   "Return everything preceding the last \"/\" from a relative filename FILE,

=== modified file 'lisp/ido.el'
--- lisp/ido.el	2011-11-15 07:55:13 +0000
+++ lisp/ido.el	2011-11-19 09:18:31 +0000
@@ -770,7 +770,7 @@
 (defcustom ido-use-virtual-buffers nil
   "If non-nil, refer to past buffers as well as existing ones.
 Essentially it works as follows: Say you are visiting a file and
-the buffer gets cleaned up by mignight.el.  Later, you want to
+the buffer gets cleaned up by midnight.el.  Later, you want to
 switch to that buffer, but find it's no longer open.  With
 virtual buffers enabled, the buffer name stays in the buffer
 list (using the `ido-virtual' face, and always at the end), and if

=== modified file 'lisp/international/characters.el'
--- lisp/international/characters.el	2011-11-15 07:55:13 +0000
+++ lisp/international/characters.el	2011-11-19 09:18:31 +0000
@@ -410,7 +410,7 @@
 		  ("ྐ-ྐྵྺྻྼ"       "w"     ?0) ;
 		  ("ིེཻོཽྀ"       "w"	?2) ; upper vowel
 		  ("ཾྂྃ྆྇ྈྉྊྋ" "w"	?2) ; upper modifier
-		  ("྄ཱུ༙༵༷"       "w"	?3) ; lowel vowel/modifier
+		  ("྄ཱུ༙༵༷"       "w"	?3) ; lower vowel/modifier
 		  ("཰"		"w" ?3)		    ; invisible vowel a
 		  ("༠-༩༪-༳"	        "w"	?6) ; digit
 		  ("་།-༒༔ཿ"        "."     ?|) ; line-break char

=== modified file 'lisp/mail/feedmail.el'
--- lisp/mail/feedmail.el	2011-11-17 09:09:20 +0000
+++ lisp/mail/feedmail.el	2011-11-19 09:18:31 +0000
@@ -2188,7 +2188,7 @@
 	    (if (or (eq user-sez ?\C-m) (eq user-sez ?\C-j) (eq user-sez ?y))
 		(setq user-sez d-char))
 	    ;; these char-to-int things are because of some
-	    ;; incomprensible difference between the two in
+	    ;; incomprehensible difference between the two in
 	    ;; byte-compiled stuff between Emacs and XEmacs
 	    ;; (well, I'm sure someone could comprehend it,
 	    ;; but I say 'uncle')

=== modified file 'lisp/minibuffer.el'
--- lisp/minibuffer.el	2011-11-18 08:31:02 +0000
+++ lisp/minibuffer.el	2011-11-19 09:18:31 +0000
@@ -2427,7 +2427,7 @@
   "Find all completions for STRING at POINT in TABLE, satisfying PRED.
 POINT is a position inside STRING.
 FILTER is a function applied to the return value, that can be used, e.g. to
-filter out additional entries (because TABLE migth not obey PRED)."
+filter out additional entries (because TABLE might not obey PRED)."
   (unless filter (setq filter 'identity))
   (let* ((beforepoint (substring string 0 point))
          (afterpoint (substring string point))

=== modified file 'lisp/net/ange-ftp.el'
--- lisp/net/ange-ftp.el	2011-11-15 17:37:37 +0000
+++ lisp/net/ange-ftp.el	2011-11-19 09:18:31 +0000
@@ -721,7 +721,7 @@
 	  "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
           "^500 .*AUTH\\|^KERBEROS\\|"
           "^504 Unknown security mechanism\\|"
-	  "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
+	  "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd
 	  "^534 Kerberos Authentication not enabled\\|"
 	  "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
   "Regular expression matching FTP messages that can be ignored."

=== modified file 'lisp/net/newst-plainview.el'
--- lisp/net/newst-plainview.el	2011-11-17 17:40:48 +0000
+++ lisp/net/newst-plainview.el	2011-11-19 09:18:31 +0000
@@ -1574,7 +1574,7 @@
       (while (and (setq pos2 (next-single-property-change pos1 'nt-type))
                   (<= pos2 end)
                   (> pos2 pos1))
-        ;; must shift one char to the left in order to handle inivisible
+        ;; must shift one char to the left in order to handle invisible
         ;; newlines, motion in invisible text areas and all that correctly
         (put-text-property (1- pos1) (1- pos2)
                            'invisible

=== modified file 'lisp/net/tramp-gvfs.el'
--- lisp/net/tramp-gvfs.el	2011-06-02 03:48:23 +0000
+++ lisp/net/tramp-gvfs.el	2011-11-19 09:18:31 +0000
@@ -39,7 +39,7 @@
 ;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a
 ;; precondition.
 
-;; The GVFS D-Bus interface is said to be instable.  There are even no
+;; The GVFS D-Bus interface is said to be unstable.  There are even no
 ;; introspection data.  The interface, as discovered during
 ;; development time, is given in respective comments.
 

=== modified file 'lisp/org/ChangeLog'
--- lisp/org/ChangeLog	2011-11-17 17:40:48 +0000
+++ lisp/org/ChangeLog	2011-11-19 09:18:31 +0000
@@ -14739,7 +14739,7 @@
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org.el (org-sort-entries-or-items): Match TODO keywrds
+	* org.el (org-sort-entries-or-items): Match TODO keywords
 	case-sensitively, when sorting.
 	(org-priority): Do not match TODO keywords with wrong case.
 

=== modified file 'lisp/org/ob-ledger.el'
--- lisp/org/ob-ledger.el	2011-08-18 20:41:06 +0000
+++ lisp/org/ob-ledger.el	2011-11-19 09:18:31 +0000
@@ -30,7 +30,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;

=== modified file 'lisp/org/org-exp.el'
--- lisp/org/org-exp.el	2011-09-02 16:38:40 +0000
+++ lisp/org/org-exp.el	2011-11-19 09:18:31 +0000
@@ -2922,7 +2922,7 @@
 	  (org-load-modules-maybe)
 	  (unless org-local-vars
 	    (setq org-local-vars (org-get-local-variables)))
-	  (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+	  (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
 	   (list 'let org-local-vars
 		 (list (intern (format "org-export-as-%s" fmt))
 		       nil nil nil ''string t))))

=== modified file 'lisp/org/org-table.el'
--- lisp/org/org-table.el	2011-11-15 17:37:37 +0000
+++ lisp/org/org-table.el	2011-11-19 09:18:31 +0000
@@ -1302,7 +1302,7 @@
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely te refrence was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2901,7 +2901,7 @@
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can chose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))

=== modified file 'lisp/play/5x5.el'
--- lisp/play/5x5.el	2011-11-16 12:34:47 +0000
+++ lisp/play/5x5.el	2011-11-19 09:18:31 +0000
@@ -649,7 +649,7 @@
 	   ;; 23x25 is a diagonal of 1, and the two last columns are a
 	   ;; base of kernel of transferm.
 	   ;;
-	   ;; base-change must be by construction inversible.
+	   ;; base-change must be by construction invertible.
 	   (base-change
 	    (5x5-log
 	     "p"

=== modified file 'lisp/progmodes/ada-mode.el'
--- lisp/progmodes/ada-mode.el	2011-11-16 12:34:47 +0000
+++ lisp/progmodes/ada-mode.el	2011-11-19 09:18:31 +0000
@@ -826,7 +826,7 @@
 ;; to be considered as part of a word or not.
 ;; Some characters may have multiple meanings depending on the context:
 ;;  - ' is either the beginning of a constant character or an attribute
-;;  - # is either part of a based litteral or a gnatprep statement.
+;;  - # is either part of a based literal or a gnatprep statement.
 ;;  - " starts a string, but not if inside a constant character.
 ;;  - ( and ) should be ignored if inside a constant character.
 ;; Thus their syntax property is changed automatically, and we can still use

=== modified file 'lisp/progmodes/cc-awk.el'
--- lisp/progmodes/cc-awk.el	2011-11-17 09:09:20 +0000
+++ lisp/progmodes/cc-awk.el	2011-11-19 09:18:31 +0000
@@ -128,7 +128,7 @@
 ;; REGEXPS FOR "HARMLESS" STRINGS/LINES.
 (defconst c-awk-harmless-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)")
 ;;   Matches an underline NOT followed by ".
 (defconst c-awk-harmless-string*-re
@@ -160,7 +160,7 @@
 (defconst c-awk-string-without-end-here-re
   (concat "\\=_?\"" c-awk-string-innards-re))
 ;;   Matches an AWK string at point up to, but not including, any terminator.
-;; A gawk 3.1+ string may look like _"localisable string".
+;; A gawk 3.1+ string may look like _"localizable string".
 (defconst c-awk-one-line-possibly-open-string-re
   (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*"
 	  "\\(\"\\|\\\\?$\\|\\'\\)"))

=== modified file 'lisp/progmodes/cc-engine.el'
--- lisp/progmodes/cc-engine.el	2011-11-18 15:06:20 +0000
+++ lisp/progmodes/cc-engine.el	2011-11-19 09:18:31 +0000
@@ -2364,7 +2364,7 @@
 
 (defun c-parse-state-get-strategy (here good-pos)
   ;; Determine the scanning strategy for adjusting `c-parse-state', attempting
-  ;; to minimise the amount of scanning.  HERE is the pertinent position in
+  ;; to minimize the amount of scanning.  HERE is the pertinent position in
   ;; the buffer, GOOD-POS is a position where `c-state-cache' (possibly with
   ;; its head trimmed) is known to be good, or nil if there is no such
   ;; position.
@@ -2788,7 +2788,7 @@
   ;;
   ;; This function must only be called only when (> `c-state-cache-good-pos'
   ;; HERE).  Usually the gap between CACHE-POS and HERE is large.  It is thus
-  ;; optimised to eliminate (or minimise) scanning between these two
+  ;; optimised to eliminate (or minimize) scanning between these two
   ;; positions.
   ;;
   ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where:
@@ -5052,7 +5052,7 @@
 ;; The strategy now (2010-01) adopted is to mark and unmark < and
 ;; > IN MATCHING PAIRS ONLY.  [Previously, they were marked
 ;; individually when their context so indicated.  This gave rise to
-;; intractible problems when one of a matching pair was deleted, or
+;; intractable problems when one of a matching pair was deleted, or
 ;; pulled into a literal.]
 ;;
 ;; At each buffer change, the syntax-table properties are removed in a
@@ -5965,7 +5965,7 @@
   ;;     `*-font-lock-extra-types');
   ;;   o - 'prefix if it's a known prefix of a type;
   ;;   o - 'found if it's a type that matches one in `c-found-types';
-  ;;   o - 'maybe if it's an identfier that might be a type; or
+  ;;   o - 'maybe if it's an identifier that might be a type; or
   ;;   o -  nil if it can't be a type (the point isn't moved then).
   ;;
   ;; The point is assumed to be at the beginning of a token.

=== modified file 'lisp/progmodes/cc-fonts.el'
--- lisp/progmodes/cc-fonts.el	2011-11-15 07:55:13 +0000
+++ lisp/progmodes/cc-fonts.el	2011-11-19 09:18:31 +0000
@@ -1122,7 +1122,7 @@
 			  (char-after (match-beginning 1))))
 
       (if types
-	  ;; Register and fontify the identifer as a type.
+	  ;; Register and fontify the identifier as a type.
 	  (let ((c-promote-possible-types t))
 	    (goto-char id-start)
 	    (c-forward-type))

=== modified file 'lisp/progmodes/cc-mode.el'
--- lisp/progmodes/cc-mode.el	2011-11-15 00:54:19 +0000
+++ lisp/progmodes/cc-mode.el	2011-11-19 09:18:31 +0000
@@ -587,7 +587,7 @@
   (add-hook 'after-change-functions 'c-after-change nil t)
   (set (make-local-variable 'font-lock-extend-after-change-region-function)
  	'c-extend-after-change-region))	; Currently (2009-05) used by all
-			; lanaguages with #define (C, C++,; ObjC), and by AWK.
+			; languages with #define (C, C++,; ObjC), and by AWK.
 
 (defun c-setup-doc-comment-style ()
   "Initialize the variables that depend on the value of `c-doc-comment-style'."

=== modified file 'lisp/progmodes/cc-vars.el'
--- lisp/progmodes/cc-vars.el	2011-11-14 23:59:56 +0000
+++ lisp/progmodes/cc-vars.el	2011-11-19 09:18:31 +0000
@@ -420,7 +420,7 @@
 according to `comment-column'.
 
 Note that a non-nil value on `c-indent-comments-syntactically-p'
-overrides this variable, so empty lines are indentented syntactically
+overrides this variable, so empty lines are indented syntactically
 in that case, i.e. as if \\[c-indent-command] was used instead."
   :type
   (let ((space '(cons :tag "space"

=== modified file 'lisp/progmodes/cperl-mode.el'
--- lisp/progmodes/cperl-mode.el	2011-11-18 08:31:02 +0000
+++ lisp/progmodes/cperl-mode.el	2011-11-19 09:18:31 +0000
@@ -839,7 +839,7 @@
         b) Can lineup vertically \"middles\" of rows, like `=' in
                 a  = b;
                 cc = d;
-        c) Can insert spaces where this impoves readability (in one
+        c) Can insert spaces where this improves readability (in one
                 interactive sweep over the buffer);
         d) Has support for imenu, including:
                 1) Separate unordered list of \"interesting places\";
@@ -2801,7 +2801,7 @@
 				 (skip-chars-forward " \t")
 				 (if (memq (char-after (point))
 					   (append "#\n" nil))
-				     nil ; Can't use intentation of this line...
+				     nil ; Can't use indentation of this line...
 				   (point)))
 			     (skip-chars-forward " \t")
 			     (point)))

=== modified file 'lisp/progmodes/gud.el'
--- lisp/progmodes/gud.el	2011-11-17 09:09:20 +0000
+++ lisp/progmodes/gud.el	2011-11-19 09:18:31 +0000
@@ -2094,7 +2094,7 @@
 
 	;; By this point the current directory is all screwed up.  Maybe we
 	;; could fix things and re-invoke gud-common-init, but for now I think
-	;; issueing the error is good enough.
+	;; issuing the error is good enough.
 	(if user-error
 	    (progn
 	      (kill-buffer (current-buffer))

=== modified file 'lisp/progmodes/idlw-help.el'
--- lisp/progmodes/idlw-help.el	2011-11-17 17:40:48 +0000
+++ lisp/progmodes/idlw-help.el	2011-11-19 09:18:31 +0000
@@ -989,7 +989,7 @@
 particlar it looks for the `NAME:' tag, either with a colon, or alone
 on a line.  Then `NAME:' must be followed by the routine name on the
 same or the next line.  When KEYWORD is non-nil, looks first for a
-`KEYWORDS' section.  It is amazing how inconsisten this is through
+`KEYWORDS' section.  It is amazing how inconsistent this is through
 some IDL libraries I have seen.  We settle for a line containing an
 upper case \"KEYWORD\" string.  If this line is not found we search
 for the keyword anyway to increase the hit-rate

=== modified file 'lisp/progmodes/js.el'
--- lisp/progmodes/js.el	2011-11-17 09:09:20 +0000
+++ lisp/progmodes/js.el	2011-11-19 09:18:31 +0000
@@ -1599,7 +1599,7 @@
 
 (defun js-syntactic-context ()
   "Return the JavaScript syntactic context at point.
-When called interatively, also display a message with that
+When called interactively, also display a message with that
 context."
   (interactive)
   (let* ((syntactic-context (js--syntactic-context-from-pstate

=== modified file 'lisp/progmodes/pascal.el'
--- lisp/progmodes/pascal.el	2011-11-11 10:04:08 +0000
+++ lisp/progmodes/pascal.el	2011-11-19 09:18:31 +0000
@@ -414,7 +414,7 @@
       (electric-pascal-terminate-line)))
 
 (defun electric-pascal-colon ()
-  "Insert `:' and do all indentions except line indent on this line."
+  "Insert `:' and do all indentations except line indent on this line."
   (interactive)
   (insert last-command-event)
   ;; Do nothing if within string.

=== modified file 'lisp/progmodes/ps-mode.el'
--- lisp/progmodes/ps-mode.el	2011-11-18 08:31:02 +0000
+++ lisp/progmodes/ps-mode.el	2011-11-19 09:18:31 +0000
@@ -713,7 +713,7 @@
   (ps-mode-r-balance ">>"))
 
 (defun ps-mode-r-balance (right)
-  "Adjust indentification if point after RIGHT."
+  "Adjust indenting if point after RIGHT."
   (if ps-mode-auto-indent
       (save-excursion
 	(when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)

=== modified file 'lisp/progmodes/verilog-mode.el'
--- lisp/progmodes/verilog-mode.el	2011-11-17 09:09:20 +0000
+++ lisp/progmodes/verilog-mode.el	2011-11-19 09:18:31 +0000
@@ -2622,7 +2622,7 @@
 
 (defmacro verilog-save-no-change-functions (&rest body)
   "Execute BODY forms, disabling all change hooks in BODY.
-For insigificant changes, see instead `verilog-save-buffer-state'."
+For insignificant changes, see instead `verilog-save-buffer-state'."
   `(let* ((inhibit-point-motion-hooks t)
 	  before-change-functions
 	  after-change-functions)
@@ -3596,7 +3596,7 @@
 	      (looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)")
           ;; keep going if we are in the middle of a word
 	      (not (or (looking-at "\\<") (forward-word -1)))
-          ;; stop if we see an assertion (perhaps labled)
+          ;; stop if we see an assertion (perhaps labeled)
 	      (and
 	       (looking-at "\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)")
 	       (progn
@@ -6974,7 +6974,7 @@
 ;;(verilog-signals-not-in '(("A" "") ("B" "") ("DEL" "[2:3]")) '(("DEL" "") ("EXT" "")))
 
 (defun verilog-signals-memory (in-list)
-  "Return list of signals in IN-LIST that are memoried (multidimensional)."
+  "Return list of signals in IN-LIST that are memorized (multidimensional)."
   (let (out-list)
     (while in-list
       (if (nth 3 (car in-list))

=== modified file 'lisp/recentf.el'
--- lisp/recentf.el	2011-10-19 12:54:24 +0000
+++ lisp/recentf.el	2011-11-19 09:18:31 +0000
@@ -567,7 +567,7 @@
   (if (and l (functionp filter))
       (let ((case-fold-search recentf-case-fold-search)
             elts others)
-        ;; split L into two sub-listes, one of sub-menus elements and
+        ;; split L into two sub-lists, one of sub-menus elements and
         ;; another of single menu elements.
         (dolist (elt l)
           (if (recentf-sub-menu-element-p elt)

=== modified file 'lisp/speedbar.el'
--- lisp/speedbar.el	2011-11-17 09:09:20 +0000
+++ lisp/speedbar.el	2011-11-19 09:18:31 +0000
@@ -35,7 +35,7 @@
 ;;
 ;;; Customizing and Developing for speedbar
 ;;
-;; Please see the speedbar manual for informaion.
+;; Please see the speedbar manual for information.
 ;;
 ;;; Notes:
 ;;
@@ -1004,7 +1004,7 @@
 		     #'speedbar-frame-mode
 		     (if (featurep 'xemacs)
 			 (append speedbar-frame-plist
-				 ;; This is a hack to get speedbar to iconfiy
+				 ;; This is a hack to get speedbar to iconify
 				 ;; with the selected frame.
 				 (list 'parent (selected-frame)))
 		       speedbar-frame-parameters)

=== modified file 'lisp/term/iris-ansi.el'
--- lisp/term/iris-ansi.el	2011-01-25 04:08:28 +0000
+++ lisp/term/iris-ansi.el	2011-11-19 09:18:31 +0000
@@ -136,7 +136,7 @@
 
     (define-key map "\e[Z" [?\S-\t])
     (define-key map "\e[072q" [?\C-\t])
-    ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
+    ;; This only works if you remove the M-TAB keyring from the system.4Dwmrc
     ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
     (define-key map "\e[073q" [?\M-\t])
 

=== modified file 'lisp/term/rxvt.el'
--- lisp/term/rxvt.el	2011-11-17 09:09:20 +0000
+++ lisp/term/rxvt.el	2011-11-19 09:18:31 +0000
@@ -114,7 +114,7 @@
 
 (defvar rxvt-alternatives-map
   (let ((map (make-sparse-keymap)))
-    ;; The terminal intialization C code file might have initialized
+    ;; The terminal initialization C code file might have initialized
     ;; function keys F11->F42 from the termcap/terminfo information.  On
     ;; a PC-style keyboard these keys correspond to
     ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The

=== modified file 'lisp/term/tty-colors.el'
--- lisp/term/tty-colors.el	2011-01-25 04:08:28 +0000
+++ lisp/term/tty-colors.el	2011-11-19 09:18:31 +0000
@@ -76,7 +76,7 @@
 ;; defined for the MS-DOS and MS-Windows consoles, because the users
 ;; on those systems expect these colors to be available.
 ;;
-;; For these reasons, package maintaners are advised NOT to use color
+;; For these reasons, package maintainers are advised NOT to use color
 ;; names such as "lightred" or "lightblue", because they will have
 ;; different effect on different displays.  Instead, use "red1" and
 ;; "blue1", respectively.

=== modified file 'lisp/term/xterm.el'
--- lisp/term/xterm.el	2011-06-12 20:18:04 +0000
+++ lisp/term/xterm.el	2011-11-19 09:18:31 +0000
@@ -460,7 +460,7 @@
   "Terminal initialization function for xterm."
   ;; rxvt terminals sometimes set the TERM variable to "xterm", but
   ;; rxvt's keybindings are incompatible with xterm's. It is
-  ;; better in that case to use rxvt's initializion function.
+  ;; better in that case to use rxvt's initialization function.
   (if (and (getenv "COLORTERM" (selected-frame))
 	   (string-match "\\`rxvt" (getenv "COLORTERM" (selected-frame))))
       (tty-run-terminal-initialization (selected-frame) "rxvt")

=== modified file 'lisp/terminal.el'
--- lisp/terminal.el	2011-05-23 17:57:17 +0000
+++ lisp/terminal.el	2011-11-19 09:18:31 +0000
@@ -1285,7 +1285,7 @@
 	;; Rename it to the desired name.
 	;; We use this roundabout approach
 	;; to avoid any risk of writing a name that
-	;; was michievouslyt set up as a symlink.
+	;; was mischievously set up as a symlink.
 	(rename-file temp-file file-name))
       ;; Now compile that source to make the binary that the
       ;; programs actually use.

=== modified file 'lisp/textmodes/reftex-cite.el'
--- lisp/textmodes/reftex-cite.el	2011-01-25 04:08:28 +0000
+++ lisp/textmodes/reftex-cite.el	2011-11-19 09:18:31 +0000
@@ -69,7 +69,7 @@
   (unless (eq (get 'reftex-default-bibliography :reftex-raw)
               reftex-default-bibliography)
     (put 'reftex-default-bibliography :reftex-expanded
-         (reftex-locate-bibliography-files 
+         (reftex-locate-bibliography-files
           default-directory reftex-default-bibliography))
     (put 'reftex-default-bibliography :reftex-raw
          reftex-default-bibliography))
@@ -128,7 +128,7 @@
   ;; If RETURN is non-nil, just return the entry and restore point.
 
   (let* ((re
-          (if item 
+          (if item
               (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}")
             (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key)
                     "[, \t\r\n}]")))
@@ -152,7 +152,7 @@
           (when return
             ;; Just return the relevant entry
             (if item (goto-char (match-end 0)))
-            (setq return (buffer-substring 
+            (setq return (buffer-substring
                           (point) (reftex-end-of-bib-entry item)))
 	    (goto-char oldpos) ;; restore point.
             (set-buffer buffer-conf)
@@ -169,9 +169,9 @@
         (error "No BibTeX entry with citation key %s" key)))))
 
 (defun reftex-end-of-bib-entry (item)
-  (save-excursion 
+  (save-excursion
     (condition-case nil
-        (if item 
+        (if item
             (progn (end-of-line)
                    (re-search-forward
                     "\\\\bibitem\\|\\end{thebibliography}")
@@ -192,16 +192,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -248,7 +248,7 @@
                    (error (goto-char key-point)
                           (throw 'search-again nil)))
                  (setq end-point (point))
-                 
+
                  ;; Ignore @string, @comment and @c entries or things
                  ;; outside entries
                  (when (or (string= (downcase (match-string 2)) "string")
@@ -257,12 +257,12 @@
                            (< (point) key-point)) ; this means match not in {}
                    (goto-char key-point)
                    (throw 'search-again nil))
-                 
+
                  ;; Well, we have got a match
                  ;;(setq entry (concat
                  ;;             (buffer-substring start-point (point)) "\n"))
                  (setq entry (buffer-substring start-point (point)))
-                 
+
                  ;; Check if other regexp match as well
                  (setq re-list rest-re)
                  (while re-list
@@ -270,24 +270,24 @@
                      ;; nope - move on
                      (throw 'search-again nil))
                    (pop re-list))
-                 
+
                  (setq alist (reftex-parse-bibtex-entry
                               nil start-point end-point))
                  (push (cons "&entry" entry) alist)
-                 
+
                  ;; check for crossref entries
                  (if (assoc "crossref" alist)
                      (setq alist
                            (append
                             alist (reftex-get-crossref-alist alist))))
-                 
+
                  ;; format the entry
                  (push (cons "&formatted" (reftex-format-bib-entry alist))
                        alist)
-                 
+
                  ;; make key the first element
                  (push (reftex-get-bib-field "&key" alist) alist)
-                 
+
                  ;; add it to the list
                  (push alist found-list)))))
           (reftex-kill-temporary-buffers))))
@@ -350,7 +350,7 @@
     (unless files
       (error "Need file name to find thebibliography environment"))
     (while (setq file (pop files))
-      (setq buf (reftex-get-file-buffer-force 
+      (setq buf (reftex-get-file-buffer-force
                  file (not reftex-keep-temporary-buffers)))
       (unless buf
         (error "No such file %s" file))
@@ -386,16 +386,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -408,14 +408,14 @@
         (error "Empty regular expression"))
 
     (while (and (setq re (pop re-list)) entries)
-      (setq entries 
+      (setq entries
             (delq nil (mapcar
                        (lambda (x)
                          (if (string-match re (cdr (assoc "&entry" x)))
                              x nil))
                        entries))))
-    (setq entries 
-          (mapcar 
+    (setq entries
+          (mapcar
             (lambda (x)
               (push (cons "&formatted" (reftex-format-bibitem x)) x)
               (push (reftex-get-bib-field "&key" x) x)
@@ -655,12 +655,12 @@
 
     (when (eq (car selected-entries) 'concat)
       ;; All keys go into a single command - we need to trick a little
-      ;; FIXME: Unfortunately, this meens that commenting does not work right.
+      ;; FIXME: Unfortunately, this means that commenting does not work right.
       (pop selected-entries)
       (let ((concat-keys (mapconcat 'car selected-entries ",")))
-        (setq insert-entries 
+        (setq insert-entries
               (list (list concat-keys (cons "&key" concat-keys))))))
-    
+
     (unless no-insert
 
       ;; We shall insert this into the buffer...

=== modified file 'lisp/textmodes/sgml-mode.el'
--- lisp/textmodes/sgml-mode.el	2011-11-14 21:00:24 +0000
+++ lisp/textmodes/sgml-mode.el	2011-11-19 09:18:31 +0000
@@ -847,7 +847,7 @@
 if ARG is omitted or nil.
 
 SGML Electric Tag Pair mode is a buffer-local minor mode for use
-with `sgml-mode' and related maor modes.  When enabled, editing
+with `sgml-mode' and related major modes.  When enabled, editing
 an opening markup tag automatically updates the closing tag."
   :lighter "/e"
   (if sgml-electric-tag-pair-mode

=== modified file 'lisp/url/url-http.el'
--- lisp/url/url-http.el	2011-11-15 07:55:13 +0000
+++ lisp/url/url-http.el	2011-11-19 09:18:31 +0000
@@ -721,7 +721,7 @@
 	  ;; The request could not be completed due to a conflict with
 	  ;; the current state of the resource.  This code is only
 	  ;; allowed in situations where it is expected that the user
-	  ;; mioght be able to resolve the conflict and resubmit the
+	  ;; might be able to resolve the conflict and resubmit the
 	  ;; request.  The response body SHOULD include enough
 	  ;; information for the user to recognize the source of the
 	  ;; conflict.

=== modified file 'lisp/vc/pcvs-parse.el'
--- lisp/vc/pcvs-parse.el	2011-01-25 04:08:28 +0000
+++ lisp/vc/pcvs-parse.el	2011-11-19 09:18:31 +0000
@@ -430,7 +430,7 @@
 	;; Conflict
 	(and
 	 (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
-	 ;; C might be followed by a "suprious" U for non-mergeable files
+	 ;; C might be followed by a "spurious" U for non-mergable files
 	 (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
 	;; Successful merge
 	(cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))

=== modified file 'nt/README'
--- nt/README	2011-01-25 04:08:28 +0000
+++ nt/README	2011-11-19 09:18:31 +0000
@@ -34,7 +34,7 @@
 
   + emacsclient.exe - A command-line client program that can
     communicate with a running Emacs process. See the `Emacs Server'
-    node of the Emacs manul.
+    node of the Emacs manual.
 
   + emacsclientw.exe - A version of emacsclient that does not open
     a command-line window.

=== modified file 'oldXMenu/AddSel.c'
--- oldXMenu/AddSel.c	2011-04-16 08:25:42 +0000
+++ oldXMenu/AddSel.c	2011-11-19 09:18:31 +0000
@@ -30,7 +30,7 @@
     register XMSelect *sel;	/* Newly created selection. */
 
 
-    int label_length;		/* Label lenght in characters. */
+    int label_length;		/* Label length in characters. */
     int label_width;		/* Label width in pixels. */
 
     /*

=== modified file 'src/ChangeLog.11'
--- src/ChangeLog.11	2011-11-16 17:47:25 +0000
+++ src/ChangeLog.11	2011-11-19 09:18:31 +0000
@@ -13149,7 +13149,7 @@
 	(ftfont_has_char): Special handling of `ja' and `ko' adstyle.
 
 	* font.c (font_sort_entites): Change the meaning of the arg
-	BEST-ONLY.  Don't optimize for VEC of lenght 1.
+	BEST-ONLY.  Don't optimize for VEC of length 1.
 	(font_select_entity): Just return the value of font_sort_entites.
 
 	* xfaces.c (merge_face_vectors): Reflect font properties in

=== modified file 'src/ChangeLog.3'
--- src/ChangeLog.3	2011-11-14 21:00:24 +0000
+++ src/ChangeLog.3	2011-11-19 09:18:31 +0000
@@ -13137,7 +13137,7 @@
 	* print.c: Include dispextern.h.
 	(printchar, strout): Use message_buf.
 
-	* sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLenght.
+	* sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLength.
 	* term.c: Likewise.
 
 	* scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a
@@ -13147,7 +13147,7 @@
 	(do_scrolling): Use alloca for queue.
 
 	* dispnew.c (remake_screen_structures): Allocate message_buf.
-	Don't use MscreenWidth, MscreenLenght.
+	Don't use MscreenWidth, MscreenLength.
 
 	* xdisp.c: bf_cur replaced with current_buffer.
 	Calls to SetBfx deleted.

=== modified file 'src/buffer.c'
--- src/buffer.c	2011-11-15 07:55:13 +0000
+++ src/buffer.c	2011-11-19 09:18:31 +0000
@@ -4439,7 +4439,7 @@
 #define MMAP_ALLOCATED_P(start, end) 1
 #endif
 
-/* Perform necessary intializations for the use of mmap.  */
+/* Perform necessary initializations for the use of mmap.  */
 
 static void
 mmap_init (void)

=== modified file 'src/buffer.h'
--- src/buffer.h	2011-09-30 20:22:01 +0000
+++ src/buffer.h	2011-11-19 09:18:31 +0000
@@ -978,7 +978,7 @@
    variable has an index > 0 associated with it, except when it always
    has buffer-local values, in which case the index is -1.  If this is
    0, this is a bug and means that the slot of VAR in
-   buffer_local_flags wasn't intiialized.  */
+   buffer_local_flags wasn't initialized.  */
 
 #define PER_BUFFER_VAR_IDX(VAR) \
     PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR))

=== modified file 'src/chartab.c'
--- src/chartab.c	2011-11-17 09:09:20 +0000
+++ src/chartab.c	2011-11-19 09:18:31 +0000
@@ -747,7 +747,7 @@
    ARG is passed to C_FUNCTION when that is called.
 
    It returns the value of last character covered by TABLE (not the
-   value inheritted from the parent), and by side-effect, the car part
+   value inherited from the parent), and by side-effect, the car part
    of RANGE is updated to the minimum character C where C and all the
    following characters in TABLE have the same value.  */
 

=== modified file 'src/fileio.c'
--- src/fileio.c	2011-09-30 20:22:01 +0000
+++ src/fileio.c	2011-11-19 09:18:31 +0000
@@ -70,7 +70,7 @@
 #define IS_DRIVE(x) isalpha ((unsigned char) (x))
 #endif
 /* Need to lower-case the drive letter, or else expanded
-   filenames will sometimes compare inequal, because
+   filenames will sometimes compare unequal, because
    `expand-file-name' doesn't always down-case the drive letter.  */
 #define DRIVE_LETTER(x) (tolower ((unsigned char) (x)))
 #endif

=== modified file 'src/fns.c'
--- src/fns.c	2011-09-09 01:06:52 +0000
+++ src/fns.c	2011-11-19 09:18:31 +0000
@@ -3252,7 +3252,7 @@
   return decoded_string;
 }
 
-/* Base64-decode the data at FROM of LENGHT bytes into TO.  If
+/* Base64-decode the data at FROM of LENGTH bytes into TO.  If
    MULTIBYTE is nonzero, the decoded result should be in multibyte
    form.  If NCHARS_RETRUN is not NULL, store the number of produced
    characters in *NCHARS_RETURN.  */

=== modified file 'src/ftxfont.c'
--- src/ftxfont.c	2011-04-12 08:42:29 +0000
+++ src/ftxfont.c	2011-11-19 09:18:31 +0000
@@ -55,7 +55,7 @@
 {
   /* Background and foreground colors.  */
   XColor colors[2];
-  /* GCs interporationg the above colors.  gcs[0] is for a color
+  /* GCs interpolating the above colors.  gcs[0] is for a color
    closest to BACKGROUND, and gcs[5] is for a color closest to
    FOREGROUND.  */
   GC gcs[6];

=== modified file 'src/image.c'
--- src/image.c	2011-11-15 17:37:37 +0000
+++ src/image.c	2011-11-19 09:18:31 +0000
@@ -7786,7 +7786,7 @@
           goto imagemagick_error;
         }
 
-      /* Copy imagegmagick image to x with primitive yet robust pixel
+      /* Copy imagemagick image to x with primitive yet robust pixel
          pusher loop.  This has been tested a lot with many different
          images.  */
 

=== modified file 'src/intervals.c'
--- src/intervals.c	2011-11-18 16:00:40 +0000
+++ src/intervals.c	2011-11-19 09:18:31 +0000
@@ -1900,7 +1900,7 @@
    current buffer, and the invisible property has a `stickiness' such that
    inserting a character at position POS would inherit the property it,
    return POS + ADJ, otherwise return POS.  If TEST_INTANG is non-zero,
-   then intangibility is required as well as invisibleness.
+   then intangibility is required as well as invisibility.
 
    TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1.
 

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2011-11-17 09:09:20 +0000
+++ src/keyboard.c	2011-11-19 09:18:31 +0000
@@ -10137,7 +10137,7 @@
 			 ! NILP (can_return_switch_frame), 0);
 
 #if 0  /* The following is fine for code reading a key sequence and
-	  then proceeding with a lenghty computation, but it's not good
+	  then proceeding with a lengthy computation, but it's not good
 	  for code reading keys in a loop, like an input method.  */
 #ifdef HAVE_WINDOW_SYSTEM
   if (display_hourglass_p)

=== modified file 'src/lisp.h'
--- src/lisp.h	2011-11-07 17:04:01 +0000
+++ src/lisp.h	2011-11-19 09:18:31 +0000
@@ -943,7 +943,7 @@
 
 /* Compute A OP B, using the unsigned comparison operator OP.  A and B
    should be integer expressions.  This is not the same as
-   mathemeatical comparison; for example, UNSIGNED_CMP (0, <, -1)
+   mathematical comparison; for example, UNSIGNED_CMP (0, <, -1)
    returns 1.  For efficiency, prefer plain unsigned comparison if A
    and B's sizes both fit (after integer promotion).  */
 #define UNSIGNED_CMP(a, op, b)						\

=== modified file 'src/lread.c'
--- src/lread.c	2011-10-12 04:58:43 +0000
+++ src/lread.c	2011-11-19 09:18:31 +0000
@@ -3984,7 +3984,7 @@
   Qnil = intern_c_string ("nil");
 
   /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil,
-     so those two need to be fixed manally.  */
+     so those two need to be fixed manually.  */
   SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound);
   XSYMBOL (Qunbound)->function = Qunbound;
   XSYMBOL (Qunbound)->plist = Qnil;

=== modified file 'src/msdos.c'
--- src/msdos.c	2011-09-09 01:06:52 +0000
+++ src/msdos.c	2011-11-19 09:18:31 +0000
@@ -1342,7 +1342,7 @@
 IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos)
 {
   /* The offsets of source and destination relative to the
-     conventional memorty selector.  */
+     conventional memory selector.  */
   int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary;
   int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary;
 

=== modified file 'src/print.c'
--- src/print.c	2011-09-09 01:06:52 +0000
+++ src/print.c	2011-11-19 09:18:31 +0000
@@ -1635,7 +1635,7 @@
 		/* Detect circular list.  */
 		if (NILP (Vprint_circle))
 		  {
-		    /* Simple but imcomplete way.  */
+		    /* Simple but incomplete way.  */
 		    if (i != 0 && EQ (obj, halftail))
 		      {
 			sprintf (buf, " . #%"pMd, i / 2);

=== modified file 'src/w32term.c'
--- src/w32term.c	2011-11-14 23:59:56 +0000
+++ src/w32term.c	2011-11-19 09:18:31 +0000
@@ -4506,7 +4506,7 @@
 	    }
 
 	  /* If window has been obscured or exposed by another window
-	     being maximised or minimised/restored, then recheck
+	     being maximized or minimized/restored, then recheck
 	     visibility of all frames.  Direct changes to our own
 	     windows get handled by WM_SIZE.  */
 #if 0
@@ -5692,10 +5692,10 @@
 
       /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
 	 causes unexpected behavior when unminimizing frames that were
-	 previously maximised.  But only SW_SHOWNORMAL works properly for
+	 previously maximized.  But only SW_SHOWNORMAL works properly for
 	 frames that were truely hidden (using make-frame-invisible), so
 	 we need it to avoid Bug#5482.  It seems that async_iconified
-	 is only set for minimised windows that are still visible, so
+	 is only set for minimized windows that are still visible, so
          use that to determine the appropriate flag to pass ShowWindow.  */
       my_show_window (f, FRAME_W32_WINDOW (f),
                       f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL);

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2011-11-19 08:39:42 +0000
+++ src/xdisp.c	2011-11-19 09:18:31 +0000
@@ -15031,7 +15031,7 @@
   int current_matrix_up_to_date_p = 0;
   int used_current_matrix_p = 0;
   /* This is less strict than current_matrix_up_to_date_p.
-     It indictes that the buffer contents and narrowing are unchanged.  */
+     It indicates that the buffer contents and narrowing are unchanged.  */
   int buffer_unchanged_p = 0;
   int temp_scroll_step = 0;
   int count = SPECPDL_INDEX ();

=== modified file 'src/xmenu.c'
--- src/xmenu.c	2011-11-06 23:38:01 +0000
+++ src/xmenu.c	2011-11-19 09:18:31 +0000
@@ -1304,7 +1304,7 @@
 #ifdef USE_MOTIF
       /* Removing the menu bar magically changes the shell widget's x
 	 and y position of (0, 0) which, when the menu bar is turned
-	 on again, leads to pull-down menuss appearing in strange
+	 on again, leads to pull-down menus appearing in strange
 	 positions near the upper-left corner of the display.  This
 	 happens only with some window managers like twm and ctwm,
 	 but not with other like Motif's mwm or kwm, because the

=== modified file 'src/xterm.c'
--- src/xterm.c	2011-11-17 09:09:20 +0000
+++ src/xterm.c	2011-11-19 09:18:31 +0000
@@ -4184,7 +4184,7 @@
 
 /* Whether the drag scrolling maintains the mouse at the top of the
    thumb.  If not, resizing the thumb needs to be done more carefully
-   to avoid jerkyness.  */
+   to avoid jerkiness.  */
 
 static Boolean xaw3d_pick_top;
 

=== modified file 'test/cedet/tests/testsppreplaced.c'
--- test/cedet/tests/testsppreplaced.c	2011-01-25 04:08:28 +0000
+++ test/cedet/tests/testsppreplaced.c	2011-11-19 09:18:31 +0000
@@ -69,7 +69,7 @@
 
 int tail (int q) {}
 
-/* TEST: macros used impropertly. */
+/* TEST: macros used improperly */
 
 int tail_fcn(int q);
 
@@ -98,7 +98,7 @@
 
     int foo_bar_func(int a) { }
 
-  } 
+  }
 }
 
 /* TEST: The VC++ macro hack. */
@@ -115,4 +115,3 @@
 
 
 /* End */
-
------------------------------------------------------------
revno: 106421
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2011-11-19 10:39:42 +0200
message:
  Revert last commit.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-18 18:29:29 +0000
+++ src/ChangeLog	2011-11-19 08:39:42 +0000
@@ -1,9 +1,3 @@
-2011-11-18  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Fix minor problems found by static checking.
-	* dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
-	* dispnew.c (verify_row_hash): Now static.
-
 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/dispextern.h'
--- src/dispextern.h	2011-11-18 18:29:29 +0000
+++ src/dispextern.h	2011-11-19 08:39:42 +0000
@@ -3127,9 +3127,7 @@
 void w32_reset_fringes (void);
 #endif
 
-#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
-#endif
 
 /* Defined in image.c */
 

=== modified file 'src/dispnew.c'
--- src/dispnew.c	2011-11-18 18:29:29 +0000
+++ src/dispnew.c	2011-11-19 08:39:42 +0000
@@ -431,7 +431,7 @@
 
 #if XASSERTS
 /* Return non-zero if ROW's hash value is correct, zero if not.  */
-static int
+int
 verify_row_hash (struct glyph_row *row)
 {
   return row->hash == row_hash (row);

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2011-11-18 18:29:29 +0000
+++ src/xdisp.c	2011-11-19 08:39:42 +0000
@@ -17950,9 +17950,6 @@
 }
 
 /* Compute the hash code for ROW.  */
-#if !XASSERTS
-static
-#endif
 unsigned
 row_hash (struct glyph_row *row)
 {
------------------------------------------------------------
revno: 106420
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Fri 2011-11-18 10:29:29 -0800
message:
  Fix minor problems found by static checking.
  
  * dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
  * dispnew.c (verify_row_hash): Now static.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-11-18 16:50:16 +0000
+++ src/ChangeLog	2011-11-18 18:29:29 +0000
@@ -1,3 +1,9 @@
+2011-11-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix minor problems found by static checking.
+	* dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
+	* dispnew.c (verify_row_hash): Now static.
+
 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/dispextern.h'
--- src/dispextern.h	2011-11-18 12:21:42 +0000
+++ src/dispextern.h	2011-11-18 18:29:29 +0000
@@ -3127,7 +3127,9 @@
 void w32_reset_fringes (void);
 #endif
 
+#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
+#endif
 
 /* Defined in image.c */
 

=== modified file 'src/dispnew.c'
--- src/dispnew.c	2011-11-18 12:41:36 +0000
+++ src/dispnew.c	2011-11-18 18:29:29 +0000
@@ -431,7 +431,7 @@
 
 #if XASSERTS
 /* Return non-zero if ROW's hash value is correct, zero if not.  */
-int
+static int
 verify_row_hash (struct glyph_row *row)
 {
   return row->hash == row_hash (row);

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2011-11-18 12:21:42 +0000
+++ src/xdisp.c	2011-11-18 18:29:29 +0000
@@ -17950,6 +17950,9 @@
 }
 
 /* Compute the hash code for ROW.  */
+#if !XASSERTS
+static
+#endif
 unsigned
 row_hash (struct glyph_row *row)
 {
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.