Merge from mainline.

68 files changed, 1095 insertions, 663 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index db3a944c160..5dd5e3e4fdc 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-17  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Logarithmic Units): Update the function names.
+
+2011-03-15  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * message.texi (Insertion Variables): Document message-cite-style.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Remote processes): New subsection "Running shell on
+        a remote host".
+
 2011-03-12  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * auth.texi (Help for developers): Update docs to explain that the
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 88103fc0034..f732eff5690 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28126,47 +28126,15 @@ tell Calc to use a different file for the Calc init file.)
 @section Logarithmic Units
 
 The units @code{dB} (decibels) and @code{Np} (nepers) are logarithmic
-units which are typically manipulated differently than standard units.
-Calc provides commands to work with these logarithmic units.
+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 
-field quantities (quantities whose squares are proportional to power).
-The decibel and neper values of a quantity are relative to
-a reference quantity; for example, the decibel value of a sound
-pressure level of 
-@infoline @math{60 uPa}
-@texline @math{60 \mu{\rm Pa}}
-relative to 
-@infoline @math{20 uPa}
-@texline @math{20 \mu{\rm Pa}}
-(the threshhold 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 
-@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. 
-
-@vindex calc-logunits-power-reference
-@vindex calc-logunits-field-reference
-The Calc commands for the logarithmic units assume that power quantities
-are being used unless the @kbd{H} prefix is used, in which case they assume that 
-field quantities are being used.  For power quantities, Calc uses 
-@infoline @math{1 mW} 
-@texline @math{1 {\rm mW}}
-as the default reference quantity; this default can be changed by changing 
-the value of the customizable variable
-@code{calc-logunits-power-reference} (@pxref{Customizing Calc}).
-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
-changed by changing the value of the customizable variable
-@code{calc-logunits-field-reference} (@pxref{Customizing Calc}).  A
-non-default reference quantity will be read from the stack if the
-capital @kbd{O} prefix is used.
+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 
 @infoline @math{P1},
@@ -28214,6 +28182,20 @@ relative to a reference
 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 
+@infoline @math{60 uPa}
+@texline @math{60 \mu{\rm Pa}}
+relative to 
+@infoline @math{20 uPa}
+@texline @math{20 \mu{\rm Pa}}
+(the threshhold 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 
+@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. 
 
 Nepers (named after John Napier, who is credited with inventing the
 logarithm) are similar to bels except they use natural logarithms instead
@@ -28236,55 +28218,72 @@ is
 @infoline @math{ln(F1/F0) Np}.
 @texline @math{\ln(F_1/F_0) {\rm Np}}.
 
+@vindex calc-lu-power-reference
+@vindex calc-lu-field-reference
+For power quantities, Calc uses
+@infoline @math{1 mW} 
+@texline @math{1 {\rm mW}}
+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} 
+@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
+changed by changing the value of the customizable variable
+@code{calc-lu-field-reference} (@pxref{Customizing Calc}).  A
+non-default reference quantity will be read from the stack if the
+capital @kbd{O} prefix is used.
+
 @kindex l q
-@pindex calc-logunits-quantity
-@tindex powerquant
-@tindex fieldquant
-The @kbd{l q} (@code{calc-logunits-quantity}) [@code{powerquant}]
+@pindex calc-lu-quant
+@tindex lupquant
+@tindex lufquant
+The @kbd{l q} (@code{calc-lu-quant}) [@code{lupquant}]
 command computes the power quantity corresponding to a given number of
 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{powerquant} can be given an optional second
+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}.   
-The @kbd{H l q} [@code{fieldquant}] command behaves like @kbd{l q} but
+The @kbd{H l q} [@code{lufquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
 @kindex l d
-@pindex calc-dblevel
-@tindex dbpowerlevel
-@tindex dbfieldlevel
+@pindex calc-db
+@tindex dbpower
+@tindex dbfield
 @kindex l n
-@pindex calc-nplevel
-@tindex nppowerlevel
-@tindex npfieldlevel
-The @kbd{l d} (@code{calc-dblevel}) [@code{dbpowerlevel}]
-command will compute the decibel level of a power quantity using the
-default reference level; @kbd{H l d} [@code{dbfieldlevel}] will
-compute the decibel level of a field quantity.  The commands @kbd{l n} 
-(@code{calc-nplevel}) [@code{nppowerlevel}] and @kbd{H l n} 
-[@code{npfieldlevel}] will similarly compute neper levels.  With the
-capital @kbd{O} prefix these commands will read a reference level
-from the stack; in an algebraic formula the reference level can be
-given as an optional second argument.
+@pindex calc-np
+@tindex nppower
+@tindex npfield
+The @kbd{l d} (@code{calc-db}) [@code{dbpower}] command will compute
+the decibel level of a power quantity using the default reference
+level; @kbd{H l d} [@code{dbfield}] will compute the decibel level of
+a field quantity.  The commands @kbd{l n} (@code{calc-np})
+[@code{nppower}] and @kbd{H l n} [@code{npfield}] will similarly
+compute neper levels.  With the capital @kbd{O} prefix these commands
+will read a reference level from the stack; in an algebraic formula
+the reference level can be given as an optional second argument.
 
 @kindex l +
-@pindex calc-logunits-add
-@tindex lupoweradd
-@tindex lufieldadd
+@pindex calc-lu-plus
+@tindex lupadd
+@tindex lufadd
 @kindex l -
-@pindex calc-logunits-sub
-@tindex lupowersub
-@tindex lufieldsub
+@pindex calc-lu-minus
+@tindex lupsub
+@tindex lufsub
 @kindex l *
-@pindex calc-logunits-mul
-@tindex lupowermul
-@tindex lufieldmul
+@pindex calc-lu-times
+@tindex lupmul
+@tindex lufmul
 @kindex l /
-@pindex calc-logunits-div
-@tindex lupowerdiv
-@tindex lufielddiv
+@pindex calc-lu-divide
+@tindex lupdiv
+@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 
@@ -28305,13 +28304,13 @@ $$ 10 \log_{10}(10^{D_1/10} + 10^{D_2/10}) {\rm dB}.$$
 @end tex
 
 @noindent
-When field quantities are combined, it often means the 
-corresponding powers are added and so the above formula might be used.  
-In acoustics, for example, the decibel sound pressure level is defined
-using the field formula but the sound pressure levels are combined
-as the sound power levels, and so the above formula should be used.  If 
-two field quantities themselves are added, the new decibel level will be 
-
+When field quantities are combined, it often means the corresponding
+powers are added and so the above formula might be used.  In
+acoustics, for example, the sound pressure level is a field quantity
+and so the decibels are often defined using the field formula, but the
+sound pressure levels are combined as the sound power levels, and so
+the above formula should be used.  If two field quantities themselves
+are added, the new decibel level will be
 
 @ifnottex
 @example
@@ -28349,20 +28348,18 @@ $$ D + 20 \log_{10}(N) {\rm dB}.$$
 @end tex
 
 @noindent
-There are similar formulas for combining nepers.  
-The @kbd{l +} (@code{calc-logunits-add}) [@code{lupoweradd}] command
-will ``add'' two logarithmic unit power levels this way; with the
-@kbd{H} prefix, @kbd{H l +} [@code{lufieldadd}] will add logarithmic
-unit field levels.  Similarly, logarithmic units can be
-``subtracted'' with @kbd{l -} (@code{calc-logunits-sub}) 
-[@code{lupowersub}] or @kbd{H l -} [@code{lufieldsub}]. 
-The @kbd{l *} (@code{calc-logunits-mul}) [@code{lupowermul}] 
-and @kbd{H l *} [@code{lufieldmul}] commands will ``multiply''
-a logarithmic unit by a number; the @kbd{l /}
-(@code{calc-logunits-divide})  [@code{lupowerdiv}] and  
-@kbd{H l /} [@code{lufielddiv}] commands will ``divide'' a
-logarithmic unit by a number. Note that the reference quantities don't
-play a role in this arithmetic. 
+There are similar formulas for combining nepers.  The @kbd{l +}
+(@code{calc-lu-plus}) [@code{lupadd}] command will ``add'' two
+logarithmic unit power levels this way; with the @kbd{H} prefix,
+@kbd{H l +} [@code{lufadd}] will add logarithmic unit field levels.
+Similarly, logarithmic units can be ``subtracted'' with @kbd{l -}
+(@code{calc-lu-minus}) [@code{lupsub}] or @kbd{H l -} [@code{lufsub}].
+The @kbd{l *} (@code{calc-lu-times}) [@code{lupmul}] and @kbd{H l *}
+[@code{lufmul}] commands will ``multiply'' a logarithmic unit by a
+number; the @kbd{l /} (@code{calc-lu-divide}) [@code{lupdiv}] and
+@kbd{H l /} [@code{lufdiv}] commands will ``divide'' a logarithmic
+unit by a number. Note that the reference quantities don't play a role
+in this arithmetic.
 
 @node Musical Notes, , Logarithmic Units, Units
 @section Musical Notes
@@ -35539,16 +35536,16 @@ should also be added to @code{calc-embedded-announce-formula-alist}
 and @code{calc-embedded-open-close-plain-alist}.
 @end defvar
 
-@defvar  calc-logunits-power-reference
-@defvarx calc-logunits-field-reference
+@defvar  calc-lu-power-reference
+@defvarx calc-lu-field-reference
 See @ref{Logarithmic Units}.@*
-The variables @code{calc-logunits-power-reference} and
-@code{calc-logunits-field-reference} are unit expressions (written as
+The variables @code{calc-lu-power-reference} and
+@code{calc-lu-field-reference} are unit expressions (written as
 strings) which Calc will use as reference quantities for logarithmic
 units.
 
-The default value of @code{calc-logunits-power-reference} is @code{"mW"}
-and the default value of @code{calc-logunits-field-reference} is
+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"}.  
 @end defvar
 
@@ -36209,26 +36206,26 @@ keystrokes are not listed in this summary.
 @r{    v x@:    I k T   @:             @:        @:ltpt@:(x,v)}
 
 @c
-@r{    a b@:      l +   @:             @:        @:lupoweradd@:(a,b)}
-@r{    a b@:    H l +   @:             @:        @:lufieldadd@:(a,b)}
-@r{    a b@:      l -   @:             @:        @:lupowersub@:(a,b)}
-@r{    a b@:    H l -   @:             @:        @:lufieldsub@:(a,b)}
-@r{    a b@:      l *   @:             @:        @:lupowermul@:(a,b)}
-@r{    a b@:    H l *   @:             @:        @:lufieldmul@:(a,b)}
-@r{    a b@:      l /   @:             @:        @:lupowerdiv@:(a,b)}
-@r{    a b@:    H l /   @:             @:        @:lufielddiv@:(a,b)}
-@r{      a@:      l d   @:             @:        @:dbpowerlevel@:(a)}
-@r{    a b@:    O l d   @:             @:        @:dbpowerlevel@:(a,b)}
-@r{      a@:    H l d   @:             @:        @:dbfieldlevel@:(a)}
-@r{    a b@:  O H l d   @:             @:        @:dbfieldlevel@:(a,b)}
-@r{      a@:      l n   @:             @:        @:nppowerlevel@:(a)}
-@r{    a b@:    O l n   @:             @:        @:nppowerlevel@:(a,b)}
-@r{      a@:    H l n   @:             @:        @:npfieldlevel@:(a)}
-@r{    a b@:  O H l n   @:             @:        @:npfieldlevel@:(a,b)}
-@r{      a@:      l q   @:             @:        @:powerquant@:(a)}
-@r{    a b@:    O l q   @:             @:        @:powerquant@:(a,b)}
-@r{      a@:    H l q   @:             @:        @:fieldquant@:(a)}
-@r{    a b@:  O H l q   @:             @:        @:fieldquant@:(a,b)}
+@r{    a b@:      l +   @:             @:        @:lupadd@:(a,b)}
+@r{    a b@:    H l +   @:             @:        @:lufadd@:(a,b)}
+@r{    a b@:      l -   @:             @:        @:lupsub@:(a,b)}
+@r{    a b@:    H l -   @:             @:        @:lufsub@:(a,b)}
+@r{    a b@:      l *   @:             @:        @:lupmul@:(a,b)}
+@r{    a b@:    H l *   @:             @:        @:lufmul@:(a,b)}
+@r{    a b@:      l /   @:             @:        @:lupdiv@:(a,b)}
+@r{    a b@:    H l /   @:             @:        @:lufdiv@:(a,b)}
+@r{      a@:      l d   @:             @:        @:dbpower@:(a)}
+@r{    a b@:    O l d   @:             @:        @:dbpower@:(a,b)}
+@r{      a@:    H l d   @:             @:        @:dbfield@:(a)}
+@r{    a b@:  O H l d   @:             @:        @:dbfield@:(a,b)}
+@r{      a@:      l n   @:             @:        @:nppower@:(a)}
+@r{    a b@:    O l n   @:             @:        @:nppower@:(a,b)}
+@r{      a@:    H l n   @:             @:        @:npfield@:(a)}
+@r{    a b@:  O H l n   @:             @:        @:npfield@:(a,b)}
+@r{      a@:      l q   @:             @:        @:lupquant@:(a)}
+@r{    a b@:    O l q   @:             @:        @:lupquant@:(a,b)}
+@r{      a@:    H l q   @:             @:        @:lufquant@:(a)}
+@r{    a b@:  O H l q   @:             @:        @:lufquant@:(a,b)}
 @r{      a@:      l s   @:             @:        @:spn@:(a)}
 @r{      a@:      l m   @:             @:        @:midi@:(a)}
 @r{      a@:      l f   @:             @:        @:freq@:(a)}
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 2937037ebb3..7d61ffd9efa 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1930,6 +1930,25 @@ posting a prepared news message.
 @section Insertion Variables
 
 @table @code
+@item message-cite-style
+@vindex message-cite-style
+The overall style to be used when replying to messages. This controls
+things like where the reply should be put relative to the original,
+how the citation is formatted, where the signature goes, etc.
+
+Value is either @code{nil} (no variable overrides) or a let-style list
+of pairs @code{(VARIABLE VALUE)} to override default values.
+
+See @code{gnus-posting-styles} to set this variable for specific
+groups. Presets to impersonate popular mail agents are available in the
+@code{message-cite-style-*} variables.
+
+@item message-cite-reply-position
+@vindex message-cite-reply-position
+Where the reply should be positioned. Available styles are
+@code{traditional} to reply inline, @code{above} for top-posting, and
+@code{below} for bottom-posting
+
 @item message-ignored-cited-headers
 @vindex message-ignored-cited-headers
 All headers that match this regexp will be removed from yanked
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index bdbba437af7..e1c4a806de2 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2540,7 +2540,28 @@ Another trick might be that you put @code{ForwardX11 yes} or
 that host.
 
 
-@subsection Running shell-command on a remote host
+@subsection Running @code{shell} on a remote host
+@cindex shell
+
+Calling @code{M-x shell} in a buffer related to a remote host runs the
+local shell as defined in @option{shell-file-name}.  This might be
+also a valid path name for a shell to be applied on the remote host,
+but it will fail at least when your local and remote hosts belong to
+different system types, like @samp{windows-nt} and @samp{gnu/linux}.
+
+You must set the variable @option{explicit-shell-file-name} to the
+shell path name on the remote host, in order to start that shell on
+the remote host.
+
+@ifset emacs
+Starting with Emacs 24 this won't be necessary, if you call
+@code{shell} interactively.  You will be asked for the remote shell
+path, if you are on a remote buffer, and if
+@option{explicit-shell-file-name} is equal to @code{nil}.
+@end ifset
+
+
+@subsection Running @code{shell-command} on a remote host
 @cindex shell-command
 
 @code{shell-command} allows to execute commands in a shell, either
@@ -2556,13 +2577,13 @@ You will see the buffer @file{*Async Shell Command*}, containing the
 continuous output of the @command{tail} command.
 
 
-@subsection Running eshell on a remote host
+@subsection Running @code{eshell} on a remote host
 @cindex eshell
 
 @value{tramp} is integrated into @file{eshell.el}.  That is, you can
 open an interactive shell on your remote host, and run commands there.
-After you have started @code{eshell}, you could perform commands like
-this:
+After you have started @code{M-x eshell}, you could perform commands
+like this:
 
 @example
 @b{~ $} cd @trampfn{sudo, , , /etc} @key{RET}
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 862ce24d29a..cbe46d3a53e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document warning about _emacs.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: `shell' prompts for the shell path name, when the default
+        directory is a remote file name and neither environment variable
+        $ESHELL nor variable `explicit-shell-file-name' is set.
+
 2011-03-08  Kristoffer Grönlund  <krig@koru.se>
 
         * themes/wombat-theme.el: New file.
diff --git a/etc/NEWS b/etc/NEWS
index 330a3b6ee51..bb59e0e2a24 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -62,6 +62,8 @@ longer have any effect.  (They were declared obsolete in Emacs 23.)
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+** On Windows, Emacs now warns when the obsolete _emacs init file is used.
+
 
 * Changes in Emacs 24.1
 
@@ -335,6 +337,10 @@ between applications.
 the lines in the current rectangle.  With an prefix argument, this
 prompts for a number to count from and for a format string.
 
+** The command shell prompts for the shell path name, when the default
+directory is a remote file name and neither environment variable
+$ESHELL nor variable `explicit-shell-file-name' is set.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c74e7cbdb2d..5164207a5ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,119 @@
+2011-03-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * custom.el (custom-known-themes): Reflow docstring.
+        (custom-theme-load-path): Fix typo in docstring.
+        (load-theme): Fix typo in error message.
+        (custom-available-themes, custom-variable-theme-value):
+        Use `let', not `let*'.
+
+2011-03-17  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/README: Mention inclusion of musical notes.
+
+        * calc/calc-units.el (calc-lu-quant): Rename from
+        `calc-logunits-quantity'.
+        (calcFunc-lupquant): Rename from `calcFunc-powerquant'.
+        (calcFunc-lufquant): Rename from `calcFunc-fieldquant'.
+        (calc-db): Rename from `calc-dblevel'.
+        (calcFunc-dbpower): Rename from `calcFunc-dbpowerlevel'.
+        (calcFunc-dbfield): Rename from `calcFunc-dbfieldlevel'.
+        (calc-np): Rename from `calc-nplevel'.
+        (calcFunc-nppower): Rename from `calcFunc-nppowerlevel'.
+        (calcFunc-npfield): Rename from `calcFunc-npfieldlevel'.
+        (calc-lu-plus): Rename from `calc-logunits-add'.
+        (calcFunc-lupadd): Rename from `calcFunc-lupoweradd'.
+        (calcFunc-lufadd): Rename from `calcFunc-lufieldadd'.
+        (calc-lu-minus): Rename from `calc-logunits-sub'.
+        (calcFunc-lupsub): Rename from `calcFunc-lupowersub'.
+        (calcFunc-lufsub): Rename from `calcFunc-lufieldsub'.
+        (calc-lu-times): Rename from `calc-logunits-mul'.
+        (calcFunc-lupmul): Rename from `calcFunc-lupowermul'.
+        (calcFunc-lufmul): Rename from `calcFunc-lufieldmul'.
+        (calc-lu-divide): Rename from `calc-logunits-div'.
+        (calcFunc-lupdiv): Rename from `calcFunc-lupowerdiv'.
+        (calcFunc-lufdiv): Rename from `calcFunc-lufielddiv'.
+
+        * calc/calc-ext.el (calc-init-extensions): Update the names of the
+        functions being autoloaded.
+
+        * calc/calc.el (calc-lu-power-reference): Rename from
+        `calc-logunits-power-reference'.
+        (calc-lu-field-reference): Rename from
+        `calc-logunits-field-reference'.
+
+        * calc/calc-help (calc-l-prefix-help): Mention musical note functions.
+
+2011-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-all-sorted-completions):
+        Use :completion-cycle-penalty text property if present.
+
+2011-03-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-yank-processing): Adjust for new rebulleting
+        regime so bullet being yanked is used without prompting the user
+        for a choice.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * startup.el (command-line): Warn the user that _emacs is deprecated.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/delphi.el (delphi-search-path, delphi-indent-level)
+        (delphi-verbose, delphi-comment-face, delphi-string-face)
+        (delphi-keyword-face, delphi-ignore-changes, delphi-indent-line)
+        (delphi-mode-abbrev-table, delphi-debug-buffer, delphi-tab)
+        (delphi-find-unit, delphi-find-current-xdef, delphi-fill-comment)
+        (delphi-new-comment-line, delphi-font-lock-defaults)
+        (delphi-debug-mode-map, delphi-mode-syntax-table, delphi-mode):
+        Fix typos in docstrings.
+
+2011-03-15  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-make-topic-prefix, allout-rebullet-heading):
+        Invert the roles of character and string values for INSTEAD, so a
+        string is used for the more common case of a defaulting prompt.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/ruby-mode.el (ruby-backward-sexp):
+        * progmodes/ebrowse.el (ebrowse-draw-file-member-info):
+        * play/gamegrid.el (gamegrid-make-face):
+        * play/bubbles.el (bubbles--grid-width, bubbles--grid-height)
+        (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images):
+        * notifications.el (notifications-notify):
+        * net/xesam.el (xesam-search-engines):
+        * net/quickurl.el (quickurl-list-insert):
+        * vc/vc-hg.el (vc-hg-dir-printer): Fix use of case.
+
+2011-03-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (command-line): Update package subdirectory regexp.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * allout.el (allout-abbreviate-flattened-numbering)
+        (allout-mode-deactivate-hook): Fix up obsolescence "date".
+
+        * subr.el (read-char-choice): Only show the cursor after the prompt,
+        not after the answer.
+
+2011-03-15  Kevin Ryde  <user42@zip.com.au>
+
+        * help-fns.el (variable-at-point): Skip leading quotes, if any
+        (bug#8253).
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-save-excursion): Change the
+        warning message.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * shell.el (shell): When called interactively, offer to change the
+        shell file name on remote hosts.
+
 2011-03-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * net/ldap.el (ldap-search-internal): Add `auth-source-search'
diff --git a/lisp/allout.el b/lisp/allout.el
index 91eaa28fdaf..3fb8ed7ccd5 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -310,6 +310,7 @@ Auto-layout is not.
 
 With value nil, inhibit any automatic allout-mode activation."
   :set 'allout-auto-activation-helper
+  ;; FIXME: Using strings here is unusual and less efficient than symbols.
   :type '(choice (const :tag "On" t)
                 (const :tag "Ask about layout" "ask")
                 (const :tag "Mode only" "activate")
@@ -752,7 +753,7 @@ Set this var to the bullet you want to use for file cross-references."
 
 ;;;_  = allout-flattened-numbering-abbreviation
 (define-obsolete-variable-alias 'allout-abbreviate-flattened-numbering
-  'allout-flattened-numbering-abbreviation "24.0")
+  'allout-flattened-numbering-abbreviation "24.1")
 (defcustom allout-flattened-numbering-abbreviation nil
   "If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
 numbers to minimal amount with some context.  Otherwise, entire
@@ -1402,7 +1403,7 @@ their settings before allout-mode was started."
 (defvar allout-mode-deactivate-hook nil
   "*Hook that's run when allout mode ends.")
 (define-obsolete-variable-alias 'allout-mode-deactivate-hook
-  'allout-mode-off-hook "future")
+  'allout-mode-off-hook "24.1")
 ;;;_   = allout-exposure-category
 (defvar allout-exposure-category nil
   "Symbol for use as allout invisible-text overlay category.")
@@ -3495,8 +3496,8 @@ the current topics' depth.
 If INSTEAD is:
 
 - nil, then the bullet char for the context is used, per distinction or depth
-- a string, then the first character of the string will be used
-- a character, then the user is solicited for bullet, with that char as default
+- a \(numeric) character, then character's string representation is used
+- a string, then the user is asked for bullet with the first char as default
 - anything else, the user is solicited with bullet char per context as default
 
 \(INSTEAD overrides other options, including, eg, a distinctive
@@ -3553,10 +3554,12 @@ index for each successive sibling)."
            ((progn (setq body (make-string (- depth 2) ?\ ))
                    ;; The actual condition:
                    instead)
-            (let* ((got
-                    (if (and (stringp instead)(> (length instead) 0))
-                        (substring instead 0 1)
-                      (allout-solicit-alternate-bullet depth instead))))
+            (let ((got (cond ((stringp instead)
+                              (if (> (length instead) 0)
+                                  (allout-solicit-alternate-bullet
+                                   depth (substring instead 0 1))))
+                             ((characterp instead) (char-to-string instead))
+                             (t (allout-solicit-alternate-bullet depth)))))
               ;; Gotta check whether we're numbering and got a numbered bullet:
               (setq numbering (and allout-numbered-bullet
                                    (not (and number-control (not index)))
@@ -3950,8 +3953,8 @@ All args are optional.
 
 If INSTEAD is:
 - nil, then the bullet char for the context is used, per distinction or depth
-- a string, then the first character of the string will be used
-- a character, then the user is solicited for bullet, with that char as default
+- a \(numeric) character, then character's string representation is used
+- a string, then the user is asked for bullet with the first char as default
 - anything else, the user is solicited with bullet char per context as default
 
 Second arg DEPTH forces the topic prefix to that depth, regardless
@@ -4596,7 +4599,7 @@ however, are left exactly like normal, non-allout-specific yanks."
                      (if (looking-at " ")
                          (delete-char 1))))
                   ;; Assert new topic's bullet - minimal effort if unchanged:
-                  (allout-rebullet-heading prefix-bullet))
+                  (allout-rebullet-heading (string-to-char prefix-bullet)))
               (exchange-point-and-mark))))
       (if rectify-numbering
           (progn
diff --git a/lisp/calc/README b/lisp/calc/README
index 533b80baeb0..308b5115aa2 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -72,6 +72,8 @@ Summary of changes to "Calc"
 
 Emacs 24.1
 
+* Support for musical notes added.
+
 * Support for logarithmic units added.
 
 * Calc no longer uses the tex prefix for TeX specific unit 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 11a26d6d125..9ea773fbb98 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -422,13 +422,13 @@
   (define-key calc-mode-map "kT" 'calc-utpt)
 
   (define-key calc-mode-map "l" nil)
-  (define-key calc-mode-map "lq" 'calc-logunits-quantity)
-  (define-key calc-mode-map "ld" 'calc-dblevel)
-  (define-key calc-mode-map "ln" 'calc-nplevel)
-  (define-key calc-mode-map "l+" 'calc-logunits-add)
-  (define-key calc-mode-map "l-" 'calc-logunits-sub)
-  (define-key calc-mode-map "l*" 'calc-logunits-mul)
-  (define-key calc-mode-map "l/" 'calc-logunits-divide)
+  (define-key calc-mode-map "lq" 'calc-lu-quant)
+  (define-key calc-mode-map "ld" 'calc-db)
+  (define-key calc-mode-map "ln" 'calc-np)
+  (define-key calc-mode-map "l+" 'calc-lu-plus)
+  (define-key calc-mode-map "l-" 'calc-lu-minus)
+  (define-key calc-mode-map "l*" 'calc-lu-times)
+  (define-key calc-mode-map "l/" 'calc-lu-divide)
   (define-key calc-mode-map "ls" 'calc-spn)
   (define-key calc-mode-map "lm" 'calc-midi)
   (define-key calc-mode-map "lf" 'calc-freq)
@@ -943,12 +943,11 @@ calc-store-value calc-var-name)
  ("calc-stuff" calc-explain-why calcFunc-clean
 calcFunc-pclean calcFunc-pfloat calcFunc-pfrac)
 
- ("calc-units" calcFunc-usimplify calcFunc-lufieldadd
-calcFunc-lupoweradd calcFunc-lufieldsub calcFunc-lupowersub
-calcFunc-lufieldmul calcFunc-lupowermul calcFunc-lufielddiv
-calcFunc-lupowerdiv calcFunc-fieldquant calcFunc-powerquant
-calcFunc-dbfieldlevel calcFunc-dbpowerlevel calcFunc-npfieldlevel
-calcFunc-nppowerlevel calcFunc-spn calcFunc-midi calcFunc-freq
+ ("calc-units" calcFunc-usimplify calcFunc-lufadd calcFunc-lupadd
+calcFunc-lufsub calcFunc-lupsub calcFunc-lufmul calcFunc-lupmul
+calcFunc-lufdiv calcFunc-lupdiv calcFunc-lufquant calcFunc-lupquant
+calcFunc-dbfield calcFunc-dbpower calcFunc-npfield
+calcFunc-nppower calcFunc-spn calcFunc-midi calcFunc-freq
 math-build-units-table math-build-units-table-buffer
 math-check-unit-name math-convert-temperature math-convert-units
 math-extract-units math-remove-units math-simplify-units
@@ -1180,9 +1179,9 @@ calc-convert-temperature calc-convert-units calc-define-unit
 calc-enter-units-table calc-explain-units calc-extract-units
 calc-get-unit-definition calc-permanent-units calc-quick-units
 calc-remove-units calc-simplify-units calc-undefine-unit
-calc-view-units-table calc-logunits-quantity calc-dblevel
-calc-nplevel calc-logunits-add calc-logunits-sub
-calc-logunits-mul calc-logunits-divide calc-spn calc-midi
+calc-view-units-table calc-lu-quant calc-db
+calc-np calc-lu-plus calc-lu-minus
+calc-lu-times calc-lu-divide calc-spn calc-midi
 calc-freq)
 
  ("calc-vec" calc-arrange-vector calc-build-vector calc-cnorm
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index d688b31b3cb..427cf6ba233 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -673,7 +673,9 @@ C-w  Describe how there is no warranty for Calc."
   (interactive)
   (calc-do-prefix-help
    '("Quantity, DB level, Np level"
-     "+, -, *, /")
+     "+, -, *, /"
+     "Scientific pitch notation, Midi number, Frequency"
+     )
    "log units" ?l))
 
 (defun calc-v-prefix-help ()
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 7f0adc9fe7e..43cb5828e85 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1623,39 +1623,39 @@ In symbolic mode, return the list (^ a b)."
                   coef)))
              units)))))))
 
-(defun calcFunc-lufieldplus (a b)
+(defun calcFunc-lufadd (a b)
   (math-logunits-add a b nil nil))
 
-(defun calcFunc-lupowerplus (a b)
+(defun calcFunc-lupadd (a b)
   (math-logunits-add a b nil t))
 
-(defun calcFunc-lufieldminus (a b)
+(defun calcFunc-lufsub (a b)
   (math-logunits-add a b t nil))
 
-(defun calcFunc-lupowerminus (a b)
+(defun calcFunc-lupsub (a b)
   (math-logunits-add a b t t))
 
-(defun calc-logunits-add (arg)
+(defun calc-lu-plus (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-inverse)
        (if (calc-is-hyperbolic)
-           (calc-binary-op "lu-" 'calcFunc-lufieldminus arg)
-         (calc-binary-op "lu-" 'calcFunc-lupowerminus arg))
+           (calc-binary-op "lu-" 'calcFunc-lufsub arg)
+         (calc-binary-op "lu-" 'calcFunc-lupsub arg))
      (if (calc-is-hyperbolic)
-         (calc-binary-op "lu+" 'calcFunc-lufieldplus arg)
-       (calc-binary-op "lu+" 'calcFunc-lupowerplus arg)))))
+         (calc-binary-op "lu+" 'calcFunc-lufadd arg)
+       (calc-binary-op "lu+" 'calcFunc-lupadd arg)))))
 
-(defun calc-logunits-sub (arg)
+(defun calc-lu-minus (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-inverse)
        (if (calc-is-hyperbolic)
-           (calc-binary-op "lu+" 'calcFunc-lufieldplus arg)
-         (calc-binary-op "lu+" 'calcFunc-lupowerplus arg))
+           (calc-binary-op "lu+" 'calcFunc-lufadd arg)
+         (calc-binary-op "lu+" 'calcFunc-lupadd arg))
      (if (calc-is-hyperbolic)
-         (calc-binary-op "lu-" 'calcFunc-lufieldminus arg)
-       (calc-binary-op "lu-" 'calcFunc-lupowerminus arg)))))
+         (calc-binary-op "lu-" 'calcFunc-lufsub arg)
+       (calc-binary-op "lu-" 'calcFunc-lupsub arg)))))
 
 (defun math-logunits-mul (a b power)
   (let (logunit coef units number)
@@ -1719,39 +1719,39 @@ In symbolic mode, return the list (^ a b)."
              (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1)))
             units)))))))))
 
-(defun calcFunc-lufieldtimes (a b)
+(defun calcFunc-lufmul (a b)
   (math-logunits-mul a b nil))
 
-(defun calcFunc-lupowertimes (a b)
+(defun calcFunc-lupmul (a b)
   (math-logunits-mul a b t))
 
-(defun calc-logunits-mul (arg)
+(defun calc-lu-times (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-inverse)
        (if (calc-is-hyperbolic)
-           (calc-binary-op "lu/" 'calcFunc-lufielddiv arg)
-         (calc-binary-op "lu/" 'calcFunc-lupowerdiv arg))
+           (calc-binary-op "lu/" 'calcFunc-lufdiv arg)
+         (calc-binary-op "lu/" 'calcFunc-lupdiv arg))
      (if (calc-is-hyperbolic)
-         (calc-binary-op "lu*" 'calcFunc-lufieldtimes arg)
-       (calc-binary-op "lu*" 'calcFunc-lupowertimes arg)))))
+         (calc-binary-op "lu*" 'calcFunc-lufmul arg)
+       (calc-binary-op "lu*" 'calcFunc-lupmul arg)))))
 
-(defun calcFunc-lufielddiv (a b)
+(defun calcFunc-lufdiv (a b)
   (math-logunits-divide a b nil))
 
-(defun calcFunc-lupowerdiv (a b)
+(defun calcFunc-lupdiv (a b)
   (math-logunits-divide a b t))
 
-(defun calc-logunits-divide (arg)
+(defun calc-lu-divide (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-inverse)
        (if (calc-is-hyperbolic)
-           (calc-binary-op "lu*" 'calcFunc-lufieldtimes arg)
-         (calc-binary-op "lu*" 'calcFunc-lupowertimes arg))
+           (calc-binary-op "lu*" 'calcFunc-lufmul arg)
+         (calc-binary-op "lu*" 'calcFunc-lupmul arg))
      (if (calc-is-hyperbolic)
-         (calc-binary-op "lu/" 'calcFunc-lufielddiv arg)
-       (calc-binary-op "lu/" 'calcFunc-lupowerdiv arg)))))
+         (calc-binary-op "lu/" 'calcFunc-lufdiv arg)
+       (calc-binary-op "lu/" 'calcFunc-lupdiv arg)))))
 
 (defun math-logunits-quant (val ref power)
   (let* ((units (math-simplify (math-extract-units val)))
@@ -1777,29 +1777,29 @@ In symbolic mode, return the list (^ a b)."
                coeff))))
          runits)))))
 
-(defvar calc-logunits-field-reference)
-(defvar calc-logunits-power-reference)
+(defvar calc-lu-field-reference)
+(defvar calc-lu-power-reference)
 
-(defun calcFunc-fieldquant (val &optional ref)
+(defun calcFunc-lufquant (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-field-reference)))
+    (setq ref (math-read-expr calc-lu-field-reference)))
   (math-logunits-quant val ref nil))
 
-(defun calcFunc-powerquant (val &optional ref)
+(defun calcFunc-lupquant (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-power-reference)))
+    (setq ref (math-read-expr calc-lu-power-reference)))
   (math-logunits-quant val ref t))
 
-(defun calc-logunits-quantity (arg)
+(defun calc-lu-quant (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)
        (if (calc-is-option)
-           (calc-binary-op "lupq" 'calcFunc-fieldquant arg)
-         (calc-unary-op "lupq" 'calcFunc-fieldquant arg))
+           (calc-binary-op "lupq" 'calcFunc-lufquant arg)
+         (calc-unary-op "lupq" 'calcFunc-lufquant arg))
      (if (calc-is-option)
-         (calc-binary-op "lufq" 'calcFunc-powerquant arg)
-       (calc-unary-op "lufq" 'calcFunc-powerquant arg)))))
+         (calc-binary-op "lufq" 'calcFunc-lupquant arg)
+       (calc-unary-op "lufq" 'calcFunc-lupquant arg)))))
 
 (defun math-logunits-level (val ref db power)
   "Compute the value of VAL in decibels or nepers."
@@ -1817,47 +1817,47 @@ In symbolic mode, return the list (^ a b)."
             '(var Np var-Np)))
          units)))
 
-(defun calcFunc-dbfieldlevel (val &optional ref)
+(defun calcFunc-dbfield (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-field-reference)))
+    (setq ref (math-read-expr calc-lu-field-reference)))
   (math-logunits-level val ref t nil))
 
-(defun calcFunc-dbpowerlevel (val &optional ref)
+(defun calcFunc-dbpower (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-power-reference)))
+    (setq ref (math-read-expr calc-lu-power-reference)))
   (math-logunits-level val ref t t))
 
-(defun calcFunc-npfieldlevel (val &optional ref)
+(defun calcFunc-npfield (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-field-reference)))
+    (setq ref (math-read-expr calc-lu-field-reference)))
   (math-logunits-level val ref nil nil))
 
-(defun calcFunc-nppowerlevel (val &optional ref)
+(defun calcFunc-nppower (val &optional ref)
   (unless ref
-    (setq ref (math-read-expr calc-logunits-power-reference)))
+    (setq ref (math-read-expr calc-lu-power-reference)))
   (math-logunits-level val ref nil t))
 
-(defun calc-dblevel (arg)
+(defun calc-db (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)
        (if (calc-is-option)
-           (calc-binary-op "ludb" 'calcFunc-dbfieldlevel arg)
-         (calc-unary-op "ludb" 'calcFunc-dbfieldlevel arg))
+           (calc-binary-op "ludb" 'calcFunc-dbfield arg)
+         (calc-unary-op "ludb" 'calcFunc-dbfield arg))
      (if (calc-is-option)
-         (calc-binary-op "ludb" 'calcFunc-dbpowerlevel arg)
-       (calc-unary-op "ludb" 'calcFunc-dbpowerlevel arg)))))
+         (calc-binary-op "ludb" 'calcFunc-dbpower arg)
+       (calc-unary-op "ludb" 'calcFunc-dbpower arg)))))
 
-(defun calc-nplevel (arg)
+(defun calc-np (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)
        (if (calc-is-option)
-           (calc-binary-op "lunp" 'calcFunc-npfieldlevel arg)
-         (calc-unary-op "lunp" 'calcFunc-npfieldlevel arg))
+           (calc-binary-op "lunp" 'calcFunc-npfield arg)
+         (calc-unary-op "lunp" 'calcFunc-npfield arg))
      (if (calc-is-option)
-         (calc-binary-op "lunp" 'calcFunc-nppowerlevel arg)
-       (calc-unary-op "lunp" 'calcFunc-nppowerlevel arg)))))
+         (calc-binary-op "lunp" 'calcFunc-nppower arg)
+       (calc-unary-op "lunp" 'calcFunc-nppower arg)))))
 
 ;;; Musical notes
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 08ae7b10113..41f549cbe2c 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -434,13 +434,13 @@ by displaying the sub-formula in `calc-selected-face'."
   :group 'calc
   :type 'boolean)
 
-(defcustom calc-logunits-field-reference
+(defcustom calc-lu-field-reference
   "20 uPa"
   "The default reference level for logarithmic units (field)."
   :group 'calc
   :type '(string))
 
-(defcustom calc-logunits-power-reference
+(defcustom calc-lu-power-reference
   "mW"
   "The default reference level for logarithmic units (power)."
   :group 'calc
diff --git a/lisp/custom.el b/lisp/custom.el
index 923321c03c9..cf06fe27f4d 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -789,10 +789,10 @@ E.g. dumped variables whose default depends on run-time information."
 (defvar custom-known-themes '(user changed)
    "Themes that have been defined with `deftheme'.
 The default value is the list (user changed).  The theme `changed'
-contains the settings before custom themes are applied.  The
-theme `user' contains all the settings the user customized and saved.
-Additional themes declared with the `deftheme' macro will be added to
-the front of this list.")
+contains the settings before custom themes are applied.  The theme
+`user' contains all the settings the user customized and saved.
+Additional themes declared with the `deftheme' macro will be added
+to the front of this list.")
 
 (defsubst custom-theme-p (theme)
   "Non-nil when THEME has been defined."
@@ -1071,7 +1071,7 @@ order.  Each element in the list should be one of the following:
   named \"themes\" in `data-directory').
 - a directory name (a string).
 
-Each theme file is named NAME-theme.el, where THEME is the theme
+Each theme file is named THEME-theme.el, where THEME is the theme
 name."
   :type '(repeat (choice (const :tag "custom-theme-directory"
                                 custom-theme-directory)
@@ -1143,7 +1143,7 @@ Return t if THEME was successfully loaded, nil otherwise."
                          '("" "c")))
         hash)
     (unless fn
-      (error "Unable to find theme file for `%s'." theme))
+      (error "Unable to find theme file for `%s'" theme))
     (with-temp-buffer
       (insert-file-contents fn)
       (setq hash (sha1 (current-buffer)))
@@ -1209,7 +1209,7 @@ NAME should be a symbol."
 
 (defun custom-available-themes ()
   "Return a list of available Custom themes (symbols)."
-  (let* (sym themes)
+  (let (sym themes)
     (dolist (dir (custom-theme--load-path))
       (when (file-directory-p dir)
         (dolist (file (file-expand-wildcards
@@ -1335,7 +1335,7 @@ That is to say, it specifies what the value should be according to
 currently enabled custom themes.
 
 This function returns nil if no custom theme specifies a value for VARIABLE."
-  (let* ((theme-value (get variable 'theme-value)))
+  (let ((theme-value (get variable 'theme-value)))
     (if theme-value
         (cdr (car theme-value)))))
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 5e24b80ac5a..5c845e59c85 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3776,7 +3776,8 @@ that suppresses all warnings during execution of BODY."
 (defun byte-compile-save-excursion (form)
   (if (and (eq 'set-buffer (car-safe (car-safe (cdr form))))
            (byte-compile-warning-enabled-p 'suspicious))
-      (byte-compile-warn "`save-excursion' defeated by `set-buffer'"))
+      (byte-compile-warn
+       "Use `with-current-buffer' rather than save-excursion+set-buffer"))
   (byte-compile-out 'byte-save-excursion 0)
   (byte-compile-body-do-effect (cdr form))
   (byte-compile-out 'byte-unbind 1))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af0bd1519c7..b22ed7397af 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,82 @@
+2011-03-16  Julien Danjou  <julien@danjou.info>
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Only dissect handle that are
+        inline.
+
+        * gnus-art.el (article-hide-list-identifiers): Use
+        gnus-group-get-list-identifiers.
+
+        * gnus-sum.el (gnus-group-get-list-identifiers): New function.
+        (gnus-summary-remove-list-identifiers): Use
+        gnus-group-get-list-identifiers to get regexp.
+        (gnus-select-newsgroup, gnus-summary-insert-subject)
+        (gnus-summary-insert-articles): Call
+        gnus-summary-remove-list-identifiers unconditionally.
+
+2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if
+        we're selecting a group with unread articles.
+
+        * nnimap.el (nnimap-open-connection-1): Allow `network-only', too.
+
+        * gssapi.el: New file separated out from imap.el to provide a general
+        Kerberos 5 connection facility for Emacs.
+
+        * message.el (message-elide-ellipsis): Document the format spec
+        ellipsis.
+
+2011-03-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el (message-elide-region): Allow the ellipsis to say how many
+        lines were removed.
+
+2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-win.el (gnus-configure-frame): Protect against trying to restore
+        window configurations containing buffers that are now dead.
+
+        * nnimap.el (nnimap-parse-flags): Remove all MODSEQ entries before
+        parsing to avoid integer overflows.
+        (nnimap-parse-flags): Simplify the last change.
+        (nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be
+        too large for 32-bit Emacsen.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * auth-source.el (auth-source-netrc-create):
+        * message.el (message-yank-original): Fix use of `case'.
+
+2011-03-15  Nelson Ferreira  <nelson.ferreira@ieee.org>  (tiny change)
+
+        * gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on
+        XEmacs, which was one character too wide.
+
+2011-03-09  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * gnus-sum.el (gnus-articles-to-read): Use gnus-large-newsgroup as
+        default number of articles to display.
+        (gnus-articles-to-read): Use pretty names for prompt.
+
+2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-int.el (gnus-open-server): Ditto.
+
+        * gnus-start.el (gnus-activate-group): Give a backtrace if
+        debug-on-quit is set and the user hits `C-g'.
+        (gnus-read-active-file): Ditto.
+
+        * gnus-group.el (gnus-group-read-ephemeral-group): Ditto.
+
+2011-03-15  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.el (message-yank-original): Use cond instead of CL case.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * auth-source.el (auth-source-netrc-create): Use usual format for the
+        default in prompts.
+
 2011-03-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * auth-source.el (auth-source-netrc-create): Show the default in the
@@ -15,9 +94,9 @@
 
 2011-03-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * gnus-sync.el (gnus-sync-install-hooks, gnus-sync-unload-hook): Don't
-        install `gnus-sync-read' to any hooks by default.  It's buggy.  The
-        user will have to run `gnus-sync-read' manually and wait for Cloudy
+        * gnus-sync.el (gnus-sync-install-hooks, gnus-sync-unload-hook):
+        Don't install `gnus-sync-read' to any hooks by default.  It's buggy.
+        The user will have to run `gnus-sync-read' manually and wait for Cloudy
         Gnus.
 
 2011-03-11  Julien Danjou  <julien@danjou.info>
@@ -101,8 +180,8 @@
 
 2011-03-05  Antoine Levitt  <antoine.levitt@gmail.com>
 
-        * message.el (message-cite-reply-position, message-cite-style): New
-        variables.
+        * message.el (message-cite-reply-position, message-cite-style):
+        New variables.
         (message-yank-original): Use the new citation styles.
 
 2011-03-04  Daiki Ueno  <ueno@unixuser.org>
@@ -216,14 +295,14 @@
 
 2011-02-23  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus-start.el (gnus-dribble-read-file): Set
-        buffer-save-without-query, since we always want to save the dribble
+        * gnus-start.el (gnus-dribble-read-file):
+        Set buffer-save-without-query, since we always want to save the dribble
         file, probably.
 
         * nnmail.el (nnmail-article-group): Allow a final "" split to work on
         nnimap.
 
-        * gnus-sum.el (gnus-user-date-format-alist): Renamed back again from
+        * gnus-sum.el (gnus-user-date-format-alist): Rename back again from
         -summary- since it's a user-visible variable.
 
         * nnimap.el (nnimap-retrieve-group-data-early): Don't do QRESYNC the
@@ -469,8 +548,8 @@
 2011-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * auth-source.el (auth-source-backend-parse-parameters): Don't rely on
-        `plist-get' to accept non-list parameters (XEmacs issue).  Fix
-        docstring.
+        `plist-get' to accept non-list parameters (XEmacs issue).
+        Fix docstring.
         (auth-source-secrets-search): Use `delete-dups', `append mapcar', and
         `butlast' instead of `remove-duplicates', `mapcan', and `subseq'.
         (auth-sources, auth-source-backend-parse, auth-source-secrets-search):
@@ -510,8 +589,8 @@
 
 2011-02-13  Tassilo Horn  <tassilo@member.fsf.org>  (tiny change)
 
-        * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
-        Gcc processing on imap.
+        * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk):
+        Fix Gcc processing on imap.
 
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -599,8 +678,8 @@
 
 2011-02-06  Michael Albinus  <michael.albinus@gmx.de>
 
-        * auth-source.el (top): Require 'eieio unconditionally.  Autoload
-        `secrets-get-attributes' instead of `secrets-get-attribute'.
+        * auth-source.el (top): Require 'eieio unconditionally.
+        Autoload `secrets-get-attributes' instead of `secrets-get-attribute'.
         (auth-source-secrets-search): Limit search when `max' is greater than
         number of results.
 
@@ -636,7 +715,7 @@
         (auth-source-protocol-defaults, auth-source-user-or-password-imap)
         (auth-source-user-or-password-pop3, auth-source-user-or-password-ssh)
         (auth-source-user-or-password-sftp)
-        (auth-source-user-or-password-smtp): Removed.
+        (auth-source-user-or-password-smtp): Remove.
         (auth-source-user-or-password): Deprecated and modified to be a wrapper
         around `auth-source-search'.  Not tested thoroughly.
 
@@ -802,16 +881,16 @@
         * gnus-group.el (gnus-group-jump-to-group): Allow jumping to groups
         that Gnus doesn't know exists again.
 
-        * gnus-art.el (gnus-article-date-lapsed-new-header): Removed.
+        * gnus-art.el (gnus-article-date-lapsed-new-header): Remove.
         (gnus-treat-date-ut): Ditto.
-        (gnus-article-update-date-header): Renamed.
-        (gnus-treat-date-local): Removed.
-        (gnus-treat-date-english): Removed.
-        (gnus-treat-date-lapsed): Removed.
-        (gnus-treat-date-combined-lapsed): Removed.
-        (gnus-treat-date-original): Removed.
-        (gnus-treat-date-iso8601): Removed.
-        (gnus-treat-date-user-defined): Removed.
+        (gnus-article-update-date-header): Rename.
+        (gnus-treat-date-local): Remove.
+        (gnus-treat-date-english): Remove.
+        (gnus-treat-date-lapsed): Remove.
+        (gnus-treat-date-combined-lapsed): Remove.
+        (gnus-treat-date-original): Remove.
+        (gnus-treat-date-iso8601): Remove.
+        (gnus-treat-date-user-defined): Remove.
         (gnus-article-date-headers): New variable to control all the date
         header options.
         (article-date-ut): Rewrite to allow using the new way to format date
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 52f2b92e933..e0bea324a25 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1093,17 +1093,19 @@ See `auth-source-search' for details on SPEC."
                         (?h ,(aget printable-defaults 'host))
                         (?p ,(aget printable-defaults 'port))))))
 
-        ;; store the data, prompting for the password if needed
+        ;; Store the data, prompting for the password if needed.
         (setq data
               (cond
                ((and (null data) (eq r 'secret))
-                ;; special case prompt for passwords
+                ;; Special case prompt for passwords.
                 (read-passwd prompt))
                ((null data)
                 (when default
-                  (setq
-                   prompt
-                   (concat prompt (format "(default %s) " default))))
+                  (setq prompt
+                        (if (string-match ": *\\'" prompt)
+                            (concat (substring prompt 0 (match-beginning 0))
+                                    " (default " default "): ")
+                          (concat prompt "(default " default ") "))))
                 (read-string prompt nil nil default))
                (t (or data default))))
 
@@ -1115,7 +1117,7 @@ See `auth-source-search' for details on SPEC."
                                             (lambda () data))
                                         data))))
 
-        ;; when r is not an empty string...
+        ;; When r is not an empty string...
         (when (and (stringp data)
                    (< 0 (length data)))
           ;; this function is not strictly necessary but I think it
@@ -1128,10 +1130,10 @@ See `auth-source-search' for details on SPEC."
                                    (if (zerop (length add)) "" " ")
                                    ;; remap auth-source tokens to netrc
                                    (case r
-                                     ('user   "login")
-                                     ('host   "machine")
-                                     ('secret "password")
-                                     ('port   "port") ; redundant but clearer
+                                     (user   "login")
+                                     (host   "machine")
+                                     (secret "password")
+                                     (port   "port") ; redundant but clearer
                                      (t (symbol-name r)))
                                    ;; the value will be printed in %S format
                                    data))))
@@ -1173,7 +1175,7 @@ Respects `auth-source-save-behavior'.  Uses
         ;; we want the new data to be found first, so insert at beginning
         (goto-char (point-min))
 
-        ;; ask AFTER we've successfully opened the file
+        ;; Ask AFTER we've successfully opened the file.
         (let ((prompt (format "Save auth info to file %s? " file))
               (done (not (eq auth-source-save-behavior 'ask)))
               (bufname "*auth-source Help*")
@@ -1190,6 +1192,8 @@ Respects `auth-source-save-behavior'.  Uses
                                "(N)o and don't ask to save again\n"
                                "(e)dit the line\n"
                                "(?) for help as you can see.\n"))
+                      ;; Why?  Doesn't with-output-to-temp-buffer already do
+                      ;; the exact same thing anyway?  --Stef
                       (set-buffer standard-output)
                       (help-mode))))
               (?n (setq add ""
@@ -1203,7 +1207,7 @@ Respects `auth-source-save-behavior'.  Uses
           (when (get-buffer-window bufname)
             (delete-window (get-buffer-window bufname)))
 
-          ;; make sure the info is not saved
+          ;; Make sure the info is not saved.
           (when (null auth-source-save-behavior)
             (setq add ""))
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c64138b43d7..b994a2839bc 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2337,10 +2337,12 @@ long lines if and only if arg is positive."
       (let ((start (point)))
         (insert "X-Boundary: ")
         (gnus-add-text-properties start (point) '(invisible t intangible t))
-        (insert (let (str)
-                  (while (>= (window-width) (length str))
+       (insert (let (str (max (window-width)))
+                 (if (featurep 'xemacs)
+                     (setq max (1- max)))
+                 (while (>= max (length str))
                     (setq str (concat str gnus-body-boundary-delimiter)))
-                  (substring str 0 (window-width)))
+                 (substring str 0 max))
                 "\n")
         (gnus-put-text-property start (point) 'gnus-decoration 'header)))))
 
@@ -3074,10 +3076,7 @@ images if any to the browser, and deletes them when exiting the group
 The `gnus-list-identifiers' variable specifies what to do."
   (interactive)
   (let ((inhibit-point-motion-hooks t)
-        (regexp (or (gnus-parameter-list-identifier gnus-newsgroup-name)
-                    (if (consp gnus-list-identifiers)
-                        (mapconcat 'identity gnus-list-identifiers " *\\|")
-                      gnus-list-identifiers)))
+        (regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
         (inhibit-read-only t))
     (when regexp
       (save-excursion
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 9ed3cf02a49..e928811b558 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2313,9 +2313,10 @@ Return the name of the group if selection was successful."
                        gnus-fetch-old-ephemeral-headers))
                   (gnus-group-read-group (or number t) t group select-articles))
             group)
-        ;;(error nil)
         (quit
-         (message "Quit reading the ephemeral group")
+         (if debug-on-quit
+             (debug "Quit")
+           (message "Quit reading the ephemeral group"))
          nil)))))
 
 (defcustom gnus-gmane-group-download-format
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index a67063bb970..ef15a479892 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -270,7 +270,9 @@ If it is down, start it up (again)."
                                server (error-message-string err))
                  nil)
                 (quit
-                 (gnus-message 1 "Quit trying to open server %s" server)
+                 (if debug-on-quit
+                     (debug "Quit")
+                   (gnus-message 1 "Quit trying to open server %s" server))
                  nil)))
              open-offline)
         ;; If this hasn't been opened before, we add it to the list.
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index c6ff6044b92..afded87fe37 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1462,9 +1462,10 @@ If SCAN, request a scan of that group as well."
                (inline (gnus-request-group group (or dont-sub-check dont-check)
                                            method
                                            (gnus-get-info group)))
-             ;;(error nil)
              (quit
-              (message "Quit activating %s" group)
+              (if debug-on-quit
+                  (debug "Quit")
+                (message "Quit activating %s" group))
               nil)))
          (unless dont-check
            (setq active (gnus-parse-active))
@@ -2004,7 +2005,9 @@ If SCAN, request a scan of that group as well."
               ;; We catch C-g so that we can continue past servers
               ;; that do not respond.
               (quit
-               (message "Quit reading the active file")
+               (if debug-on-quit
+                   (debug "Quit")
+                 (message "Quit reading the active file"))
                nil))))))))
 
 (defun gnus-read-active-file-1 (method force)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a8786e39c7b..29a98b7d11d 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5510,12 +5510,17 @@ or a straight list of headers."
          (cdr (assq number gnus-newsgroup-scored))
          (memq number gnus-newsgroup-processable))))))
 
+(defun gnus-group-get-list-identifiers (group)
+  "Get list identifier regexp for GROUP."
+  (or (gnus-parameter-list-identifier group)
+      (if (consp gnus-list-identifiers)
+          (mapconcat 'identity gnus-list-identifiers " *\\|")
+        gnus-list-identifiers)))
+
 (defun gnus-summary-remove-list-identifiers ()
   "Remove list identifiers in `gnus-list-identifiers' from articles in the current group."
-  (let ((regexp (if (consp gnus-list-identifiers)
-                    (mapconcat 'identity gnus-list-identifiers " *\\|")
-                  gnus-list-identifiers))
-        changed subject)
+  (let ((regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
+        changed subject)
     (when regexp
       (setq regexp (concat "^\\(?:R[Ee]: +\\)*\\(" regexp " *\\)"))
       (dolist (header gnus-newsgroup-headers)
@@ -5707,8 +5712,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (when gnus-agent
         (gnus-agent-get-undownloaded-list))
       ;; Remove list identifiers from subject
-      (when gnus-list-identifiers
-        (gnus-summary-remove-list-identifiers))
+      (gnus-summary-remove-list-identifiers)
       ;; Check whether auto-expire is to be done in this group.
       (setq gnus-newsgroup-auto-expire
             (gnus-group-auto-expirable-p group))
@@ -5798,7 +5802,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 
 (defun gnus-articles-to-read (group &optional read-all)
   "Find out what articles the user wants to read."
-  (let* ((articles
+  (let* ((only-read-p t)
+         (articles
           ;; Select all articles if `read-all' is non-nil, or if there
           ;; are no unread articles.
           (if (or read-all
@@ -5822,6 +5827,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                  (gnus-uncompress-range (gnus-active group)))
                (gnus-cache-articles-in-group group))
             ;; Select only the "normal" subset of articles.
+            (setq only-read-p nil)
             (gnus-sorted-nunion
              (gnus-sorted-union gnus-newsgroup-dormant gnus-newsgroup-marked)
              gnus-newsgroup-unreads)))
@@ -5845,16 +5851,25 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                   (let* ((cursor-in-echo-area nil)
                          (initial (gnus-parameter-large-newsgroup-initial
                                    gnus-newsgroup-name))
+                         (default (if only-read-p
+                                      (or initial gnus-large-newsgroup)
+                                    number))
                          (input
                           (read-string
-                           (format
-                            "How many articles from %s (%s %d): "
-                            (gnus-group-decoded-name gnus-newsgroup-name)
-                            (if initial "max" "default")
-                            number)
-                           (if initial
-                               (cons (number-to-string initial)
-                                     0)))))
+                           (if only-read-p
+                               (format
+                              "How many articles from %s (available %d, default %d): "
+                              (gnus-group-decoded-name
+                               (gnus-group-real-name gnus-newsgroup-name))
+                              number default)
+                             (format
+                                "How many articles from %s (%d available): "
+                                (gnus-group-decoded-name
+                                 (gnus-group-real-name gnus-newsgroup-name))
+                                default))
+                           nil
+                           nil
+                           (number-to-string default))))
                     (if (string-match "^[ \t]*$" input) number input)))
                  ((and (> scored marked) (< scored number)
                        (> (- scored number) 20))
@@ -5862,7 +5877,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                          (read-string
                           (format "%s %s (%d scored, %d total): "
                                   "How many articles from"
-                                  (gnus-group-decoded-name group)
+                                  (gnus-group-decoded-name
+                                   (gnus-group-real-name gnus-newsgroup-name))
                                   scored number))))
                     (if (string-match "^[ \t]*$" input)
                         number input)))
@@ -6564,9 +6580,8 @@ the subject line on."
                   (1+ (point-at-eol))
                 (gnus-delete-line))))))
       ;; Remove list identifiers from subject.
-      (when gnus-list-identifiers
-        (let ((gnus-newsgroup-headers (list header)))
-          (gnus-summary-remove-list-identifiers)))
+      (let ((gnus-newsgroup-headers (list header)))
+        (gnus-summary-remove-list-identifiers))
       (when old-header
         (mail-header-set-number header (mail-header-number old-header)))
       (setq gnus-newsgroup-sparse
@@ -12670,8 +12685,7 @@ returned."
     (when gnus-agent
       (gnus-agent-get-undownloaded-list))
     ;; Remove list identifiers from subject
-    (when gnus-list-identifiers
-      (gnus-summary-remove-list-identifiers))
+    (gnus-summary-remove-list-identifiers)
     ;; First and last article in this newsgroup.
     (when gnus-newsgroup-headers
       (setq gnus-newsgroup-begin
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 156f9a020fd..c38f57d96cb 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -268,8 +268,10 @@ See the Gnus manual for an explanation of the syntax used.")
             (error "Invalid buffer type: %s" type))
           (let ((buf (gnus-get-buffer-create
                       (gnus-window-to-buffer-helper buffer))))
-            (if (eq buf (window-buffer (selected-window))) (set-buffer buf)
-              (switch-to-buffer buf)))
+            (when (buffer-name buf)
+              (if (eq buf (window-buffer (selected-window)))
+                  (set-buffer buf)
+                (switch-to-buffer buf))))
           (when (memq 'frame-focus split)
             (setq gnus-window-frame-focus window))
           ;; We return the window if it has the `point' spec.
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el
new file mode 100644
index 00000000000..3765fb84ee8
--- /dev/null
+++ b/lisp/gnus/gssapi.el
@@ -0,0 +1,105 @@
+;;; gssapi.el --- GSSAPI/Kerberos 5 interface for Emacs
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Simon Josefsson <simon@josefsson.org>
+;;         Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Keywords: network
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'format-spec)
+
+(defcustom gssapi-program (list
+                           (concat "gsasl %s %p "
+                                   "--mechanism GSSAPI "
+                                   "--authentication-id %l")
+                           "imtest -m gssapi -u %l -p %p %s")
+  "List of strings containing commands for GSSAPI (krb5) authentication.
+%s is replaced with server hostname, %p with port to connect to, and
+%l with the value of `imap-default-user'.  The program should accept
+IMAP commands on stdin and return responses to stdout.  Each entry in
+the list is tried until a successful connection is made."
+  :group 'network
+  :type '(repeat string))
+
+(defun open-gssapi-stream (name buffer server port)
+  (let ((cmds gssapi-program)
+        cmd done)
+    (with-current-buffer buffer
+      (while (and (not done)
+                  (setq cmd (pop cmds)))
+        (message "Opening GSSAPI connection with `%s'..." cmd)
+        (erase-buffer)
+        (let* ((coding-system-for-read 'binary)
+               (coding-system-for-write 'binary)
+               (process (start-process
+                         name buffer shell-file-name shell-command-switch
+                         (format-spec
+                          cmd
+                          (format-spec-make
+                           ?s server
+                           ?p (number-to-string port)
+                           ?l imap-default-user))))
+               response)
+          (when process
+            (while (and (memq (process-status process) '(open run))
+                        (goto-char (point-min))
+                        ;; Athena IMTEST can output SSL verify errors
+                        (or (while (looking-at "^verify error:num=")
+                              (forward-line))
+                            t)
+                        (or (while (looking-at "^TLS connection established")
+                              (forward-line))
+                            t)
+                        ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
+                        (or (while (looking-at "^C:")
+                              (forward-line))
+                            t)
+                        ;; cyrus 1.6 imtest print "S: " before server greeting
+                        (or (not (looking-at "S: "))
+                            (forward-char 3)
+                            t)
+                        ;; GNU SASL may print 'Trying ...' first.
+                        (or (not (looking-at "Trying "))
+                            (forward-line)
+                            t)
+                        (not (and (looking-at "\\* \\(OK\\|PREAUTH\\|BYE\\) ")
+                                  ;; success in imtest 1.6:
+                                  (re-search-forward
+                                   (concat "^\\(\\(Authenticat.*\\)\\|\\("
+                                           "Client authentication "
+                                           "finished.*\\)\\)")
+                                   nil t)
+                                  (setq response (match-string 1)))))
+              (accept-process-output process 1)
+              (sit-for 1))
+            (erase-buffer)
+            (message "GSSAPI IMAP connection: %s" (or response "failed"))
+            (if (and response (let ((case-fold-search nil))
+                                (not (string-match "failed" response))))
+                (setq done process)
+              (delete-process process)
+              nil))))
+      done)))
+
+(provide 'gssapi)
+
+;;; gssapi.el ends here
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 08c59b00bfc..bb9215aca7c 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -49,6 +49,7 @@
 (require 'mail-parse)
 (require 'mml)
 (require 'rfc822)
+(require 'format-spec)
 
 (autoload 'mailclient-send-it "mailclient") ;; Emacs 22 or contrib/
 
@@ -438,7 +439,10 @@ whitespace)."
   :group 'message-various)
 
 (defcustom message-elide-ellipsis "\n[...]\n\n"
-  "*The string which is inserted for elided text."
+  "*The string which is inserted for elided text.
+This is a format-spec string, and you can use %l to say how many
+lines were removed, and %c to say how many characters were
+removed."
   :type 'string
   :link '(custom-manual "(message)Various Commands")
   :group 'message-various)
@@ -3535,8 +3539,12 @@ Note that this should not be used in newsgroups."
 An ellipsis (from `message-elide-ellipsis') will be inserted where the
 text was killed."
   (interactive "r")
-  (kill-region b e)
-  (insert message-elide-ellipsis))
+  (let ((lines (count-lines b e))
+        (chars (- e b)))
+    (kill-region b e)
+    (insert (format-spec message-elide-ellipsis
+                         `((?l . ,lines)
+                           (?c . ,chars))))))
 
 (defvar message-caesar-translation-table nil)
 
@@ -3749,12 +3757,12 @@ prefix, and don't delete any headers."
                 (insert-before-markers ?\n)
                 (goto-char pt))))
           (case message-cite-reply-position
-            ('above
+            (above
              (message-goto-body)
              (insert body-text)
              (insert (if (bolp) "\n" "\n\n"))
              (message-goto-body))
-            ('below
+            (below
              (message-goto-signature)))
           ;; Add a `message-setup-very-last-hook' here?
           ;; Add `gnus-article-highlight-citation' here?
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 96dce48a774..4f7b5ed26b3 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -705,6 +705,8 @@ Assume text has been decoded if DECODED is non-nil."
                     ;; Mutt still uses application/pgp even though
                     ;; it has already been withdrawn.
                     (string-match "\\`text/\\|\\`application/pgp\\'" type)
+                    (equal (car (mm-handle-disposition handle))
+                           "inline")
                     (setq
                      children
                      (with-current-buffer buffer
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e76ead515c5..e0804f81e2e 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -340,6 +340,7 @@ textual parts.")
            (ports
             (cond
              ((or (eq nnimap-stream 'network)
+                  (eq nnimap-stream 'network-only)
                   (eq nnimap-stream 'starttls))
               (nnheader-message 7 "Opening connection to %s..."
                                 nnimap-address)
@@ -1452,6 +1453,11 @@ textual parts.")
   ;; Change \Delete etc to %Delete, so that the reader can read it.
   (subst-char-in-region (point-min) (point-max)
                         ?\\ ?% t)
+  ;; Remove any MODSEQ entries in the buffer, because they may contain
+  ;; numbers that are too large for 32-bit Emacsen.
+  (while (re-search-forward " MODSEQ ([0-9]+)" nil t)
+    (replace-match "" t t))
+  (goto-char (point-min))
   (let (start end articles groups uidnext elems permanent-flags
               uidvalidity vanished highestmodseq)
     (dolist (elem sequences)
@@ -1491,9 +1497,9 @@ textual parts.")
                             (match-string 1)))
                  (goto-char start)
                  (setq highestmodseq
-                       (and (search-forward "HIGHESTMODSEQ "
+                       (and (re-search-forward "HIGHESTMODSEQ \\([0-9]+\\)"
                                             (or end (point-min)) t)
-                            (read (current-buffer))))
+                            (match-string 1)))
                  (goto-char end)
                  (forward-line -1))
                ;; The UID FETCH FLAGS was successful.
@@ -1507,18 +1513,7 @@ textual parts.")
             (goto-char end))
           (while (re-search-forward "^\\* [0-9]+ FETCH " start t)
             (let ((p (point)))
-              ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID
-              ;; 12509 MODSEQ (13419098521433281274))" we get an
-              ;; overflow-error.  The handler simply deletes that large number
-              ;; and reads again.  But maybe there's a better fix...
-              (setq elems (condition-case nil (read (current-buffer))
-                            (overflow-error
-                             ;; After an overflow-error, point is just after
-                             ;; the too large number.  So delete it and try
-                             ;; again.
-                             (delete-region (point) (progn (backward-word) (point)))
-                             (goto-char p)
-                             (read (current-buffer)))))
+              (setq elems (read (current-buffer)))
               (push (cons (cadr (memq 'UID elems))
                           (cadr (memq 'FLAGS elems)))
                     articles)))
@@ -1674,6 +1669,8 @@ textual parts.")
             (goto-char (point-max)))
           openp)
       (quit
+       (when debug-on-quit
+         (debug "Quit"))
        ;; The user hit C-g while we were waiting: kill the process, in case
        ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind
        ;; NAT routers).
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e27a1e47b5c..ede80f858bf 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -534,6 +534,7 @@ If ANY-SYMBOL is non-nil, don't insist the symbol be bound."
   (with-syntax-table emacs-lisp-mode-syntax-table
     (or (condition-case ()
             (save-excursion
+              (skip-chars-forward "'")
               (or (not (zerop (skip-syntax-backward "_w")))
                   (eq (char-syntax (following-char)) ?w)
                   (eq (char-syntax (following-char)) ?_)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 3c8628c9cfa..fa36da01cd9 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -704,7 +704,15 @@ scroll the window of possible completions."
         (when last
           (setcdr last nil)
           ;; Prefer shorter completions.
-          (setq all (sort all (lambda (c1 c2) (< (length c1) (length c2)))))
+          (setq all (sort all (lambda (c1 c2)
+                                (let ((s1 (get-text-property
+                                           0 :completion-cycle-penalty c1))
+                                      (s2 (get-text-property
+                                           0 :completion-cycle-penalty c2)))
+                                  (if (eq s1 s2)
+                                      (< (length c1) (length c2))
+                                    (< (or s1 (length c1))
+                                       (or s2 (length c2))))))))
           ;; Prefer recently used completions.
           (let ((hist (symbol-value minibuffer-history-variable)))
             (setq all (sort all (lambda (c1 c2)
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 4045a443640..c3da1707165 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -511,15 +511,15 @@ TYPE dictates what will be inserted, options are:
         (with-current-buffer quickurl-list-last-buffer
           (insert
            (case type
-             ('url         (funcall quickurl-format-function url))
-             ('naked-url   (quickurl-url-url url))
-             ('with-lookup (format "%s <URL:%s>"
+             (url         (funcall quickurl-format-function url))
+             (naked-url   (quickurl-url-url url))
+             (with-lookup (format "%s <URL:%s>"
                                    (quickurl-url-keyword url)
                                    (quickurl-url-url url)))
-             ('with-desc   (format "%S <URL:%s>"
+             (with-desc   (format "%S <URL:%s>"
                                    (quickurl-url-description url)
                                    (quickurl-url-url url)))
-             ('lookup      (quickurl-url-keyword url)))))
+             (lookup      (quickurl-url-keyword url)))))
       (error "No URL details on that line"))
     url))
 
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 21a22749408..64c26cfb2c9 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -414,18 +414,18 @@ If there is no registered search engine at all, the function returns `nil'."
         ;; Hopefully, this will change later.
         (setq hit-fields
               (case (intern vendor-id)
-                ('Beagle
+                (Beagle
                  '("xesam:mimeType" "xesam:url"))
-                ('Strigi
+                (Strigi
                  '("xesam:author" "xesam:cc" "xesam:charset"
                    "xesam:contentType" "xesam:fileExtension"
                    "xesam:id" "xesam:lineCount" "xesam:links"
                    "xesam:mimeType" "xesam:name" "xesam:size"
                    "xesam:sourceModified" "xesam:subject" "xesam:to"
                    "xesam:url"))
-                ('TrackerXesamSession
+                (TrackerXesamSession
                  '("xesam:relevancyRating" "xesam:url"))
-                ('Debbugs
+                (Debbugs
                  '("xesam:keyword" "xesam:owner" "xesam:title"
                    "xesam:url" "xesam:sourceModified" "xesam:mimeType"
                    "debbugs:key"))
diff --git a/lisp/notifications.el b/lisp/notifications.el
index 893b9ed095f..adb9fdd641a 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -210,8 +210,8 @@ used to manipulate the notification item with
       (add-to-list 'hints `(:dict-entry
                             "urgency"
                             (:variant :byte ,(case urgency
-                                               ('low 0)
-                                               ('critical 2)
+                                               (low 0)
+                                               (critical 2)
                                                (t 1)))) t))
     (when category
       (add-to-list 'hints `(:dict-entry
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index e75821b6860..44a2cb15b7e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * org-src.el (org-src-switch-to-buffer):
+        * org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot):
+        * org-mouse.el (org-mouse-agenda-type):
+        * org-freemind.el (org-freemind-node-to-org):
+        * ob-sql.el (org-babel-execute:sql):
+        * ob-exp.el (org-babel-exp-do-export, org-babel-exp-code):
+        * ob-ref.el (org-babel-ref-resolve): Fix use of case.
+
 2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.el (org-blank-before-new-entry, org-context-in-file-links)
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 1be45198e0d..3215bcf4d8a 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -231,10 +231,10 @@ The function respects the value of the :exports header argument."
                           (org-babel-exp-results info type 'silent))))
          (clean () (org-babel-remove-result info)))
     (case (intern (or (cdr (assoc :exports (nth 2 info))) "code"))
-      ('none (silently) (clean) "")
-      ('code (silently) (clean) (org-babel-exp-code info type))
-      ('results (org-babel-exp-results info type))
-      ('both (concat (org-babel-exp-code info type)
+      (none (silently) (clean) "")
+      (code (silently) (clean) (org-babel-exp-code info type))
+      (results (org-babel-exp-results info type))
+      (both (concat (org-babel-exp-code info type)
                      "\n\n"
                      (org-babel-exp-results info type))))))
 
@@ -250,8 +250,8 @@ The code block is not evaluated."
         (name (nth 4 info))
         (args (mapcar #'cdr (org-babel-get-header (nth 2 info) :var))))
     (case type
-      ('inline (format "=%s=" body))
-      ('block
+      (inline (format "=%s=" body))
+      (block
           (let ((str
                  (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body
                          (if (and body (string-match "\n$" body))
@@ -265,7 +265,7 @@ The code block is not evaluated."
                              (mapconcat #'identity args ", ")))
                str))
             str))
-      ('lob
+      (lob
        (let ((call-line (and (string-match "results=" (car args))
                              (substring (car args) (match-end 0)))))
          (cond
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 7b06e90f924..96819df8ea1 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -147,12 +147,12 @@ the variable."
         (let ((params (append args '((:results . "silent")))))
           (setq result
                 (case type
-                  ('results-line (org-babel-read-result))
-                  ('table (org-babel-read-table))
-                  ('list (org-babel-read-list))
-                  ('file (org-babel-read-link))
-                  ('source-block (org-babel-execute-src-block nil nil params))
-                  ('lob (org-babel-execute-src-block nil lob-info params)))))
+                  (results-line (org-babel-read-result))
+                  (table (org-babel-read-table))
+                  (list (org-babel-read-list))
+                  (file (org-babel-read-link))
+                  (source-block (org-babel-execute-src-block nil nil params))
+                  (lob (org-babel-execute-src-block nil lob-info params)))))
         (if (symbolp result)
             (format "%S" result)
           (if (and index (listp result))
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 3bd10d6b2bd..49859d24a17 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -66,18 +66,18 @@ This function is called by `org-babel-execute-src-block'."
          (out-file (or (cdr (assoc :out-file params))
                        (org-babel-temp-file "sql-out-")))
          (command (case (intern engine)
-                    ('msosql (format "osql %s -s \"\t\" -i %s -o %s"
-                                     (or cmdline "")
-                                     (org-babel-process-file-name in-file)
-                                     (org-babel-process-file-name out-file)))
-                    ('mysql (format "mysql %s -e \"source %s\" > %s"
+                    (msosql (format "osql %s -s \"\t\" -i %s -o %s"
                                     (or cmdline "")
-                                    (org-babel-process-file-name in-file)
-                                    (org-babel-process-file-name out-file)))
-                    ('postgresql (format "psql -A -P footer=off -F \"\t\"  -f %s -o %s %s"
-                                    (org-babel-process-file-name in-file)
-                                    (org-babel-process-file-name out-file)
-                                    (or cmdline "")))
+                                    (org-babel-process-file-name in-file)
+                                    (org-babel-process-file-name out-file)))
+                    (mysql (format "mysql %s -e \"source %s\" > %s"
+                                   (or cmdline "")
+                                   (org-babel-process-file-name in-file)
+                                   (org-babel-process-file-name out-file)))
+                    (postgresql (format "psql -A -P footer=off -F \"\t\"  -f %s -o %s %s"
+                                        (org-babel-process-file-name in-file)
+                                        (org-babel-process-file-name out-file)
+                                        (or cmdline "")))
                     (t (error "no support for the %s sql engine" engine)))))
     (with-temp-file in-file
       (insert (org-babel-expand-body:sql body params)))
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index c85b4bac36a..dccdf449296 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1172,8 +1172,8 @@ PATH should be a list of steps, where each step has the form
     (when (< 0 (- level skip-levels))
       (dolist (attrib attributes)
         (case (car attrib)
-          ('TEXT (setq text (cdr attrib)))
-          ('text (setq text (cdr attrib)))))
+          (TEXT (setq text (cdr attrib)))
+          (text (setq text (cdr attrib)))))
       (unless text
         ;; There should be a richcontent node holding the text:
         (setq text (org-freemind-get-richcontent-node-text node)))
@@ -1193,7 +1193,7 @@ PATH should be a list of steps, where each step has the form
             (setq text (replace-regexp-in-string "\n $" "" text))
             (insert text))
         (case qname
-          ('node
+          (node
            (insert (make-string (- level skip-levels) ?*) " " text "\n")
            (when note
              (insert ":COMMENT:\n" note "\n:END:\n"))
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index d30f172f42f..cec19d89de1 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -476,11 +476,11 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 
 (defun org-mouse-agenda-type (type)
   (case type
-   ('tags "Tags: ")
-   ('todo "TODO: ")
-   ('tags-tree "Tags tree: ")
-   ('todo-tree "TODO tree: ")
-   ('occur-tree "Occur tree: ")
+   (tags "Tags: ")
+   (todo "TODO: ")
+   (tags-tree "Tags tree: ")
+   (todo-tree "TODO tree: ")
+   (occur-tree "Occur tree: ")
    (t "Agenda command ???")))
 
 
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index c5f4bff24fa..10722403f7e 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -206,18 +206,18 @@ manner suitable for prepending to a user-specified script."
          (y-labels (plist-get params :ylabels))
          (plot-str "'%s' using %s%d%s with %s title '%s'")
          (plot-cmd (case type
-                     ('2d "plot")
-                     ('3d "splot")
-                     ('grid "splot")))
+                     (2d "plot")
+                     (3d "splot")
+                     (grid "splot")))
          (script "reset") plot-lines)
     (flet ((add-to-script (line) (setf script (format "%s\n%s" script line))))
       (when file ;; output file
         (add-to-script (format "set term %s" (file-name-extension file)))
         (add-to-script (format "set output '%s'" file)))
       (case type ;; type
-        ('2d ())
-        ('3d (if map (add-to-script "set map")))
-        ('grid (if map
+        (2d ())
+        (3d (if map (add-to-script "set map")))
+        (grid (if map
                    (add-to-script "set pm3d map")
                  (add-to-script "set pm3d"))))
       (when title (add-to-script (format "set title '%s'" title))) ;; title
@@ -243,7 +243,7 @@ manner suitable for prepending to a user-specified script."
                                    "%Y-%m-%d-%H:%M:%S") "\"")))
       (unless preface
         (case type ;; plot command
-        ('2d (dotimes (col num-cols)
+        (2d (dotimes (col num-cols)
                (unless (and (equal type '2d)
                             (or (and ind (equal (+ 1 col) ind))
                                 (and deps (not (member (+ 1 col) deps)))))
@@ -258,10 +258,10 @@ manner suitable for prepending to a user-specified script."
                                 with
                                 (or (nth col col-labels) (format "%d" (+ 1 col))))
                         plot-lines)))))
-        ('3d
+        (3d
          (setq plot-lines (list (format "'%s' matrix with %s title ''"
                                         data-file with))))
-        ('grid
+        (grid
          (setq plot-lines (list (format "'%s' with %s title ''"
                                         data-file with)))))
         (add-to-script
@@ -305,9 +305,9 @@ line directly before or after the table."
                         (setf params (org-plot/collect-options params))))
       ;; dump table to datafile (very different for grid)
       (case (plist-get params :plot-type)
-        ('2d   (org-plot/gnuplot-to-data table data-file params))
-        ('3d   (org-plot/gnuplot-to-data table data-file params))
-        ('grid (let ((y-labels (org-plot/gnuplot-to-grid-data
+        (2d   (org-plot/gnuplot-to-data table data-file params))
+        (3d   (org-plot/gnuplot-to-data table data-file params))
+        (grid (let ((y-labels (org-plot/gnuplot-to-grid-data
                                 table data-file params)))
                  (when y-labels (plist-put params :ylabels y-labels)))))
       ;; check for timestamp ind column
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 98fdb75423d..bd1c3802044 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -335,26 +335,26 @@ buffer."
 
 (defun org-src-switch-to-buffer (buffer context)
   (case org-src-window-setup
-    ('current-window
+    (current-window
      (switch-to-buffer buffer))
-    ('other-window
+    (other-window
      (switch-to-buffer-other-window buffer))
-    ('other-frame
+    (other-frame
      (case context
-       ('exit
+       (exit
         (let ((frame (selected-frame)))
           (switch-to-buffer-other-frame buffer)
           (delete-frame frame)))
-       ('save
+       (save
         (kill-buffer (current-buffer))
         (switch-to-buffer buffer))
        (t
         (switch-to-buffer-other-frame buffer))))
-    ('reorganize-frame
+    (reorganize-frame
      (if (eq context 'edit) (delete-other-windows))
      (org-switch-to-buffer-other-window buffer)
      (if (eq context 'exit) (delete-other-windows)))
-    ('switch-invisibly
+    (switch-invisibly
      (set-buffer buffer))
     (t
      (message "Invalid value %s for org-src-window-setup"
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 8fea2cef6ad..0dc556007ba 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -719,57 +719,57 @@ static char * dot3d_xpm[] = {
 (defsubst bubbles--grid-width ()
   "Return the grid width for the current game theme."
   (car (case bubbles-game-theme
-         ('easy
+         (easy
           bubbles--grid-small)
-         ('medium
+         (medium
           bubbles--grid-medium)
-         ('difficult
+         (difficult
           bubbles--grid-large)
-         ('hard
+         (hard
           bubbles--grid-huge)
-         ('user-defined
+         (user-defined
           bubbles-grid-size))))
 
 (defsubst bubbles--grid-height ()
   "Return the grid height for the current game theme."
   (cdr (case bubbles-game-theme
-         ('easy
+         (easy
           bubbles--grid-small)
-         ('medium
+         (medium
           bubbles--grid-medium)
-         ('difficult
+         (difficult
           bubbles--grid-large)
-         ('hard
+         (hard
           bubbles--grid-huge)
-         ('user-defined
+         (user-defined
           bubbles-grid-size))))
 
 (defsubst bubbles--colors ()
   "Return the color list for the current game theme."
   (case bubbles-game-theme
-    ('easy
+    (easy
      bubbles--colors-2)
-    ('medium
+    (medium
      bubbles--colors-3)
-    ('difficult
+    (difficult
      bubbles--colors-4)
-    ('hard
+    (hard
      bubbles--colors-5)
-    ('user-defined
+    (user-defined
      bubbles-colors)))
 
 (defsubst bubbles--shift-mode ()
   "Return the shift mode for the current game theme."
   (case bubbles-game-theme
-    ('easy
+    (easy
      'default)
-    ('medium
+    (medium
      'default)
-    ('difficult
+    (difficult
      'always)
-    ('hard
+    (hard
      'always)
-    ('user-defined
+    (user-defined
      bubbles-shift-mode)))
 
 (defun bubbles-save-settings ()
@@ -1346,11 +1346,11 @@ Return t if new char is non-empty."
   (when (and (display-images-p)
              (not (eq bubbles-graphics-theme 'ascii)))
     (let ((template (case bubbles-graphics-theme
-                      ('circles bubbles--image-template-circle)
-                      ('balls bubbles--image-template-ball)
-                      ('squares bubbles--image-template-square)
-                      ('diamonds bubbles--image-template-diamond)
-                      ('emacs bubbles--image-template-emacs))))
+                      (circles bubbles--image-template-circle)
+                      (balls bubbles--image-template-ball)
+                      (squares bubbles--image-template-square)
+                      (diamonds bubbles--image-template-diamond)
+                      (emacs bubbles--image-template-emacs))))
       (setq bubbles--empty-image
             (create-image (replace-regexp-in-string
                            "^\"\\(.*\\)\t.*c .*\",$"
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index d3d8350a43f..99e3b487437 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -213,19 +213,19 @@ static unsigned char gamegrid_bits[] = {
   (let ((data (gamegrid-match-spec-list data-spec-list))
         (color (gamegrid-match-spec-list color-spec-list)))
     (case data
-      ('color-x
+      (color-x
        (gamegrid-make-color-x-face color))
-      ('grid-x
+      (grid-x
        (unless gamegrid-grid-x-face
          (setq gamegrid-grid-x-face (gamegrid-make-grid-x-face)))
        gamegrid-grid-x-face)
-      ('mono-x
+      (mono-x
        (unless gamegrid-mono-x-face
          (setq gamegrid-mono-x-face (gamegrid-make-mono-x-face)))
        gamegrid-mono-x-face)
-      ('color-tty
+      (color-tty
        (gamegrid-make-color-tty-face color))
-      ('mono-tty
+      (mono-tty
        (unless gamegrid-mono-tty-face
          (setq gamegrid-mono-tty-face (gamegrid-make-mono-tty-face)))
        gamegrid-mono-tty-face))))
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index c376b25fae0..0f823c806e0 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -26,14 +26,14 @@
 
 ;; To enter Delphi mode when you find a Delphi source file, one must override
 ;; the auto-mode-alist to associate Delphi with .pas (and .dpr and .dpk)
-;; files. Emacs, by default, will otherwise enter Pascal mode. E.g.
+;; files.  Emacs, by default, will otherwise enter Pascal mode. E.g.
 ;;
 ;; (autoload 'delphi-mode "delphi")
 ;; (setq auto-mode-alist
 ;;       (cons '("\\.\\(pas\\|dpr\\|dpk\\)$" . delphi-mode) auto-mode-alist))
 
 ;; To get keyword, comment, and string literal coloring, be sure that font-lock
-;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or
+;; is running.  One can manually do M-x font-lock-mode in a Delphi buffer, or
 ;; one can put in .emacs:
 ;;
 ;; (add-hook 'delphi-mode-hook 'turn-on-font-lock)
@@ -56,8 +56,8 @@
 ;; When you have entered Delphi mode, you may get more info by pressing
 ;; C-h m.
 
-;; This delphi mode implementation is fairly tolerant of syntax errors, relying
-;; as much as possible on the indentation of the previous statement. This also
+;; This Delphi mode implementation is fairly tolerant of syntax errors, relying
+;; as much as possible on the indentation of the previous statement.  This also
 ;; makes it faster and simpler, since there is less searching for properly
 ;; constructed beginnings.
 
@@ -74,15 +74,16 @@
   "True if in debug mode.")
 
 (defcustom delphi-search-path "."
-  "*Directories to search when finding external units. It is a list of
-directory strings. If only a single directory, it can be a single
-string instead of a list. If a directory ends in \"...\" then that
-directory is recursively searched."
+  "*Directories to search when finding external units.
+It is a list of directory strings.  If only a single directory,
+it can be a single string instead of a list.  If a directory
+ends in \"...\" then that directory is recursively searched."
   :type 'string
   :group 'delphi)
 
 (defcustom delphi-indent-level 3
-  "*Indentation of Delphi statements with respect to containing block. E.g.
+  "*Indentation of Delphi statements with respect to containing block.
+E.g.
 
 begin
    // This is an indent of 3.
@@ -117,7 +118,7 @@ end;                            end;"
   :group 'delphi)
 
 (defcustom delphi-verbose t ; nil
-  "*If true then delphi token processing progress is reported to the user."
+  "*If true then Delphi token processing progress is reported to the user."
   :type 'boolean
   :group 'delphi)
 
@@ -137,17 +138,17 @@ differs from the default."
   :group 'delphi)
 
 (defcustom delphi-comment-face 'font-lock-comment-face
-  "*Face used to color delphi comments."
+  "*Face used to color Delphi comments."
   :type 'face
   :group 'delphi)
 
 (defcustom delphi-string-face 'font-lock-string-face
-  "*Face used to color delphi strings."
+  "*Face used to color Delphi strings."
   :type 'face
   :group 'delphi)
 
 (defcustom delphi-keyword-face 'font-lock-keyword-face
-  "*Face used to color delphi keywords."
+  "*Face used to color Delphi keywords."
   :type 'face
   :group 'delphi)
 
@@ -720,9 +721,9 @@ routine.")
       (delphi-progress-done)))))
 
 (defvar delphi-ignore-changes t
-  "Internal flag to control if the delphi-mode responds to buffer changes.
-Defaults to t in case the delphi-after-change function is called on a
-non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
+  "Internal flag to control if the Delphi mode responds to buffer changes.
+Defaults to t in case the `delphi-after-change' function is called on a
+non-Delphi buffer.  Set to nil in a Delphi buffer.  To override, just do:
  (let ((delphi-ignore-changes t)) ...)")
 
 (defun delphi-after-change (change-start change-end old-length)
@@ -1521,8 +1522,8 @@ non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
       indent)))
 
 (defun delphi-indent-line ()
-  "Indent the current line according to the current language construct. If
-before the indent, the point is moved to the indent."
+  "Indent the current line according to the current language construct.
+If before the indent, the point is moved to the indent."
   (interactive)
   (delphi-save-match-data
    (let ((marked-point (point-marker))  ; Maintain our position reliably.
@@ -1547,7 +1548,7 @@ before the indent, the point is moved to the indent."
      (set-marker marked-point nil))))
 
 (defvar delphi-mode-abbrev-table nil
-  "Abbrev table in use in delphi-mode buffers.")
+  "Abbrev table in use in Delphi mode buffers.")
 (define-abbrev-table 'delphi-mode-abbrev-table ())
 
 (defmacro delphi-ensure-buffer (buffer-var buffer-name)
@@ -1568,7 +1569,7 @@ before the indent, the point is moved to the indent."
 ;; Debugging helpers:
 
 (defvar delphi-debug-buffer nil
-  "Buffer to write delphi-mode debug messages to. Created on demand.")
+  "Buffer to write Delphi mode debug messages to.  Created on demand.")
 
 (defun delphi-debug-log (format-string &rest args)
   ;; Writes a message to the log buffer.
@@ -1679,7 +1680,7 @@ before the indent, the point is moved to the indent."
 
 (defun delphi-tab ()
   "Indent the region, when Transient Mark mode is enabled and the region is
-active. Otherwise, indent the current line or insert a TAB, depending on the
+active.  Otherwise, indent the current line or insert a TAB, depending on the
 value of `delphi-tab-always-indents' and the current line position."
   (interactive)
   (cond ((use-region-p)
@@ -1768,8 +1769,8 @@ value of `delphi-tab-always-indents' and the current line position."
     nil))
 
 (defun delphi-find-unit (unit)
-  "Finds the specified delphi source file according to `delphi-search-path'.
-If no extension is specified, .pas is assumed. Creates a buffer for the unit."
+  "Find the specified Delphi source file according to `delphi-search-path'.
+If no extension is specified, .pas is assumed.  Creates a buffer for the unit."
   (interactive "sDelphi unit name: ")
   (let* ((unit-file (if (string-match "^\\(.*\\)\\.[a-z]+$" unit)
                         unit
@@ -1791,7 +1792,7 @@ If no extension is specified, .pas is assumed. Creates a buffer for the unit."
   "Find the definition of the identifier under the current point, searching
 in external units if necessary (as listed in the current unit's use clause).
 The set of directories to search for a unit is specified by the global variable
-delphi-search-path."
+`delphi-search-path'."
   (interactive)
   (error "delphi-find-current-xdef: not implemented yet"))
 
@@ -1802,7 +1803,7 @@ it is a routine."
   (error "delphi-find-current-body: not implemented yet"))
 
 (defun delphi-fill-comment ()
-  "Fills the text of the current comment, according to `fill-column'.
+  "Fill the text of the current comment, according to `fill-column'.
 An error is raised if not in a comment."
   (interactive)
   (save-excursion
@@ -1888,8 +1889,8 @@ An error is raised if not in a comment."
             (delphi-progress-done)))))))
 
 (defun delphi-new-comment-line ()
-  "If in a // comment, does a newline, indented such that one is still in the
-comment block. If not in a // comment, just does a normal newline."
+  "If in a // comment, do a newline, indented such that one is still in the
+comment block.  If not in a // comment, just does a normal newline."
   (interactive)
   (let ((comment (delphi-current-token)))
     (if (not (eq 'comment-single-line (delphi-token-kind comment)))
@@ -1923,7 +1924,7 @@ comment block. If not in a // comment, just does a normal newline."
     nil ; Syntax begin movement doesn't apply
     (font-lock-fontify-region-function . delphi-fontify-region)
     (font-lock-verbose . delphi-fontifying-progress-step))
-  "Delphi mode font-lock defaults. Syntactic fontification is ignored.")
+  "Delphi mode font-lock defaults.  Syntactic fontification is ignored.")
 
 (defvar delphi-debug-mode-map
   (let ((kmap (make-sparse-keymap)))
@@ -1944,7 +1945,7 @@ comment block. If not in a // comment, just does a normal newline."
             ("x" delphi-debug-show-is-stable)
             ))
     kmap)
-  "Keystrokes for delphi-mode debug commands.")
+  "Keystrokes for Delphi mode debug commands.")
 
 (defvar delphi-mode-map
   (let ((kmap (make-sparse-keymap)))
@@ -1964,7 +1965,7 @@ comment block. If not in a // comment, just does a normal newline."
   "Keymap used in Delphi mode.")
 
 (defconst delphi-mode-syntax-table (make-syntax-table)
-  "Delphi mode's syntax table. It is just a standard syntax table.
+  "Delphi mode's syntax table.  It is just a standard syntax table.
 This is ok since we do our own keyword/comment/string face coloring.")
 
 ;;;###autoload
@@ -1976,7 +1977,7 @@ This is ok since we do our own keyword/comment/string face coloring.")
 \\[delphi-fill-comment]\t- Fill the current comment.
 \\[delphi-new-comment-line]\t- If in a // comment, do a new comment line.
 
-M-x indent-region also works for indenting a whole region.
+\\[indent-region] also works for indenting a whole region.
 
 Customization:
 
@@ -1996,21 +1997,21 @@ Customization:
  `delphi-search-path'                 (default .)
     Directories to search when finding external units.
  `delphi-verbose'                     (default nil)
-    If true then delphi token processing progress is reported to the user.
+    If true then Delphi token processing progress is reported to the user.
 
 Coloring:
 
  `delphi-comment-face'                (default font-lock-comment-face)
-    Face used to color delphi comments.
+    Face used to color Delphi comments.
  `delphi-string-face'                 (default font-lock-string-face)
-    Face used to color delphi strings.
+    Face used to color Delphi strings.
  `delphi-keyword-face'                (default font-lock-keyword-face)
-    Face used to color delphi keywords.
+    Face used to color Delphi keywords.
  `delphi-other-face'                  (default nil)
     Face used to color everything else.
 
-Turning on Delphi mode calls the value of the variable delphi-mode-hook with
-no args, if that value is non-nil."
+Turning on Delphi mode calls the value of the variable `delphi-mode-hook'
+with no args, if that value is non-nil."
   (interactive)
   (kill-all-local-variables)
   (use-local-map delphi-mode-map)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index d674484345a..87e5875c943 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3566,12 +3566,12 @@ KIND is an additional string printed in the buffer."
     (insert kind)
     (indent-to 50)
     (insert (case (second info)
-              ('ebrowse-ts-member-functions "member function")
-              ('ebrowse-ts-member-variables "member variable")
-              ('ebrowse-ts-static-functions "static function")
-              ('ebrowse-ts-static-variables "static variable")
-              ('ebrowse-ts-friends (if globals-p "define" "friend"))
-              ('ebrowse-ts-types "type")
+              (ebrowse-ts-member-functions "member function")
+              (ebrowse-ts-member-variables "member variable")
+              (ebrowse-ts-static-functions "static function")
+              (ebrowse-ts-static-variables "static variable")
+              (ebrowse-ts-friends (if globals-p "define" "friend"))
+              (ebrowse-ts-types "type")
               (t "unknown"))
             "\n")))
 
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 9d40b4d8fd7..c8b156c5441 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -974,7 +974,7 @@ With ARG, do it many times.  Negative ARG means move forward."
                    (goto-char (scan-sexps (1+ (point)) -1))
                    (case (char-before)
                      (?% (forward-char -1))
-                     ('(?q ?Q ?w ?W ?r ?x)
+                     ((?q ?Q ?w ?W ?r ?x)
                       (if (eq (char-before (1- (point))) ?%) (forward-char -2))))
                    nil)
                   ((looking-at "\\s\"\\|\\\\\\S_")
diff --git a/lisp/shell.el b/lisp/shell.el
index bceea990baf..dde81c6cb95 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -583,6 +583,21 @@ Otherwise, one argument `-i' is passed to the shell.
                    (get-buffer-create (or buffer "*shell*"))
                  ;; If the current buffer is a dead shell buffer, use it.
                  (current-buffer)))
+
+  ;; On remote hosts, the local `shell-file-name' might be useless.
+  (if (and (interactive-p)
+           (file-remote-p default-directory)
+           (null explicit-shell-file-name)
+           (null (getenv "ESHELL")))
+      (with-current-buffer buffer
+        (set (make-local-variable 'explicit-shell-file-name)
+             (file-remote-p
+              (expand-file-name
+               (read-file-name
+                "Remote shell path: " default-directory shell-file-name
+                t shell-file-name))
+              'localname))))
+
   ;; Pop to buffer, so that the buffer's window will be correctly set
   ;; when we call comint (so that comint sets the COLUMNS env var properly).
   (pop-to-buffer buffer)
diff --git a/lisp/startup.el b/lisp/startup.el
index 384d81391ab..65b1a013c21 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1006,19 +1006,23 @@ opening the first frame (e.g. open a connection to an X server).")
                 (if init-file-user
                     (let ((user-init-file-1
                            (cond
-                            ((eq system-type 'ms-dos)
-                             (concat "~" init-file-user "/_emacs"))
-                            ((eq system-type 'windows-nt)
-                             ;; Prefer .emacs on Windows.
-                             (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
-                                 "~/.emacs"
-                               ;; Also support _emacs for compatibility.
-                               (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
-                                   "~/_emacs"
-                                 ;; But default to .emacs if _emacs does not exist.
-                                 "~/.emacs")))
-                            (t
-                             (concat "~" init-file-user "/.emacs")))))
+                             ((eq system-type 'ms-dos)
+                              (concat "~" init-file-user "/_emacs"))
+                             ((not (eq system-type 'windows-nt))
+                              (concat "~" init-file-user "/.emacs"))
+                             ;; Else deal with the Windows situation
+                             ((directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
+                              ;; Prefer .emacs on Windows.
+                              "~/.emacs")
+                             ((directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
+                              ;; Also support _emacs for compatibility, but warn about it.
+                              (display-warning
+                               'initialization
+                               "`_emacs' init file is deprecated, please use `.emacs'"
+                               :warning)
+                              "~/_emacs")
+                             (t ;; But default to .emacs if _emacs does not exist.
+                              "~/.emacs"))))
                       ;; This tells `load' to store the file name found
                       ;; into user-init-file.
                       (setq user-init-file t)
@@ -1191,7 +1195,7 @@ the `--debug-init' option to view a complete error backtrace."
                (dolist (subdir (directory-files dir))
                  (when (and (file-directory-p (expand-file-name subdir dir))
                             ;; package-subdirectory-regexp from package.el
-                            (string-match "^\\([^.].*\\)-\\([0-9]+\\(?:[.][0-9]+\\)*\\)$"
+                            (string-match "\\`\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)\\'"
                                           subdir))
                    (throw 'package-dir-found t)))))))
        (package-initialize))
diff --git a/lisp/subr.el b/lisp/subr.el
index 3330fa20379..6f39a41709e 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2003,24 +2003,24 @@ If optional argument INHIBIT-KEYBOARD-QUIT is non-nil, ignore
 keyboard-quit events while waiting for a valid input."
   (unless (consp chars)
     (error "Called `read-char-choice' without valid char choices"))
-  (let ((cursor-in-echo-area t)
-        (executing-kbd-macro executing-kbd-macro)
-        char done)
-    (while (not done)
-      (unless (get-text-property 0 'face prompt)
-        (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
-      (setq char (let ((inhibit-quit inhibit-keyboard-quit))
-                   (read-key prompt)))
-      (cond
-       ((not (numberp char)))
-       ((memq char chars)
-        (setq done t))
-       ((and executing-kbd-macro (= char -1))
-        ;; read-event returns -1 if we are in a kbd macro and
-        ;; there are no more events in the macro.  Attempt to
-        ;; get an event interactively.
-        (setq executing-kbd-macro nil))))
-    ;; Display the question with the answer.
+  (let (char done)
+    (let ((cursor-in-echo-area t)
+          (executing-kbd-macro executing-kbd-macro))
+      (while (not done)
+        (unless (get-text-property 0 'face prompt)
+          (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
+        (setq char (let ((inhibit-quit inhibit-keyboard-quit))
+                     (read-key prompt)))
+        (cond
+         ((not (numberp char)))
+         ((memq char chars)
+          (setq done t))
+         ((and executing-kbd-macro (= char -1))
+          ;; read-event returns -1 if we are in a kbd macro and
+          ;; there are no more events in the macro.  Attempt to
+          ;; get an event interactively.
+          (setq executing-kbd-macro nil)))))
+    ;; Display the question with the answer.  But without cursor-in-echo-area.
     (message "%s%s" prompt (char-to-string char))
     char))
 
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index d4970207b94..01b6f2fc26e 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -104,7 +104,7 @@ See `run-hooks'."
         ;; We pass a filename to create-file-buffer because it is what
         ;; the function expects, and also what uniquify needs (if active)
         (with-current-buffer (create-file-buffer (expand-file-name bname dir))
-          (cd dir)
+          (setq default-directory dir)
           (vc-setup-buffer (current-buffer))
           ;; Reset the vc-parent-buffer-name so that it does not appear
           ;; in the mode-line.
@@ -1002,7 +1002,7 @@ specific headers."
             (generate-new-buffer (format " *VC-%s* tmp status" backend))))
     (lexical-let ((buffer (current-buffer)))
       (with-current-buffer vc-dir-process-buffer
-        (cd def-dir)
+        (setq default-directory def-dir)
         (erase-buffer)
         (vc-call-backend
          backend 'dir-status-files def-dir files default-state
@@ -1067,7 +1067,7 @@ Throw an error if another update process is in progress."
       (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")
       (lexical-let ((buffer (current-buffer)))
         (with-current-buffer vc-dir-process-buffer
-          (cd def-dir)
+          (setq default-directory def-dir)
           (erase-buffer)
           (vc-call-backend
            backend 'dir-status def-dir
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 4ac7ef15fc7..0516abbf024 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -529,9 +529,9 @@ REV is the revision to check out into WORKFILE."
       (insert (propertize
                (format "   (%s %s)"
                        (case (vc-hg-extra-fileinfo->rename-state extra)
-                         ('copied "copied from")
-                         ('renamed-from "renamed from")
-                         ('renamed-to "renamed to"))
+                         (copied "copied from")
+                         (renamed-from "renamed from")
+                         (renamed-to "renamed to"))
                        (vc-hg-extra-fileinfo->extra-name extra))
                'face 'font-lock-comment-face)))))
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 2b7d5289e67..7243eb23527 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -26,8 +26,6 @@
 
         * deps.mk (unexalpha.o): Remove; unused.
 
-2011-03-16  Paul Eggert  <eggert@cs.ucla.edu>
-
         New file unexec.h, the (simple) interface for unexec (Bug#8267).
         * unexec.h: New file.
         * deps.mk (emacs.o, unexaix.o, unexcw.o, unexcoff.o, unexelf.o):
@@ -98,8 +96,6 @@
         Rename or remove local vars to avoid shadowing.
         (Ftranslate_region_internal): Mark var as initialized.
 
-2011-03-15  Paul Eggert  <eggert@cs.ucla.edu>
-
         * doc.c (Fdocumentation, Fsnarf_documentation): Move locals to
         avoid shadowing.
 
@@ -249,10 +245,7 @@
         (fix_start_end_in_overlays): Likewise.  This function should be
         simplified by using pointers-to-pointers, but that's a different
         matter.
-
-2011-03-14  Paul Eggert  <eggert@cs.ucla.edu>
-
-        * buffer.c (switch_to_buffer_1): Now static.
+        (switch_to_buffer_1): Now static.
         (Fkill_buffer, record_buffer, Fbury_buffer, Fset_buffer_multibyte):
         (report_overlay_modification): Rename locals to avoid shadowing.
 
@@ -317,6 +310,51 @@
         if GCC considers string literals to be constants.
         (Fdbus_register_service, Fdbus_register_method): Remove unused vars.
 
+2011-03-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * print.c (PRINT_CIRCLE_CANDIDATE_P): New macro.
+        (print_preprocess, print_object): New macro to fix last change.
+
+        * print.c (print_preprocess): Don't forget font objects.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs.c (USAGE3): Doc fixes.
+
+2011-03-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * coding.c (detect_coding_iso_2022): Reorganize code to clarify
+        structure.
+
+2011-03-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lisp.h (VWindow_system, Qfile_name_history):
+        * keyboard.h (lispy_function_keys) [WINDOWSNT]:
+        * w32term.h (w32_system_caret_hwnd, w32_system_caret_height)
+        (w32_system_caret_x, w32_system_caret_y): Declare extern.
+
+        * w32select.c: Don't #include "keyboard.h".
+        (run_protected): Add extern declaration for waiting_for_input.
+
+        * w32.c (Qlocal, noninteractive1, inhibit_window_system):
+        * w32console.c (detect_input_pending, read_input_pending)
+        (encode_terminal_code):
+        * w32fns.c (quit_char, lispy_function_keys, Qtooltip)
+        (w32_system_caret_hwnd, w32_system_caret_height, w32_system_caret_x)
+        (w32_system_caret_y, Qfile_name_history):
+        * w32font.c (w32font_driver, QCantialias, QCotf, QClang):
+        * w32inevt.c (reinvoke_input_signal, lispy_function_keys):
+        * w32menu.c (Qmenu_bar, QCtoggle, QCradio, Qoverriding_local_map)
+        (Qoverriding_terminal_local_map, Qmenu_bar_update_hook):
+        * w32proc.c (Qlocal, report_file_error):
+        * w32term.c (Vwindow_system, updating_frame):
+        * w32uniscribe.c (initialized, uniscribe_font_driver):
+        Remove unneeded extern declarations.
+
+2011-03-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buffer.c (Fmake_indirect_buffer): Fix incorrect assertions.
+
 2011-03-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT)
@@ -420,7 +458,7 @@
 
 2011-03-12  Eli Zaretskii  <eliz@gnu.org>
 
-        * termcap.c [MSDOS]: Include "msdos.h.
+        * termcap.c [MSDOS]: Include "msdos.h".
         (find_capability, tgetnum, tgetflag, tgetstr, tputs, tgetent):
         Constify `char *' arguments and their references according to
         prototypes in tparam.h.
diff --git a/src/buffer.c b/src/buffer.c
index b718bf3e576..c0e6866dee1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -611,8 +611,8 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
   /* Make sure the base buffer has markers for its narrowing.  */
   if (NILP (BVAR (b->base_buffer, pt_marker)))
     {
-      eassert (NILP (BVAR (b, begv_marker)));
-      eassert (NILP (BVAR (b, zv_marker)));
+      eassert (NILP (BVAR (b->base_buffer, begv_marker)));
+      eassert (NILP (BVAR (b->base_buffer, zv_marker)));
 
       BVAR (b->base_buffer, pt_marker) = Fmake_marker ();
       set_marker_both (BVAR (b->base_buffer, pt_marker), base_buffer,
diff --git a/src/coding.c b/src/coding.c
index 9a6a4484e50..0c2836c19f6 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2954,12 +2954,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
   const unsigned char *src_end = coding->source + coding->src_bytes;
   int multibytep = coding->src_multibyte;
   int single_shifting = 0;
-
-  /* FIXME: Does ID need to be initialized here?  The "End of composition"
-     code below does not initialize ID even though ID is used
-     afterwards, and perhaps that is a bug.  */
-  int id = 0;
-
+  int id;
   int c, c1;
   int consumed_chars = 0;
   int i;
@@ -2999,40 +2994,11 @@ detect_coding_iso_2022 (struct coding_system *coding,
             break;
           single_shifting = 0;
           ONE_MORE_BYTE (c);
-          if (c >= '(' && c <= '/')
-            {
-              /* Designation sequence for a charset of dimension 1.  */
-              ONE_MORE_BYTE (c1);
-              if (c1 < ' ' || c1 >= 0x80
-                  || (id = iso_charset_table[0][c >= ','][c1]) < 0)
-                /* Invalid designation sequence.  Just ignore.  */
-                break;
-            }
-          else if (c == '$')
-            {
-              /* Designation sequence for a charset of dimension 2.  */
-              ONE_MORE_BYTE (c);
-              if (c >= '@' && c <= 'B')
-                /* Designation for JISX0208.1978, GB2312, or JISX0208.  */
-                id = iso_charset_table[1][0][c];
-              else if (c >= '(' && c <= '/')
-                {
-                  ONE_MORE_BYTE (c1);
-                  if (c1 < ' ' || c1 >= 0x80
-                      || (id = iso_charset_table[1][c >= ','][c1]) < 0)
-                    /* Invalid designation sequence.  Just ignore.  */
-                    break;
-                }
-              else
-                /* Invalid designation sequence.  Just ignore it.  */
-                break;
-            }
-          else if (c == 'N' || c == 'O')
+          if (c == 'N' || c == 'O')
             {
               /* ESC <Fe> for SS2 or SS3.  */
               single_shifting = 1;
               rejected |= CATEGORY_MASK_ISO_7BIT | CATEGORY_MASK_ISO_8BIT;
-              break;
             }
           else if (c == '1')
             {
@@ -3048,36 +3014,66 @@ detect_coding_iso_2022 (struct coding_system *coding,
             {
               /* ESC <Fp> for start/end composition.  */
               composition_count = 0;
-              break;
             }
           else
             {
-              /* Invalid escape sequence.  Just ignore it.  */
-              break;
-            }
+              if (c >= '(' && c <= '/')
+                {
+                  /* Designation sequence for a charset of dimension 1.  */
+                  ONE_MORE_BYTE (c1);
+                  if (c1 < ' ' || c1 >= 0x80
+                      || (id = iso_charset_table[0][c >= ','][c1]) < 0)
+                    /* Invalid designation sequence.  Just ignore.  */
+                    break;
+                }
+              else if (c == '$')
+                {
+                  /* Designation sequence for a charset of dimension 2.  */
+                  ONE_MORE_BYTE (c);
+                  if (c >= '@' && c <= 'B')
+                    /* Designation for JISX0208.1978, GB2312, or JISX0208.  */
+                    id = iso_charset_table[1][0][c];
+                  else if (c >= '(' && c <= '/')
+                    {
+                      ONE_MORE_BYTE (c1);
+                      if (c1 < ' ' || c1 >= 0x80
+                          || (id = iso_charset_table[1][c >= ','][c1]) < 0)
+                        /* Invalid designation sequence.  Just ignore.  */
+                        break;
+                    }
+                  else
+                    /* Invalid designation sequence.  Just ignore it.  */
+                    break;
+                }
+              else
+                {
+                  /* Invalid escape sequence.  Just ignore it.  */
+                  break;
+                }
 
-          /* We found a valid designation sequence for CHARSET.  */
-          rejected |= CATEGORY_MASK_ISO_8BIT;
-          if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7],
-                              id))
-            found |= CATEGORY_MASK_ISO_7;
-          else
-            rejected |= CATEGORY_MASK_ISO_7;
-          if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_tight],
-                              id))
-            found |= CATEGORY_MASK_ISO_7_TIGHT;
-          else
-            rejected |= CATEGORY_MASK_ISO_7_TIGHT;
-          if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_else],
-                              id))
-            found |= CATEGORY_MASK_ISO_7_ELSE;
-          else
-            rejected |= CATEGORY_MASK_ISO_7_ELSE;
-          if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_8_else],
-                              id))
-            found |= CATEGORY_MASK_ISO_8_ELSE;
-          else
-            rejected |= CATEGORY_MASK_ISO_8_ELSE;
+              /* We found a valid designation sequence for CHARSET.  */
+              rejected |= CATEGORY_MASK_ISO_8BIT;
+              if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7],
+                                  id))
+                found |= CATEGORY_MASK_ISO_7;
+              else
+                rejected |= CATEGORY_MASK_ISO_7;
+              if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_tight],
+                                  id))
+                found |= CATEGORY_MASK_ISO_7_TIGHT;
+              else
+                rejected |= CATEGORY_MASK_ISO_7_TIGHT;
+              if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_else],
+                                  id))
+                found |= CATEGORY_MASK_ISO_7_ELSE;
+              else
+                rejected |= CATEGORY_MASK_ISO_7_ELSE;
+              if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_8_else],
+                                  id))
+                found |= CATEGORY_MASK_ISO_8_ELSE;
+              else
+                rejected |= CATEGORY_MASK_ISO_8_ELSE;
+            }
           break;
 
         case ISO_CODE_SO:
@@ -3105,13 +3101,32 @@ detect_coding_iso_2022 (struct coding_system *coding,
           rejected |= CATEGORY_MASK_ISO_7BIT;
           if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
               & CODING_ISO_FLAG_SINGLE_SHIFT)
-            found |= CATEGORY_MASK_ISO_8_1, single_shifting = 1;
+            {
+              found |= CATEGORY_MASK_ISO_8_1;
+              single_shifting = 1;
+            }
           if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_2])
               & CODING_ISO_FLAG_SINGLE_SHIFT)
-            found |= CATEGORY_MASK_ISO_8_2, single_shifting = 1;
+            {
+              found |= CATEGORY_MASK_ISO_8_2;
+              single_shifting = 1;
+            }
           if (single_shifting)
             break;
-          goto check_extra_latin;
+        check_extra_latin:
+          if (! VECTORP (Vlatin_extra_code_table)
+              || NILP (XVECTOR (Vlatin_extra_code_table)->contents[c]))
+            {
+              rejected = CATEGORY_MASK_ISO;
+              break;
+            }
+          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
+              & CODING_ISO_FLAG_LATIN_EXTRA)
+            found |= CATEGORY_MASK_ISO_8_1;
+          else
+            rejected |= CATEGORY_MASK_ISO_8_1;
+          rejected |= CATEGORY_MASK_ISO_8_2;
+          break;
 
         default:
           if (c < 0)
@@ -3162,20 +3177,6 @@ detect_coding_iso_2022 (struct coding_system *coding,
                 }
               break;
             }
-        check_extra_latin:
-          single_shifting = 0;
-          if (! VECTORP (Vlatin_extra_code_table)
-              || NILP (XVECTOR (Vlatin_extra_code_table)->contents[c]))
-            {
-              rejected = CATEGORY_MASK_ISO;
-              break;
-            }
-          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
-              & CODING_ISO_FLAG_LATIN_EXTRA)
-            found |= CATEGORY_MASK_ISO_8_1;
-          else
-            rejected |= CATEGORY_MASK_ISO_8_1;
-          rejected |= CATEGORY_MASK_ISO_8_2;
         }
     }
   detect_info->rejected |= CATEGORY_MASK_ISO;
diff --git a/src/emacs.c b/src/emacs.c
index d30d42f1ee4..052f22ea622 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -141,7 +141,7 @@ Lisp_Object Qfile_name_handler_alist;
 
 Lisp_Object Qrisky_local_variable;
 
-/* If non-zero, emacs should not attempt to use a window-specific code,
+/* If non-zero, Emacs should not attempt to use a window-specific code,
    but instead should use the virtual terminal under which it was started.  */
 int inhibit_window_system;
 
@@ -169,7 +169,6 @@ static unsigned long heap_bss_diff;
 #define MAX_HEAP_BSS_DIFF (1024*1024)
 
 /* Nonzero means running Emacs without interactive terminal.  */
-
 int noninteractive;
 
 /* Nonzero means remove site-lisp directories from load-path.  */
@@ -249,14 +248,14 @@ Display options:\n\
 --border-color, -bd COLOR       main border color\n\
 --border-width, -bw WIDTH       width of main border\n\
 --color, --color=MODE           override color mode for character terminals;\n\
-                                  MODE defaults to `auto', and can also\n\
-                                  be `never', `auto', `always',\n\
+                                  MODE defaults to `auto', and\n\
+                                  can also be `never', `always',\n\
                                   or a mode name like `ansi8'\n\
 --cursor-color, -cr COLOR       color of the Emacs cursor indicating point\n\
 --font, -fn FONT                default font; must be fixed-width\n\
 --foreground-color, -fg COLOR   window foreground color\n\
 --fullheight, -fh               make the first frame high as the screen\n\
---fullscreen, -fs               make first frame fullscreen\n\
+--fullscreen, -fs               make the first frame fullscreen\n\
 --fullwidth, -fw                make the first frame wide as the screen\n\
 --maximized, -mm                make the first frame maximized\n\
 --geometry, -g GEOMETRY         window geometry\n\
@@ -577,7 +576,8 @@ DEFINE_DUMMY_FUNCTION (__main)
    enough information to do it right.  */
 
 static int
-argmatch (char **argv, int argc, const char *sstr, const char *lstr, int minlen, char **valptr, int *skipptr)
+argmatch (char **argv, int argc, const char *sstr, const char *lstr,
+          int minlen, char **valptr, int *skipptr)
 {
   char *p = NULL;
   int arglen;
diff --git a/src/keyboard.h b/src/keyboard.h
index 765979b3997..00745a09140 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -519,3 +519,7 @@ extern int tty_read_avail_input (struct terminal *, int,
                                  struct input_event *);
 extern EMACS_TIME timer_check (int);
 extern void mark_kboards (void);
+
+#ifdef WINDOWSNT
+extern const char *const lispy_function_keys[];
+#endif
diff --git a/src/lisp.h b/src/lisp.h
index 04d75d55dc6..283b0989c1d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2581,6 +2581,7 @@ extern void syms_of_insdel (void);
 
 /* Defined in dispnew.c */
 extern Lisp_Object selected_frame;
+extern Lisp_Object Vwindow_system;
 EXFUN (Fding, 1);
 EXFUN (Fredraw_frame, 1);
 EXFUN (Fsleep_for, 2);
@@ -2990,6 +2991,7 @@ extern Lisp_Object Qfile_error;
 extern Lisp_Object Qfile_exists_p;
 extern Lisp_Object Qfile_directory_p;
 extern Lisp_Object Qinsert_file_contents;
+extern Lisp_Object Qfile_name_history;
 EXFUN (Ffind_file_name_handler, 2);
 EXFUN (Ffile_name_as_directory, 1);
 EXFUN (Fexpand_file_name, 2);
diff --git a/src/print.c b/src/print.c
index b2e5965cd1c..5b2778cf251 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1173,6 +1173,16 @@ print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag)
   print_object (obj, printcharfun, escapeflag);
 }
 
+#define PRINT_CIRCLE_CANDIDATE_P(obj)                                   \
+  (STRINGP (obj) || CONSP (obj)                                         \
+   || (VECTORLIKEP (obj)                                                \
+      && (VECTORP (obj) || COMPILEDP (obj)                              \
+          || CHAR_TABLE_P (obj) || SUB_CHAR_TABLE_P (obj)               \
+          || HASH_TABLE_P (obj) || FONTP (obj)))                        \
+   || (! NILP (Vprint_gensym)                                           \
+       && SYMBOLP (obj)                                                 \
+       && !SYMBOL_INTERNED_P (obj)))
+
 /* Construct Vprint_number_table according to the structure of OBJ.
    OBJ itself and all its elements will be added to Vprint_number_table
    recursively if it is a list, vector, compiled function, char-table,
@@ -1207,12 +1217,7 @@ print_preprocess (Lisp_Object obj)
   halftail = obj;
 
  loop:
-  if (STRINGP (obj) || CONSP (obj) || VECTORP (obj)
-      || COMPILEDP (obj) || CHAR_TABLE_P (obj) || SUB_CHAR_TABLE_P (obj)
-      || HASH_TABLE_P (obj)
-      || (! NILP (Vprint_gensym)
-          && SYMBOLP (obj)
-          && !SYMBOL_INTERNED_P (obj)))
+  if (PRINT_CIRCLE_CANDIDATE_P (obj))
     {
       if (!HASH_TABLE_P (Vprint_number_table))
         {
@@ -1389,12 +1394,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
     error ("Apparently circular structure being printed");
 
   /* Detect circularities and truncate them.  */
-  if (STRINGP (obj) || CONSP (obj) || VECTORP (obj)
-      || COMPILEDP (obj) || CHAR_TABLE_P (obj) || SUB_CHAR_TABLE_P (obj)
-      || HASH_TABLE_P (obj)
-      || (! NILP (Vprint_gensym)
-          && SYMBOLP (obj)
-          && !SYMBOL_INTERNED_P (obj)))
+  if (PRINT_CIRCLE_CANDIDATE_P (obj))
     {
       if (NILP (Vprint_circle) && NILP (Vprint_gensym))
         {
diff --git a/src/w32.c b/src/w32.c
index ae2373be46e..721cea07d20 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -147,9 +147,6 @@ typedef HRESULT (WINAPI * ShGetFolderPath_fn)
 void globals_of_w32 (void);
 static DWORD get_rid (PSID);
 
-/* Defined in process.c for its own purpose.  */
-extern Lisp_Object Qlocal;
-
 
 /* Initialization states.
 
@@ -5666,8 +5663,6 @@ sys_write (int fd, const void * buffer, unsigned int count)
 static void
 check_windows_init_file (void)
 {
-  extern int noninteractive, inhibit_window_system;
-
   /* A common indication that Emacs is not installed properly is when
      it cannot find the Windows installation file.  If this file does
      not exist in the expected place, tell the user.  */
diff --git a/src/w32console.c b/src/w32console.c
index 31c4a7c4e5a..3c200405cb5 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -41,12 +41,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* from window.c */
 extern Lisp_Object Frecenter (Lisp_Object);
 
-/* from keyboard.c */
-extern int detect_input_pending (void);
-
-/* from sysdep.c */
-extern int read_input_pending (void);
-
 static void w32con_move_cursor (struct frame *f, int row, int col);
 static void w32con_clear_to_end (struct frame *f);
 static void w32con_clear_frame (struct frame *f);
@@ -277,9 +271,6 @@ w32con_insert_glyphs (struct frame *f, register struct glyph *start,
     }
 }
 
-extern unsigned char *encode_terminal_code (struct glyph *, int,
-                                            struct coding_system *);
-
 static void
 w32con_write_glyphs (struct frame *f, register struct glyph *string,
                      register int len)
diff --git a/src/w32fns.c b/src/w32fns.c
index 09442d41e14..0c899cdceff 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -80,10 +80,6 @@ extern void w32_menu_display_help (HWND, HMENU, UINT, UINT);
 extern void w32_free_menu_strings (HWND);
 extern const char *map_w32_filename (const char *, const char **);
 
-extern int quit_char;
-
-extern const char *const lispy_function_keys[];
-
 /* If non-zero, a w32 timer that, when it expires, displays an
    hourglass cursor on all frames.  */
 static unsigned hourglass_timer = 0;
@@ -187,18 +183,10 @@ unsigned int msh_mousewheel = 0;
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
 
-extern Lisp_Object Qtooltip;
-
 #ifdef GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
 
-
-extern HWND w32_system_caret_hwnd;
-
-extern int w32_system_caret_height;
-extern int w32_system_caret_x;
-extern int w32_system_caret_y;
 static HWND w32_visible_system_caret_hwnd;
 
 /* From w32menu.c  */
@@ -5851,7 +5839,6 @@ Value is t if tooltip was open, nil otherwise.  */)
 /***********************************************************************
                         File selection dialog
  ***********************************************************************/
-extern Lisp_Object Qfile_name_history;
 
 /* Callback for altering the behavior of the Open File dialog.
    Makes the Filename text field contain "Current Directory" and be
@@ -5899,7 +5886,7 @@ file_dialog_callback (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                  no man's land and the user will be unable to tab through the
                  dialog box (pressing tab will only result in a beep).
                  Avoid that problem by setting focus to the list here.  */
-              if (CDN_INITDONE == notify->hdr.code)
+              if (notify->hdr.code == CDN_INITDONE)
                 SetFocus (list);
             }
           else
diff --git a/src/w32font.c b/src/w32font.c
index aef62f61a3a..40ff0782b88 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -54,8 +54,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define JOHAB_CHARSET 130
 #endif
 
-extern struct font_driver w32font_driver;
-
 Lisp_Object Qgdi;
 Lisp_Object Quniscribe;
 static Lisp_Object QCformat;
@@ -64,7 +62,6 @@ static Lisp_Object Qserif, Qscript, Qdecorative;
 static Lisp_Object Qraster, Qoutline, Qunknown;
 
 /* antialiasing  */
-extern Lisp_Object QCantialias, QCotf, QClang; /* defined in font.c  */
 extern Lisp_Object Qnone; /* reuse from w32fns.c  */
 static Lisp_Object Qstandard, Qsubpixel, Qnatural;
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index d0b097100fd..c4858dea908 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -40,18 +40,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "w32heap.h"
 #include "w32term.h"
 
-/* stdin, from ntterm */
+/* stdin, from w32console.c */
 extern HANDLE keyboard_handle;
 
 /* Info for last mouse motion */
 static COORD movement_pos;
 static DWORD movement_time;
 
-/* from keyboard.c */
-extern void reinvoke_input_signal (void);
-
+/* from w32fns.c */
 extern unsigned int map_keypad_keys (unsigned int, unsigned int);
-
 extern unsigned int w32_key_to_modifier (int key);
 
 /* Event queue */
@@ -261,8 +258,6 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event)
 }
 
 
-extern const char *const lispy_function_keys[];
-
 static int faked_key = 0;
 
 /* return code -1 means that event_queue_ptr won't be incremented.
diff --git a/src/w32menu.c b/src/w32menu.c
index 92447eb9fae..a2e62f24f6a 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -84,14 +84,6 @@ MessageBoxW_Proc unicode_message_box = NULL;
 
 Lisp_Object Qdebug_on_next_call;
 
-extern Lisp_Object Qmenu_bar;
-
-extern Lisp_Object QCtoggle, QCradio;
-
-extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
-
-extern Lisp_Object Qmenu_bar_update_hook;
-
 void set_frame_menubar (FRAME_PTR, int, int);
 
 #ifdef HAVE_DIALOGS
diff --git a/src/w32proc.c b/src/w32proc.c
index bb8b428ffe4..e94d9aa3254 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -67,8 +67,6 @@ extern BOOL WINAPI IsValidLocale (LCID, DWORD);
             + ((DWORD)(var) - (section)->VirtualAddress)                \
             + (filedata).file_base))
 
-extern Lisp_Object Qlocal;
-
 Lisp_Object Qhigh, Qlow;
 
 #ifdef EMACSDEBUG
@@ -1053,7 +1051,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
    detect that we were woken up by C-g, we return -1 with errno set to
    EINTR as on Unix.  */
 
-/* From ntterm.c */
+/* From w32console.c */
 extern HANDLE keyboard_handle;
 
 /* From w32xfns.c */
@@ -1559,8 +1557,6 @@ sys_kill (int pid, int sig)
   return rc;
 }
 
-/* extern int report_file_error (char *, Lisp_Object); */
-
 /* The following two routines are used to manipulate stdin, stdout, and
    stderr of our child processes.
 
@@ -1660,7 +1656,7 @@ set_process_dir (char * dir)
    dial-up users to only be connected when they actually need to use
    socket services.  */
 
-/* From nt.c */
+/* From w32.c */
 extern HANDLE winsock_lib;
 extern BOOL term_winsock (void);
 extern BOOL init_winsock (int load_now);
diff --git a/src/w32select.c b/src/w32select.c
index 23d5fb68c77..ef0cb3adc24 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -78,7 +78,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "w32term.h"    /* for all of the w32 includes */
 #include "w32heap.h"    /* os_subtype */
 #include "blockinput.h"
-#include "keyboard.h"   /* cmd_error_internal() */
 #include "charset.h"
 #include "coding.h"
 #include "character.h"
@@ -391,6 +390,7 @@ run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg)
      with global variables and calling strange looking functions.  Is
      this really the right way to run Lisp callbacks?  */
 
+  extern int waiting_for_input; /* from keyboard.c */
   int owfi;
 
   BLOCK_INPUT;
diff --git a/src/w32term.c b/src/w32term.c
index 67e853f21f0..f31c4e90e77 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -88,8 +88,6 @@ extern void free_frame_menubar (struct frame *);
 extern int w32_codepage_for_font (char *fontname);
 extern Cursor w32_load_cursor (LPCTSTR name);
 
-extern Lisp_Object Vwindow_system;
-
 #define x_any_window_to_frame x_window_to_frame
 #define x_top_window_to_frame x_window_to_frame
 
@@ -138,13 +136,6 @@ BOOL (WINAPI *pfnSetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD);
 #define WS_EX_LAYERED 0x80000
 #endif
 
-/* Frame being updated by update_frame.  This is declared in term.c.
-   This is set by update_begin and looked at by all the
-   w32 functions.  It is zero while not inside an update.
-   In that case, the w32 functions assume that `SELECTED_FRAME ()'
-   is the frame to apply to.  */
-extern struct frame *updating_frame;
-
 /* This is a frame waiting to be autoraised, within w32_read_socket.  */
 struct frame *pending_autoraise_frame;
 
@@ -2536,8 +2527,7 @@ x_delete_glyphs (struct frame *f, register int n)
 }
 
 
-/* Clear entire frame.  If updating_frame is non-null, clear that
-   frame.  Otherwise clear the selected frame.  */
+/* Clear entire frame.  */
 
 static void
 x_clear_frame (struct frame *f)
@@ -6060,7 +6050,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
   terminal->mouse_position_hook = w32_mouse_position;
   terminal->frame_rehighlight_hook = w32_frame_rehighlight;
   terminal->frame_raise_lower_hook = w32_frame_raise_lower;
-  //  terminal->fullscreen_hook = XTfullscreen_hook;
+  /* terminal->fullscreen_hook = XTfullscreen_hook; */
   terminal->set_vertical_scroll_bar_hook = w32_set_vertical_scroll_bar;
   terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars;
   terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar;
diff --git a/src/w32term.h b/src/w32term.h
index c79352a8db8..cf6751b7d63 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -547,7 +547,7 @@ do { \
 #define WM_APPCOMMAND 0x319
 #define GET_APPCOMMAND_LPARAM(lParam)  (HIWORD(lParam) & 0x7fff)
 #endif
-#ifndef WM_UNICHAR 
+#ifndef WM_UNICHAR
 #define WM_UNICHAR 0x109
 #endif
 #ifndef UNICODE_NOCHAR
@@ -697,3 +697,7 @@ typedef BOOL (WINAPI * AppendMenuW_Proc) (
     IN UINT_PTR,
     IN LPCWSTR);
 
+extern HWND w32_system_caret_hwnd;
+extern int w32_system_caret_height;
+extern int w32_system_caret_x;
+extern int w32_system_caret_y;
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 319f934e3bb..39d1ee5c851 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -52,10 +52,6 @@ int uniscribe_available = 0;
 extern Lisp_Object Quniscribe;
 extern Lisp_Object Qopentype;
 
-extern int initialized;
-
-extern struct font_driver uniscribe_font_driver;
-
 /* EnumFontFamiliesEx callback.  */
 static int CALLBACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
                                                     NEWTEXTMETRICEX *,