auto upstream

97 files changed, 880 insertions, 516 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index bcd9c0c0693..ba6f7e323e0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi (Acknowledgments): Don't mention yow any more.
+
+2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * cmdargs.texi (General Variables):
+        Fix TMPDIR documentation to match the code's behavior.
+
 2013-02-10  Glenn Morris  <rgm@gnu.org>
 
         * trouble.texi (Checklist): Update bug keybinding.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index a0ab8223ae0..718a51c60db 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -726,7 +726,7 @@ the display of the Emacs tool bar.  With Riccardo Murri he wrote
 Eric Ludlam wrote the Speedbar package; @file{checkdoc.el}, for checking
 doc strings in Emacs Lisp programs; @file{dframe.el}, providing
 dedicated frame support modes; @file{ezimage.el}, a generalized way to
-place images over text; @file{chart.el} for drawing bar charts etc; and
+place images over text; @file{chart.el} for drawing bar charts etc.; and
 the EIEIO (Enhanced Implementation of Emacs Interpreted Objects)
 package.  He was also the main author of the CEDET (Collection of Emacs
 Development Environment Tools) package.  Portions were also written by
@@ -811,9 +811,8 @@ Richard Mlynarik wrote @file{cl-indent.el}, a package for indenting
 Common Lisp code; @file{ebuff-menu.el}, an ``electric'' browser for
 buffer listings; @file{ehelp.el}, bindings for browsing help screens;
 @file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
-used in mail messages and news articles; @file{terminal.el}, a
-terminal emulator for Emacs subprocesses; and @file{yow.el}, an
-essential utility.
+used in mail messages and news articles; and @file{terminal.el}, a
+terminal emulator for Emacs subprocesses.
 
 @item
 Gerd Moellmann was the Emacs maintainer from the beginning of Emacs 21
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index c4a74042865..19b439afc7f 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -567,10 +567,9 @@ terminal specified by @env{TERM}.  This defaults to
 These environment variables are used to initialize the variable
 @code{temporary-file-directory}, which specifies a directory in which
 to put temporary files (@pxref{Backup}).  Emacs tries to use
-@env{TMPDIR} first; if that is unset, it tries @env{TMP}, then
-@env{TEMP}, and finally @file{/tmp}.  But on MS-Windows and MS-DOS,
-Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally
-@file{c:/temp}.
+@env{TMPDIR} first.  If that is unset, Emacs normally falls back on
+@file{/tmp}, but on MS-Windows and MS-DOS it instead falls back on
+@env{TMP}, then @env{TEMP}, and finally @file{c:/temp}.
 
 @item TZ
 This specifies the current time zone and possibly also daylight
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 6ed3b2e6d37..05b2a5be3a4 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -131,7 +131,7 @@ detailed description of these mouse commands.
 @cindex shift-selection
   Finally, you can set the mark by holding down the shift key while
 typing certain cursor motion commands (such as @kbd{S-@key{right}},
-@kbd{S-C-f}, @kbd{S-C-n}, etc.)  This is called @dfn{shift-selection}.
+@kbd{S-C-f}, @kbd{S-C-n}, etc.).  This is called @dfn{shift-selection}.
 It sets the mark at point before moving point, but only if there is no
 active mark set via shift-selection.  The mark set by mouse commands
 and by shift-selection behaves slightly differently from the usual
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a61d84a77b1..be1bdfcfa3d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * objects.texi (Char-Table Type): Add footnote about #^^.
+
+        * modes.texi (Minor Mode Conventions): Fix typo.
+
+        * keymaps.texi (Scanning Keymaps): Remove obsolete sentence about
+        meta characters; this changed in 22.1.  (Bug#13684)
+
+        * objects.texi (Char-Table Type): Add cindex.
+
+        * keymaps.texi (Key Binding Commands): Trivial rephrasing.
+
 2013-02-10  Glenn Morris  <rgm@gnu.org>
 
         * keymaps.texi (Creating Keymaps): Update make-keymap result.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 54211d1aa0b..822e952ef98 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1784,7 +1784,7 @@ that uses @var{key} as a prefix---which would not be allowed if
 @end group
 @end smallexample
 
-This function is implemented simply using @code{define-key}:
+This function is equivalent to using @code{define-key} as follows:
 
 @smallexample
 @group
@@ -1975,9 +1975,6 @@ modes---minor modes first, then the major mode, then global bindings.
 If @var{prefix} is non-@code{nil}, it should be a prefix key; then the
 listing includes only keys that start with @var{prefix}.
 
-The listing describes meta characters as @key{ESC} followed by the
-corresponding non-meta character.
-
 When several characters with consecutive @acronym{ASCII} codes have the
 same definition, they are shown together, as
 @samp{@var{firstchar}..@var{lastchar}}.  In this instance, you need to
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 71ce2bb9271..5f1eb8619ee 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1361,7 +1361,7 @@ follow them is to use the macro @code{define-minor-mode}.
 @cindex mode variable
 Define a variable whose name ends in @samp{-mode}.  We call this the
 @dfn{mode variable}.  The minor mode command should set this variable.
-The value will be @code{nil} is the mode is disabled, and non-@code{nil}
+The value will be @code{nil} if the mode is disabled, and non-@code{nil}
 if the mode is enabled.  The variable should be buffer-local if the
 minor mode is buffer-local.
 
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 4b24d920f9f..0437d2337a3 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1177,8 +1177,10 @@ inherit from, a default value, and a small number of extra slots to use for
 special purposes.  A char-table can also specify a single value for
 a whole character set.
 
+@cindex @samp{#^} read syntax
   The printed representation of a char-table is like a vector
-except that there is an extra @samp{#^} at the beginning.
+except that there is an extra @samp{#^} at the beginning.@footnote{You
+may also encounter @samp{#^^}, used for ``sub-char-tables''.}
 
   @xref{Char-Tables}, for special functions to operate on char-tables.
 Uses of char-tables include:
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 50710e23234..1181244a974 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -88,7 +88,7 @@ initializes @code{exec-path} when it starts up, based on the value of
 the environment variable @env{PATH}.  The standard file name
 constructs, @samp{~}, @samp{.}, and @samp{..}, are interpreted as
 usual in @code{exec-path}, but environment variable substitutions
-(@samp{$HOME}, etc.) are not recognized; use
+(@samp{$HOME}, etc.)@: are not recognized; use
 @code{substitute-in-file-name} to perform them (@pxref{File Name
 Expansion}).  @code{nil} in this list refers to
 @code{default-directory}.
@@ -557,7 +557,7 @@ from the process only while waiting for input or for a time delay.
 when creating the process, based on the value of the variable
 @code{process-connection-type} (see below).  Ptys are usually
 preferable for processes visible to the user, as in Shell mode,
-because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)
+because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)@:
 between the process and its children, whereas pipes do not.  For
 subprocesses used for internal purposes by programs, it is often
 better to use a pipe, because they are more efficient, and because
@@ -571,7 +571,7 @@ program @var{program} running in it.  It returns a process object that
 stands for the new subprocess in Lisp.  The argument @var{name}
 specifies the name for the process object; if a process with this name
 already exists, then @var{name} is modified (by appending @samp{<1>},
-etc.) to be unique.  The buffer @var{buffer-or-name} is the buffer to
+etc.)@: to be unique.  The buffer @var{buffer-or-name} is the buffer to
 associate with the process.
 
 If @var{program} is @code{nil}, Emacs opens a new pseudoterminal (pty)
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 94fe2af1a8a..5ccf528868b 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -147,7 +147,7 @@ of \- means standard output; overrides default \fBTAGS\fP or \fBtags\fP.
 Make tags based on regexp matching for the files following this option,
 in addition to the tags made with the standard parsing based on
 language. May be freely intermixed with filenames and the \fB\-R\fP
-option.  The regexps are cumulative, i.e. each such option will add to
+option.  The regexps are cumulative, i.e., each such option will add to
 the previous ones.  The regexps are of one of the forms:
 .br
         [\fB{\fP\fIlanguage\fP\fB}\fP]\fB/\fP\fItagregexp/\fP[\fInameregexp\fP\fB/\fP]\fImodifiers\fP
@@ -283,4 +283,3 @@ Permission is granted to copy and distribute translations of this
 document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
-
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 11ff3700da4..dd3c0ccd1e2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * message.texi (News Headers): Don't mention yow any more.
+
 2013-02-09  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Basic Operations on Units):
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 926d6a5749c..b5a640e13e0 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -72,7 +72,7 @@ existing code and facilitates writing new code.
 
 When the Gnu Ada compiler GNAT is used, the cross-reference
 information output by the compiler is used to provide powerful code
-navigation (jump to definition, find all uses, etc).
+navigation (jump to definition, find all uses, etc.).
 
 When you open a file with a file extension of @file{.ads} or
 @file{.adb}, Emacs will automatically load and activate Ada mode.
@@ -1267,7 +1267,7 @@ Non-@code{nil} means that the current line will also be re-indented
 before inserting a newline, when you press @key{RET}.
 @end table
 
-Most of the time, the indentation will be automatic, i.e when you
+Most of the time, the indentation will be automatic, i.e., when you
 press @key{RET}, the cursor will move to the correct column on the
 next line.
 
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index 48d5cf9e18a..978345e5cc8 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -314,7 +314,7 @@ The first object spliced into the list (assuming it is a list from a
 non-terminal).
 
 @item '$1
-The first object matched, placed in a list.  i.e. @code{( $1 )}.
+The first object matched, placed in a list.  I.e., @code{( $1 )}.
 
 @item foo
 The symbol @code{foo} (exactly as displayed).
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index da018acffe9..2d1f59cfa68 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -14122,7 +14122,7 @@ conventions.  Like C mode, Pascal mode interprets array brackets and uses
 a different table of operators.  Hexadecimal numbers are entered and
 displayed with a preceding dollar sign.  (Thus the regular meaning of
 @kbd{$2} during algebraic entry does not work in Pascal mode, though
-@kbd{$} (and @kbd{$$}, etc.) not followed by digits works the same as
+@kbd{$} (and @kbd{$$}, etc.)@: not followed by digits works the same as
 always.)  No special provisions are made for other non-decimal numbers,
 vectors, and so on, since there is no universally accepted standard way
 of handling these in Pascal.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 55b7028101a..bb6a5b001ad 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -4959,7 +4959,7 @@ the declaration is an annotation.
 
 There are a few occasions where a statement block might be used inside
 an expression.  One is in C or C++ code using the gcc extension for
-this, e.g:
+this, e.g.:
 
 @example
  1: int res = (@{
@@ -5552,7 +5552,7 @@ parentheses and statements within brace blocks.
 @findex lineup-close-paren (c-)
 Line up the closing paren under its corresponding open paren if the
 open paren is followed by code.  If the open paren ends its line, no
-indentation is added.  E.g:
+indentation is added.  E.g.:
 
 @example
 @group
@@ -5606,7 +5606,7 @@ discussion of this ``DWIM'' measure.
 
 @defun c-indent-one-line-block
 @findex indent-one-line-block (c-)
-Indent a one line block @code{c-basic-offset} extra.  E.g:
+Indent a one line block @code{c-basic-offset} extra.  E.g.:
 
 @example
 @group
@@ -5640,7 +5640,7 @@ which makes the function usable in list expressions.
 
 @defun c-indent-multi-line-block
 @findex indent-multi-line-block (c-)
-Indent a multiline block @code{c-basic-offset} extra.  E.g:
+Indent a multiline block @code{c-basic-offset} extra.  E.g.:
 
 @example
 @group
@@ -5679,7 +5679,7 @@ block, which makes the function usable in list expressions.
 Line up statements for coding standards which place the first statement
 in a block on the same line as the block opening brace@footnote{Run-in
 style doesn't really work too well.  You might need to write your own
-custom line-up functions to better support this style.}.  E.g:
+custom line-up functions to better support this style.}.  E.g.:
 
 @example
 @group
@@ -5762,7 +5762,7 @@ indents relative to the surrounding block just like
 @defun c-lineup-whitesmith-in-block
 @findex lineup-whitesmith-in-block (c-)
 Line up lines inside a block in Whitesmith style.  It's done in a way
-that works both when the opening brace hangs and when it doesn't.  E.g:
+that works both when the opening brace hangs and when it doesn't.  E.g.:
 
 @example
 @group
@@ -5816,7 +5816,7 @@ Line up the current argument line under the first argument.
 As a special case, if an argument on the same line as the open
 parenthesis starts with a brace block opener, the indentation is
 @code{c-basic-offset} only.  This is intended as a ``DWIM'' measure in
-cases like macros that contain statement blocks, e.g:
+cases like macros that contain statement blocks, e.g.:
 
 @example
 @group
@@ -5852,7 +5852,7 @@ brace block.
 @defun c-lineup-multi-inher
 @findex lineup-multi-inher (c-)
 Line up the classes in C++ multiple inheritance clauses and member
-initializers under each other.  E.g:
+initializers under each other.  E.g.:
 
 @example
 @group
@@ -5895,7 +5895,7 @@ Line up Java implements and extends declarations.  If class names
 follow on the same line as the @samp{implements}/@samp{extends}
 keyword, they are lined up under each other.  Otherwise, they are
 indented by adding @code{c-basic-offset} to the column of the keyword.
-E.g:
+E.g.:
 
 @example
 @group
@@ -5929,7 +5929,7 @@ same line as the throws keyword, they are lined up under each other.
 Otherwise, they are indented by adding @code{c-basic-offset} to the
 column of the @samp{throws} keyword.  The @samp{throws} keyword itself
 is also indented by @code{c-basic-offset} from the function declaration
-start if it doesn't hang.  E.g:
+start if it doesn't hang.  E.g.:
 
 @example
 @group
@@ -6014,7 +6014,7 @@ line.
 
 @defun c-lineup-argcont
 @findex lineup-argcont (c-)
-Line up a continued argument.  E.g:
+Line up a continued argument.  E.g.:
 
 @example
 @group
@@ -6101,7 +6101,7 @@ function is the same as specifying a list @code{(c-lineup-assignments
 Line up ``cascaded calls'' under each other.  If the line begins with
 @code{->} or @code{.} and the preceding line ends with one or more
 function calls preceded by the same token, then the arrow is lined up
-with the first of those tokens.  E.g:
+with the first of those tokens.  E.g.:
 
 @example
 @group
@@ -6133,7 +6133,7 @@ Line up C++ stream operators (i.e., @samp{<<} and @samp{>>}).
 @findex lineup-string-cont (c-)
 Line up a continued string under the one it continues.  A continued
 string in this sense is where a string literal follows directly after
-another one.  E.g:
+another one.  E.g.:
 
 @example
 @group
@@ -6242,7 +6242,7 @@ is equivalent to @code{(@r{@var{value}} . -1000)}.
 @findex lineup-knr-region-comment (c-)
 Line up a comment in the ``K&R region'' with the declaration.  That is
 the region between the function or class header and the beginning of the
-block.  E.g:
+block.  E.g.:
 
 @example
 @group
@@ -6282,7 +6282,7 @@ already has; think of it as an identity function for lineups.
 @defun c-lineup-cpp-define
 @findex lineup-cpp-define (c-)
 Line up macro continuation lines according to the indentation of the
-construct preceding the macro.  E.g:
+construct preceding the macro.  E.g.:
 
 @example
 @group
@@ -6409,7 +6409,7 @@ that those lines could be analyzed as either topmost-intro-cont or
 statement-cont.  It's used for @code{topmost-intro-cont} by default, but
 you might consider using @code{+} instead.}.  For lines preceding a
 definition, zero is used.  For other lines, @code{c-basic-offset} is
-added to the indentation.  E.g:
+added to the indentation.  E.g.:
 
 @example
 @group
@@ -6507,7 +6507,7 @@ earlier.  Line-up functions are still passed this cons cell, so as to
 preserve compatibility with older configurations.  In the future, we
 may decide to convert to using the full list format---you can prepare
 your setup for this by using the access functions
-(@code{c-langelem-sym}, etc.)  described below.
+(@code{c-langelem-sym}, etc.)@: described below.
 
 @vindex c-syntactic-element
 @vindex syntactic-element (c-)
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 8da6032d728..11f19c8df06 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -748,7 +748,7 @@ This function attempts to convert @var{object} to the specified
 @var{type}.  If @var{object} is already of that type as determined by
 @code{cl-typep}, it is simply returned.  Otherwise, certain types of
 conversions will be made:  If @var{type} is any sequence type
-(@code{string}, @code{list}, etc.) then @var{object} will be
+(@code{string}, @code{list}, etc.)@: then @var{object} will be
 converted to that type if possible.  If @var{type} is
 @code{character}, then strings of length one and symbols with
 one-character names can be coerced.  If @var{type} is @code{float},
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 2cf25641350..1e3d11f6dc6 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -882,7 +882,7 @@ Dired buffers, is like @code{shell-command}, but it runs with
 
 @file{dired-x} provides a method of visiting or editing a file mentioned in
 the buffer you are viewing (e.g., a mail buffer, a news article, a
-@file{README} file, etc.) or to test if that file exists.  You can then modify
+@file{README} file, etc.)@: or to test if that file exists.  You can then modify
 this in the minibuffer after snatching the file name.
 
 When installed @file{dired-x} will substitute @code{dired-x-find-file} for
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index ddee7e6b5d5..f2e787fd588 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1050,7 +1050,7 @@ other options for that project.  The configuration is saved in
 
 Generic projects are disabled by default because they have the
 potential to interfere with other projects.  To use the generic
-project sytem to start detecting projects, you need to enable it.
+project system to start detecting projects, you need to enable it.
 
 @deffn Command ede-enable-generic-projects
 Enable generic project loaders.
@@ -1956,7 +1956,7 @@ Type: @code{list} @*
 Default Value: @code{(quote ("/include" "../include/"))}
 
 The default locate function expands filenames within a project.
-If a header file (.h, .hh, etc) name is expanded, and
+If a header file (.h, .hh, etc.)@: name is expanded, and
 the @code{:locate-fcn} slot is @code{nil}, then the include path is checked
 first, and other directories are ignored.  For very large
 projects, this optimization can save a lot of time.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 1e4c888a9e7..378eee08c51 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1148,7 +1148,7 @@ packages also use this method).
 Regular files are treated by the @code{patch} utility in the usual manner,
 i.e., the original is renamed into @file{source-name.orig} and the result
 of the patch is placed into the file source-name (@file{_orig} is used
-on systems like DOS, etc.)
+on systems like DOS, etc.).
 
 @node Customization
 @chapter Customization
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 216e4733cd1..b1cf40aa645 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -993,7 +993,7 @@ Customization}).
 The charset to be used can be overridden by setting the @code{charset}
 @acronym{MML} tag (@pxref{MML Definition}) when composing the message.
 
-The encoding of characters (quoted-printable, 8bit etc) is orthogonal
+The encoding of characters (quoted-printable, 8bit, etc.)@: is orthogonal
 to the discussion here, and is controlled by the variables
 @code{mm-body-charset-encoding-alist} and
 @code{mm-content-transfer-encoding-defaults} (@pxref{Encoding
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 9825c90dd81..94093dc15ce 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -625,7 +625,7 @@ string-manipulation expansions because the Elisp library already
 provides many functions for this.}  For example, @code{$var} on a line
 expands to the value of the variable @code{var} when the line is
 executed.  Expansions are usually passed as arguments, but may also be
-used as commands.@footnote{e.g. Entering just @samp{$var} at the prompt
+used as commands.@footnote{E.g., entering just @samp{$var} at the prompt
 is equivalent to entering the value of @code{var} at the prompt.}
 
 @menu
@@ -1158,7 +1158,7 @@ it).
 @item Make the shell spawning commands be visual
 
 That is, make (@command{su}, @command{bash}, @command{telnet},
-@command{rlogin}, @command{rsh}, etc.) be part of
+@command{rlogin}, @command{rsh}, etc.)@: be part of
 @code{eshell-visual-commands}.  The only exception is if the shell is
 being used to invoke a single command.  Then, the behavior should be
 based on what that command is.
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 8f3c0c2d623..39b4a9037bd 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1909,7 +1909,7 @@ following line to your @file{.emacs}:
 where @var{syntactic-symbol} is the name Emacs shows in the minibuffer
 when you type @kbd{C-c C-o} at the beginning of the line, and
 @var{offset} is one of the indentation symbols listed above (@code{+},
-@code{/}, @code{0}, etc.) that you've chosen during the interactive
+@code{/}, @code{0}, etc.)@: that you've chosen during the interactive
 procedure.
 
 @item
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 1807f108e3b..79259a76503 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -64,7 +64,7 @@ modify this GNU manual.''
 
 Flymake is a universal on-the-fly syntax checker implemented as an
 Emacs minor mode. Flymake runs the pre-configured syntax check tool
-(compiler for C++ files, @code{perl} for perl files, etc.) in the
+(compiler for C++ files, @code{perl} for perl files, etc.)@: in the
 background, passing it a temporary copy of the current buffer, and
 parses the output for known error/warning message patterns. Flymake
 then highlights erroneous lines (i.e., lines for which at least one
@@ -569,7 +569,7 @@ These modes are handled inside init/cleanup/getfname functions, see
 Flymake contains implementations of all functionality required to
 support different syntax check modes described above (making temporary
 copies, finding master files, etc.), as well as some tool-specific
-(routines for Make, Ant, etc.) code.
+(routines for Make, Ant, etc.)@: code.
 
 
 @node Making a temporary copy
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 43ffab26c9b..17b117be961 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -117,7 +117,7 @@ they make up a forms.
 
 The contents of the forms consist of the contents of the fields of the
 record (e.g., @samp{root}, @samp{0}, @samp{1}, @samp{Super User})
-interspersed with normal text (e.g @samp{User : }, @samp{Uid: }).
+interspersed with normal text (e.g., @samp{User : }, @samp{Uid: }).
 
 If you modify the contents of the fields, Forms mode will analyze your
 changes and update the file appropriately.  You cannot modify the
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 2a1f5ac2cc1..e7367730040 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1218,7 +1218,7 @@ from using them):
                 messages?
 * FAQ 5-3::     How to set stuff like From, Organization, Reply-To,
                 signature...?
-* FAQ 5-4::     Can I set things like From, Signature etc group based on
+* FAQ 5-4::     Can I set things like From, Signature etc. group based on
                 the group I post too?
 * FAQ 5-5::     Is there a spell-checker? Perhaps even on-the-fly
                 spell-checking?
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b5029e5d6a8..65e2ce6150e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -2348,8 +2348,8 @@ Gnus considers groups from levels 1 to
 unsubscribed, @code{gnus-level-zombie} to be zombies (walking dead)
 (default 8) and @code{gnus-level-killed} to be killed (completely dead)
 (default 9).  Gnus treats subscribed and unsubscribed groups exactly the
-same, but zombie and killed groups have no information on what articles
-you have read, etc, stored.  This distinction between dead and living
+same, but zombie and killed groups store no information on what articles
+you have read, etc.  This distinction between dead and living
 groups isn't done because it is nice or clever, it is done purely for
 reasons of efficiency.
 
@@ -11140,7 +11140,7 @@ There will never be more than one dead summary buffer at any one time.
 
 @vindex gnus-use-cross-reference
 The data on the current group will be updated (which articles you have
-read, which articles you have replied to, etc.) when you exit the
+read, which articles you have replied to, etc.)@: when you exit the
 summary buffer.  If the @code{gnus-use-cross-reference} variable is
 @code{t} (which is the default), articles that are cross-referenced to
 this group and are marked as read, will also be marked as read in the
@@ -14022,7 +14022,7 @@ The address of the @acronym{NNTP} server.
 Port number to connect to the @acronym{NNTP} server.  The default is
 @samp{nntp}.  If you use @acronym{NNTP} over
 @acronym{TLS}/@acronym{SSL}, you may want to use integer ports rather
-than named ports (i.e, use @samp{563} instead of @samp{snews} or
+than named ports (i.e., use @samp{563} instead of @samp{snews} or
 @samp{nntps}), because external @acronym{TLS}/@acronym{SSL} tools may
 not work with named ports.
 
@@ -19019,7 +19019,7 @@ agent as unread.
 @subsection Agent and flags
 
 The Agent works with any Gnus back end including those, such as
-nnimap, that store flags (read, ticked, etc) on the server.  Sadly,
+nnimap, that store flags (read, ticked, etc.)@: on the server.  Sadly,
 the Agent does not actually know which backends keep their flags in
 the backend server rather than in @file{.newsrc}.  This means that the
 Agent, while unplugged or disconnected, will always record all changes
@@ -19995,7 +19995,7 @@ the article was posted from.  Time zones are such wholesome fun for the
 whole family, eh?)
 
 @item Head, Body, All
-These three match keys use the same match types as the @code{From} (etc)
+These three match keys use the same match types as the @code{From} (etc.)@:
 header uses.
 
 @item Followup
@@ -23816,7 +23816,7 @@ from Bulgarian IPs.
 
 This, unfortunately, is a great way to discard legitimate e-mail.  The
 risks of blocking a whole country (Bulgaria, Norway, Nigeria, China,
-etc.) or even a continent (Asia, Africa, Europe, etc.) from contacting
+etc.)@: or even a continent (Asia, Africa, Europe, etc.)@: from contacting
 you should be obvious, so don't do it if you have the choice.
 
 In another instance, the very informative and useful RISKS digest has
@@ -25869,7 +25869,7 @@ Fortunately, setting up the Gnus registry is pretty easy:
 
 This adds registry saves to Gnus newsrc saves (which happen on exit
 and when you press @kbd{s} from the @code{*Group*} buffer.  It also
-adds registry calls to article actions in Gnus (copy, move, etc.)  so
+adds registry calls to article actions in Gnus (copy, move, etc.)@: so
 it's not easy to undo the initialization.  See
 @code{gnus-registry-initialize} for the gory details.
 
@@ -27946,7 +27946,7 @@ consist of a little new content at the top with a long, untrimmed
 message cited below.
 
 @item
-Smileys (@samp{:-)}, @samp{;-)} etc) are now displayed graphically in
+Smileys (@samp{:-)}, @samp{;-)} etc.)@: are now displayed graphically in
 Emacs too.
 
 Put @code{(setq gnus-treat-display-smileys nil)} in @file{~/.gnus.el} to
@@ -28552,7 +28552,7 @@ A mail message or news article
 
 @item head
 @cindex head
-The top part of a message, where administrative information (etc.) is
+The top part of a message, where administrative information (etc.)@: is
 put.
 
 @item body
@@ -29501,7 +29501,7 @@ There should be no result data from this function.
 @item (nnchoke-request-set-mark GROUP ACTION &optional SERVER)
 
 Set/remove/add marks on articles.  Normally Gnus handles the article
-marks (such as read, ticked, expired etc) internally, and store them in
+marks (such as read, ticked, expired etc.)@: internally, and store them in
 @file{~/.newsrc.eld}.  Some back ends (such as @acronym{IMAP}) however carry
 all information about the articles on the server, so Gnus need to
 propagate the mark information to the server.
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index a756cc6b6c6..a432d4dc14a 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -2182,8 +2182,8 @@ operators (outside of strings and comments, of course), try this in
 @end lisp
 
 Note that the modified assignment operators which begin with a word
-(@samp{AND=}, @samp{OR=}, @samp{NOT=}, etc.) require a leading space to
-be recognized (e.g @code{vAND=4} would be interpreted as a variable
+(@samp{AND=}, @samp{OR=}, @samp{NOT=}, etc.)@: require a leading space to
+be recognized (e.g., @code{vAND=4} would be interpreted as a variable
 @code{vAND}).  Also note that since, e.g., @code{>} and @code{>=} are
 both valid operators, it is impossible to surround both by blanks while
 they are being typed.  Similarly with @code{&} and @code{&&}.  For
@@ -2195,7 +2195,7 @@ repad everything if @code{idlwave-do-actions} is on).
 @defopt idlwave-surround-by-blank (@code{nil})
 Non-@code{nil} means enable @code{idlwave-surround}.  If non-@code{nil},
 @samp{=}, @samp{<}, @samp{>}, @samp{&}, @samp{,}, @samp{->}, and the
-modified assignment operators (@samp{AND=}, @samp{OR=}, etc.) are
+modified assignment operators (@samp{AND=}, @samp{OR=}, etc.)@: are
 surrounded with spaces by @code{idlwave-surround}.
 @end defopt
 
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 0e0bd115bb2..a98c7e48e53 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1817,17 +1817,14 @@ a string nor @code{nil}, use the user name only.  However, it is highly
 unlikely that you should need to fiddle with this variable at all.
 @end table
 
-@findex yow
 @cindex Mime-Version
 In addition, you can enter conses into this list.  The @sc{car} of this cons
 should be a symbol.  This symbol's name is the name of the header, and
 the @sc{cdr} can either be a string to be entered verbatim as the value of
 this header, or it can be a function to be called.  This function should
-return a string to be inserted.  For instance, if you want to insert
-@code{Mime-Version: 1.0}, you should enter @code{(Mime-Version . "1.0")}
-into the list.  If you want to insert a funny quote, you could enter
-something like @code{(X-Yow . yow)} into the list.  The function
-@code{yow} will then be called without any arguments.
+take no arguments, and return a string to be inserted.  For
+instance, if you want to insert @code{Mime-Version: 1.0}, you should
+enter @code{(Mime-Version . "1.0")} into the list.
 
 If the list contains a cons where the @sc{car} of the cons is
 @code{optional}, the @sc{cdr} of this cons will only be inserted if it is
@@ -2344,7 +2341,7 @@ Valid values include:
 @table @code
 @item nil
 Generate the buffer name in the Message way (e.g., *mail*, *news*, *mail
-to whom*, *news on group*, etc.) and continue editing in the existing
+to whom*, *news on group*, etc.)@: and continue editing in the existing
 buffer of that name.  If there is no such buffer, it will be newly
 created.
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 7b880fc386c..16015e49362 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1426,7 +1426,7 @@ level).
 Move subtree down (swap with next subtree of same level).
 @orgcmd{M-h,org-mark-element}
 Mark the element at point.  Hitting repeatedly will mark subsequent elements
-of the one just marked.  E.g. hitting @key{M-h} on a paragraph will mark it,
+of the one just marked.  E.g., hitting @key{M-h} on a paragraph will mark it,
 hitting @key{M-h} immediately again will mark the next one.
 @orgcmd{C-c @@,org-mark-subtree}
 Mark the subtree at point.  Hitting repeatedly will mark subsequent subtrees
@@ -2439,7 +2439,7 @@ You may reference a rectangular range of fields by specifying two field
 references connected by two dots @samp{..}.  If both fields are in the
 current row, you may simply use @samp{$2..$7}, but if at least one field
 is in a different row, you need to use the general @code{@@row$column}
-format at least for the first field (i.e the reference must start with
+format at least for the first field (i.e., the reference must start with
 @samp{@@} in order to be interpreted correctly).  Examples:
 
 @example
@@ -11990,7 +11990,7 @@ resource or resource node which is known to TaskJuggler, such as
 @samp{efficiency}, @samp{journalentry}, @samp{rate} for resources or
 @samp{account}, @samp{start}, @samp{note}, @samp{duration}, @samp{end},
 @samp{journalentry}, @samp{milestone}, @samp{reference}, @samp{responsible},
-@samp{scheduling}, etc for tasks.
+@samp{scheduling}, etc.@: for tasks.
 
 @subsection Dependencies
 
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 0ee206b1a4d..312b84146fa 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -647,7 +647,7 @@ buffer.
 @vindex reftex-toc-max-level
 Change the maximum level of toc entries displayed in the @file{*toc*}
 buffer.  Without prefix arg, all levels will be included.  With prefix
-arg (e.g @kbd{3 t}), ignore all toc entries with level greater than
+arg (e.g., @kbd{3 t}), ignore all toc entries with level greater than
 @var{arg} (3 in this case).  Chapters are level 1, sections are level 2.
 The mode line @samp{T<>} indicator shows the current value.  The default
 depth can be configured with the variable
@@ -3501,7 +3501,7 @@ make use of this feature, try
 @item
 @b{@LaTeX{} commands}@*
 @cindex LaTeX commands, not found
-@code{\input}, @code{\include}, and @code{\section} (etc.) statements
+@code{\input}, @code{\include}, and @code{\section} (etc.)@: statements
 have to be first on a line (except for white space).
 
 @item
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index c70b6212268..290c18a7b47 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -169,7 +169,7 @@ typing it into a buffer, or using the contents of the selected region,
 it will store that data---unindexed, uninterpreted---in a data pool.
 It will also try to remember as much context information as possible
 (any text properties that were set, where you copied it from, when,
-how, etc).  Later, you can walk through your accumulated set of data
+how, etc.).  Later, you can walk through your accumulated set of data
 (both organized, and unorganized) and easily begin moving things
 around, and making annotations that will express the full meaning of
 that data, as far as you know it.
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index ce75f2ef91e..20bd689c6a0 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -901,7 +901,7 @@ Begins with an 014 character, followed by sets of cell-definition
 macros for each row, followed by column-widths, column-printers,
 default-printer, and header-row.  Then there's the global parameters
 (file-format ID, numrows, numcols) and the local variables (specifying
-@acronym{SES} mode for the buffer, etc.)
+@acronym{SES} mode for the buffer, etc.).
 
 When a @acronym{SES} file is loaded, first the numrows and numcols values are
 loaded, then the entire data area is @code{eval}ed, and finally the local
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index cbcd6a61f39..b84c3047ec1 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -159,7 +159,7 @@ press RET on <new script> to create a new script.
 @end example
 
 One of the scripts are highlighted, and standard point navigation
-commands (@kbd{<up>}, @kbd{<down>} etc) can be used to navigate the
+commands (@kbd{<up>}, @kbd{<down>} etc.)@: can be used to navigate the
 list.
 
 The following commands are available in the Manage Sieve buffer:
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index c017490d4aa..7227e2597ae 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1158,7 +1158,7 @@ the next line.
 Create a tag line with @var{exp-button-type} for the small expansion
 button.  This is the button that expands or contracts a node (if
 applicable), and @var{exp-button-char} the character in it (@samp{+},
-@samp{-}, @samp{?}, etc).  @var{exp-button-function} is the function
+@samp{-}, @samp{?}, etc.).  @var{exp-button-function} is the function
 to call if it's clicked on.  Button types are @code{bracket},
 @code{angle}, @code{curly}, @code{expandtag}, @code{statictag}, and
 @code{nil}.  @var{exp-button-data} is extra data attached to the text
@@ -1167,7 +1167,7 @@ forming the expansion button.
 Next, @var{tag-button} is the text of the tag.
 @var{tag-button-function} is the function to call if clicked on, and
 @var{tag-button-data} is the data to attach to the text field (such a
-tag positioning, etc).  @var{tag-button-face} is a face used for this
+tag positioning, etc.).  @var{tag-button-face} is a face used for this
 type of tag.
 
 Lastly, @var{depth} shows the depth of expansion.
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 9e9dbc0a77d..49f8f3f0959 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -890,7 +890,7 @@ containing the data cached for that URL.
 
 @c With a large cache of documents on the local disk, it can be very handy
 @c when traveling, or any other time the network connection is not active
-@c (a laptop with a dial-on-demand PPP connection, etc).  Emacs/W3 can rely
+@c (a laptop with a dial-on-demand PPP connection, etc.).  Emacs/W3 can rely
 @c solely on its cache, and avoid checking to see if the page has changed
 @c on the remote server.  In the case of a dial-on-demand PPP connection,
 @c this will keep the phone line free as long as possible, only bringing up
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 01048d43dbf..7c998b37010 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -356,7 +356,7 @@ you can abort a partially formed command by typing @kbd{C-g}.@refill
 As in Vi, searching is done by @kbd{/} and @kbd{?}.  The string will be
 searched literally by default.  To invoke a regular expression search,
 first execute the search command @kbd{/} (or @kbd{?}) with empty search
-string.  (I.e, type @kbd{/} followed by @key{RET}.)
+string.  (I.e., type @kbd{/} followed by @key{RET}.)
 A search for empty string will toggle the search mode between vanilla
 search and regular expression search.  You cannot give an offset to the
 search string.  (It is a limitation.)  By default, search will wrap around
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 9bcecf8e3de..8b4c9e93f7c 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -3204,7 +3204,7 @@ and they don't look into the value of variable
 syntax tables in order to not thwart the various major modes that set these
 tables.
 
-The usual Emacs convention is used to indicate Control Characters, i.e
+The usual Emacs convention is used to indicate Control Characters, i.e.,
 C-h for Control-h.  @emph{Do not confuse this with a sequence of separate
 characters
 C, -, h!!!} The @kbd{^} is itself, never used to indicate a
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 3e4448ed1e0..9b9f9947da5 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -904,7 +904,7 @@ for a man configuration file.  The default is
 
 @noindent
 [for GNU/Linux and Cygwin respectively.]  A trailing separator (@file{/}
-for UNIX etc.) on directories is optional and the filename matched if a
+for UNIX etc.)@: on directories is optional and the filename matched if a
 directory is specified is the first to match the regexp
 @code{man.*\.conf}.  If the environment variable @code{MANPATH} is not
 set but a configuration file is found then it is parsed instead (or as
diff --git a/etc/NEWS b/etc/NEWS
index bbee14d2ac9..770ebc17ac0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -120,6 +120,10 @@ on the given date.
 
 *** Support for ISO 8601 dates.
 
+** Dired
+
+*** New minor mode `dired-hide-details-mode' hides details.
+
 ** ERC
 
 *** New option `erc-accidental-paste-threshold-seconds'.
@@ -201,6 +205,9 @@ are obsolete.  Customize the `woman-* faces instead.
 
 *** terminal.el is obsolete; use term.el instead.
 
++++
+*** yow.el is obsolete; use fortune.el or cookie1.el instead.
+
 
 * New Modes and Packages in Emacs 24.4
 ** New nadvice.el package offering lighter-weight advice facilities.
@@ -996,7 +1003,7 @@ are deprecated and will be removed eventually.
 *** `vc-checkout-carefully'
 
 
-* Lisp changes in Emacs 24.3
+* Lisp Changes in Emacs 24.3
 
 ** CL-style generalized variables are now in core Elisp.
 `setf' is autoloaded; `push' and `pop' accept generalized variables.
@@ -1169,7 +1176,7 @@ takes precedence over most other maps for a short while (normally one key).
 *** `font-list-limit' (has had no effect since Emacs < 23)
 
 
-* Changes in Emacs 24.3 on non-free operating systems
+* Changes in Emacs 24.3 on Non-Free Operating Systems
 
 ** Cygwin builds can use the native MS Windows user interface.
 Pass `--with-w32' to configure.  The default remains the X11 interface.
@@ -2241,7 +2248,7 @@ assumes every inspected file is in your `load-path'.  It instead
 generates relative names according to the current `load-path'.
 
 
-* Lisp changes in Emacs 24.1
+* Lisp Changes in Emacs 24.1
 
 ** Code can now use lexical scoping by default instead of dynamic scoping.
 The `lexical-binding' variable enables lexical scoping for local
@@ -2628,7 +2635,7 @@ Use `post-command-hook' instead.
 *** `font-lock-maximum-size' is obsolete.
 
 
-* Changes in Emacs 24.1 on non-free operating systems
+* Changes in Emacs 24.1 on Non-Free Operating Systems
 
 ** On MS Windows, Emacs warns when using the obsolete init file _emacs,
 and also when HOME is set to C:\ by default.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18c11debf0d..eb3f4f833f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,119 @@
+2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        Use ControlMaster where applicable.  (Bug#13677)
+
+        * net/tramp.el (tramp-ssh-controlmaster-template): New defvar,
+        replacing `tramp-detect-ssh-controlmaster'.
+        (tramp-default-method): Use it.
+
+        * net/tramp-sh.el (tramp-methods) [scp, scp1, scp2, scpx, sftp]:
+        [rsync, ssh, ssh1, ssh2, sshx]: Add ControlPath and ControlMaster
+        arguments.
+        [scpc, rsyncc]: Remove methods.
+        (top): Remove completion functions for "scpc", "rsyncc", "ssh1_old"
+        and "ssh2_old".
+        (tramp-do-copy-or-rename-file-out-of-band):  Change trace level.
+        (tramp-maybe-open-connection): Reuse tmpfile for ControlPath.
+
+2013-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/package.el (package--initialized): Move before first use.
+
+2013-02-13  Jambunathan K  <kjambunathan@gmail.com>
+
+        * icomplete.el (icomplete-hide-common-prefix):  New user option.
+        (icomplete-first-match): New face.
+        (icomplete-completions): Correct handling of "complete but not
+        unique" (Bug#12638).
+
+2013-02-13  YE Qianchuan  <stool.ye@gmail.com>  (tiny change)
+
+        * descr-text.el (describe-char): Display the script (bug#13698).
+
+2013-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * tmm.el: Use lexical-binding and current-active-maps.
+        (tmm-menubar): Use map-keymap and pcase.
+        (tmm--completion-table): New function.
+        (tmm-prompt): Use it to fix the menu order.
+        (tmm-get-keybind): Use current-active-maps.
+
+2013-02-12  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        Add dired-hide-details-mode.  (Bug#6799)
+
+        * locate.el (locate-mode): Set parent mode property to dired-mode.
+
+        * find-dired.el (find-dired): Call dired-insert-set-properties on
+        initial information line.  Set process mark on end of buffer.
+        (find-dired-sentinel):
+        Call dired-insert-set-properties on summary.
+
+        * dired.el (dired-hide-details-hide-symlink-targets)
+        (dired-hide-details-hide-information-lines): New options.
+        (dired-insert-directory):
+        Set properties after final treatment of output.
+        (dired-insert-set-properties):
+        Set dired-hide-details-* properties.
+        (dired-mode-map): Bind dired-hide-details-mode.
+        (dired-mode): Set buffer-invisibility-spec to a list.
+        (dired-next-line): Skip hidden lines.
+        (dired-previous-line): Use dired-next-line.
+        (dired-hide-details-mode): New minor mode.
+        (dired-hide-details-update-invisibility-spec): New function.
+
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * play/yow.el: Move to obsolete/.  (Bug#9384)
+
+2013-02-13  Juri Linkov  <juri@jurta.org>
+
+        * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'
+        to select `ediff-control-frame' and set input focus correctly on Xfce.
+        (Bug#12218)
+
+2013-02-13  Juri Linkov  <juri@jurta.org>
+
+        * image-mode.el (image-mode-map):
+        * doc-view.el (doc-view-mode-map):
+        * vc/ediff-util.el (ediff-setup-keymap):
+        Make S-SPC scroll in the opposite sense to SPC.  (Bug#2145)
+
+2013-02-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-move-to-block): Improve
+        performance.  Instead of recalculating indentation fully for each
+        line, sum up indentation depth based only on visited lines.
+        (ruby-parse-partial): Increase the depth after "do" even when END
+        is right after it.
+        (ruby-parse-partial): When END is in the middle of a percent
+        literal, increase the depth if the delimiter chars belong to the
+        paren syntax class.
+
+2013-02-13  Kirill A. Korinskiy  <catap@catap.ru>
+
+        * play/fortune.el (fortune-compile): Also make the compiled file
+        if it does not exist at all, not just if it is old.  (Bug#5338)
+
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/package.el (package-menu-execute): Doc fix.
+
+2013-02-13  Yves Baumes  <ybaumes@gmail.com>  (tiny change)
+
+        * lisp/emacs-lisp/package.el (package-menu-execute):
+        Add optional noquery argument.  (Bug#13625)
+
+2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
+        if DIR exists and PARENTS is non-nil.
+
+2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/js.el (js--multi-line-declaration-indentation):
+        Silence byte-compiler warning.
+
 2013-02-12  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-adb.el (tramp-adb-handle-start-file-process): Rewrite.
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index b3f78780bd3..2aea0a96215 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -574,6 +574,9 @@ relevant to POS."
                         'help-echo
                         "mouse-2, RET: show this character in its character set")
                     str)))
+              ,@(let ((script (aref char-script-table char)))
+                  (if script
+                      (list (list "script" (symbol-name script)))))
               ("syntax"
                ,(let ((syntax (syntax-after pos)))
                   (with-temp-buffer
diff --git a/lisp/dired.el b/lisp/dired.el
index b5fc46eb78d..28045043c82 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -230,6 +230,18 @@ new dired buffers."
   :version "22.1"
   :group 'dired)
 
+(defcustom dired-hide-details-hide-symlink-targets t
+  "If non-nil, `dired-hide-details-mode' hides symbolic link targets."
+  :type 'boolean
+  :version "24.4"
+  :group 'dired)
+
+(defcustom dired-hide-details-hide-information-lines t
+  "Non-nil means hide lines other than header and file/dir lines."
+  :type 'boolean
+  :version "24.4"
+  :group 'dired)
+
 ;; Internal variables
 
 (defvar dired-marker-char ?*            ; the answer is 42
@@ -1196,7 +1208,6 @@ see `dired-use-ls-dired' for more details.")
       ;; Note: adjust dired-build-subdir-alist if you change this.
       (setq dir (replace-regexp-in-string "\\\\" "\\\\" dir nil t)
             dir (replace-regexp-in-string "\n" "\\n" dir nil t)))
-    (dired-insert-set-properties opoint (point))
     ;; If we used --dired and it worked, the lines are already indented.
     ;; Otherwise, indent them.
     (unless (save-excursion
@@ -1205,18 +1216,21 @@ see `dired-use-ls-dired' for more details.")
       (let ((indent-tabs-mode nil))
         (indent-rigidly opoint (point) 2)))
     ;; Insert text at the beginning to standardize things.
-    (save-excursion
-      (goto-char opoint)
-      (if (and (or hdr wildcard)
-               (not (and (looking-at "^  \\(.*\\):$")
-                         (file-name-absolute-p (match-string 1)))))
+    (let ((content-point opoint))
+      (save-excursion
+        (goto-char opoint)
+        (when (and (or hdr wildcard)
+                   (not (and (looking-at "^  \\(.*\\):$")
+                             (file-name-absolute-p (match-string 1)))))
           ;; Note that dired-build-subdir-alist will replace the name
           ;; by its expansion, so it does not matter whether what we insert
           ;; here is fully expanded, but it should be absolute.
-          (insert "  " (directory-file-name (file-name-directory dir)) ":\n"))
-      (when wildcard
-        ;; Insert "wildcard" line where "total" line would be for a full dir.
-        (insert "  wildcard " (file-name-nondirectory dir) "\n")))))
+          (insert "  " (directory-file-name (file-name-directory dir)) ":\n")
+          (setq content-point (point)))
+        (when wildcard
+          ;; Insert "wildcard" line where "total" line would be for a full dir.
+          (insert "  wildcard " (file-name-nondirectory dir) "\n")))
+      (dired-insert-set-properties content-point (point)))))
 
 (defun dired-insert-set-properties (beg end)
   "Add various text properties to the lines in the region."
@@ -1224,15 +1238,24 @@ see `dired-use-ls-dired' for more details.")
     (goto-char beg)
     (while (< (point) end)
       (condition-case nil
-          (if (dired-move-to-filename)
-              (add-text-properties
-               (point)
-               (save-excursion
-                 (dired-move-to-end-of-filename)
-                 (point))
-               '(mouse-face highlight
-                 dired-filename t
-                 help-echo "mouse-2: visit this file in other window")))
+          (if (not (dired-move-to-filename))
+              (put-text-property (line-beginning-position)
+                                 (1+ (line-end-position))
+                                 'invisible 'dired-hide-details-information)
+            (put-text-property (+ (line-beginning-position) 1) (1- (point))
+                               'invisible 'dired-hide-details-detail)
+            (add-text-properties
+             (point)
+             (progn
+               (dired-move-to-end-of-filename)
+               (point))
+             '(mouse-face
+               highlight
+               dired-filename t
+               help-echo "mouse-2: visit this file in other window"))
+            (when (< (+ (point) 4) (line-end-position))
+              (put-text-property (+ (point) 4) (line-end-position)
+                                 'invisible 'dired-hide-details-link)))
         (error nil))
       (forward-line 1))))
 
@@ -1496,6 +1519,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     ;; hiding
     (define-key map "$" 'dired-hide-subdir)
     (define-key map "\M-$" 'dired-hide-all)
+    (define-key map "(" 'dired-hide-details-mode)
     ;; isearch
     (define-key map (kbd "M-s a C-s")   'dired-do-isearch)
     (define-key map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp)
@@ -1586,6 +1610,10 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
       '(menu-item "Toggle Image Thumbnails in This Buffer" image-dired-dired-toggle-marked-thumbs
                   :help "Add or remove image thumbnails in front of marked file names"))
 
+    (define-key map [menu-bar immediate hide-details]
+      '(menu-item "Hide Details" dired-hide-details-mode
+                  :help "Hide details in buffer"
+                  :button (:toggle . dired-hide-details-mode)))
     (define-key map [menu-bar immediate revert-buffer]
       '(menu-item "Refresh" revert-buffer
                   :help "Update contents of shown directories"))
@@ -1914,6 +1942,9 @@ Keybindings:
         selective-display t             ; for subdirectory hiding
         mode-line-buffer-identification
         (propertized-buffer-identification "%17b"))
+  ;; Ignore dired-hide-details-* value of invisible text property by default.
+  (when (eq buffer-invisibility-spec t)
+    (setq buffer-invisibility-spec (list t)))
   (set (make-local-variable 'revert-buffer-function)
        (function dired-revert))
   (set (make-local-variable 'buffer-stale-function)
@@ -1978,15 +2009,20 @@ Otherwise, call `toggle-read-only'."
   "Move down lines then position at filename.
 Optional prefix ARG says how many lines to move; default is one line."
   (interactive "p")
-  (forward-line arg)
+  (let ((line-move-visual)
+        (goal-column))
+    (line-move arg t))
+  ;; We never want to move point into an invisible line.
+  (while (and (invisible-p (point))
+              (not (if (and arg (< arg 0)) (bobp) (eobp))))
+    (forward-char (if (and arg (< arg 0)) -1 1)))
   (dired-move-to-filename))
 
 (defun dired-previous-line (arg)
   "Move up lines then position at filename.
 Optional prefix ARG says how many lines to move; default is one line."
   (interactive "p")
-  (forward-line (- arg))
-  (dired-move-to-filename))
+  (dired-next-line (- (or arg 1))))
 
 (defun dired-next-dirline (arg &optional opoint)
   "Goto ARG'th next directory file line."
@@ -2230,6 +2266,40 @@ unchanged."
       (substring file (match-end 0))
     file))
 
+;;; Minor mode for hiding details
+;;;###autoload
+(define-minor-mode dired-hide-details-mode
+  "Hide details in `dired-mode'."
+  :group 'dired
+  (unless (derived-mode-p 'dired-mode)
+    (error "Not a Dired buffer"))
+  (dired-hide-details-update-invisibility-spec)
+  (if dired-hide-details-mode
+      (add-hook 'wdired-mode-hook
+                'dired-hide-details-update-invisibility-spec
+                nil
+                t)
+    (remove-hook 'wdired-mode-hook
+                 'dired-hide-details-update-invisibility-spec
+                 t)))
+
+(defun dired-hide-details-update-invisibility-spec ()
+  (funcall (if dired-hide-details-mode
+               'add-to-invisibility-spec
+             'remove-from-invisibility-spec)
+           'dired-hide-details-detail)
+  (funcall (if (and dired-hide-details-mode
+                    dired-hide-details-hide-information-lines)
+               'add-to-invisibility-spec
+             'remove-from-invisibility-spec)
+           'dired-hide-details-information)
+  (funcall (if (and dired-hide-details-mode
+                    dired-hide-details-hide-symlink-targets
+                    (not (derived-mode-p 'wdired-mode)))
+               'add-to-invisibility-spec
+             'remove-from-invisibility-spec)
+           'dired-hide-details-link))
+
 ;;; Functions for finding the file name in a dired buffer line.
 
 (defvar dired-permission-flags-regexp
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index dcc28a52322..89d2edd3dbb 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -390,6 +390,7 @@ Typically \"page-%s.png\".")
     (define-key map [remap forward-page]  'doc-view-next-page)
     (define-key map [remap backward-page] 'doc-view-previous-page)
     (define-key map (kbd "SPC")       'doc-view-scroll-up-or-next-page)
+    (define-key map (kbd "S-SPC")     'doc-view-scroll-down-or-previous-page)
     (define-key map (kbd "DEL")       'doc-view-scroll-down-or-previous-page)
     (define-key map (kbd "C-n")       'doc-view-next-line-or-next-page)
     (define-key map (kbd "<down>")    'doc-view-next-line-or-next-page)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index dd828691158..c15c9e079fe 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -735,6 +735,8 @@ It will move point to somewhere in the headers."
     (package--with-work-buffer location file
       (package-unpack name version))))
 
+(defvar package--initialized nil)
+
 (defun package-installed-p (package &optional min-version)
   "Return true if PACKAGE, of MIN-VERSION or newer, is installed.
 MIN-VERSION should be a version list."
@@ -896,8 +898,6 @@ using `package-compute-transaction'."
                                      package-user-dir)
       (package-activate elt (version-to-list v-string)))))
 
-(defvar package--initialized nil)
-
 ;;;###autoload
 (defun package-install (name)
   "Install the package named NAME.
@@ -1591,10 +1591,11 @@ call will upgrade the package."
                (length upgrades)
                (if (= (length upgrades) 1) "" "s")))))
 
-(defun package-menu-execute ()
+(defun package-menu-execute (&optional noquery)
   "Perform marked Package Menu actions.
 Packages marked for installation are downloaded and installed;
-packages marked for deletion are removed."
+packages marked for deletion are removed.
+Optional argument NOQUERY non-nil means do not ask the user to confirm."
   (interactive)
   (unless (derived-mode-p 'package-menu-mode)
     (error "The current buffer is not in Package Menu mode"))
@@ -1614,16 +1615,20 @@ packages marked for deletion are removed."
                  (push (car id) install-list))))
         (forward-line)))
     (when install-list
-      (if (yes-or-no-p
+      (if (or
+           noquery
+           (yes-or-no-p
            (if (= (length install-list) 1)
                (format "Install package `%s'? " (car install-list))
              (format "Install these %d packages (%s)? "
                      (length install-list)
-                     (mapconcat 'symbol-name install-list ", "))))
+                      (mapconcat 'symbol-name install-list ", ")))))
           (mapc 'package-install install-list)))
     ;; Delete packages, prompting if necessary.
     (when delete-list
-      (if (yes-or-no-p
+      (if (or
+           noquery
+           (yes-or-no-p
            (if (= (length delete-list) 1)
                (format "Delete package `%s-%s'? "
                        (caar delete-list)
@@ -1633,7 +1638,7 @@ packages marked for deletion are removed."
                      (mapconcat (lambda (elt)
                                   (concat (car elt) "-" (cdr elt)))
                                 delete-list
-                                ", "))))
+                                 ", ")))))
           (dolist (elt delete-list)
             (condition-case-unless-debug err
                 (package-delete (car elt) (cdr elt))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3245c31384a..f3d54782897 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-13  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * erc-match.el (erc-match-message): Fix last commit.
+
 2013-02-12  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
         * erc-match.el (erc-match-message):
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 1da838557f7..63683890226 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -447,7 +447,7 @@ Use this defun with `erc-insert-modify-hook'."
                         (nth 0 (erc-parse-user nickuserhost))))
          (old-pt (point))
          (nick-beg (and nickname
-                        (re-search-forward "\\(\\* \\)?"(regexp-quote nickname)
+                        (re-search-forward (regexp-quote nickname)
                                            (point-max) t)
                         (match-beginning 0)))
          (nick-end (when nick-beg
@@ -455,14 +455,14 @@ Use this defun with `erc-insert-modify-hook'."
          (message (buffer-substring
                    (if (and nick-end
                             (<= (+ 2 nick-end) (point-max)))
+                       ;; Message starts 2 characters after the nick
+                       ;; except for CTCP ACTION messages.  Nick
+                       ;; surrounded by angle brackets only in normal
+                       ;; messages.
                        (+ nick-end
-                          ;; Message starts 2 characters after the nick except
-                          ;; for CTCP ACTION messages.
-                          (if (string= "* "
-                                       (buffer-substring (- nick-beg 2)
-                                                         nick-beg))
-                              1
-                            2))
+                          (if (eq ?> (char-after nick-end))
+                              2
+                            1))
                      (point-min))
                    (point-max))))
     (when (and vector
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index ae7cc1c8629..f9a0c015bf7 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -210,13 +210,15 @@ use in place of \"-ls\" as the final argument."
     (insert "  " dir ":\n")
     ;; Make second line a ``find'' line in analogy to the ``total'' or
     ;; ``wildcard'' line.
-    (insert "  " args "\n")
+    (let ((point (point)))
+      (insert "  " args "\n")
+      (dired-insert-set-properties point (point)))
     (setq buffer-read-only t)
     (let ((proc (get-buffer-process (current-buffer))))
       (set-process-filter proc (function find-dired-filter))
       (set-process-sentinel proc (function find-dired-sentinel))
       ;; Initialize the process marker; it is used by the filter.
-      (move-marker (process-mark proc) 1 (current-buffer)))
+      (move-marker (process-mark proc) (point) (current-buffer)))
     (setq mode-line-process '(":%s"))))
 
 (defun kill-find ()
@@ -337,10 +339,11 @@ use in place of \"-ls\" as the final argument."
           (let ((buffer-read-only nil))
             (save-excursion
               (goto-char (point-max))
-              (insert "\n  find " state)
-              (forward-char -1)         ;Back up before \n at end of STATE.
-              (insert " at " (substring (current-time-string) 0 19))
-              (forward-char 1)
+              (let ((point (point)))
+                (insert "\n  find " state)
+                (forward-char -1)               ;Back up before \n at end of STATE.
+                (insert " at " (substring (current-time-string) 0 19))
+                (dired-insert-set-properties point (point)))
               (setq mode-line-process
                     (concat ":"
                             (symbol-name (process-status proc))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4c27eea1602..14499a8fafc 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-13  Juri Linkov  <juri@jurta.org>
+
+        * gnus-art.el (gnus-article-mode-map):
+        * gnus-sum.el (gnus-summary-mode-map, gnus-summary-article-map):
+        Make S-SPC scroll in the opposite sense to SPC.  (Bug#2145)
+
 2013-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nnir.el ("nnir"): Add 'virtual ability to nnir backend.  (This was
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 25a555f3d8b..13d9b4e5c28 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4361,6 +4361,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 
 (gnus-define-keys gnus-article-mode-map
   " " gnus-article-goto-next-page
+  [?\S-\ ] gnus-article-goto-prev-page
   "\177" gnus-article-goto-prev-page
   [delete] gnus-article-goto-prev-page
   [backspace] gnus-article-goto-prev-page
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 700d319228f..2c45d3c24a1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4377,7 +4377,7 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting."
 (defun gnus-group-browse-foreign-server (method)
   "Browse a foreign news server.
 If called interactively, this function will ask for a select method
- (nntp, nnspool, etc.) and a server address (eg. nntp.some.where).
+ (nntp, nnspool, etc.) and a server address (e.g., nntp.some.where).
 If not, METHOD should be a list where the first element is the method
 and the second element is the address."
   (interactive
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index aa8b6bf2703..48bb99bfbce 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -121,7 +121,7 @@ This variable can be a list of select methods which Gnus will query with
 the `ask-server' method in addition to the primary, secondary, and archive
 servers.
 
-Eg.
+E.g.:
   (setq gnus-check-new-newsgroups
         '((nntp \"some.server\") (nntp \"other.server\")))
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 658863f9f00..183eabca6dc 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1819,6 +1819,7 @@ increase the score of each group you read."
 
 (gnus-define-keys gnus-summary-mode-map
   " " gnus-summary-next-page
+  [?\S-\ ] gnus-summary-prev-page
   "\177" gnus-summary-prev-page
   [delete] gnus-summary-prev-page
   [backspace] gnus-summary-prev-page
@@ -2058,6 +2059,7 @@ increase the score of each group you read."
 (gnus-define-keys (gnus-summary-article-map "A" gnus-summary-mode-map)
   " " gnus-summary-next-page
   "n" gnus-summary-next-page
+  [?\S-\ ] gnus-summary-prev-page
   "\177" gnus-summary-prev-page
   [delete] gnus-summary-prev-page
   "p" gnus-summary-prev-page
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 85a6d5639a1..a266567987d 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -179,7 +179,7 @@ is to be performed in, and it should return an integer that says how
 many days an article can be stored before it is considered \"old\".
 It can also return the values `never' and `immediate'.
 
-Eg.:
+E.g.:
 
 \(setq nnmail-expiry-wait-function
       (lambda (newsgroup)
@@ -291,7 +291,7 @@ directory.  This hook is called after the incoming mail box has been
 emptied, and can be used to call any mail box programs you have
 running (\"xwatch\", etc.)
 
-Eg.
+E.g.:
 
 \(add-hook 'nnmail-read-incoming-hook
           (lambda ()
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 7e391c03778..2c2775dfbd7 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -214,7 +214,7 @@ Enabling this will have OpenSSL check the signers certificate
 against a certificate revocation list (CRL).
 
 For this to work the CRL must be up-to-date and since they are
-normally updated quite often (ie. several times a day) you
+normally updated quite often (i.e., several times a day) you
 probably need some tool to keep them up-to-date. Unfortunately
 Gnus cannot do this for you.
 
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 13181ff0e3c..2ee492b4c5e 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -311,8 +311,8 @@ A sample format:
   000000c0: 7265 6769 6f6e 2e0a                      region..
 
 Movement is as simple as movement in a normal Emacs text buffer.  Most
-cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
-to move the cursor left, right, down, and up).
+cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
+to move the cursor left, right, down, and up.
 
 Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are
 also supported.
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 8e4dd69e199..1f9b4a3afe6 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -76,6 +76,18 @@
   :type 'string
   :version "24.4")
 
+(defcustom icomplete-hide-common-prefix t
+  "When non-nil, hide common prefix from completion candidates.
+When nil, show candidates in full."
+  :type 'boolean
+  :version "24.4"
+  :group 'icomplete)
+
+(defface icomplete-first-match  '((t :weight bold))
+  "Face used by icomplete for highlighting first match."
+  :version "24.4"
+  :group 'icomplete)
+
 ;;;_* User Customization variables
 (defcustom icomplete-prospects-height
   ;; 20 is an estimated common size for the prompt + minibuffer content, to
@@ -344,7 +356,8 @@ are exhibited within the square braces.)"
                                 (t (concat "…" (substring most compare))))
                                close-bracket)))
              ;;"-prospects" - more than one candidate
-             (prospects-len (+ (length determ)
+             (prospects-len (+ (string-width
+                                (or determ (concat open-bracket close-bracket)))
                                (string-width icomplete-separator)
                                3 ;; take {…} into account
                                (string-width (buffer-string))))
@@ -355,6 +368,8 @@ are exhibited within the square braces.)"
                     ;; one line, increase the allowable space accordingly.
                     (/ prospects-len (window-width)))
                  (window-width)))
+             (prefix (when icomplete-hide-common-prefix
+                       (try-completion "" comps)))
              (prefix-len
               ;; Find the common prefix among `comps'.
               ;; We can't use the optimization below because its assumptions
@@ -364,37 +379,55 @@ are exhibited within the square braces.)"
               ;;     ;; Common case.
               ;;     (length most)
               ;; Else, use try-completion.
-              (let ((comps-prefix (try-completion "" comps)))
-                (and (stringp comps-prefix)
-                     (length comps-prefix)))) ;;)
-
-             prospects most-is-exact comp limit)
+              (and (stringp prefix) (length prefix))) ;;)
+             prospects comp limit)
         (if (eq most-try t) ;; (or (null (cdr comps))
             (setq prospects nil)
+          (when (member name comps)
+            ;; NAME is complete but not unique.  This scenario poses
+            ;; following UI issues:
+            ;;
+            ;; - When `icomplete-hide-common-prefix' is non-nil, NAME
+            ;;   is stripped empty.  This would make the entry
+            ;;   inconspicuous.
+            ;;
+            ;; - Due to sorting of completions, NAME may not be the
+            ;;   first of the prospects and could be hidden deep in
+            ;;   the displayed string.
+            ;;
+            ;; - Because of `icomplete-prospects-height' , NAME may
+            ;;   not even be displayed to the user.
+            ;;
+            ;; To circumvent all the above problems, provide a visual
+            ;; cue to the user via an "empty string" in the try
+            ;; completion field.
+            (setq determ (concat open-bracket "" close-bracket)))
+          ;; Compute prospects for display.
           (while (and comps (not limit))
             (setq comp
                   (if prefix-len (substring (car comps) prefix-len) (car comps))
                   comps (cdr comps))
-            (cond ((string-equal comp "") (setq most-is-exact t))
-                  ((member comp prospects))
-                  (t (setq prospects-len
+            (setq prospects-len
                            (+ (string-width comp)
                               (string-width icomplete-separator)
                               prospects-len))
                      (if (< prospects-len prospects-max)
                          (push comp prospects)
-                       (setq limit t))))))
+              (setq limit t))))
+        (setq prospects (nreverse prospects))
+        ;; Decorate first of the prospects.
+        (when prospects
+          (let ((first (copy-sequence (pop prospects))))
+            (put-text-property 0 (length first)
+                               'face 'icomplete-first-match first)
+            (push first prospects)))
         ;; Restore the base-size info, since completion-all-sorted-completions
         ;; is cached.
         (if last (setcdr last base-size))
         (if prospects
             (concat determ
                     "{"
-                    (and most-is-exact
-                         (substring icomplete-separator
-                                    (string-match "[^ ]" icomplete-separator)))
-                    (mapconcat 'identity (nreverse prospects)
-                               icomplete-separator)
+                    (mapconcat 'identity prospects icomplete-separator)
                     (and limit (concat icomplete-separator "…"))
                     "}")
           (concat determ " [Matched]"))))))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 6a13d528037..196336717db 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -337,6 +337,7 @@ call."
     (set-keymap-parent map special-mode-map)
     (define-key map "\C-c\C-c" 'image-toggle-display)
     (define-key map (kbd "SPC")       'image-scroll-up)
+    (define-key map (kbd "S-SPC")     'image-scroll-down)
     (define-key map (kbd "DEL")       'image-scroll-down)
     (define-key map (kbd "RET")       'image-toggle-animation)
     (define-key map "n" 'image-next-file)
diff --git a/lisp/locate.el b/lisp/locate.el
index 804260969ee..ab0417070e7 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -496,6 +496,7 @@ do not work in subdirectories.
   (setq revert-buffer-function 'locate-update)
   (set (make-local-variable 'page-delimiter) "\n\n")
   (run-mode-hooks 'locate-mode-hook))
+(put 'locate-mode 'derived-mode-parent 'dired-mode)
 
 (defun locate-do-setup (search-string)
   (goto-char (point-min))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 5e9ba6d9cea..2b8c7ae145b 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4084,7 +4084,8 @@ directory, so that Emacs will know its current contents."
         (or (file-exists-p parent)
             (ange-ftp-make-directory parent parents))))
   (if (file-exists-p dir)
-      (error "Cannot make directory %s: file already exists" dir)
+      (unless parents
+        (error "Cannot make directory %s: file already exists" dir))
     (let ((parsed (ange-ftp-ftp-name dir)))
       (if parsed
           (let* ((host (nth 0 parsed))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 0c2a0aa385a..001a27f3b2e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -109,31 +109,17 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-copy-keep-date       t)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
- '("scp"
-   (tramp-login-program        "ssh")
-   (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
-   (tramp-async-args           (("-q")))
-   (tramp-remote-shell         "/bin/sh")
-   (tramp-remote-shell-args    ("-c"))
-   (tramp-copy-program         "scp")
-   (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
-   (tramp-copy-keep-date       t)
-   (tramp-copy-recursive       t)
-   (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
-                                ("-o" "UserKnownHostsFile=/dev/null")
-                                ("-o" "StrictHostKeyChecking=no")))
-   (tramp-default-port         22)))
-;;;###tramp-autoload
-(add-to-list 'tramp-methods
-  '("scp1"
+  `("scp"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-1") ("-e" "none") ("%h")))
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
+    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")
+                                 ,tramp-ssh-controlmaster-template))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
@@ -142,15 +128,17 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("scp2"
+  `("scp1"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-2") ("-e" "none") ("%h")))
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-1") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
+    (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r")
+                                 ,tramp-ssh-controlmaster-template))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
@@ -159,19 +147,17 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("scpc"
+  `("scp2"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-o" "ControlPath=%t.%%r@%%h:%%p")
-                                 ("-o" "ControlMaster=yes")
-                                 ("-e" "none") ("%h")))
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-2") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")
-                                 ("-o" "ControlPath=%t.%%r@%%h:%%p")
-                                 ("-o" "ControlMaster=auto")))
+    (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r")
+                                 ,tramp-ssh-controlmaster-template))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
@@ -180,16 +166,17 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("scpx"
+  `("scpx"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-e" "none") ("-t" "-t")
-                                 ("%h") ("/bin/sh")))
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
+    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")
+                                 ,tramp-ssh-controlmaster-template))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
@@ -198,33 +185,22 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("sftp"
+  `("sftp"
     (tramp-login-program        "ssh")
-    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
-    (tramp-async-args           (("-q")))
-    (tramp-remote-shell         "/bin/sh")
-    (tramp-remote-shell-args    ("-c"))
-    (tramp-copy-program         "sftp")))
-;;;###tramp-autoload
-(add-to-list 'tramp-methods
-  '("rsync"
-    (tramp-login-program        "ssh")
-    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
-    (tramp-copy-program         "rsync")
-    (tramp-copy-args            (("-e" "ssh") ("-t" "%k") ("-r")))
-    (tramp-copy-keep-date       t)
-    (tramp-copy-keep-tmpfile    t)
-    (tramp-copy-recursive       t)))
-;;;###tramp-autoload
+    (tramp-copy-program         "sftp")
+    (tramp-copy-args            ,tramp-ssh-controlmaster-template)))
+ ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  `("rsyncc"
+  `("rsync"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-o" "ControlPath=%t.%%r@%%h:%%p")
-                                 ("-o" "ControlMaster=yes")
+                                 ,tramp-ssh-controlmaster-template
                                  ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
@@ -232,10 +208,11 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-copy-program         "rsync")
     (tramp-copy-args            (("-t" "%k") ("-r")))
     (tramp-copy-env             (("RSYNC_RSH")
-                                 (,(concat
-                                    "ssh"
-                                    " -o ControlPath=%t.%%r@%%h:%%p"
-                                    " -o ControlMaster=auto"))))
+                                 (,(mapconcat
+                                    'identity
+                                    (append
+                                     '("ssh") tramp-ssh-controlmaster-template)
+                                    " "))))
     (tramp-copy-keep-date       t)
     (tramp-copy-keep-tmpfile    t)
     (tramp-copy-recursive       t)))
@@ -255,9 +232,11 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("ssh"
+  `("ssh"
     (tramp-login-program        "ssh")
-    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
+    (tramp-login-args           (("-l" "%u") ("-p" "%p")
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
@@ -267,9 +246,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("ssh1"
+  `("ssh1"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
+                                 ,tramp-ssh-controlmaster-template
                                  ("-1") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
@@ -280,9 +260,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("ssh2"
+  `("ssh2"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
+                                 ,tramp-ssh-controlmaster-template
                                  ("-2") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
@@ -293,11 +274,11 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-default-port         22)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
-  '("sshx"
+  `("sshx"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
-                                 ("-e" "none") ("-t" "-t")
-                                 ("%h") ("/bin/sh")))
+                                 ,tramp-ssh-controlmaster-template
+                                 ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh")))
     (tramp-async-args           (("-q")))
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
@@ -473,21 +454,14 @@ detected as prompt when being sent on echoing hosts, therefore.")
      (tramp-set-completion-function "scp" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "scp1" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "scp2" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function "scpc" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "scpx" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "sftp" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "rsync" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "rsyncc" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "rsh" tramp-completion-function-alist-rsh)
      (tramp-set-completion-function "remsh" tramp-completion-function-alist-rsh)
      (tramp-set-completion-function "ssh" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "ssh1" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "ssh2" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh1_old" tramp-completion-function-alist-ssh)
-     (tramp-set-completion-function
-      "ssh2_old" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function "sshx" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function
       "telnet" tramp-completion-function-alist-telnet)
@@ -2419,7 +2393,7 @@ The method used must be an out-of-band method."
                  v "process-buffer" (current-buffer))
                 (while copy-env
                   (tramp-message
-                   orig-vec 5 "%s=\"%s\"" (car copy-env) (cadr copy-env))
+                   orig-vec 6 "%s=\"%s\"" (car copy-env) (cadr copy-env))
                   (setenv (pop copy-env) (pop copy-env)))
 
                 ;; Use an asynchronous process.  By this, password can
@@ -4478,14 +4452,16 @@ connection if a previous connection has died for some reason."
                          ;; temporary file has another name, and it is
                          ;; created and protected by ssh.  It is also
                          ;; removed by ssh when the connection is
-                         ;; closed.
+                         ;; closed.  The temporary file name is cached
+                         ;; in the main connection process, therefore
+                         ;; we cannot use `tramp-get-connection-process'.
                          (tmpfile
-                          (tramp-set-connection-property
-                           p "temp-file"
-                           (make-temp-name
-                            (expand-file-name
-                             tramp-temp-name-prefix
-                             (tramp-compat-temporary-file-directory)))))
+                          (with-tramp-connection-property
+                              (get-process (tramp-buffer-name vec)) "temp-file"
+                            (make-temp-name
+                             (expand-file-name
+                              tramp-temp-name-prefix
+                              (tramp-compat-temporary-file-directory)))))
                          spec r-shell)
 
                     ;; Add arguments for asynchronous processes.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 7743e10c8d4..a4250f94988 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -280,15 +280,18 @@ started on the local host.  You should specify a remote host
 `localhost' or the name of the local host.  Another host name is
 useful only in combination with `tramp-default-proxies-alist'.")
 
-(defun tramp-detect-ssh-controlmaster ()
-  "Call ssh to detect whether it supports the ControlMaster argument.
-This function may return nil when the argument is supported, but
-shouldn't return t when it isn't."
-  (ignore-errors
-    (with-temp-buffer
-      (call-process "ssh" nil t nil "-o" "ControlMaster")
-      (goto-char (point-min))
-      (search-forward-regexp "Missing ControlMaster argument" nil t))))
+;;;###tramp-autoload
+(defvar tramp-ssh-controlmaster-template
+    (ignore-errors
+      (with-temp-buffer
+        (call-process "ssh" nil t nil "-o" "ControlMaster")
+        (goto-char (point-min))
+        (when (search-forward-regexp "Missing ControlMaster argument" nil t)
+          '("-o" "ControlPath=%t.%%r@%%h:%%p"
+            "-o" "ControlMaster=auto"
+            "-o" "ControlPersist=no"))))
+    "Call ssh to detect whether it supports the ControlMaster argument.
+Return a template to be used in `tramp-methods'.")
 
 (defcustom tramp-default-method
   ;; An external copy method seems to be preferred, because it performs
@@ -297,8 +300,9 @@ shouldn't return t when it isn't."
   ;; permanent password queries.  Either a password agent like
   ;; "ssh-agent" or "Pageant" shall run, or the optional
   ;; password-cache.el or auth-sources.el packages shall be active for
-  ;; password caching.  "scpc" is chosen if we detect that the user is
-  ;; running OpenSSH 4.0 or newer.
+  ;; password caching.  If we detect that the user is running OpenSSH
+  ;; 4.0 or newer, we could reuse the connection, which calls also for
+  ;; an external method.
   (cond
    ;; PuTTY is installed.  We don't take it, if it is installed on a
    ;; non-windows system, or pscp from the pssh (parallel ssh) package
@@ -314,16 +318,16 @@ shouldn't return t when it isn't."
       "plink"))
    ;; There is an ssh installation.
    ((executable-find "scp")
-    (cond
-     ((tramp-detect-ssh-controlmaster) "scpc")
-     ((or (fboundp 'password-read)
-          (fboundp 'auth-source-user-or-password)
-          (fboundp 'auth-source-search)
-          ;; ssh-agent is running.
-          (getenv "SSH_AUTH_SOCK")
-          (getenv "SSH_AGENT_PID"))
-      "scp")
-     (t "ssh")))
+    (if (or (fboundp 'password-read)
+            (fboundp 'auth-source-user-or-password)
+            (fboundp 'auth-source-search)
+            ;; ssh-agent is running.
+            (getenv "SSH_AUTH_SOCK")
+            (getenv "SSH_AGENT_PID")
+            ;; We could reuse the connection.
+            tramp-ssh-controlmaster-template)
+        "scp"
+      "ssh"))
    ;; Fallback.
    (t "ftp"))
   "Default method to use for transferring files.
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 6c25d903feb..2ee73235dd0 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -159,12 +159,12 @@ This is not used directly, but only via inheritance by other faces."
 
 (defface nxml-comment-delimiter
   '((t (:inherit font-lock-comment-delimiter-face)))
-  "Face used for the delimiters of comments, i.e <!-- and -->."
+  "Face used for the delimiters of comments, i.e., <!-- and -->."
   :group 'nxml-faces)
 
 (defface nxml-processing-instruction-delimiter
   '((t (:inherit nxml-delimiter)))
-  "Face used for the delimiters of processing instructions, i.e <? and ?>."
+  "Face used for the delimiters of processing instructions, i.e., <? and ?>."
   :group 'nxml-faces)
 
 (defface nxml-processing-instruction-target
@@ -179,7 +179,7 @@ This is not used directly, but only via inheritance by other faces."
 
 (defface nxml-cdata-section-delimiter
   '((t (:inherit nxml-delimiter)))
-  "Face used for the delimiters of CDATA sections, i.e <![, [, and ]]>."
+  "Face used for the delimiters of CDATA sections, i.e., <![, [, and ]]>."
   :group 'nxml-faces)
 
 (defface nxml-cdata-section-CDATA
@@ -200,7 +200,7 @@ This includes ths `x' in hex references."
 
 (defface nxml-char-ref-delimiter
   '((t (:inherit nxml-ref)))
-  "Face used for the delimiters of character references, i.e &# and ;."
+  "Face used for the delimiters of character references, i.e., &# and ;."
   :group 'nxml-faces)
 
 (defface nxml-entity-ref-name
@@ -210,7 +210,7 @@ This includes ths `x' in hex references."
 
 (defface nxml-entity-ref-delimiter
   '((t (:inherit nxml-ref)))
-  "Face used for the delimiters of entity references, i.e & and ;."
+  "Face used for the delimiters of entity references, i.e., & and ;."
   :group 'nxml-faces)
 
 (defface nxml-tag-delimiter
diff --git a/lisp/play/yow.el b/lisp/obsolete/yow.el
index 10c69347469..42bb0a0b354 100644
--- a/lisp/play/yow.el
+++ b/lisp/obsolete/yow.el
@@ -5,6 +5,7 @@
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik
 ;; Keywords: games
+;; Obsolete-since: 24.4
 
 ;; This file is part of GNU Emacs.
 
@@ -24,6 +25,8 @@
 ;;; Commentary:
 
 ;; Important pinheadery for GNU Emacs.
+;; This file is obsolete.  For similar functionality, see
+;; fortune.el and cookie1.el.
 
 ;;; Code:
 
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 6a0b8eee45c..5be14771961 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -3668,7 +3668,7 @@ containing the secondary string.  It is used to set correctly
 (defun org-element-map (data types fun &optional info first-match no-recursion)
   "Map a function on selected elements or objects.
 
-DATA is an Org buffer parse tree, as returned by, i.e,
+DATA is an Org buffer parse tree, as returned by, i.e.,
 `org-element-parse-buffer'.  TYPES is a symbol or list of symbols
 of elements or objects types (see `org-element-all-elements' and
 `org-element-all-objects' for a complete list of types).  FUN is
diff --git a/lisp/org/org.el b/lisp/org/org.el
index bba52a8b63a..ede633a0a93 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -928,7 +928,7 @@ nil, don't do anything special at the beginning of the buffer."
 (defcustom org-cycle-level-after-item/entry-creation t
   "Non-nil means cycle entry level or item indentation in new empty entries.
 
-When the cursor is at the end of an empty headline, i.e with only stars
+When the cursor is at the end of an empty headline, i.e., with only stars
 and maybe a TODO keyword, TAB will then switch the entry to become a child,
 and then all possible ancestor states, before returning to the original state.
 This makes data entry extremely fast:  M-RET to create a new headline,
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 17ab6f98254..0920012b280 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -244,15 +244,17 @@ the value of `fortune-file'.  This currently cannot handle directories."
   (let* ((fortune-file (expand-file-name (substitute-in-file-name file)))
          (fortune-dat (expand-file-name
                        (substitute-in-file-name
-                        (concat fortune-file fortune-database-extension)))))
-  (cond ((file-exists-p fortune-file)
-         (if (file-exists-p fortune-dat)
-             (cond ((file-newer-than-file-p fortune-file fortune-dat)
-                    (message "Compiling new fortune database %s" fortune-dat)
-                    (shell-command
-                     (concat fortune-strfile fortune-strfile-options
-                             " " fortune-file fortune-quiet-strfile-options))))))
-        (t (error "Can't compile fortune file %s" fortune-file)))))
+                        (concat fortune-file fortune-database-extension))))
+         (fortune-dat-exist (file-exists-p fortune-dat)))
+    (cond ((file-exists-p fortune-file)
+           (if (or (not fortune-dat-exist)
+                   (and fortune-dat-exist
+                        (file-newer-than-file-p fortune-file fortune-dat)))
+               (message "Compiling new fortune database %s" fortune-dat)
+             (shell-command
+              (concat fortune-strfile fortune-strfile-options
+                      " " fortune-file fortune-quiet-strfile-options))))
+          (t (error "Can't compile fortune file %s" fortune-file)))))
 
 
 ;;; **************
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index b552b68c4b7..cb8d2d23c84 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -53,7 +53,7 @@
 (defun c-lineup-topmost-intro-cont (langelem)
   "Line up declaration continuation lines zero or one indentation step.
 For lines in the \"header\" of a definition, zero is used.  For other
-lines, `c-basic-offset' is added to the indentation.  E.g:
+lines, `c-basic-offset' is added to the indentation.  E.g.:
 
 int
 neg (int i)           <- c-lineup-topmost-intro-cont
@@ -165,7 +165,7 @@ Works with: topmost-intro-cont."
 As a special case, if the indented line is inside a brace block
 construct, the indentation is `c-basic-offset' only.  This is intended
 as a \"DWIM\" measure in cases like macros that contains statement
-blocks, e.g:
+blocks, e.g.:
 
 A_VERY_LONG_MACRO_NAME ({
         some (code, with + long, lines * in[it]);
@@ -340,7 +340,7 @@ Works with: arglist-cont, arglist-cont-nonempty."
 (defun c-lineup-close-paren (langelem)
   "Line up the closing paren under its corresponding open paren if the
 open paren is followed by code.  If the open paren ends its line, no
-indentation is added.  E.g:
+indentation is added.  E.g.:
 
 main (int,              main (
       char **               int, char **
@@ -394,7 +394,7 @@ Works with: stream-op."
 
 (defun c-lineup-multi-inher (langelem)
   "Line up the classes in C++ multiple inheritance clauses and member
-initializers under each other.  E.g:
+initializers under each other.  E.g.:
 
 class Foo:                Foo::Foo (int a, int b):
     public Cyphr,             Cyphr (a),
@@ -439,7 +439,7 @@ Works with: inher-cont, member-init-cont."
 If class names follow on the same line as the implements/extends
 keyword, they are lined up under each other.  Otherwise, they are
 indented by adding `c-basic-offset' to the column of the keyword.
-E.g:
+E.g.:
 
 class Foo             class Foo
     extends               extends Cyphr,
@@ -461,7 +461,7 @@ If exception names follow on the same line as the throws keyword,
 they are lined up under each other.  Otherwise, they are indented by
 adding `c-basic-offset' to the column of the throws keyword.  The
 throws keyword itself is also indented by `c-basic-offset' from the
-function declaration start if it doesn't hang.  E.g:
+function declaration start if it doesn't hang.  E.g.:
 
 int foo()           int foo() throws Cyphr,
     throws     <->                   Bar,    <- c-lineup-java-throws
@@ -485,7 +485,7 @@ Works with: func-decl-cont."
 
 (defun c-indent-one-line-block (langelem)
   "Indent a one line block `c-basic-offset' extra.
-E.g:
+E.g.:
 
 if (n > 0)                 if (n > 0)
     {m+=n; n=0;}    <->    {               <- c-indent-one-line-block
@@ -508,7 +508,7 @@ Work with: Almost all syntactic symbols, but most useful on *-open."
 
 (defun c-indent-multi-line-block (langelem)
   "Indent a multi line block `c-basic-offset' extra.
-E.g:
+E.g.:
 
 int *foo[] = {           int *foo[] = {
     NULL,                    NULL,
@@ -670,7 +670,7 @@ Works with: comment-intro."
 (defun c-lineup-knr-region-comment (langelem)
   "Line up a comment in the \"K&R region\" with the declaration.
 That is the region between the function or class header and the
-beginning of the block.  E.g:
+beginning of the block.  E.g.:
 
 int main()
 /* This is the main function. */  <- c-lineup-knr-region-comment
@@ -693,7 +693,7 @@ Works with: comment-intro."
 
 (defun c-lineup-runin-statements (langelem)
   "Line up statements when the first statement is on the same line as
-the block opening brace.  E.g:
+the block opening brace.  E.g.:
 
 int main()
 { puts (\"Hello world!\");
@@ -794,7 +794,7 @@ arglist-cont-nonempty."
   "Line up \"cascaded calls\" under each other.
 If the line begins with \"->\" or \".\" and the preceding line ends
 with one or more function calls preceded by the same token, then the
-arrow is lined up with the first of those tokens.  E.g:
+arrow is lined up with the first of those tokens.  E.g.:
 
 result = proc->add(17)->add(18)
              ->add(19) +           <- c-lineup-cascaded-calls
@@ -839,7 +839,7 @@ arglist-cont-nonempty."
 (defun c-lineup-string-cont (langelem)
   "Line up a continued string under the one it continues.
 A continued string in this sense is where a string literal follows
-directly after another one.  E.g:
+directly after another one.  E.g.:
 
 result = prefix + \"A message \"
                   \"string.\";      <- c-lineup-string-cont
@@ -921,7 +921,7 @@ Works with: objc-method-call-cont."
                                  ; no complete argument to indent yet
                                  (throw 'no-idea nil))))
 
-             (extra (save-excursion 
+             (extra (save-excursion
                       ; indent parameter to argument if needed
                       (back-to-indentation)
                       (c-backward-syntactic-ws (c-langelem-pos langelem))
@@ -1023,7 +1023,7 @@ Works with: inlambda, inexpr-statement, inexpr-class."
 (defun c-lineup-whitesmith-in-block (langelem)
   "Line up lines inside a block in Whitesmith style.
 It's done in a way that works both when the opening brace hangs and
-when it doesn't.  E.g:
+when it doesn't.  E.g.:
 
 something
     {                something {
@@ -1085,7 +1085,7 @@ arglist-cont."
 
 (defun c-lineup-cpp-define (langelem)
   "Line up macro continuation lines according to the indentation of
-the construct preceding the macro.  E.g:
+the construct preceding the macro.  E.g.:
 
 v beg of preceding constr      v beg of preceding constr
                              int dribble() {
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 89cf89f8770..0d5549e4441 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2819,7 +2819,7 @@ undefined whether identifier syntax (see `c-identifier-syntax-table')
 is in effect or not.
 
 Note that it's used in cases like after \"foo (bar)\" so it should
-only match when it's certain that it's a declaration, e.g \"{\" but
+only match when it's certain that it's a declaration, e.g., \"{\" but
 not \",\" or \";\"."
   t "{"
   ;; If K&R style declarations should be recognized then one could
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d2a9617e28e..9e9e2f0b090 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1949,7 +1949,7 @@ Runs `compilation-mode-hook' with `run-mode-hooks' (which see).
   "This is like `define-derived-mode' without the PARENT argument.
 The parent is always `compilation-mode' and the customizable `compilation-...'
 variables are also set from the name of the mode you have chosen,
-by replacing the first word, e.g `compilation-scroll-output' from
+by replacing the first word, e.g., `compilation-scroll-output' from
 `grep-scroll-output' if that variable exists."
   (let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
     `(define-derived-mode ,mode compilation-mode ,name
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7d34269b6b5..e8678fe6281 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1551,7 +1551,7 @@ and POD directives (Disabled by default, see `cperl-electric-keywords'.)
 
 The user types the keyword immediately followed by a space, which
 causes the construct to be expanded, and the point is positioned where
-she is most likely to want to be.  eg. when the user types a space
+she is most likely to want to be.  E.g., when the user types a space
 following \"if\" the following appears in the buffer: if () { or if ()
 } { } and the cursor is between the parentheses.  The user can then
 type some boolean expression within the parens.  Having done that,
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 76e94875c8d..8a868883a11 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -168,8 +168,8 @@ nil to get the default indentation.
 
 INDENT-TYPE is a symbol indicating what kind of indentation should be done.
 It can have the following values:
-  indent      the lines indentation should be increased, e.g. after THEN.
-  outdent     the lines indentation should be decreased, e.g a line with ENDIF.
+  indent      the indentation should be increased, e.g., after THEN.
+  outdent     the indentation should be decreased, e.g., a line with ENDIF.
   first-line  indentation for the first line in a buffer or SUBROUTINE.
 CUR-INDENT is the indentation of the preceding command line.
 EXTRA-INDENT is the default change in indentation for this line
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 5f76cb4bbc5..4aa1ac270d5 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1791,7 +1791,7 @@ statement spanning multiple lines; otherwise, return nil."
                                  (not (eq (char-before) ?\;)))
                             (and (>= pos (point-at-bol))
                                  (<= pos (point-at-eol)))))))
-          (condition-case err
+          (condition-case nil
               (backward-sexp)
             (scan-error (setq at-opening-bracket t))))
         (when (looking-at js--declaration-keyword-re)
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 19d1ffe0a3b..b1017bb6302 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -519,6 +519,12 @@ Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
                               (concat "[^\\]\\(\\\\\\\\\\)*" w))
                             end t)))
             (setq in-string (point))
+            (when (eq (char-syntax (string-to-char w)) ?\()
+              ;; The rest of the literal, when parsed separately, will
+              ;; have the depth of -1. So in the rare case when this
+              ;; number is used despite the in-string status, the
+              ;; depths will balance.
+              (setq depth (1+ depth)))
             (goto-char end)))
          (t
           (goto-char pnt))))
@@ -595,8 +601,7 @@ Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
                (not (or (eq ?_ w)
                         (eq ?. w)))))
          (goto-char pnt)
-         (setq w (char-after (point)))
-         (not (eq ?! w))
+         (not (eq ?! (char-after (point))))
          (skip-chars-forward " \t")
          (goto-char (match-beginning 0))
          (or (not (looking-at ruby-modifier-re))
@@ -877,11 +882,15 @@ calculating indentation on the lines after it."
 (defun ruby-move-to-block (n)
   "Move to the beginning (N < 0) or the end (N > 0) of the
 current block, a sibling block, or an outer block.  Do that (abs N) times."
-  (let ((orig (point))
-        (start (ruby-calculate-indent))
-        (signum (if (> n 0) 1 -1))
+  (let ((signum (if (> n 0) 1 -1))
         (backward (< n 0))
-        down pos done)
+        (depth (or (nth 2 (ruby-parse-region (line-beginning-position)
+                                             (line-end-position)))
+                   0))
+        down done)
+    (when (< (* depth signum) 0)
+      ;; Moving end -> end or beginning -> beginning.
+      (setq depth 0))
     (dotimes (_ (abs n))
       (setq done nil)
       (setq down (save-excursion
@@ -905,17 +914,19 @@ current block, a sibling block, or an outer block.  Do that (abs N) times."
          ((and backward (looking-at "^=end\\>"))
           (re-search-backward "^=begin\\>"))
          (t
-          (setq pos (ruby-calculate-indent))
+          (incf depth (or (nth 2 (ruby-parse-region (point)
+                                                    (line-end-position)))
+                          0))
           (cond
            ;; Deeper indentation, we found a block.
            ;; FIXME: We can't recognize empty blocks this way.
-           ((< start pos)
+           ((> (* signum depth) 0)
             (setq down t))
            ;; Block found, and same indentation as when started, stop.
-           ((and down (= pos start))
+           ((and down (zerop depth))
             (setq done t))
            ;; Shallower indentation, means outer block, can stop now.
-           ((> start pos)
+           ((< (* signum depth) 0)
             (setq done t)))))
         (if done
             (save-excursion
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 55be6222586..5571a905f85 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -4777,7 +4777,7 @@ primitive or interface named NAME."
                 ))))))))))
 
 (defun verilog-get-expr()
-  "Grab expression at point, e.g, case ( a | b & (c ^d))."
+  "Grab expression at point, e.g., case ( a | b & (c ^d))."
   (let* ((b (progn
               (verilog-forward-syntactic-ws)
               (skip-chars-forward " \t")
diff --git a/lisp/server.el b/lisp/server.el
index 64224d2a310..05ac345d904 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -154,7 +154,7 @@ long-lived shared key will decrease security (especially since
 the key is transmitted as plain-text).
 
 In some situations however, it can be difficult to share randomly
-generated passwords with remote hosts (eg. no shared directory),
+generated passwords with remote hosts (e.g., no shared directory),
 so you can set the key with this variable and then copy the
 server file to the remote host (with possible changes to IP
 address and/or port if that applies).
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index c22b5482b3e..c03d64a2f54 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -36,7 +36,7 @@ If `check', try to check if it does.
 If a list, assume that the listed features are supported, without checking.
 
 The relevant features are:
-  modifyOtherKeys  -- if supported, more key bindings work (e.g, \"\\C-,\")
+  modifyOtherKeys  -- if supported, more key bindings work (e.g., \"\\C-,\")
   reportBackground -- if supported, Xterm reports its background color
 "
   :version "24.1"
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index c67aa338791..23e90552096 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -259,9 +259,9 @@ if that value is non-nil.
 These buffers can be edited separately, for example with `fill-paragraph'.
 If you want to disable parallel scrolling temporarily, use  \\[2C-toggle-autoscroll] .
 
-If you include long lines, i.e which will span both columns (eg.
-source code), they should be in what will be the first column, with
-the associated buffer having empty lines next to them.
+If you include long lines that span both columns (e.g., source
+code), they should be in what will be the first column, with the
+associated buffer having empty lines next to them.
 
 Potential uses are writing bilingual texts, or editing the comments of a
 source code.  See the file lisp/two-column.el for detailed examples.
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 542270a8761..cd91742649d 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -1,4 +1,4 @@
-;;; tmm.el --- text mode access to menu-bar
+;;; tmm.el --- text mode access to menu-bar  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1994-1996, 2000-2013 Free Software Foundation, Inc.
 
@@ -54,36 +54,37 @@ we make that menu bar item (the one at that position) the default choice."
   (interactive)
   (run-hooks 'menu-bar-update-hook)
   ;; Obey menu-bar-final-items; put those items last.
-  (let ((menu-bar (tmm-get-keybind [menu-bar]))
+  (let ((menu-bar '())
+        (menu-end '())
         menu-bar-item)
-    (let ((list menu-bar-final-items))
-      (while list
-        (let ((item (car list)))
-          ;; ITEM is the name of an item that we want to put last.
-          ;; Find it in MENU-BAR and move it to the end.
-          (let ((this-one (assq item menu-bar)))
-            (setq menu-bar (append (delq this-one menu-bar)
-                                   (list this-one)))))
-        (setq list (cdr list))))
+    (map-keymap
+     (lambda (key binding)
+       (push (cons key binding)
+             ;; If KEY is the name of an item that we want to put last,
+             ;; move it to the end.
+             (if (memq key menu-bar-final-items)
+                 menu-end
+               menu-bar)))
+     (tmm-get-keybind [menu-bar]))
+    (setq menu-bar `(keymap ,@(nreverse menu-bar) ,@(nreverse menu-end)))
     (if x-position
-        (let ((tail menu-bar) (column 0)
-              this-one name visible)
-          (while (and tail (<= column x-position))
-            (setq this-one (car tail))
-            (if (and (consp this-one)
-                     (consp (cdr this-one))
-                     (setq name  ;simple menu
-                           (cond ((stringp (nth 1  this-one))
-                                  (nth 1  this-one))
-                                 ;extended menu
-                                 ((stringp (nth 2 this-one))
-                                  (setq visible (plist-get
-                                                 (nthcdr 4 this-one) :visible))
-                                  (unless (and visible (not (eval visible)))
-                                    (nth 2 this-one))))))
-                (setq column (+ column (length name) 1)))
-            (setq tail (cdr tail)))
-          (setq menu-bar-item (car this-one))))
+        (let ((column 0))
+          (catch 'done
+            (map-keymap
+             (lambda (key binding)
+               (when (> column x-position)
+                 (setq menu-bar-item key)
+                 (throw 'done nil))
+               (pcase binding
+                 ((or `(,(and (pred stringp) name) . ,_) ;Simple menu item.
+                      `(menu-item ,name ,_cmd            ;Extended menu item.
+                        . ,(and props
+                                (guard (let ((visible
+                                              (plist-get props :visible)))
+                                         (or (null visible)
+                                             (eval visible)))))))
+                  (setq column (+ column (length name) 1)))))
+             menu-bar))))
     (tmm-prompt menu-bar nil menu-bar-item)))
 
 ;;;###autoload
@@ -138,6 +139,12 @@ specify nil for this variable."
   "Face used for inactive menu items."
   :group 'tmm)
 
+(defun tmm--completion-table (items)
+  (lambda (string pred action)
+    (if (eq action 'metadata)
+        '(metadata (display-sort-function . identity))
+      (complete-with-action action items string pred))))
+
 ;;;###autoload
 (defun tmm-prompt (menu &optional in-popup default-item)
   "Text-mode emulation of calling the bindings in keymap.
@@ -174,6 +181,7 @@ Its value should be an event that has a binding in MENU."
          ((vectorp elt)
           (dotimes (i (length elt))
             (tmm-get-keymap (cons i (aref elt i)) not-menu))))))
+    (setq tmm-km-list (nreverse tmm-km-list))
     ;; Choose an element of tmm-km-list; put it in choice.
     (if (and not-menu (= 1 (length tmm-km-list)))
         ;; If this is the top-level of an x-popup-menu menu,
@@ -226,7 +234,7 @@ Its value should be an event that has a binding in MENU."
                        (completing-read
                         (concat gl-str
                                 " (up/down to change, PgUp to menu): ")
-                        tmm-km-list nil t nil
+                        (tmm--completion-table tmm-km-list) nil t nil
                         (cons 'history
                               (- (* 2 history-len) index-of-default))))))))
       (setq choice (cdr (assoc out tmm-km-list)))
@@ -497,46 +505,7 @@ If KEYSEQ is a prefix key that has local and global bindings,
 we merge them into a single keymap which shows the proper order of the menu.
 However, for the menu bar itself, the value does not take account
 of `menu-bar-final-items'."
-  (let (allbind bind minorbind localbind globalbind)
-    (setq bind (key-binding keyseq))
-    ;; If KEYSEQ is a prefix key, then BIND is either nil
-    ;; or a symbol defined as a keymap (which satisfies keymapp).
-    (if (keymapp bind)
-        (setq bind nil))
-    ;; If we have a non-keymap definition, return that.
-    (or bind
-        (progn
-          ;; Otherwise, it is a prefix, so make a list of the subcommands.
-          ;; Make a list of all the bindings in all the keymaps.
-          ;; FIXME: we'd really like to just use `key-binding' now that it
-          ;; returns a keymap that contains really all the bindings under that
-          ;; prefix, but `keyseq' is always [menu-bar], so the desired order of
-          ;; the bindings is difficult to recover.
-          (setq minorbind (mapcar 'cdr (minor-mode-key-binding keyseq)))
-          (setq localbind (local-key-binding keyseq))
-          (setq globalbind (copy-sequence (cdr (global-key-binding keyseq))))
-
-          ;; If items have been redefined/undefined locally, remove them from
-          ;; the global list.
-          (dolist (minor minorbind)
-            (dolist (item (cdr minor))
-              (setq globalbind (assq-delete-all (car-safe item) globalbind))))
-          (dolist (item (cdr localbind))
-            (setq globalbind (assq-delete-all (car-safe item) globalbind)))
-
-          (setq globalbind (cons 'keymap globalbind))
-          (setq allbind (cons globalbind (cons localbind minorbind)))
-
-          ;; Merge all the elements of ALLBIND into one keymap.
-          (dolist (in allbind)
-            (if (and (symbolp in) (keymapp in))
-                (setq in (symbol-function in)))
-            (and in (keymapp in)
-                 (setq bind (if (keymapp bind)
-                                (nconc bind (copy-sequence (cdr in)))
-                              (copy-sequence in)))))
-          ;; Return that keymap.
-          bind))))
+  (lookup-key (cons 'keymap (nreverse (current-active-maps))) keyseq))
 
 (provide 'tmm)
 
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 2456d6ede41..fd53aabd33c 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -143,6 +143,7 @@ to invocation.")
                                         'ediff-previous-difference nil))
   ;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs
   (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
+  (define-key ediff-mode-map [?\S-\ ] 'ediff-previous-difference)
   (define-key ediff-mode-map "n" 'ediff-next-difference)
   (define-key ediff-mode-map " " 'ediff-next-difference)
   (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
@@ -786,7 +787,12 @@ Reestablish the default three-window display."
            (frame-live-p ediff-control-frame)
            (not ediff-use-long-help-message)
            (not (ediff-frame-iconified-p ediff-control-frame)))
-      (raise-frame ediff-control-frame))
+      (if (fboundp 'select-frame-set-input-focus)
+          (select-frame-set-input-focus ediff-control-frame)
+        (raise-frame ediff-control-frame)
+        (select-frame ediff-control-frame)
+        (if (fboundp 'focus-frame)
+            (focus-frame ediff-control-frame))))
 
   ;; Redisplay whatever buffers are showing, if there is a selected difference
   (let ((control-frame ediff-control-frame)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 1d3f7b7f49f..18911b90fac 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (GC_MARK_STACK): Remove.
+        (GNULIB_FDOPENDIR, HAVE_DECL_FDOPENDIR, HAVE_DECL_MEMRCHR)
+        (HAVE_DIRENT_H, HAVE_FDOPENDIR, HAVE_FSTATAT, HAVE_MEMRCHR)
+        (HAVE_WORKING_FSTATAT_ZERO_FLAG, _NETBSD_SOURCE): New macros.
+
 2013-02-12  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h: Add prototype for memrchr.
diff --git a/nt/config.nt b/nt/config.nt
index 2a8c54baa47..61e56174bb4 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -164,10 +164,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Mark a secondary stack, like the register stack on the ia64. */
 #undef GC_MARK_SECONDARY_STACK
 
-/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not
-   known to work. */
-#define GC_MARK_STACK 1
-
 /* Define if setjmp is known to save all registers relevant for conservative
    garbage collection in the jmp_buf.
    MSVC ignores the "register" keyword, so test fails even though
@@ -201,6 +197,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef GNULIB_FACCESSAT
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module fdopendir shall be considered present. */
+#undef GNULIB_FDOPENDIR
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module fscanf shall be considered present. */
 #undef GNULIB_FSCANF
 
@@ -286,6 +286,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
 #undef HAVE_DBUS_WATCH_GET_UNIX_FD
 
+/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FDOPENDIR
+
 /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
    */
 #define HAVE_DECL_GETENV 1
@@ -294,6 +298,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    don't. */
 #undef HAVE_DECL_LOCALTIME_R
 
+/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MEMRCHR
+
 /* Define to 1 if you have the declaration of `strmode', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRMODE
@@ -343,6 +351,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `difftime' function. */
 #undef HAVE_DIFFTIME
 
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
 /* Define to 1 if you have the 'dup2' function. */
 #define HAVE_DUP2 1
 
@@ -367,6 +378,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `faccessat' function. */
 #undef HAVE_FACCESSAT
 
+/* Define to 1 if you have the `fdopendir' function. */
+#undef HAVE_FDOPENDIR
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -379,6 +393,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define to 1 if you have the `fstatat' function. */
+#undef HAVE_FSTATAT
+
 /* Define to 1 if you have the `fsync' function. */
 #define HAVE_FSYNC 1
 
@@ -686,6 +703,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `memrchr' function. */
+#undef HAVE_MEMRCHR
+
 /* Define to 1 if you have mouse menus. (This is automatic if you use X, but
    the option to specify it remains.) It is also defined with other window
    systems that support xmenu.c. */
@@ -1051,6 +1071,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if `fork' works. */
 #undef HAVE_WORKING_FORK
 
+/* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX
+   7.1. */
+#undef HAVE_WORKING_FSTATAT_ZERO_FLAG
+
 /* Define if utimes works properly. */
 #undef HAVE_WORKING_UTIMES
 
@@ -1388,6 +1412,38 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using the Motif X toolkit. */
 #undef USE_MOTIF
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on OS X.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #define USE_TOOLKIT_SCROLL_BARS 1
 
@@ -1452,10 +1508,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if the system is AIX. */
 #undef _AIX
 
-/* Enable large inode numbers on Mac OS X.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
+/* Enable large inode numbers on Mac OS X 10.5. */
+#undef _DARWIN_USE_64_BIT_INODE
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
@@ -1476,6 +1530,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if GNUstep uses ObjC exceptions. */
 #undef _NATIVE_OBJC_EXCEPTIONS
 
+/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
+#undef _NETBSD_SOURCE
+
 /* The _Noreturn keyword of C11.  */
 #if ! (defined _Noreturn \
        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
@@ -1499,35 +1556,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Needed for system_process_attributes on Solaris. */
 #undef _STRUCTURED_PROC
 
-/* Define to 500 only on HP-UX. */
-#undef _XOPEN_SOURCE
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on Mac OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
diff --git a/src/ChangeLog b/src/ChangeLog
index 05737bb1194..82cc8f0f552 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,76 @@
+2013-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (syms_of_keyboard): Further tweaks of docstring.
+
+2013-02-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (font_range): Add pos_byte argument.  Adjust comment
+        and break long line.
+        * font.h (font_range): Adjust prototype.
+        * composite.c (autocmp_chars): Pass byte position to font_range.
+        Break long line.  Remove useless prototype and format comment.
+
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * keyboard.c (input-decode-map, key-translation-map): Doc fixes.
+
+2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve AIX port some more (Bug#13650).
+        With this, it should be as good as it was in 23.3, though it's
+        still pretty bad: the dumped emacs does not run.  See Mark Fleishman in
+        http://lists.gnu.org/archive/html/help-gnu-emacs/2011-04/msg00287.html
+        * unexaix.c (start_of_text): Remove.
+        (_data, _text): Declare as char[], not int, as AIX manual suggests.
+        (bias, lnnoptr, text_scnptr, data_scnptr, load_scnptr)
+        (orig_load_scnptr, orig_data_scnptr):
+        Now off_t, not long, since they are file offsets.
+        (make_hdr): Use _data, not start_of_data ().
+        This is the key part of the fix.
+        (make_hdr, unrelocate_symbols): Use off_t for file offsets.
+        (unrelocate_symbols): Cast pointers to intptr_t, not to ulong.
+
+        * pre-crt0.c (data_start): Initialize to 1.
+        This ports to compilers that optimize the external declaration
+        'int x = 0;' as if it were 'int x;' to shrink the executable.
+
+        Improve AIX port (Bug#13650).
+        This doesn't fix the bug, but it makes progress: Emacs builds now.
+        * unexaix.c: Include inttypes.h, stdarg.h.
+        (report_error, report_error_1): Mark as _Noreturn.
+        (report_error): Don't report the wrong errno.
+        (report_error_1): Now varargs.  All callers changed.
+        (make_hdr): Use uintptr_t, not unsigned, when converting pointers
+        to unsigned.  Don't use ADDR_CORRECT, as it no longer exists.
+        (write_ptr): Use %p to print address rather than %lx and a cast
+        to unsigned long.  Grow buffer a bit, to be safer.
+
+2013-02-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_resolve_neutral): After finding the next
+        non-neutral character, accept NEUTRAL_ON type as well, because
+        directional control characters, such as LRE and RLE, have their
+        type converted to that by bidi_resolve_weak.  This avoids aborts
+        when LRE/RLE follows a run of neutrals.
+        (bidi_move_to_visually_next): Assert that return value of
+        bidi_peek_at_next_level is non-negative.  Negative values will
+        cause an infloop.
+
+2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Minor getenv-related fixes.
+        * callproc.c (Fcall_process_region) [!DOS_NT]:
+        Avoid unnecessary duplicate call to getenv.
+        * callproc.c (init_callproc):
+        * dispnew.c (init_display):
+        * sysdep.c (sys_subshell):
+        Omit unnecessary cast of getenv or egetenv.
+
+2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/filelock.$(O), $(BLD)/sysdep.$(O)):
+        Update dependencies.
+
 2013-02-12  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (redisplay_internal): Don't set w->region_showing to the
diff --git a/src/bidi.c b/src/bidi.c
index b067c8134e3..db2e48a2ca7 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1973,6 +1973,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
                 next_type = STRONG_R;
                 break;
               case WEAK_BN:
+              case NEUTRAL_ON:  /* W6/Retaining */
                 if (!bidi_explicit_dir_char (bidi_it->ch))
                   emacs_abort (); /* can't happen: BNs are skipped */
                 /* FALLTHROUGH */
@@ -2391,6 +2392,10 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
       next_level = bidi_peek_at_next_level (bidi_it);
       while (next_level != expected_next_level)
         {
+          /* If next_level is -1, it means we have an unresolved level
+             in the cache, which at this point should not happen.  If
+             it does, we will infloop.  */
+          eassert (next_level >= 0);
           expected_next_level += incr;
           level_to_search += incr;
           bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
diff --git a/src/callproc.c b/src/callproc.c
index cb11ee0cc53..9132c0dd976 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -997,13 +997,11 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
     tmpdir = Vtemporary_file_directory;
   else
     {
+      char *outf;
 #ifndef DOS_NT
-      if (getenv ("TMPDIR"))
-        tmpdir = build_string (getenv ("TMPDIR"));
-      else
-        tmpdir = build_string ("/tmp/");
+      outf = getenv ("TMPDIR");
+      tmpdir = build_string (outf ? outf : "/tmp/");
 #else /* DOS_NT */
-      char *outf;
       if ((outf = egetenv ("TMPDIR"))
           || (outf = egetenv ("TMP"))
           || (outf = egetenv ("TEMP")))
@@ -1655,7 +1653,7 @@ init_callproc (void)
   if (! file_accessible_directory_p (SSDATA (tempdir)))
     dir_warning ("arch-independent data dir", Vdata_directory);
 
-  sh = (char *) getenv ("SHELL");
+  sh = getenv ("SHELL");
   Vshell_file_name = build_string (sh ? sh : "/bin/sh");
 
 #ifdef DOS_NT
diff --git a/src/coding.c b/src/coding.c
index b881f162ab9..868fb7df0ea 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10712,7 +10712,7 @@ reading if you suppress escape sequence detection.
 
 The other way to read escape sequences in a file without decoding is
 to explicitly specify some coding system that doesn't use ISO-2022
-escape sequence (e.g `latin-1') on reading by \\[universal-coding-system-argument].  */);
+escape sequence (e.g., `latin-1') on reading by \\[universal-coding-system-argument].  */);
   inhibit_iso_escape_detection = 0;
 
   DEFVAR_BOOL ("inhibit-null-byte-detection",
diff --git a/src/composite.c b/src/composite.c
index 54cebc00eb7..9bbd4550c7b 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -642,13 +642,7 @@ compose_text (ptrdiff_t start, ptrdiff_t end, Lisp_Object components,
                        Qcomposition, prop, string);
 }
 
-
-static Lisp_Object autocmp_chars (Lisp_Object, ptrdiff_t, ptrdiff_t,
-                                  ptrdiff_t, struct window *,
-                                  struct face *, Lisp_Object);
-
-
-/* Lisp glyph-string handlers */
+/* Lisp glyph-string handlers.  */
 
 /* Hash table for automatic composition.  The key is a header of a
    lgstring (Lispy glyph-string), and the value is a body of a
@@ -905,7 +899,9 @@ fill_gstring_body (Lisp_Object gstring)
    object.  Otherwise return nil.  */
 
 static Lisp_Object
-autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t limit, struct window *win, struct face *face, Lisp_Object string)
+autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos,
+               ptrdiff_t limit, struct window *win, struct face *face,
+               Lisp_Object string)
 {
   ptrdiff_t count = SPECPDL_INDEX ();
   FRAME_PTR f = XFRAME (win->frame);
@@ -935,7 +931,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
     {
-      font_object = font_range (charpos, &to, win, face, string);
+      font_object = font_range (charpos, bytepos, &to, win, face, string);
       if (! FONT_OBJECT_P (font_object)
           || (! NILP (re)
               && to < limit
diff --git a/src/dispnew.c b/src/dispnew.c
index 0037c0269de..54004daada9 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6025,7 +6025,6 @@ init_display (void)
 
   inverse_video = 0;
   cursor_in_echo_area = 0;
-  terminal_type = (char *) 0;
 
   /* Now is the time to initialize this; it's used by init_sys_modes
      during startup.  */
@@ -6120,8 +6119,7 @@ init_display (void)
 #ifdef WINDOWSNT
   terminal_type = "w32console";
 #else
-  /* Look at the TERM variable.  */
-  terminal_type = (char *) getenv ("TERM");
+  terminal_type = getenv ("TERM");
 #endif
   if (!terminal_type)
     {
diff --git a/src/font.c b/src/font.c
index bed0ac8caf2..e2ea7262397 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3689,11 +3689,11 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
 
 #ifdef HAVE_WINDOW_SYSTEM
 
-/* Check how many characters after POS (at most to *LIMIT) can be
-   displayed by the same font in the window W.  FACE, if non-NULL, is
-   the face selected for the character at POS.  If STRING is not nil,
-   it is the string to check instead of the current buffer.  In that
-   case, FACE must be not NULL.
+/* Check how many characters after character/byte position POS/POS_BYTE
+   (at most to *LIMIT) can be displayed by the same font in the window W.
+   FACE, if non-NULL, is the face selected for the character at POS.
+   If STRING is not nil, it is the string to check instead of the current
+   buffer.  In that case, FACE must be not NULL.
 
    The return value is the font-object for the character at POS.
    *LIMIT is set to the position where that font can't be used.
@@ -3701,15 +3701,15 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
    It is assured that the current buffer (or STRING) is multibyte.  */
 
 Lisp_Object
-font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face, Lisp_Object string)
+font_range (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t *limit,
+            struct window *w, struct face *face, Lisp_Object string)
 {
-  ptrdiff_t pos_byte, ignore;
+  ptrdiff_t ignore;
   int c;
   Lisp_Object font_object = Qnil;
 
   if (NILP (string))
     {
-      pos_byte = CHAR_TO_BYTE (pos);
       if (! face)
         {
           int face_id;
@@ -3720,10 +3720,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face
         }
     }
   else
-    {
-      eassert (face);
-      pos_byte = string_char_to_byte (string, pos);
-    }
+    eassert (face);
 
   while (pos < *limit)
     {
@@ -4831,7 +4828,7 @@ where
   OPENED-NAME is the name used for opening the font,
   FULL-NAME is the full name of the font,
   SIZE is the pixelsize of the font,
-  HEIGHT is the pixel-height of the font (i.e ascent + descent),
+  HEIGHT is the pixel-height of the font (i.e., ascent + descent),
   BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
   RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
     how to compose characters.
diff --git a/src/font.h b/src/font.h
index b565fb4b01b..ffed0461ff7 100644
--- a/src/font.h
+++ b/src/font.h
@@ -781,7 +781,7 @@ extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
 extern void register_font_driver (struct font_driver *driver, FRAME_PTR f);
 extern void free_font_driver_list (FRAME_PTR f);
 extern Lisp_Object font_update_drivers (FRAME_PTR f, Lisp_Object list);
-extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t *,
+extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *,
                                struct window *, struct face *,
                                Lisp_Object);
 extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object);
diff --git a/src/indent.c b/src/indent.c
index 44ecbbc8a58..ce1639eae1e 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -291,7 +291,7 @@ DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
        doc: /* Return the horizontal position of point.  Beginning of line is column 0.
 This is calculated by adding together the widths of all the displayed
 representations of the character between the start of the previous line
-and point (eg. control characters will have a width of 2 or 4, tabs
+and point (e.g., control characters will have a width of 2 or 4, tabs
 will have a variable width).
 Ignores finite width of frame, which means that this function may return
 values greater than (frame-width).
diff --git a/src/keyboard.c b/src/keyboard.c
index 4a92cea30c8..3e1a6ba3346 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11641,9 +11641,7 @@ If the binding is a function, it is called with one argument (the prompt)
 and its return value (a key sequence) is used.
 
 The events that come from bindings in `input-decode-map' are not
-themselves looked up in `input-decode-map'.
-
-This variable is keyboard-local.  */);
+themselves looked up in `input-decode-map'.  */);
 
   DEFVAR_LISP ("function-key-map", Vfunction_key_map,
                doc: /* The parent keymap of all `local-function-key-map' instances.
@@ -11655,9 +11653,8 @@ definition will take precedence.  */);
 
   DEFVAR_LISP ("key-translation-map", Vkey_translation_map,
                doc: /* Keymap of key translations that can override keymaps.
-This keymap works like `function-key-map', but comes after that,
-and its non-prefix bindings override ordinary bindings.
-Another difference is that it is global rather than keyboard-local.  */);
+This keymap works like `input-decode-map', but comes after `function-key-map'.
+Another difference is that it is global rather than terminal-local.  */);
   Vkey_translation_map = Fmake_sparse_keymap (Qnil);
 
   DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list,
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index bbd9fd907b6..6e1873f8e49 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -847,7 +847,9 @@ $(BLD)/fileio.$(O) : \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
         $(NT_INC)/unistd.h \
+        $(GNU_LIB)/allocator.h \
         $(BUFFER_H) \
+        $(CAREADLINKAT_H) \
         $(CHARACTER_H) \
         $(CODING_H) \
         $(CONFIG_H) \
@@ -1397,11 +1399,9 @@ $(BLD)/sysdep.$(O) : \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
         $(NT_INC)/unistd.h \
-        $(GNU_LIB)/allocator.h \
         $(GNU_LIB)/execinfo.h \
         $(GNU_LIB)/ignore-value.h \
         $(GNU_LIB)/utimens.h \
-        $(CAREADLINKAT_H) \
         $(CONFIG_H) \
         $(C_CTYPE_H) \
         $(DISPEXTERN_H) \
diff --git a/src/pre-crt0.c b/src/pre-crt0.c
index ea5736eba2a..6b9618c8dc3 100644
--- a/src/pre-crt0.c
+++ b/src/pre-crt0.c
@@ -4,7 +4,7 @@
    that make environ an initialized variable.  However, we do
    need to make sure the label data_start exists anyway.  */
 
-/* Create a label to appear at the beginning of data space.  */
-
-int data_start = 0;
+/* Create a label to appear at the beginning of data space.
+   Its value is nonzero so that it cannot be put into bss.  */
 
+int data_start = 1;
diff --git a/src/sysdep.c b/src/sysdep.c
index 57ca8265a65..606a5b038ca 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -527,10 +527,10 @@ sys_subshell (void)
 #ifdef DOS_NT    /* MW, Aug 1993 */
       getcwd (oldwd, sizeof oldwd);
       if (sh == 0)
-        sh = (char *) egetenv ("SUSPEND");      /* KFS, 1994-12-14 */
+        sh = egetenv ("SUSPEND");       /* KFS, 1994-12-14 */
 #endif
       if (sh == 0)
-        sh = (char *) egetenv ("SHELL");
+        sh = egetenv ("SHELL");
       if (sh == 0)
         sh = "sh";
 
diff --git a/src/unexaix.c b/src/unexaix.c
index 92ebd2e3ceb..da44480fdca 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -51,6 +51,8 @@ what you give them.   Help stamp out software-hoarding!  */
 #include "getpagesize.h"
 
 #include <sys/types.h>
+#include <inttypes.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -59,10 +61,8 @@ what you give them.   Help stamp out software-hoarding!  */
 
 #include "mem-limits.h"
 
-char *start_of_text (void);                     /* Start of text */
-
-extern int _data;
-extern int _text;
+extern char _data[];
+extern char _text[];
 
 #include <filehdr.h>
 #include <aouthdr.h>
@@ -71,15 +71,15 @@ extern int _text;
 
 static struct filehdr f_hdr;            /* File header */
 static struct aouthdr f_ohdr;           /* Optional file header (a.out) */
-static long bias;                       /* Bias to add for growth */
-static long lnnoptr;                    /* Pointer to line-number info within file */
+static off_t bias;                      /* Bias to add for growth */
+static off_t lnnoptr;                   /* Pointer to line-number info within file */
 
-static long text_scnptr;
-static long data_scnptr;
+static off_t text_scnptr;
+static off_t data_scnptr;
 #define ALIGN(val, pwr) (((val) + ((1L<<(pwr))-1)) & ~((1L<<(pwr))-1))
-static long load_scnptr;
-static long orig_load_scnptr;
-static long orig_data_scnptr;
+static off_t load_scnptr;
+static off_t orig_load_scnptr;
+static off_t orig_data_scnptr;
 static int unrelocate_symbols (int, int, const char *, const char *);
 
 #ifndef MAX_SECTIONS
@@ -92,23 +92,30 @@ static int pagemask;
 
 #include "lisp.h"
 
-static void
+static _Noreturn void
 report_error (const char *file, int fd)
 {
   if (fd)
-    close (fd);
+    {
+      int failed_errno = errno;
+      close (fd);
+      errno = failed_errno;
+    }
   report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
 }
 
-#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
-#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
-#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1
+#define ERROR0(msg) report_error_1 (new, msg)
+#define ERROR1(msg,x) report_error_1 (new, msg, x)
+#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y)
 
-static void
-report_error_1 (int fd, const char *msg, int a1, int a2)
+static _Noreturn void ATTRIBUTE_FORMAT_PRINTF (2, 3)
+report_error_1 (int fd, const char *msg, ...)
 {
+  va_list ap;
   close (fd);
-  error (msg, a1, a2);
+  va_start (ap, msg);
+  verror (msg, ap);
+  va_end (ap);
 }
 
 static int make_hdr (int, int, const char *, const char *);
@@ -163,8 +170,8 @@ make_hdr (int new, int a_out,
           const char *a_name, const char *new_name)
 {
   int scns;
-  unsigned int bss_start;
-  unsigned int data_start;
+  uintptr_t bss_start;
+  uintptr_t data_start;
 
   struct scnhdr section[MAX_SECTIONS];
   struct scnhdr * f_thdr;               /* Text section header */
@@ -179,17 +186,17 @@ make_hdr (int new, int a_out,
   pagemask = getpagesize () - 1;
 
   /* Adjust text/data boundary. */
-  data_start = (long) start_of_data ();
-  data_start = ADDR_CORRECT (data_start);
+  data_start = (uintptr_t) _data;
 
   data_start = data_start & ~pagemask; /* (Down) to page boundary. */
 
-  bss_start = ADDR_CORRECT (sbrk (0)) + pagemask;
+  bss_start = (uintptr_t) sbrk (0) + pagemask;
   bss_start &= ~ pagemask;
 
   if (data_start > bss_start)   /* Can't have negative data size. */
     {
-      ERROR2 ("unexec: data_start (%u) can't be greater than bss_start (%u)",
+      ERROR2 (("unexec: data_start (0x%"PRIxPTR
+               ") can't be greater than bss_start (0x%"PRIxPTR")"),
               data_start, bss_start);
     }
 
@@ -279,7 +286,7 @@ make_hdr (int new, int a_out,
 
   /* fix scnptr's */
   {
-    ulong ptr = section[0].s_scnptr;
+    off_t ptr = section[0].s_scnptr;
 
     bias = -1;
     for (scns = 0; scns < f_hdr.f_nscns; scns++)
@@ -375,12 +382,12 @@ copy_text_and_data (int new)
   char *end;
   char *ptr;
 
-  lseek (new, (long) text_scnptr, SEEK_SET);
-  ptr = start_of_text () + text_scnptr;
+  lseek (new, text_scnptr, SEEK_SET);
+  ptr = _text + text_scnptr;
   end = ptr + f_ohdr.tsize;
   write_segment (new, ptr, end);
 
-  lseek (new, (long) data_scnptr, SEEK_SET);
+  lseek (new, data_scnptr, SEEK_SET);
   ptr = (char *) f_ohdr.data_start;
   end = ptr + f_ohdr.dsize;
   write_segment (new, ptr, end);
@@ -393,7 +400,6 @@ static void
 write_segment (int new, char *ptr, char *end)
 {
   int i, nwrite, ret;
-  char buf[80];
   char zeros[UnexBlockSz];
 
   for (i = 0; ptr < end;)
@@ -414,9 +420,13 @@ write_segment (int new, char *ptr, char *end)
         }
       else if (nwrite != ret)
         {
+          int write_errno = errno;
+          char buf[1000];
+          void *addr = ptr;
           sprintf (buf,
-                   "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d",
-                   (unsigned long)ptr, new, nwrite, ret, errno);
+                   "unexec write failure: addr %p, fileno %d, size 0x%x, wrote 0x%x, errno %d",
+                   addr, new, nwrite, ret, errno);
+          errno = write_errno;
           PERROR (buf);
         }
       i += nwrite;
@@ -537,13 +547,13 @@ unrelocate_symbols (int new, int a_out,
   int i;
   LDHDR ldhdr;
   LDREL ldrel;
-  ulong t_reloc = (ulong) &_text - f_ohdr.text_start;
+  off_t t_reloc = (intptr_t) _text - f_ohdr.text_start;
 #ifndef ALIGN_DATA_RELOC
-  ulong d_reloc = (ulong) &_data - f_ohdr.data_start;
+  off_t d_reloc = (intptr_t) _data - f_ohdr.data_start;
 #else
   /* This worked (and was needed) before AIX 4.2.
      I have no idea why. -- Mike */
-  ulong d_reloc = (ulong) &_data - ALIGN (f_ohdr.data_start, 2);
+  off_t d_reloc = (intptr_t) _data - ALIGN (f_ohdr.data_start, 2);
 #endif
   int * p;
 
@@ -628,16 +638,3 @@ unrelocate_symbols (int new, int a_out,
     }
   return 0;
 }
-
-/*
- *      Return the address of the start of the text segment prior to
- *      doing an unexec.  After unexec the return value is undefined.
- *      See crt0.c for further explanation and _start.
- *
- */
-
-char *
-start_of_text (void)
-{
-  return ((char *) 0x10000000);
-}
diff --git a/test/ChangeLog b/test/ChangeLog
index 41bb1be190e..f508209008e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-move-to-block-skips-percent-literal): New test.
+
 2013-02-04  Chong Yidong  <cyd@gnu.org>
 
         * automated/thingatpt.el: New file.
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 2028c6fad00..6798a49d53c 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -445,6 +445,24 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-move-to-block -2)
   (should (= 2 (line-number-at-pos))))
 
+(ert-deftest ruby-move-to-block-skips-percent-literal ()
+  (dolist (s (list (ruby-test-string
+                    "foo do
+                    |  a = %%w(
+                    |  )
+                    |end")
+                   (ruby-test-string
+                    "foo do
+                    |  a = %%w|
+                    |  |
+                    |end")))
+    (ruby-with-temp-buffer s
+      (goto-line 1)
+      (ruby-end-of-block)
+      (should (= 4 (line-number-at-pos)))
+      (ruby-beginning-of-block)
+      (should (= 1 (line-number-at-pos))))))
+
 (provide 'ruby-mode-tests)
 
 ;;; ruby-mode-tests.el ends here