upstream

78 files changed, 1688 insertions, 826 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index bfe831fa07f..fe3bab7feb0 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -214,7 +214,7 @@ maps.texi         rgm
 markers.texi      rgm
 minibuf.texi      
 modes.texi        cyd
-nonascii.texi     
+nonascii.texi     cyd
 numbers.texi      cyd
 objects.texi      cyd
 os.texi           
@@ -227,7 +227,7 @@ streams.texi      cyd
 strings.texi      cyd
 symbols.texi      cyd
 syntax.texi       cyd
-text.texi         
+text.texi         cyd
 tips.texi         rgm
 variables.texi    cyd
 windows.texi      
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 42ec24fac5f..3584c89d5fe 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,41 @@
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Configurations): save-window-excursion is
+        now a macro.
+
+        * display.texi (Temporary Displays): with-output-to-temp-buffer is
+        now a macro.
+
+        * text.texi (Fields): Minor copyedit.
+
+2012-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * strings.texi (String Basics):
+        * sequences.texi (Sequence Functions): Mention that `length' is
+        not appropriate for computing the string width on display; add a
+        cross-reference to the description of `string-width'.  (Bug#10978)
+
+        * eval.texi (Autoloading): Minor change of wording.
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * loading.texi (Autoload): Explicitly state which forms are
+        processed specially (Bug#7783).
+
+        * keymaps.texi (Mouse Menus): Describe non-toolkit behavior as the
+        non-default situation.  Describe one-submenu exception (Bug#7695).
+
+        * nonascii.texi (Character Properties): Copyedits.
+
+2012-03-08  Chong Yidong  <cyd@gnu.org>
+
+        * text.texi (Mode-Specific Indent): Document new behavior of
+        indent-for-tab-command.  Document tab-always-indent.
+        (Special Properties): Copyedits.
+        (Checksum/Hash): Improve secure-hash doc.  Do not recommend MD5.
+        (Parsing HTML/XML): Rename from Parsing HTML.  Update doc of
+        libxml-parse-html-region.
+
 2012-03-07  Glenn Morris  <rgm@gnu.org>
 
         * markers.texi (The Region): Briefly mention use-empty-active-region
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 281ddda9cec..c70418be52b 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1031,7 +1031,7 @@ You can use a display table to substitute other text for the ellipsis
 buffer and then present it to the user for perusal rather than for
 editing.  Many help commands use this feature.
 
-@defspec with-output-to-temp-buffer buffer-name forms@dots{}
+@defmac with-output-to-temp-buffer buffer-name forms@dots{}
 This function executes @var{forms} while arranging to insert any output
 they print into the buffer named @var{buffer-name}, which is first
 created if necessary, and put into Help mode.  Finally, the buffer is
@@ -1083,7 +1083,7 @@ The value of the last form in @var{forms} is returned.
 ---------- Buffer: foo ----------
 @end group
 @end example
-@end defspec
+@end defmac
 
 @defopt temp-buffer-show-function
 If this variable is non-@code{nil}, @code{with-output-to-temp-buffer}
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 7a444ee4039..ea304292497 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1054,7 +1054,8 @@ Text
 * Registers::               How registers are implemented.  Accessing
                               the text or position stored in a register.
 * Base 64::                 Conversion to or from base 64 encoding.
-* Checksum/Hash::           Computing "message digests"/"checksums"/"hashes".
+* Checksum/Hash::           Computing cryptographic hashes.
+* Parsing HTML/XML::        Parsing HTML and XML.
 * Atomic Changes::          Installing several buffer changes "atomically".
 * Change Hooks::            Supplying functions to be run when text is changed.
 
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index cb3a4c54fac..429d999a2c8 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -521,8 +521,10 @@ values).@refill
 whose function definition has not yet been loaded into Emacs.  It
 specifies which file contains the definition.  When an autoload object
 appears as a symbol's function definition, calling that symbol as a
-function automatically loads the specified file; then it calls the real
-definition loaded from that file.  @xref{Autoload}.
+function automatically loads the specified file; then it calls the
+real definition loaded from that file.  The way to arrange for an
+autoload object to appear as a symbol's function definition is
+described in @ref{Autoload}.
 
 @node Quoting
 @section Quoting
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 83bbc140b13..55b18edf2ec 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -134,7 +134,7 @@ in a different location since it was dumped.
 This function delays the initialization of @var{symbol} to the next
 Emacs start.  You normally use this function by specifying it as the
 @code{:initialize} property of a customizable variable.  (The argument
-@var{value} is unused, and is provided only for compatiblity with the
+@var{value} is unused, and is provided only for compatibility with the
 form Custom expects.)
 @end defun
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 669f058ef13..5dd57ccb4ac 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2345,24 +2345,25 @@ multiple levels or comes from the menu bar.)
   It's often best to use a button-down event to trigger the menu.  Then
 the user can select a menu item by releasing the button.
 
-  A single keymap can appear as multiple menu panes, if you explicitly
-arrange for this.  The way to do this is to make a keymap for each pane,
-then create a binding for each of those maps in the main keymap of the
-menu.  Give each of these bindings an item string that starts with
-@samp{@@}.  The rest of the item string becomes the name of the pane.
-See the file @file{lisp/mouse.el} for an example of this.  Any ordinary
-bindings with @samp{@@}-less item strings are grouped into one pane,
-which appears along with the other panes explicitly created for the
-submaps.
-
-  X toolkit menus don't have panes; instead, they can have submenus.
-Every nested keymap becomes a submenu, whether the item string starts
-with @samp{@@} or not.  In a toolkit version of Emacs, the only thing
-special about @samp{@@} at the beginning of an item string is that the
-@samp{@@} doesn't appear in the menu item.
-
-  Multiple keymaps that define the same menu prefix key produce
-separate panes or separate submenus.
+@cindex submenu
+  If the menu keymap contains a binding to a nested keymap, the nested
+keymap specifies a @dfn{submenu}.  There will be a menu item, labeled
+by the nested keymap's item string, and clicking on this item
+automatically pops up the specified submenu.  As a special exception,
+if the menu keymap contains a single nested keymap and no other menu
+items, the menu shows the contents of the nested keymap directly, not
+as a submenu.
+
+  However, if Emacs is compiled without X toolkit support, submenus
+are not supported.  Each nested keymap is shown as a menu item, but
+clicking on it does not automatically pop up the submenu.  If you wish
+to imitate the effect of submenus, you can do that by giving a nested
+keymap an item string which starts with @samp{@@}.  This causes Emacs
+to display the nested keymap using a separate @dfn{menu pane}; the
+rest of the item string after the @samp{@@} is the pane label.  If
+Emacs is compiled without X toolkit support, menu panes are not used;
+in that case, a @samp{@@} at the beginning of an item string is
+omitted when the menu label is displayed, and has no other effect.
 
 @node Keyboard Menus
 @subsection Menus and the Keyboard
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 3c2fa60248e..47a2a39ed63 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -500,14 +500,31 @@ Building Emacs loads @file{loaddefs.el} and thus calls @code{autoload}.
 autoloads for all files in the current directory.
 
   The same magic comment can copy any kind of form into
-@file{loaddefs.el}.  If the form following the magic comment is not a
-function-defining form or a @code{defcustom} form, it is copied
-verbatim.  ``Function-defining forms'' include @code{define-skeleton},
-@code{define-derived-mode}, @code{define-generic-mode} and
-@code{define-minor-mode} as well as @code{defun} and
-@code{defmacro}.  To save space, a @code{defcustom} form is converted to
-a @code{defvar} in @file{loaddefs.el}, with some additional information
-if it uses @code{:require}.
+@file{loaddefs.el}.  The form following the magic comment is copied
+verbatim, @emph{except} if it is one of the forms which the autoload
+facility handles specially (e.g.@: by conversion into an
+@code{autoload} call).  The forms which are not copied verbatim are
+the following:
+
+@table @asis
+@item Definitions for function or function-like objects:
+@code{defun} and @code{defmacro}; also @code{defun*} and
+@code{defmacro*} (@pxref{Argument Lists,,,cl,CL Manual}), and
+@code{define-overloadable-function} (see the commentary in
+@file{mode-local.el}).
+
+@item Definitions for major or minor modes:
+@code{define-derived-mode}, @code{define-minor-mode},
+@code{define-compilation-mode}, @code{define-generic-mode},
+@code{easy-mmode-define-global-mode}, @code{define-global-minor-mode},
+@code{define-globalized-minor-mode}, and
+@code{easy-mmode-define-minor-mode}.
+
+@item Other definition types:
+@code{defcustom}, @code{defgroup}, @code{defclass}
+(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} (see the
+commentary in @file{skeleton.el}).
+@end table
 
   You can also use a magic comment to execute a form at build time
 @emph{without} executing it when the file itself is loaded.  To do this,
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 19c72981174..c97cd099328 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -412,14 +412,13 @@ or @code{R} (strong R).
 Corresponds to the Unicode @code{Decomposition_Type} and
 @code{Decomposition_Value} properties.  The value is a list, whose
 first element may be a symbol representing a compatibility formatting
-tag, such as @code{small}@footnote{
-Note that the Unicode spec writes these tag names inside
-@samp{<..>} brackets.  The tag names in Emacs do not include the
-brackets; e.g., Unicode specifies @samp{<small>} where Emacs uses
-@samp{small}.
-}; the other elements are characters that give the compatibility
-decomposition sequence of this character.  For unassigned codepoints,
-the value is the character itself.
+tag, such as @code{small}@footnote{The Unicode specification writes
+these tag names inside @samp{<..>} brackets, but the tag names in
+Emacs do not include the brackets; e.g.@: Unicode specifies
+@samp{<small>} where Emacs uses @samp{small}.  }; the other elements
+are characters that give the compatibility decomposition sequence of
+this character.  For unassigned codepoints, the value is the character
+itself.
 
 @item decimal-digit-value
 Corresponds to the Unicode @code{Numeric_Value} property for
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 94f1bf666d2..50f75da2de8 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -108,6 +108,11 @@ Emacs character code.
 @noindent
 See also @code{string-bytes}, in @ref{Text Representations}.
 
+If you need to compute the width of a string on display, you should
+use @code{string-width} (@pxref{Width}), not @code{length}, since
+@code{length} only counts the number of characters, but does not
+account for the display width of each character.
+
 @defun elt sequence index
 @cindex elements of sequences
 This function returns the element of @var{sequence} indexed by
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index bbb75f1474d..64d0986493a 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -51,7 +51,9 @@ C are terminated by a character with @acronym{ASCII} code 0.)
 operate on them with the general array and sequence functions.
 (@xref{Sequences Arrays Vectors}.)  For example, you can access or
 change individual characters in a string using the functions @code{aref}
-and @code{aset} (@pxref{Array Functions}).
+and @code{aset} (@pxref{Array Functions}).  However, note that
+@code{length} should @emph{not} be used for computing the width of a
+string on display; use @code{string-width} (@pxref{Width}) instead.
 
   There are two text representations for non-@acronym{ASCII} characters in
 Emacs strings (and in buffers): unibyte and multibyte (@pxref{Text
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 88cb6a157f8..1ba0cae43b6 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -56,8 +56,8 @@ the character after point.
 * Registers::        How registers are implemented.  Accessing the text or
                        position stored in a register.
 * Base 64::          Conversion to or from base 64 encoding.
-* Checksum/Hash::    Computing "message digests"/"checksums"/"hashes".
-* Parsing HTML::     Parsing HTML and XML.
+* Checksum/Hash::    Computing cryptographic hashes.
+* Parsing HTML/XML:: Parsing HTML and XML.
 * Atomic Changes::   Installing several buffer changes "atomically".
 * Change Hooks::     Supplying functions to be run when text is changed.
 @end menu
@@ -2203,14 +2203,48 @@ key to indent properly for the language being edited.  This section
 describes the mechanism of the @key{TAB} key and how to control it.
 The functions in this section return unpredictable values.
 
-@defvar indent-line-function
-This variable's value is the function to be used by @key{TAB} (and
-various commands) to indent the current line.  The command
-@code{indent-according-to-mode} does little more than call this function.
+@deffn Command indent-for-tab-command &optional rigid
+This is the command bound to @key{TAB} in most editing modes.  Its
+usual action is to indent the current line, but it can alternatively
+insert a tab character or indent a region.
+
+Here is what it does:
 
-In Lisp mode, the value is the symbol @code{lisp-indent-line}; in C
-mode, @code{c-indent-line}; in Fortran mode, @code{fortran-indent-line}.
-The default value is @code{indent-relative}.  @xref{Auto-Indentation}.
+@itemize
+@item
+First, it checks whether Transient Mark mode is enabled and the region
+is active.  If so, it called @code{indent-region} to indent all the
+text in the region (@pxref{Region Indent}).
+
+@item
+Otherwise, if the indentation function in @code{indent-line-function}
+is @code{indent-to-left-margin} (a trivial command that inserts a tab
+character), or if the variable @code{tab-always-indent} specifies that
+a tab character ought to be inserted (see below), then it inserts a
+tab character.
+
+@item
+Otherwise, it indents the current line; this is done by calling the
+function in @code{indent-line-function}.  If the line is already
+indented, and the value of @code{tab-always-indent} is @code{complete}
+(see below), it tries completing the text at point.
+@end itemize
+
+If @var{rigid} is non-@code{nil} (interactively, with a prefix
+argument), then after this command indents a line or inserts a tab, it
+also rigidly indents the entire balanced expression which starts at
+the beginning of the current line, in order to reflect the new
+indentation.  This argument is ignored if the command indents the
+region.
+@end deffn
+
+@defvar indent-line-function
+This variable's value is the function to be used by
+@code{indent-for-tab-command}, and various other indentation commands,
+to indent the current line.  It is usually assigned by the major mode;
+for instance, Lisp mode sets it to @code{lisp-indent-line}, C mode
+sets it to @code{c-indent-line}, and so on.  The default value is
+@code{indent-relative}.  @xref{Auto-Indentation}.
 @end defvar
 
 @deffn Command indent-according-to-mode
@@ -2218,41 +2252,31 @@ This command calls the function in @code{indent-line-function} to
 indent the current line in a way appropriate for the current major mode.
 @end deffn
 
-@deffn Command indent-for-tab-command &optional rigid
-This command calls the function in @code{indent-line-function} to
-indent the current line; however, if that function is
-@code{indent-to-left-margin}, @code{insert-tab} is called instead.
-(That is a trivial command that inserts a tab character.)  If
-@var{rigid} is non-@code{nil}, this function also rigidly indents the
-entire balanced expression that starts at the beginning of the current
-line, to reflect change in indentation of the current line.
-@end deffn
-
 @deffn Command newline-and-indent
 This function inserts a newline, then indents the new line (the one
-following the newline just inserted) according to the major mode.
-
-It does indentation by calling the current @code{indent-line-function}.
-In programming language modes, this is the same thing @key{TAB} does,
-but in some text modes, where @key{TAB} inserts a tab,
-@code{newline-and-indent} indents to the column specified by
-@code{left-margin}.
+following the newline just inserted) according to the major mode.  It
+does indentation by calling @code{indent-according-to-mode}.
 @end deffn
 
 @deffn Command reindent-then-newline-and-indent
-@comment !!SourceFile simple.el
 This command reindents the current line, inserts a newline at point,
 and then indents the new line (the one following the newline just
-inserted).
-
-This command does indentation on both lines according to the current
-major mode, by calling the current value of @code{indent-line-function}.
-In programming language modes, this is the same thing @key{TAB} does,
-but in some text modes, where @key{TAB} inserts a tab,
-@code{reindent-then-newline-and-indent} indents to the column specified
-by @code{left-margin}.
+inserted).  It does indentation on both lines by calling
+@code{indent-according-to-mode}.
 @end deffn
 
+@defopt tab-always-indent
+This variable can be used to customize the behavior of the @key{TAB}
+(@code{indent-for-tab-command}) command.  If the value is @code{t}
+(the default), the command normally just indents the current line.  If
+the value is @code{nil}, the command indents the current line only if
+point is at the left margin or in the line's indentation; otherwise,
+it inserts a tab character.  If the value is @code{complete}, the
+command first tries to indent the current line, and if the line was
+already indented, it calls @code{completion-at-point} to complete the
+text at point (@pxref{Completion in Buffers}).
+@end defopt
+
 @node Region Indent
 @subsection Indenting an Entire Region
 
@@ -2827,7 +2851,7 @@ faster to process chunks of text that have the same property value.
 comparing property values.  In all cases, @var{object} defaults to the
 current buffer.
 
-  For high performance, it's very important to use the @var{limit}
+  For good performance, it's very important to use the @var{limit}
 argument to these functions, especially the ones that search for a
 single property---otherwise, they may spend a long time scanning to the
 end of the buffer, if the property you are interested in does not change.
@@ -2839,15 +2863,15 @@ different properties.
 
 @defun next-property-change pos &optional object limit
 The function scans the text forward from position @var{pos} in the
-string or buffer @var{object} till it finds a change in some text
+string or buffer @var{object} until it finds a change in some text
 property, then returns the position of the change.  In other words, it
 returns the position of the first character beyond @var{pos} whose
 properties are not identical to those of the character just after
 @var{pos}.
 
 If @var{limit} is non-@code{nil}, then the scan ends at position
-@var{limit}.  If there is no property change before that point,
-@code{next-property-change} returns @var{limit}.
+@var{limit}.  If there is no property change before that point, this
+function returns @var{limit}.
 
 The value is @code{nil} if the properties remain unchanged all the way
 to the end of @var{object} and @var{limit} is @code{nil}.  If the value
@@ -2980,10 +3004,9 @@ character.
 @item face
 @cindex face codes of text
 @kindex face @r{(text property)}
-You can use the property @code{face} to control the font and color of
-text.  @xref{Faces}, for more information.
-
-@code{face} can be the following:
+The @code{face} property controls the appearance of the character,
+such as its font and color.  @xref{Faces}.  The value of the property
+can be the following:
 
 @itemize @bullet
 @item
@@ -2996,10 +3019,10 @@ face attribute name and @var{value} is a meaningful value for that
 attribute.  With this feature, you do not need to create a face each
 time you want to specify a particular attribute for certain text.
 @xref{Face Attributes}.
-@end itemize
 
-@code{face} can also be a list, where each element uses one of the
-forms listed above.
+@item
+A list, where each element uses one of the two forms listed above.
+@end itemize
 
 Font Lock mode (@pxref{Font Lock Mode}) works in most buffers by
 dynamically updating the @code{face} property of characters based on
@@ -3354,15 +3377,15 @@ of the text.
   Self-inserting characters normally take on the same properties as the
 preceding character.  This is called @dfn{inheritance} of properties.
 
-  In a Lisp program, you can do insertion with inheritance or without,
-depending on your choice of insertion primitive.  The ordinary text
-insertion functions such as @code{insert} do not inherit any properties.
-They insert text with precisely the properties of the string being
-inserted, and no others.  This is correct for programs that copy text
-from one context to another---for example, into or out of the kill ring.
-To insert with inheritance, use the special primitives described in this
-section.  Self-inserting characters inherit properties because they work
-using these primitives.
+  A Lisp program can do insertion with inheritance or without,
+depending on the choice of insertion primitive.  The ordinary text
+insertion functions, such as @code{insert}, do not inherit any
+properties.  They insert text with precisely the properties of the
+string being inserted, and no others.  This is correct for programs
+that copy text from one context to another---for example, into or out
+of the kill ring.  To insert with inheritance, use the special
+primitives described in this section.  Self-inserting characters
+inherit properties because they work using these primitives.
 
   When you do insertion with inheritance, @emph{which} properties are
 inherited, and from where, depends on which properties are @dfn{sticky}.
@@ -3754,7 +3777,7 @@ closest to @var{new-pos} that is in the same field as @var{old-pos}.
 
 If @var{new-pos} is @code{nil}, then @code{constrain-to-field} uses
 the value of point instead, and moves point to the resulting position
-as well as returning it.
+in addition to returning that position.
 
 If @var{old-pos} is at the boundary of two fields, then the acceptable
 final positions depend on the argument @var{escape-from-edge}.  If
@@ -4063,46 +4086,64 @@ The decoding functions ignore newline characters in the encoded text.
 @node Checksum/Hash
 @section Checksum/Hash
 @cindex MD5 checksum
-@cindex hashing, secure
-@cindex SHA-1
-@cindex message digest computation
-
-  MD5 cryptographic checksums, or @dfn{message digests}, are 128-bit
-``fingerprints'' of a document or program.  They are used to verify
-that you have an exact and unaltered copy of the data.  The algorithm
-to calculate the MD5 message digest is defined in Internet
-RFC@footnote{
-For an explanation of what is an RFC, see the footnote in @ref{Base
-64}.
-}1321.  This section describes the Emacs facilities for computing
-message digests and other forms of ``secure hash''.
+@cindex SHA hash
+@cindex hash, cryptographic
+@cindex cryptographic hash
+
+  Emacs has built-in support for computing @dfn{cryptographic hashes}.
+A cryptographic hash, or @dfn{checksum}, is a digital ``fingerprint''
+of a piece of data (e.g.@: a block of text) which can be used to check
+that you have an unaltered copy of that data.
+
+@cindex message digest
+  Emacs supports several common cryptographic hash algorithms: MD5,
+SHA-1, SHA-2, SHA-224, SHA-256, SHA-384 and SHA-512.  MD5 is the
+oldest of these algorithms, and is commonly used in @dfn{message
+digests} to check the integrity of messages transmitted over a
+network.  MD5 is not ``collision resistant'' (i.e.@: it is possible to
+deliberately design different pieces of data which have the same MD5
+hash), so you should not used it for anything security-related.  A
+similar theoretical weakness also exists in SHA-1.  Therefore, for
+security-related applications you should use the other hash types,
+such as SHA-2.
 
-@defun md5 object &optional start end coding-system noerror
-This function returns the MD5 message digest of @var{object}, which
-should be a buffer or a string.
+@defun secure-hash algorithm object &optional start end binary
+This function returns a hash for @var{object}.  The argument
+@var{algorithm} is a symbol stating which hash to compute: one of
+@code{md5}, @code{sha1}, @code{sha224}, @code{sha256}, @code{sha384}
+or @code{sha512}.  The argument @var{object} should be a buffer or a
+string.
 
-The two optional arguments @var{start} and @var{end} are character
+The optional arguments @var{start} and @var{end} are character
 positions specifying the portion of @var{object} to compute the
-message digest for.  If they are @code{nil} or omitted, the digest is
+message digest for.  If they are @code{nil} or omitted, the hash is
 computed for the whole of @var{object}.
 
-The function @code{md5} does not compute the message digest directly
-from the internal Emacs representation of the text (@pxref{Text
-Representations}).  Instead, it encodes the text using a coding
-system, and computes the message digest from the encoded text.  The
-optional fourth argument @var{coding-system} specifies which coding
-system to use for encoding the text.  It should be the same coding
-system that you used to read the text, or that you used or will use
-when saving or sending the text.  @xref{Coding Systems}, for more
-information about coding systems.
-
-If @var{coding-system} is @code{nil} or omitted, the default depends
-on @var{object}.  If @var{object} is a buffer, the default for
-@var{coding-system} is whatever coding system would be chosen by
-default for writing this text into a file.  If @var{object} is a
-string, the user's most preferred coding system (@pxref{Recognize
-Coding, prefer-coding-system, the description of
-@code{prefer-coding-system}, emacs, GNU Emacs Manual}) is used.
+If the argument @var{binary} is omitted or @code{nil}, the function
+returns the @dfn{text form} of the hash, as an ordinary Lisp string.
+If @var{binary} is non-@code{nil}, it returns the hash in @dfn{binary
+form}, as a sequence of bytes stored in a unibyte string.
+
+This function does not compute the hash directly from the internal
+representation of @var{object}'s text (@pxref{Text Representations}).
+Instead, it encodes the text using a coding system (@pxref{Coding
+Systems}), and computes the hash from that encoded text.  If
+@var{object} is a buffer, the coding system used is the one which
+would be chosen by default for writing the text into a file.  If
+@var{object} is a string, the user's preferred coding system is used
+(@pxref{Recognize Coding,,, emacs, GNU Emacs Manual}).
+@end defun
+
+@defun md5 object &optional start end coding-system noerror
+This function returns an MD5 hash.  It is semi-obsolete, since for
+most purposes it is equivalent to calling @code{secure-hash} with
+@code{md5} as the @var{algorithm} argument.  The @var{object},
+@var{start} and @var{end} arguments have the same meanings as in
+@code{secure-hash}.
+
+If @var{coding-system} is non-@code{nil}, it specifies a coding system
+to use to encode the text; if omitted or @code{nil}, the default
+coding system is used, like in @code{secure-hash}.
 
 Normally, @code{md5} signals an error if the text can't be encoded
 using the specified or chosen coding system.  However, if
@@ -4110,65 +4151,53 @@ using the specified or chosen coding system.  However, if
 coding instead.
 @end defun
 
-@defun secure-hash algorithm object &optional start end binary
-This function provides a general interface to a variety of secure
-hashing algorithms.  As well as the MD5 algorithm, it supports SHA-1,
-SHA-2, SHA-224, SHA-256, SHA-384 and SHA-512.  The argument
-@var{algorithm} is a symbol stating which hash to compute.  The
-arguments @var{object}, @var{start}, and @var{end} are as for the
-@code{md5} function.  If the optional argument @var{binary} is
-non-@code{nil}, returns a string in binary form.
-@end defun
-
-@node Parsing HTML
-@section Parsing HTML
+@node Parsing HTML/XML
+@section Parsing HTML and XML
 @cindex parsing html
 
+When Emacs is compiled with libxml2 support, the following functions
+are available to parse HTML or XML text into Lisp object trees.
+
 @defun libxml-parse-html-region start end &optional base-url
-This function provides HTML parsing via the @code{libxml2} library.
-It parses ``real world'' HTML and tries to return a sensible parse tree
-regardless.
+This function parses the text between @var{start} and @var{end} as
+HTML, and returns a list representing the HTML @dfn{parse tree}.  It
+attempts to handle ``real world'' HTML by robustly coping with syntax
+mistakes.
 
-In addition to @var{start} and @var{end} (specifying the start and end
-of the region to act on), it takes an optional parameter,
-@var{base-url}, which is used to expand relative URLs in the document,
-if any.
+The optional argument @var{base-url}, if non-@code{nil}, should be a
+string specifying the base URL for relative URLs occurring in links.
 
-Here's an example demonstrating the structure of the parsed data you
-get out.  Given this HTML document:
+In the parse tree, each HTML node is represented by a list in which
+the first element is a symbol representing the node name, the second
+element is an alist of node attributes, and the remaining elements are
+the subnodes.
+
+The following example demonstrates this.  Given this (malformed) HTML
+document:
 
 @example
-<html><hEad></head><body width=101><div class=thing>Foo<div>Yes
+<html><head></head><body width=101><div class=thing>Foo<div>Yes
 @end example
 
-You get this parse tree:
+@noindent
+A call to @code{libxml-parse-html-region} returns this:
 
 @example
-(html
- (head)
- (body
-  (:width . "101")
-  (div
-   (:class . "thing")
-   (text . "Foo")
-   (div
-    (text . "Yes\n")))))
+(html ()
+  (head ())
+  (body ((width . "101"))
+   (div ((class . "thing"))
+    "Foo"
+    (div ()
+      "Yes"))))
 @end example
-
-It's a simple tree structure, where the @code{car} for each node is
-the name of the node, and the @code{cdr} is the value, or the list of
-values.
-
-Attributes are coded the same way as child nodes, but with @samp{:} as
-the first character.
 @end defun
 
 @cindex parsing xml
 @defun libxml-parse-xml-region start end &optional base-url
-
-This is much the same as @code{libxml-parse-html-region} above, but
-operates on XML instead of HTML, and is correspondingly stricter about
-syntax.
+This function is the same as @code{libxml-parse-html-region}, except
+that it parses the text as XML rather than HTML (so it is stricter
+about syntax).
 @end defun
 
 @node Atomic Changes
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index a92a807b747..58092f23157 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -1076,7 +1076,8 @@ Text
 * Registers::               How registers are implemented.  Accessing
                               the text or position stored in a register.
 * Base 64::                 Conversion to or from base 64 encoding.
-* Checksum/Hash::           Computing "message digests"/"checksums"/"hashes".
+* Checksum/Hash::           Computing cryptographic hashes.
+* Parsing HTML/XML::        Parsing HTML and XML.
 * Atomic Changes::          Installing several buffer changes "atomically".
 * Change Hooks::            Supplying functions to be run when text is changed.
 
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 97b21aba10b..a42b70d77a4 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -1075,7 +1075,8 @@ Text
 * Registers::               How registers are implemented.  Accessing
                               the text or position stored in a register.
 * Base 64::                 Conversion to or from base 64 encoding.
-* Checksum/Hash::           Computing "message digests"/"checksums"/"hashes".
+* Checksum/Hash::           Computing cryptographic hashes.
+* Parsing HTML/XML::        Parsing HTML and XML.
 * Atomic Changes::          Installing several buffer changes "atomically".
 * Change Hooks::            Supplying functions to be run when text is changed.
 
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 07be7fa9079..b541b2419c8 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3142,7 +3142,7 @@ as @code{save-window-excursion}:
 @end example
 @end defun
 
-@defspec save-window-excursion forms@dots{}
+@defmac save-window-excursion forms@dots{}
 This special form records the window configuration, executes @var{forms}
 in sequence, then restores the earlier window configuration.  The window
 configuration includes, for each window, the value of point and the
@@ -3179,7 +3179,7 @@ For example:
      ;; @r{The screen is now split again.}
 @end group
 @end example
-@end defspec
+@end defmac
 
 @defun window-configuration-p object
 This function returns @code{t} if @var{object} is a window configuration.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 1691c979fb6..c95aaa9b15d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * info.texi (Expert Info): Move the index entry for "Texinfo" from
+        "Getting Started" to this node.  (Bug#10450)
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * flymake.texi (Example -- Configuring a tool called via make):
+        Mention the Automake COMPILE variable (Bug#8715).
+
+        * info.texi (Getting Started): Add an index entry (Bug#10450).
+
 2012-03-02  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Signals): Known names will be mapped onto unique
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 687a2f7b4d4..28fb7864f06 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -449,10 +449,10 @@ Finally, we add an entry to @code{flymake-err-line-patterns}:
 @cindex Adding support for C (gcc+make)
 
 In this example we will add support for C files syntax checked by
-@code{gcc} called via @code{make}.
+@command{gcc} called via @command{make}.
 
 We're not required to write any new functions, as Flymake already has
-functions for @code{make}. We just add a new entry to the
+functions for @command{make}. We just add a new entry to the
 @code{flymake-allowed-file-name-masks}:
 
 @lisp
@@ -464,7 +464,7 @@ functions for @code{make}. We just add a new entry to the
             flymake-allowed-file-name-masks))
 @end lisp
 
-@code{flymake-simple-make-init} builds the following @code{make}
+@code{flymake-simple-make-init} builds the following @command{make}
 command line:
 
 @lisp
@@ -486,9 +486,17 @@ check-syntax:
         gcc -o /dev/null -S ${CHK_SOURCES}
 @end verbatim
 
-The format of error messages reported by @code{gcc} is already
+@noindent
+The format of error messages reported by @command{gcc} is already
 supported by Flymake, so we don't have to add a new entry to
-@code{flymake-err-line-patterns}.
+@code{flymake-err-line-patterns}.  Note that if you are using
+Automake, you may want to replace @code{gcc} with the standard
+Automake variable @code{COMPILE}:
+
+@verbatim
+check-syntax:
+        $(COMPILE) -o /dev/null -S ${CHK_SOURCES}
+@end verbatim
 
 @node Flymake Implementation
 @chapter Flymake Implementation
@@ -548,9 +556,9 @@ These modes are handled inside init/cleanup/getfname functions, see
 @ref{Adding support for a new syntax check tool}.
 
 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 @code{make}, @code{Ant}, etc.) code.
+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.
 
 
 @node Making a temporary copy
@@ -626,8 +634,8 @@ Therefore, a customizable variable
 way to implement the desired behavior.
 
 The default implementation, @code{flymake-get-project-include-dirs-imp},
-uses a @code{make} call. This requires a correct base directory, that is, a
-directory containing a correct @code{Makefile}, to be determined.
+uses a @command{make} call. This requires a correct base directory, that is, a
+directory containing a correct @file{Makefile}, to be determined.
 
 As obtaining the project include directories might be a costly operation, its
 return value is cached in the hash table. The cache is cleared in the beginning
@@ -641,16 +649,16 @@ of every syntax check attempt.
 
 Flymake can be configured to use different tools for performing syntax
 checks. For example, it can use direct compiler call to syntax check a perl
-script or a call to @code{make} for a more complicated case of a
+script or a call to @command{make} for a more complicated case of a
 @code{C/C++} source. The general idea is that simple files, like perl
 scripts and html pages, can be checked by directly invoking a
 corresponding tool. Files that are usually more complex and generally
 used as part of larger projects, might require non-trivial options to
 be passed to the syntax check tool, like include directories for
 C++. The latter files are syntax checked using some build tool, like
-@code{make} or @code{Ant}.
+Make or Ant.
 
-All @code{make} configuration data is usually stored in a file called
+All Make configuration data is usually stored in a file called
 @code{Makefile}. To allow for future extensions, flymake uses a notion of
 buildfile to reference the 'project configuration' file.
 
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index ed00e8da028..8952bfb9122 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1235,6 +1235,7 @@ this:
 
 @node Expert Info
 @chapter Info for Experts
+@cindex Texinfo
 
   This chapter explains how to write an Info file by hand.  However,
 in most cases, writing a Texinfo file is better, since you can use it
diff --git a/etc/NEWS b/etc/NEWS
index fd4f7afa863..1d56a0044c6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -251,7 +251,8 @@ On character terminals, these methods are used for characters that
 cannot be encoded by the `terminal-coding-system'.
 
 ---
-*** New input methods for Farsi: farsi and farsi-translit.
+*** New input methods for Farsi: farsi and farsi-translit;
+and for Bulgarian: bulgarian-alt-phonetic.
 
 +++
 *** `nobreak-char-display' now also highlights Unicode hyphen chars
@@ -771,6 +772,11 @@ See MH-E-NEWS for details.
 ---
 ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags.
 
+** nXML mode no longer binds C-RET to `nxml-complete'.
+Completion is now performed via `completion-at-point', bound to M-TAB.
+If `nxml-bind-meta-tab-to-complete-flag' is non-nil (the default),
+this performs tag completion.
+
 ---
 ** Prolog mode has been completely revamped, with lots of additional
 functionality such as more intelligent indentation, electricity, support for
@@ -1025,7 +1031,7 @@ for buffers with dead inferior processes has been generalized.
 ** The return value of `backup-buffer' has changed.
 It is now a list of three elements, where the second element is a list
 describing the original file's SELinux context.  If Emacs or the
-system lacks SELinux cupport, the context list is (nil nil nil nil).
+system lacks SELinux support, the context list is (nil nil nil nil).
 See the "Basic SELinux support" entry under "Changes in Emacs 24.1",
 above.
 
@@ -1482,13 +1488,12 @@ These require Emacs to be built with ImageMagick support.
 image-transform-fit-to-height, image-transform-fit-to-width,
 image-transform-set-rotation, image-transform-set-scale.
 
++++
 ** XML and HTML parsing
-If Emacs is compiled with libxml2 support, there are two new functions:
-`libxml-parse-html-region' (which parses "real world" HTML) and
-`libxml-parse-xml-region' (which parses XML).  Both return an Emacs
-Lisp parse tree.
-
-FIXME: These should be front-ended by xml.el.
+If Emacs is compiled with libxml2 support, there are two new
+functions: `libxml-parse-html-region' (which parses "real world" HTML)
+and `libxml-parse-xml-region' (which parses XML).  Both return an
+Emacs Lisp parse tree.
 
 ** GnuTLS
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 75627f084cd..ae3f49868b2 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -302,6 +302,12 @@ Help mode due to setting `temp-buffer-show-hook' rather than using
 
 ** Keyboard problems
 
+*** Unable to enter the M-| key on some German keyboards.
+Some users have reported that M-| suffers from "keyboard ghosting".
+This can't be fixed by Emacs, as the keypress never gets passed to it
+at all (as can be verified using "xev").  You can work around this by
+typing `ESC |' instead.
+
 *** "Compose Character" key does strange things when used as a Meta key.
 
 If you define one key to serve as both Meta and Compose Character, you
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 39ba53201da..40e570c99c1 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-13  Йордан Миладинов  <jordanmiladinov@gmail.com>  (tiny change)
+
+        * quail/cyrillic.el (bulgarian-alt-phonetic):
+        New input method.  (Bug#10893)
+
+2012-03-09  Mohsen BANAN  <libre@mohsen.1.banan.byname.net>
+
+        * quail/persian.el: Update which includes: (1) full compliance to
+        ISIRI-6219, forbidden characters were eliminated and missing
+        characters were added; (2) layer 3 of ISIRI-9147 is now
+        implemented with a '\' prefix; (3) double entry of characters
+        which were postfixed with 'h' is now supported; (4) lots of
+        comment and additional pointers have been added.
+
 2011-12-15  Kenichi Handa  <handa@m17n.org>
 
         * quail/ethiopic.el ("ethiopic"): Do not refer to
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 0c2f64e3d69..0e5fb0cdb83 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1236,6 +1236,79 @@ Unicode based."
  ("." ?$,1(n(B)
  ("/" ?.))
 
+(quail-define-package
+ "bulgarian-alt-phonetic" "Bulgarian" "$,1(1(=(D(B"
+ nil
+ "Bulgarian alternative Phonetic keyboard layout, producing Unicode.
+
+This phonetic layout replaces all the Latin letters with Bulgarian
+\(Cyrillic\) letters based on similarities in their pronunciation or look.
+
+Note that, since the letters ',Li(B', ',Ll(B', ',Ln(B' and ',Lo(B' are attached to the
+']', '\', '`' and '[' keys respectively, Caps Lock does not affect them."
+nil t t t t nil nil nil nil nil t)
+
+;;  $,1(N(B  1! 2@ 3$,1uV(B 4$ 5% 6$,1tL(B 7,A'(B 8* 9( 0) -$,1rs(B =+ $,1(l(}(B
+;;      $,1(G(B  $,1(H(B  $,1(5(B  $,1(@(B  $,1(B(B  $,1(J(B  $,1(C(B  $,1(8(B  $,1(>(B  $,1(?(B  $,1(O(B  $,1(I(B
+;;       ,L0(B  $,1(A(B  $,1(4(B  $,1(D(B  $,1(3(B  $,1(E(B  $,1(9(B  $,1(:(B  $,1(;(B  :; '"
+;;        $,1(7(B  $,1(6(B  $,1(F(B  $,1(2(B  $,1(1(B  $,1(=(B  $,1(<(B  ,$,1r~(B .$,1r|(B /?
+
+(quail-define-rules
+ ("#" ?,Lp(B)
+ ("&" ?,A'(B)
+ ("/#" ?#)
+ ("/&" ?&)
+ ("/<" ?<)
+ ("/>" ?>)
+ ("/[" ?\[)
+ ("/\\" ?\\)
+ ("/]" ?\])
+ ("/^" ?^)
+ ("/_" ?_)
+ ("/`" ?`)
+ ("/{" ?{)
+ ("/|" ?|)
+ ("/}" ?})
+ ("/~" ?~)
+ ("<" ?$,1r~(B)
+ (">" ?$,1r|(B)
+ ("A" ?$,1(0(B) ("a" ?$,1(P(B)
+ ("B" ?$,1(1(B) ("b" ?$,1(Q(B)
+ ("C" ?$,1(F(B) ("c" ?$,1(f(B)
+ ("D" ?$,1(4(B) ("d" ?$,1(T(B)
+ ("E" ?$,1(5(B) ("e" ?$,1(U(B)
+ ("F" ?$,1(D(B) ("f" ?$,1(d(B)
+ ("G" ?$,1(3(B) ("g" ?$,1(S(B)
+ ("H" ?$,1(E(B) ("h" ?$,1(e(B)
+ ("I" ?$,1(8(B) ("i" ?$,1(X(B)
+ ("J" ?$,1(9(B) ("j" ?$,1(Y(B)
+ ("K" ?$,1(:(B) ("k" ?$,1(Z(B)
+ ("L" ?$,1(;(B) ("l" ?$,1([(B)
+ ("M" ?$,1(<(B) ("m" ?$,1(\(B)
+ ("N" ?$,1(=(B) ("n" ?$,1(](B)
+ ("O" ?$,1(>(B) ("o" ?$,1(^(B)
+ ("P" ?$,1(?(B) ("p" ?$,1(_(B)
+ ("Q" ?$,1(G(B) ("q" ?$,1(g(B)
+ ("R" ?$,1(@(B) ("r" ?$,1(`(B)
+ ("S" ?$,1(A(B) ("s" ?$,1(a(B)
+ ("T" ?$,1(B(B) ("t" ?$,1(b(B)
+ ("U" ?$,1(C(B) ("u" ?$,1(c(B)
+ ("V" ?$,1(2(B) ("v" ?$,1(R(B)
+ ("W" ?$,1(H(B) ("w" ?$,1(h(B)
+ ("X" ?$,1(6(B) ("x" ?$,1(V(B)
+ ("Y" ?$,1(J(B) ("y" ?$,1(j(B)
+ ("Z" ?$,1(7(B) ("z" ?$,1(W(B)
+ ("[" ?$,1(o(B)
+ ("\\" ?$,1(l(B)
+ ("]" ?$,1(i(B)
+ ("^" ?$,1tL(B)
+ ("_" ?$,1rs(B)
+ ("`" ?$,1(n(B)
+ ("{" ?$,1(O(B)
+ ("|" ?$,1(}(B)
+ ("}" ?$,1(I(B)
+ ("~" ?$,1(N(B))
+
 ;; From `Bulgarian-PHO.kmap for Yudit', Alexander Shopov
 ;; <al_shopov@web.bg>.
 
diff --git a/leim/quail/persian.el b/leim/quail/persian.el
index d006e83aa71..70e2d380329 100644
--- a/leim/quail/persian.el
+++ b/leim/quail/persian.el
@@ -2,8 +2,8 @@
 
 ;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
-;; Author: Mohsen BANAN  <libre@mohsen.banan.1.byname.net>
-;; http://mohsen.banan.1.byname.net/contact
+;; Author: Mohsen BANAN  <libre@mohsen.1.banan.byname.net>
+;; http://mohsen.1.banan.byname.net/contact
 
 ;; Keywords: multilingual, input method, Farsi, Persian, keyboard
 
@@ -27,12 +27,15 @@
 ;;; Commentary:
 ;;
 ;; This file contains a collection of input methods for
-;; Persian languages - Farsi, Urdu, Pashto (Afghani), ...
+;; Persian languages (Farsi, Urdu, Pashto/Afghanic, ...)
 ;;
 ;; At this time, the following input methods are specified:
 ;;
-;;  - (farsi) Persian Keyboard based on Islamic Republic of Iran's ISIR-9147
-;;  - (farsi-translit) Intuitive transliteration keyboard layout for Persian
+;;  - (farsi-isiri-9149) Persian Keyboard based on Islamic Republic of Iran's ISIR-9147
+;;  - (farsi-transliterate-banan) An intuitive transliteration keyboard for Farsi
+;;
+;; Additional documentation for these input methods can be found at:
+;;  http://www.persoarabic.org/PLPC/120036
 ;;
 
 ;;; Code:
@@ -42,42 +45,71 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; farsi
+;; farsi-isiri-9147
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The keyboard mapping defined here is based on:
 ;;
-;;   Institute of Standards and Industrial Research of Iran
-;;   Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards
-;;   ISIRI 9147 -- 1st edition
-;;   http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
+;; Institute of Standards and Industrial Research of Iran
+;; Information Technology – Layout of Persian Letters and Symbols
+;; on Computer Keyboards
+;; ISIRI 9147 -- 1st edition
+;; http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
+;;
+;; The specification is also republished at
+;;     http://www.farsiweb.ir/wiki/Image:Isiri-9147.pdf
+;; and various other sites.
+;;
+;; ISIRI-6219 is also relevant.
+;;
+;; Layers 1, 2 and 3 of ISIRI-9147 are fully implemented with the
+;; exception of the Backslash, Alt-Backslash, Shift-Space and
+;; Alt-Space keys.
+;;
+;; The Backslash key is used to replace کلید با دگر ساز راست‌ -- the Alt or
+;; Meta key.
 ;;
-;;  Only layers 1 and 2 of ISIRI-9147 are applicable to emacs.
+;; Layer 3 is then entered with the Backslash key and Layer 3 is
+;; implemented as two letter keys as specified in ISIRI-9147.
 ;;
-;;  This input method was built using the Farsi table in X Keyboard Configuration Data Base.
+;; The character corresponding to Backslash is entered with Backslash-Backslash.
+;; Alt-Backslash has been moved to Backslash-r.
+;; Alt-Space has been moved to Backslash-t.
+;; Shift-Space has been moved to Backslash-y.
 ;;
-;;  0) Selected gnome keyboard "USA"
-;;  1) Created a list of all keys
-;;  2) Selected gnome keyboard "Iran"
-;;  3) For each key just press it and get the mapped persian character
+;; With these modifications, farsi-isiri-9147 is a full implementation
+;; of ISIRI-9147.  Additionally, these modifications allow for this
+;; implementation to be ascii input stream based -- in addition to
+;; being a keyboard layout.
+;;
+;; If a key on Layer 1 was reserved to replace دگر ساز راست‌ (the Alt
+;; or Meta key), then farsi-isiri-9147 could have claimed full
+;; compliance -- without the need for the above description. Perhaps
+;; this can be considered a flaw in the base ISIRI-9147 specification
+;; to be addressed in the next revision.
 ;;
 
 
 (quail-define-package
- "farsi" "Farsi" " Ù�" nil "Farsi input method.
+ "farsi-isiri-9147" "Farsi" " Ù�" nil "Farsi input method.
 
-Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
+Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
 " nil t t t t nil nil nil nil nil t)
 
+;; Note: the rows of keys below are enclosed in Left-To-Right Override
+;; embedding, to prevent them from being reordered by the Emacs
+;; display engine.
+
+
 ;; +----------------------------------------------------------------+
-;; | ۱! | ۲٬ | ۳٫ | ۴﷼ | ۵٪ | ۶× | ۷، | ۸* | ۹) | ۰( | -ـ | =+ | `÷ |
+;; ‭| ۱! | ۲٬ | ۳٫ | ۴﷼ | ۵٪ | ۶× | ۷، | ۸* | ۹( | ۰) | -ـ | =+ | `÷ |‬
 ;; +----------------------------------------------------------------+
-;;   | ضْ| صٌ| ث�| قً| ��| غ�| عَ| هّ| خ] | ح[ | ج} | چ{ |
+;;   ‭| ضْ| صٌ| ث�| قً| ��| غ�| عَ| هّ| خ] | ح[ | ج{ | چ} |‬
 ;;   +------------------------------------------------------------+
-;;    | شؤ | سئ | یي | بإ | لأ | اآ | تة | ن» | م« | ک: | گ؛ | \| |
+;;    ‭| ش‌ؤ | س‌ئ | ی‌ي | ب‌إ | لأ | اآ | ت‌ة | ن« | م» | ک: | گ؛ | \| |‬
 ;;    +-----------------------------------------------------------+
-;;      | ظك | طٓ| زژ | رٰ| ذB | دٔ| پء | و> | .< | /؟ |
+;;      ‭| ظ‌ك | طٓ| زژ | رٰ| ذB | دٔ| پء | و< | .> | /؟ |‬
 ;;      +-------------------------------------------+
 
 (quail-define-rules
@@ -93,7 +125,7 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("0" ?Û°)
  ("-" ?-)
  ("=" ?=)
- ;;("`" ?�\))  ;; اتصال مجازى
+ ("`" ?\u200D)      ;; ZWJ --  ZERO WIDTH JOINER اتصال مجازى
  ("q" ?ض)
  ("w" ?ص)
  ("e" ?Ø«)
@@ -117,7 +149,7 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("l" ?Ù…)
  (";" ?Ú©)
  ("'" ?Ú¯)
- ("\\" ?\\)  ;; خط اريب وارو
+
  ("z" ?ظ)
  ("x" ?Ø·)
  ("c" ?ز)
@@ -170,93 +202,204 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("X" ?Ù“)
  ("C" ?Ú˜)
  ("V" ?Ù°)
- ;; ("B" ?‌‌) ;; �اصلهً مجازى
+ ("B" ?\u200C)     ;; ZWNJ -- ZERO WIDTH NON-JOINER  �اصلهٔ مجازى
  ("N" ?ٔ)  ;; همزه �ارسى بالا
  ("M" ?Ø¡)   ;;  harf farsi hamzeh
  ("<" ?>)
  (">" ?<)
  ("?" ?ØŸ)
+
+ ;; Level 3 Entered with \ 
+ ;;
+ ("\\" ?\\)  ;; خط اريب وارو
+ ("\\\\" ?\\)
+ ("\\~" ?\u007E)
+ ("\\1" ?\u0060)
+ ("\\2" ?\u0040)
+ ("\\3" ?\u0023)
+ ("\\4" ?\u0024)
+ ("\\5" ?\u0025)
+ ("\\6" ?\u005E)
+ ("\\7" ?\u0026)
+ ("\\8" ?\u2022)
+ ("\\9" ?\u200E)
+ ("\\0" ?\u200F)
+ ("\\-" ?\u005F)
+ ("\\+" ?\u2212)
+ ("\\q" ?\u00B0)
+ ;;\\w" ?\u0000)
+ ("\\e" ?\u20AC)
+ ("\\r" ?\u2010)       ;; replacement for Alt-BSL
+ ("\\t" ?\u00A0)       ;; replacement for ALT-SPC
+ ("\\y" ?\u200C)       ;; replacement for SHIFT-SPC
+ ;;("\\u" ?\u0000)
+ ("\\i" ?\u202D)
+ ("\\o" ?\u202E)
+ ("\\p" ?\u202C)
+ ("\\[" ?\u202A)
+ ("\\]" ?\u202B)
+ ;;("\\a" ?\u0000)
+ ;;("\\s" ?\u0000)
+ ("\\d" ?\u0649)
+ ;;("\\f" ?\u0000)
+ ;;("\\g" ?\u0000)
+ ("\\h" ?\u0671)
+ ;;("\\j" ?\u0000)
+ ("\\k" ?\uFD3E)
+ ("\\l" ?\uFD3F)
+ ("\\;" ?\u003B)
+ ("\\'" ?\u0022)
+ ;;("\\z" ?\u0000)
+ ;;("\\x" ?\u0000)
+ ;;("\\c" ?\u0000)
+ ("\\v" ?\u0656)
+ ("\\b" ?\u200D)
+ ("\\n" ?\u0655)
+ ("\\m" ?\u2026)
+ ("\\," ?\u002C)
+ ("\\." ?\u0027)
+ ("\\?" ?\u003F)
+ ;;("\\\\"   ?\u2010)    ;; Moved to backslash r to leave room for BSL-BSL
   )
 
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; farsi-translit
+;; farsi-transliterate-banan
+;;
+;; Given a Qwerty keyboard, use Persian-to-Latin transliteration knowledge
+;; to reverse transliterate in persian
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
-;;;  This is a persian/farsi transliteration keyboard designed
-;;;  for people who:
-;;;   - Know how to write in farsi
-;;;   - Are comfortable with the qwerty keyboard
-;;;   - Are familiar with two letter phonetic mapping to persian characters
-;;;     (e.g.: gh, kh, ch, sh, zh, hh, lh)
+;;;  See http://www.persoarabic.org/PLPC/120036 document for more complete
+;;;  documentation of keyboard bindings and usage instructions.
 ;;;
-;;;  This translit keyboard is designed to be intuitive such that
-;;;  mapping are easy and natural to remember for a persian writer.
-;;;  For some persian characters there are multiple ways of inputting
-;;;  the same character.
-;;;
-;;;  The letter 'h' is used for a number of two character mappings,
-;;;  this means that some character sequence inputs need to be repeated
-;;;  followed by a backspace followed by the 'h'.
-;;;    For example:  سحر = 's' 's' '<bs>' 'h' 'h' 'r'
-;;;  In practice such sequences are rare.
-;;;
-
+;;
+;; ISIRI-9147 Persian keyboard is generally not well suited for Iranian-Expatriates
+;; working/living in the West.
+;;
+;; The qwerty keyboard is usually second nature to Persian speaking expatriates and they
+;; don't want to learn/adapt to ISIRI-9147.  They expect software to adapt to them.
+;;
+;; That is what the ``Banan Multi-Character (Reverse) Transliteration Persian Input Method'' does.
+;;
+;; The typical profile of the user is assumed to be one who:
+;;
+;;  -  can write in farsi (not just speak it).
+;;  -  is fully comfortable with a qwerty latin keyboard.
+;;  -  is not familiar with isir-9147 and does not wish to be trained.
+;;  -  communicates and writes in a mixed globish/persian -- not pure persian.
+;;  -  is intuitively familiar with transliteration of farsi/persian into latin based on two letter
+;;     phonetic mapping to persian characters (e.g., gh Ù‚ --  kh Ø® -- sh Ø´ -- ch Ú† -- zh Ú˜.
+;;
+;; This transliteration keyboard is designed to be intuitive such that
+;; mapping are easy and natural to remember for a persian writer.
+;; It is designed to be equivalent in capability to farsi-isiri-9147
+;; and provide for inputting all characters enumerated in ISIRI-6219.
+;;
+;; farsi-transliterate-banan is of course phonetic oriented.  But it is very different from
+;; pinglish. Pinglish is word oriented where you sound out the word with latin letters --
+;; including the vowels. farsi-transliterate-banan is letter oriented where you enter the
+;; latin letter/letters closest to the persian letter. And usually omit vowels.
+;;
+;; For some persian characters there are multiple ways of inputting
+;; the same character. For example both ``i'' and ``y'' produce ی.
+;; For یک ``yk'', ``y'' is more natural and for این ``ain'', ``i'' is more natural. 
+;;
+;; The more frequently used keys are mapped to lower case. The less frequently used letter moves to
+;; upper case. For example: ``s'' is س and ``S'' is ص.  ``h'' is ح and ``H''
+;; is Ù‡.
+;;
+;; Multi-character input is based on \, &, and / prefix
+;; characters. The letter 'h' is used as a postfix for the following two character mappings:
+;; gh Ù‚ --  kh Ø® -- sh Ø´ -- ch Ú† -- zh Ú˜  -- Th Ø© -- Yh Ù‰.
+;;
+;;
+;; Prefix letter \ is used for two character inputs when an alternate form of a letter
+;; is desired for example \% is: ‌÷ when % is: ٪.
+;;
+;; Prefix letter & is used for multi-character inputs when special characters are
+;; desired based on their abbreviate name. For example you can enter &lrm; to enter the
+;; ``LEFT-TO-RIGHT MARK'' character.
+;;
+;; Prefix letter / is used to provide two characters. / is: ``ZERO WIDTH NON-JOINER'' 
+;; and // is /.
+;;
+;; The letter 'h' is used in a number of two character postfix mappings,
+;; for example ``sh'' Ø´. So if you need the sequence of ``s'' and ``h'' you
+;; need to repeat the ``s''. For example: سحر = 's' 's' 'h' 'r'.
+;;
 
 
 (quail-define-package
- "farsi-translit" "Farsi" "Ù¾" t
+ "farsi-transliterate-banan" "Farsi" "ب" t
  "Intuitive transliteration keyboard layout for persian/farsi.
 " nil t t t t nil nil nil nil nil t)
 
 
 (quail-define-rules
- ("a"  ?ا)
- ("A"  ?Ø¢)  ;; alef madde
- ("b"  ?ب)
- ("p"  ?Ù¾)
+;;;;;;;;;;;  isiri-6219 Table 5 -- جدول ۵ - حرو��� اصلی� �ارسی 
+ ("W"  ?Ø¡)        ;; hamzeh
+ ("A"  ?آ)        ;; U+0622   & ARABIC LETTER ALEF WITH MADDA ABOVE & ال� با  کلاه
+ ("a"  ?ا)        ;; U+0627   & ARABIC LETTER ALEF  & ال�
+ ("\\a" ?Ø£)
+ ("b"  ?ب)        ;; U+0628   & ARABIC LETTER BEH  &
+ ("p"  ?Ù¾)        ;; U+067e   & ARABIC LETTER PEH  &
  ("t"  ?ت)
+ ("tt"  ?ت)
  ("c"  ?Ø«)
+ ("cc"  ?Ø«)
  ("j"  ?ج)
  ("ch" ?Ú†)
- ("hh" ?Ø­)
+ ("h"  ?Ø­)
  ("kh" ?Ø®)
  ("d"  ?د)
  ("Z"  ?Ø°)
  ("r"  ?ر)
  ("z"  ?ز)
+ ("zz"  ?ز)
  ("zh" ?Ú˜)
  ("s"  ?س)
+ ("ss"  ?س)
  ("sh" ?Ø´)
  ("S"  ?ص)
  ("x"  ?ض)
  ("T"  ?Ø·)
+ ("TT"  ?Ø·)
  ("X"  ?ظ)
  ("w"  ?ع)
- ("Q"  ?غ)
+ ("q"  ?غ)
  ("f"  ?Ù�)
- ("q"  ?Ù‚)
+ ("Q"  ?Ù‚)
  ("gh" ?Ù‚)
  ("k"  ?Ú©)
- ("K"  ?Ùƒ)  ;;  Arabic kaf
+ ("kk"  ?Ú©)
  ("g"  ?Ú¯)
+ ("gg"  ?Ú¯)
  ("l"  ?Ù„)
- ("lh" ?ï»»)
  ("m"  ?Ù…)
  ("n"  ?Ù†)
  ("v"  ?Ùˆ)
- ("V" ?ؤ)
  ("u"  ?Ùˆ)
+ ("V" ?ؤ)
  ("H"  ?Ù‡)
- ("h"  ?Ù‡)
- ("th" ?Ø©)  ;; ta marbuteh
- ("yh" ?Û€)  ;; he ye
- ("y"  ?Ù‰)
- ("i"  ?ÙŠ)
+ ("y"  ?ی)
+ ("i"  ?ی)
  ("I" ?ئ)
 
+
+;;;;;;;;;;;  isiri-6219 Table 6 -- جدول ۶ - حرو���  عربی 
+ ("F" ?Ø¥)
+ ("D" ?\u0671)     ;; (ucs-insert #x0671)ٱ   named: حر�� ال�� وصل
+ ("K"  ?Ùƒ)         ;;  Arabic kaf
+ ("Th" ?Ø©)         ;; ta marbuteh
+ ("Y"  ?ÙŠ)
+ ("YY"  ?ÙŠ)
+ ("Yh"  ?Ù‰)
+
+;;;;;;;;;;;  isiri-6219 Table 4 -- جدول ۴ -  ارقام و علائم ریاضی
+ ("0"  ?Û°)
  ("1"  ?Û±)
  ("2"  ?Û²)
  ("3"  ?Û³)
@@ -266,31 +409,106 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("7"  ?Û·)
  ("8"  ?Û¸)
  ("9"  ?Û¹)
- ("0"  ?Û°)
 
- ("F" ?Ø¥)
- ("G" ?Ø£)
+ ("\\/" ?\u066B)     ;; (ucs-insert #x066B)٫   named: ممیز� �ارسی
+ ("\\," ?\u066C)     ;; (ucs-insert #x066C)٬   named: جداکننده‌ی هزارهای �ارسی
+ ("%" ?\u066A)       ;; (ucs-insert #x066A)٪   named: درصد� �ارسی
+ ("+" ?\u002B)     ;; (ucs-insert #x002B)+   named: علامت� به‌اضا�ه
+ ("-" ?\u2212)     ;; (ucs-insert #x2212)−   named: علامت� منها
+ ("\\*" ?\u00D7)     ;; (ucs-insert #x00D7)×   named: علامت� ضرب
+ ("\\%" ?\u007F)    ;; (ucs-insert #x00F7)÷   named: علامت� تقسیم
+ ("<" ?\u003C)     ;; (ucs-insert #x003C)<   named: علامت� کوچکتر  
+ ("=" ?\u003D)     ;; (ucs-insert #x003D)=   named: علامت� مساوی
+ (">" ?\u003E)     ;; (ucs-insert #x003E)>   named: علامت� بزرگتر
 
- ("~"  ?ّ)  ;; tashdid ;;  تشديد �ارسى
- ("`" ?Ù“)
- ("e"  ?�)  ;; zir   زير �ارسى -- �تحه
- ("E"  ?�)  ;; eizan ;; دو زير �ارسى -- تنوين جر
- ("#"  ?ً)  ;; ً tanvin nasb ;; دو زبر �ارسى -- تنوين نصب
- ("@" ?ْ)  ;; ساکن �ارسى
- ("^"  ?َ)  ;; zbar ;; زبر �ارسى -- �تحه
- ("o"  ?�)  ;; peesh ;; پيش �ارسى -- ضمه
- ("O" ?ٌ)  ;; دو پيش �ارسى -- تنوين ر�ع
- ("?"  ?ØŸ)  ;; alamat soal
- ("&" ?ٔ)  ;; همزه �ارسى بالا
- ("$"  ?Ø¡)  ;; hamzeh
- ("%"  ?÷)  ;;
- ("*"  ?×)  ;;
- (";"  ?Ø›)  ;;
- (",h" ?،)  ;; farsi
- (",h" ?,)  ;; latin
+
+;;;;;;;;;;;  isiri-6219 Table 2 -- جدول ۲ -  علائم نقطه گذاری� مشترک
+ ;;; Space
  ("."  ?.)  ;;
+ (":" ?\u003A)     ;; (ucs-insert #x003A):   named: 
+ ("!" ?\u0021)     ;; (ucs-insert #x0021)!   named: 
+ ("\\." ?\u2026)     ;; (ucs-insert #x2026)…   named: 
+ ("\\-" ?\u2010)     ;; (ucs-insert #x2010)�   named: 
+ ("-" ?\u002D)     ;; (ucs-insert #x002D)-   named: 
+ ("|" ?|)
+ ;;("\\\\" ?\)
+ ("//" ?/)
+ ("*" ?\u002A)     ;; (ucs-insert #x002A)*   named: 
+ ("(" ?\u0028)     ;; (ucs-insert #x0028)(   named: 
+ (")" ?\u0029)     ;; (ucs-insert #x0029))   named: 
+ ("[" ?\u005B)     ;; (ucs-insert #x005B)[   named: 
+ ("[" ?\u005D)     ;; (ucs-insert #x005D)]   named: 
+ ("{" ?\u007B)     ;; (ucs-insert #x007B){   named: 
+ ("}" ?\u007D)     ;; (ucs-insert #x007D)}   named: 
+ ("\\<" ?\u00AB)     ;; (ucs-insert #x00AB)«   named: 
+ ("\\>" ?\u00BB)     ;; (ucs-insert #x00BB)»   named: 
+
+
+;;;;;;;;;;;  isiri-6219 Table 3 -- جدول ۳ -  علائم نقطه گذاری� �ارسی
+ ("," ?،)  ;; farsi
+ (";"  ?Ø›)  ;;
+ ("?"  ?ØŸ)  ;; alamat soal
  ("_"  ?Ù€)  ;;
-)
 
 
+;;;;;;;;;;;  isiri-6219 Table 1 -- جدول ۱ -  نویسه‌های کنترلی
+ ;; LF
+ ;; CR
+ ("&zwnj;" ?\u200C) ;; (ucs-insert #x200C)‌   named: �اصله‌ی مجازی
+ ("/" ?\u200C)      ;; 
+ ("&zwj;" ?\u200D)  ;; (ucs-insert #x200D)�   named: اتصال� مجازی
+ ("J" ?\u200D)      ;; 
+ ("&lrm;" ?\u200E)  ;; (ucs-insert #x200E)‎   named: نشانه‌ی چپ‌به‌راست
+ ("&rlm;" ?\u200F)  ;; (ucs-insert #x200F)�   named: نشانه‌ی راست‌به‌چپ
+ ("&ls;" ?\u2028)   ;; (ucs-insert #x2028)
   named: جداکننده‌ی سطرها
+ ("&ps;" ?\u2028)   ;; (ucs-insert #x2029)
   named: جداکننده‌ی بندها
+ ("&lre;" ?\u202A)   ;; (ucs-insert #x202A)‪   named: زیرمتن� چپ‌به‌راست
+ ("&rle;" ?\u202B)   ;; (ucs-insert #x202B)   named: زیرمتن� راست‌به‌چپ
+ ("&pdf;" ?\u202C)   ;; (ucs-insert #x202C)   named: پایان� زیرمتن
+ ("&lro;" ?\u202D)   ;; (ucs-insert #x202D)   named: زیرمتن� اکیداً چپ‌به‌راست
+ ("&rlo;" ?\u202D)   ;; (ucs-insert #x202E)   named: زیرمتن� اکیداً راست‌به‌چپ
+ ("&bom;" ?\uFEFF)   ;; (ucs-insert #xFEFF)   named: نشانه‌ی ترتیب� بایت‌ها
+ 
+
+;;;;;;;;;;;  isiri-6219 Table 7 -- جدول ۷ -  نشانه‌های� �ارسی
+ ("^"  ?َ)  ;; zbar ;; زبر �ارسى
+ ("e"  ?�)  ;; zir   زير �ارسى
+ ("o"  ?�)  ;; peesh ;; پيش �ارسى -- ضمه
+ ("E"  ?�)  ;; eizan ;; دو زير �ارسى -- تنوين جر
+ ("#"  ?ً)  ;; دو زبر
+ ("O" ?ٌ)  ;; دو پيش �ارسى -- تنوين ر�ع
+ ("~"  ?ّ)  ;; tashdid ;;  تشديد �ارسى
+ ("@" ?ْ)   ;; ساکن �ارسى
+ ("U" ?\u0653)  ;; (ucs-insert #x0653)ٓ   named: مد� �ارسی
+ ("`" ?ٔ)  ;; همزه �ارسى بالا
+ ("C" ?\u0655)  ;; (ucs-insert #x0655)ٕ   named: همزه �ارسى پایین 
+ ("$" ?\u0670)  ;; (ucs-insert #x0670)ٰ   named: ال�� مقصوره‌ی �ارسی
+
+
+;;;;;;;;;;;  isiri-6219 Table 8 - Forbidden Characters -- جدول ۸ - نویسه‌های� ممنوع
+;;  ;; he ye (ucs-insert 1728) kills emacs-24.0.90
+;; arabic digits 0-9
+
+
+;;;;;;;  Latin Extensions
+ ("\\" ?\\)  ;; خط اريب وارو
+ ("\\\\" ?\\)
+ ("\\~" ?~)
+ ("\\@" ?@)
+ ("\\#" ?#)
+ ("\\$" ?\uFDFC)  ;; (ucs-insert #xFDFC)ï·¼   named: 
+ ("\\^" ?^)
+ ("\\1" ?1)
+ ("\\2" ?2)
+ ("\\3" ?3)
+ ("\\4" ?4)
+ ("\\5" ?5)
+ ("\\6" ?6)
+ ("\\7" ?7)
+ ("\\8" ?8)
+ ("\\9" ?9)
+ ("\\0" ?0)
+
+)
+
 ;;; persian.el ends here
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 32054e68db2..2384599caf2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacsclient.c (main): Handle -print-nonl command.
+
+        * emacsclient.c (main): Handle multiple messages in a single
+        datagram.
+
+        * emacsclient.c (socket_name): Add const.
+        (get_server_config): Add parameter config_file, use it instead of
+        global server_file.
+        (set_tcp_socket): Add parameter local_server_file, pass it down to
+        get_server_config.
+        (set_local_socket): Add parameter local_socket_name, use it
+        instead of global socket_name.
+        (set_socket): Adjust calls to set_local_socket and set_tcp_socket.
+        Don't clobber global server_file or socket_name.
+        (main): No longer reset server_file or socket_name.
+
 2012-01-05  Glenn Morris  <rgm@gnu.org>
 
         * ebrowse.c (version) <emacs_copyright>:
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 11eba2792d6..049886ed2ba 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -152,7 +152,7 @@ int tty = 0;
 const char *alternate_editor = NULL;
 
 /* If non-NULL, the filename of the UNIX socket.  */
-char *socket_name = NULL;
+const char *socket_name = NULL;
 
 /* If non-NULL, the filename of the authentication file.  */
 const char *server_file = NULL;
@@ -955,36 +955,37 @@ initialize_sockets (void)
  * the Emacs server: host, port, and authentication string.
  */
 static int
-get_server_config (struct sockaddr_in *server, char *authentication)
+get_server_config (const char *config_file, struct sockaddr_in *server,
+                   char *authentication)
 {
   char dotted[32];
   char *port;
   FILE *config = NULL;
 
-  if (file_name_absolute_p (server_file))
-    config = fopen (server_file, "rb");
+  if (file_name_absolute_p (config_file))
+    config = fopen (config_file, "rb");
   else
     {
       const char *home = egetenv ("HOME");
 
       if (home)
         {
-          char *path = xmalloc (strlen (home) + strlen (server_file)
+          char *path = xmalloc (strlen (home) + strlen (config_file)
                                 + EXTRA_SPACE);
           strcpy (path, home);
           strcat (path, "/.emacs.d/server/");
-          strcat (path, server_file);
+          strcat (path, config_file);
           config = fopen (path, "rb");
           free (path);
         }
 #ifdef WINDOWSNT
       if (!config && (home = egetenv ("APPDATA")))
         {
-          char *path = xmalloc (strlen (home) + strlen (server_file)
+          char *path = xmalloc (strlen (home) + strlen (config_file)
                                 + EXTRA_SPACE);
           strcpy (path, home);
           strcat (path, "/.emacs.d/server/");
-          strcat (path, server_file);
+          strcat (path, config_file);
           config = fopen (path, "rb");
           free (path);
         }
@@ -1019,14 +1020,14 @@ get_server_config (struct sockaddr_in *server, char *authentication)
 }
 
 static HSOCKET
-set_tcp_socket (void)
+set_tcp_socket (const char *local_server_file)
 {
   HSOCKET s;
   struct sockaddr_in server;
   struct linger l_arg = {1, 1};
   char auth_string[AUTH_KEY_LENGTH + 1];
 
-  if (! get_server_config (&server, auth_string))
+  if (! get_server_config (local_server_file, &server, auth_string))
     return INVALID_SOCKET;
 
   if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
@@ -1236,7 +1237,7 @@ init_signals (void)
 
 
 static HSOCKET
-set_local_socket (void)
+set_local_socket (const char *local_socket_name)
 {
   HSOCKET s;
   struct sockaddr_un server;
@@ -1254,27 +1255,20 @@ set_local_socket (void)
   server.sun_family = AF_UNIX;
 
   {
-    int sock_status = 0;
-    int default_sock = !socket_name;
-    int saved_errno = 0;
-    const char *server_name = "server";
+    int sock_status;
+    int use_tmpdir = 0;
+    int saved_errno;
+    const char *server_name = local_socket_name;
     const char *tmpdir IF_LINT ( = NULL);
     char *tmpdir_storage = NULL;
     char *socket_name_storage = NULL;
 
-    if (socket_name && !strchr (socket_name, '/')
-        && !strchr (socket_name, '\\'))
+    if (!strchr (local_socket_name, '/') && !strchr (local_socket_name, '\\'))
       {
         /* socket_name is a file name component.  */
-        server_name = socket_name;
-        socket_name = NULL;
-        default_sock = 1;       /* Try both UIDs.  */
-      }
-
-    if (default_sock)
-      {
         long uid = geteuid ();
         ptrdiff_t tmpdirlen;
+        use_tmpdir = 1;
         tmpdir = egetenv ("TMPDIR");
         if (!tmpdir)
           {
@@ -1293,26 +1287,27 @@ set_local_socket (void)
               tmpdir = "/tmp";
           }
         tmpdirlen = strlen (tmpdir);
-        socket_name = socket_name_storage =
+        socket_name_storage =
           xmalloc (tmpdirlen + strlen (server_name) + EXTRA_SPACE);
-        strcpy (socket_name, tmpdir);
-        sprintf (socket_name + tmpdirlen, "/emacs%ld/", uid);
-        strcat (socket_name + tmpdirlen, server_name);
+        strcpy (socket_name_storage, tmpdir);
+        sprintf (socket_name_storage + tmpdirlen, "/emacs%ld/", uid);
+        strcat (socket_name_storage + tmpdirlen, server_name);
+        local_socket_name = socket_name_storage;
       }
 
-    if (strlen (socket_name) < sizeof (server.sun_path))
-      strcpy (server.sun_path, socket_name);
+    if (strlen (local_socket_name) < sizeof (server.sun_path))
+      strcpy (server.sun_path, local_socket_name);
     else
       {
         message (TRUE, "%s: socket-name %s too long\n",
-                 progname, socket_name);
+                 progname, local_socket_name);
         fail ();
       }
 
     /* See if the socket exists, and if it's owned by us. */
     sock_status = socket_status (server.sun_path);
     saved_errno = errno;
-    if (sock_status && default_sock)
+    if (sock_status && use_tmpdir)
       {
         /* Failing that, see if LOGNAME or USER exist and differ from
            our euid.  If so, look for a socket based on the UID
@@ -1333,21 +1328,21 @@ set_local_socket (void)
                 /* We're running under su, apparently. */
                 long uid = pw->pw_uid;
                 ptrdiff_t tmpdirlen = strlen (tmpdir);
-                socket_name = xmalloc (tmpdirlen + strlen (server_name)
-                                       + EXTRA_SPACE);
-                strcpy (socket_name, tmpdir);
-                sprintf (socket_name + tmpdirlen, "/emacs%ld/", uid);
-                strcat (socket_name + tmpdirlen, server_name);
-
-                if (strlen (socket_name) < sizeof (server.sun_path))
-                  strcpy (server.sun_path, socket_name);
+                char *user_socket_name
+                  = xmalloc (tmpdirlen + strlen (server_name) + EXTRA_SPACE);
+                strcpy (user_socket_name, tmpdir);
+                sprintf (user_socket_name + tmpdirlen, "/emacs%ld/", uid);
+                strcat (user_socket_name + tmpdirlen, server_name);
+
+                if (strlen (user_socket_name) < sizeof (server.sun_path))
+                  strcpy (server.sun_path, user_socket_name);
                 else
                   {
                     message (TRUE, "%s: socket-name %s too long\n",
-                             progname, socket_name);
+                             progname, user_socket_name);
                     exit (EXIT_FAILURE);
                   }
-                free (socket_name);
+                free (user_socket_name);
 
                 sock_status = socket_status (server.sun_path);
                 saved_errno = errno;
@@ -1401,6 +1396,7 @@ static HSOCKET
 set_socket (int no_exit_if_error)
 {
   HSOCKET s;
+  const char *local_server_file = server_file;
 
   INITIALIZE ();
 
@@ -1408,7 +1404,7 @@ set_socket (int no_exit_if_error)
   /* Explicit --socket-name argument.  */
   if (socket_name)
     {
-      s = set_local_socket ();
+      s = set_local_socket (socket_name);
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
       message (TRUE, "%s: error accessing socket \"%s\"\n",
@@ -1418,30 +1414,29 @@ set_socket (int no_exit_if_error)
 #endif
 
   /* Explicit --server-file arg or EMACS_SERVER_FILE variable.  */
-  if (!server_file)
-    server_file = egetenv ("EMACS_SERVER_FILE");
+  if (!local_server_file)
+    local_server_file = egetenv ("EMACS_SERVER_FILE");
 
-  if (server_file)
+  if (local_server_file)
     {
-      s = set_tcp_socket ();
+      s = set_tcp_socket (local_server_file);
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
 
       message (TRUE, "%s: error accessing server file \"%s\"\n",
-               progname, server_file);
+               progname, local_server_file);
       exit (EXIT_FAILURE);
     }
 
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
   /* Implicit local socket.  */
-  s = set_local_socket ();
+  s = set_local_socket ("server");
   if (s != INVALID_SOCKET)
     return s;
 #endif
 
   /* Implicit server file.  */
-  server_file = "server";
-  s = set_tcp_socket ();
+  s = set_tcp_socket ("server");
   if ((s != INVALID_SOCKET) || no_exit_if_error)
     return s;
 
@@ -1573,8 +1568,6 @@ main (int argc, char **argv)
   int rl = 0, needlf = 0;
   char *cwd, *str;
   char string[BUFSIZ+1];
-  int null_socket_name IF_LINT ( = 0);
-  int null_server_file IF_LINT ( = 0);
   int start_daemon_if_needed;
   int exit_status = EXIT_SUCCESS;
 
@@ -1602,14 +1595,6 @@ main (int argc, char **argv)
      in case of failure to connect.  */
   start_daemon_if_needed = (alternate_editor
                             && (alternate_editor[0] == '\0'));
-  if (start_daemon_if_needed)
-    {
-      /* set_socket changes the values for socket_name and
-         server_file, we need to reset them, if they were NULL before
-         for the second call to set_socket.  */
-      null_socket_name = (socket_name == NULL);
-      null_server_file = (server_file == NULL);
-    }
 
   emacs_socket = set_socket (alternate_editor || start_daemon_if_needed);
   if (emacs_socket == INVALID_SOCKET)
@@ -1617,13 +1602,6 @@ main (int argc, char **argv)
       if (! start_daemon_if_needed)
         fail ();
 
-      /* Reset socket_name and server_file if they were NULL
-         before the set_socket call.  */
-      if (null_socket_name)
-        socket_name = NULL;
-      if (null_server_file)
-        server_file = NULL;
-
       start_daemon_and_retry_set_socket ();
     }
 
@@ -1790,7 +1768,7 @@ main (int argc, char **argv)
   /* Now, wait for an answer and print any messages.  */
   while (exit_status == EXIT_SUCCESS)
     {
-      char *p;
+      char *p, *end_p;
       do
         {
           errno = 0;
@@ -1805,61 +1783,72 @@ main (int argc, char **argv)
 
       string[rl] = '\0';
 
-      p = string + strlen (string) - 1;
-      while (p > string && *p == '\n')
-        *p-- = 0;
+      /* Loop over all NL-terminated messages.  */
+      for (end_p = p = string; end_p != NULL && *end_p != '\0'; p = end_p)
+        {
+          end_p = strchr (p, '\n');
+          if (end_p != NULL)
+            *end_p++ = '\0';
 
-      if (strprefix ("-emacs-pid ", string))
-        {
-          /* -emacs-pid PID: The process id of the Emacs process. */
-          emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10);
-        }
-      else if (strprefix ("-window-system-unsupported ", string))
-        {
-          /* -window-system-unsupported: Emacs was compiled without X
-              support.  Try again on the terminal. */
-          nowait = 0;
-          tty = 1;
-          goto retry;
-        }
-      else if (strprefix ("-print ", string))
-        {
-          /* -print STRING: Print STRING on the terminal. */
-          str = unquote_argument (string + strlen ("-print "));
-          if (needlf)
-            printf ("\n");
-          printf ("%s", str);
-          needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-        }
-      else if (strprefix ("-error ", string))
-        {
-          /* -error DESCRIPTION: Signal an error on the terminal. */
-          str = unquote_argument (string + strlen ("-error "));
-          if (needlf)
-            printf ("\n");
-          fprintf (stderr, "*ERROR*: %s", str);
-          needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-          exit_status = EXIT_FAILURE;
-        }
+          if (strprefix ("-emacs-pid ", p))
+            {
+              /* -emacs-pid PID: The process id of the Emacs process. */
+              emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
+            }
+          else if (strprefix ("-window-system-unsupported ", p))
+            {
+              /* -window-system-unsupported: Emacs was compiled without X
+                 support.  Try again on the terminal. */
+              nowait = 0;
+              tty = 1;
+              goto retry;
+            }
+          else if (strprefix ("-print ", p))
+            {
+              /* -print STRING: Print STRING on the terminal. */
+              str = unquote_argument (p + strlen ("-print "));
+              if (needlf)
+                printf ("\n");
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-print-nonl ", p))
+            {
+              /* -print-nonl STRING: Print STRING on the terminal.
+                 Used to continue a preceding -print command.  */
+              str = unquote_argument (p + strlen ("-print-nonl "));
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-error ", p))
+            {
+              /* -error DESCRIPTION: Signal an error on the terminal. */
+              str = unquote_argument (p + strlen ("-error "));
+              if (needlf)
+                printf ("\n");
+              fprintf (stderr, "*ERROR*: %s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+              exit_status = EXIT_FAILURE;
+            }
 #ifdef SIGSTOP
-      else if (strprefix ("-suspend ", string))
-        {
-          /* -suspend: Suspend this terminal, i.e., stop the process. */
-          if (needlf)
-            printf ("\n");
-          needlf = 0;
-          kill (0, SIGSTOP);
-        }
+          else if (strprefix ("-suspend ", p))
+            {
+              /* -suspend: Suspend this terminal, i.e., stop the process. */
+              if (needlf)
+                printf ("\n");
+              needlf = 0;
+              kill (0, SIGSTOP);
+            }
 #endif
-      else
-        {
-          /* Unknown command. */
-          if (needlf)
-            printf ("\n");
-          printf ("*ERROR*: Unknown message: %s", string);
-          needlf = string[0]
-            == '\0' ? needlf : string[strlen (string) - 1] != '\n';
-        }
+          else
+            {
+              /* Unknown command. */
+              if (needlf)
+                printf ("\n");
+              needlf = 0;
+              printf ("*ERROR*: Unknown message: %s\n", p);
+            }
+        }
     }
 
   if (needlf)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68b48f5047e..bd0e6f865cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,203 @@
+2012-03-13  Kaushik Srenevasan  <ksrenevasan@gmail.com>  (tiny change)
+
+        * progmodes/gdb-mi.el (gdb-invalidate-disassembly):
+        For dynamically generated code, follow $PC.
+        (gdb-disassembly-handler-custom): Handle no function name case.
+
+2012-03-13  Tim Landscheidt  <tim@tim-landscheidt.de>  (tiny change)
+
+        * calendar/icalendar.el (icalendar-export-file, icalendar-import-file):
+        * emulation/ws-mode.el (ws-query-replace):
+        * sort.el (sort-regexp-fields):
+        Fix missing trailing whitespace in interactive prompts.  (Bug#11002)
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dabbrev.el: Fix cycle completion order (bug#10963).
+        (dabbrev--last-obarray, dabbrev--last-completion-buffer): Remove.
+        (dabbrev-completion): Don't use an obarray; provide
+        a cycle-sort-function.
+
+2012-03-12  Leo Liu  <sdl.web@gmail.com>
+
+        * simple.el (kill-new): Use equal-including-properties for
+        comparison.
+        (kill-do-not-save-duplicates): Doc fix.
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dabbrev.el: Fix cycle completion (bug#10963).
+        Use lexical binding and wrap to 80 columns.
+        (dabbrev-completion): Delay computing the list of completions.
+
+2012-03-12  Kenichi Handa  <handa@m17n.org>
+
+        * international/quail.el (quail-insert-kbd-layout): Surround each
+        row by LRO and PDF instead of inserting many LRMs.  Pad the left
+        and right of each non-spacing marks.  Insert invisible space
+        between lower and upper characters to prevent composition.
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-complete): Don't get confused when the
+        function is run twice via different commands (bug#10958).
+        (complete-with-action): Fix docstring.
+
+2012-03-12  Chong Yidong  <cyd@gnu.org>
+
+        * nxml/nxml-mode.el (nxml-mode-map): Do not bind C-RET (Bug#6776).
+        (nxml-completion-at-point-function): New function.
+        (nxml-mode): Use it.
+        (nxml-bind-meta-tab-to-complete-flag): Default to t.
+
+        * emacs-lisp/package.el (package-unpack, package-unpack-single):
+        Load generated autoloads file before byte compiling (Bug#10970).
+        (package--make-autoloads-and-compile): New helper fun.
+
+2012-03-12  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * ibuffer.el (ibuffer-redisplay): Remove another gratuitous error.
+
+2012-03-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-handler): Ensure, that
+        file-readable-p is applied only for local files or in
+        auto-revert-tail-mode.
+
+2012-03-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * server.el (server-eval-at): Handle non-tcp connections.
+        Decode result string.
+
+        * server.el (server-msg-size): New constant.
+        (server-reply-print): New function.
+        (server-eval-and-print): Use it.
+        (server-eval-at): Use server-quote-arg and server-unquote-arg.
+        Handle -print-nonl.
+
+2012-03-11  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * ibuffer.el (ibuffer-redisplay): Remove gratuitous error
+        (Bug#10987).
+
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (goto-line): Doc fix (Bug#9938).
+
+        * subr.el (save-window-excursion): Doc fix (Bug#9979).
+
+        * dabbrev.el (dabbrev--find-expansion): Update progress reporter
+        when finished (Bug#10963).
+
+2012-03-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (split-window-below): Fix bug in case where
+        split-window-keep-point is nil (Bug#10971).
+
+2012-03-11  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (replace-highlight): Set isearch-word to nil
+        unconditionally.  (Bug#10887)
+
+2012-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * net/mairix.el (mairix-replace-invalid-chars): Rename from
+        mairix-replace-illegal-chars; all callers changed.  Don't remove
+        ^, ~, and = characters: they are meaningful in mairix search
+        specs.
+        (mairix-widget-create-query): Add usage information about mairix
+        search forms: negating words, searching for substrings, etc.
+
+2012-03-10  Jae-hyeon Park  <jae-hyeon.park@desy.de>  (tiny change)
+
+        * international/fontset.el (font-encoding-alist): Add an entry for
+        ksx1001 (Bug#5667).
+
+2012-03-10  Richard Stallman  <rms@gnu.org>
+
+        * mail/sendmail.el (mail-encode-header):
+        Set rfc2047-encode-encoded-words.
+
+        * mail/mail-utils.el (mail-quote-printable): Quote multibyte chars.
+
+        * mail/rmail.el (rmail-buffers-swapped-p): Don't assume dead
+        view buffer means not swapped.
+        (rmail-view-buffer-kill-buffer-hook): Give buf name in error msg.
+        (rmail-write-region-annotate): Error if real text has disappeared.
+
+        * epa-mail.el (epa-mail-encrypt): Bind inhibit-read-only.
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * emulation/cua-rect.el (cua--init-rectangles):
+        * emulation/cua-base.el (cua--init-keymaps):
+        Add delete-forward-char to remappings (Bug#9666).
+
+2012-03-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * speedbar.el (speedbar-unhighlight-one-tag-line):
+        Avoid unhighlighting due to frame switching (Bug#10275).
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * minibuffer.el (completion-in-region, completion-help-at-point):
+        Give the completion field overlay a high priority (Bug#6830).
+
+        * dired.el (dired-goto-file): Recognize absolute file name
+        listings (Bug#7126).
+        (dired-goto-file-1): New helper function.
+        (dired-toggle-read-only): Inhibit warnings.
+
+2012-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el: (dbus-property-handler): Return empty array if
+        there are no properties.
+
+2012-03-09  Leo Liu  <sdl.web@gmail.com>
+
+        * savehist.el (savehist-printable): Stricter check for string
+        value (Bug#10937).
+
+2012-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/smtpmail.el (smtpmail-send-it):
+        Bind coding-system-for-write to *-unix, so that FCC files are kept in
+        valid mbox format.
+
+2012-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-find-file):
+        Don't check result is regular, readable.
+        (dir-locals-read-from-file): Demote errors.
+
+2012-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/quail.el (quail-insert-kbd-layout):
+        Insert invisible LRM characters before each character in a keyboard
+        layout cell, to prevent their reordering by bidi display engine.
+        For details, see the discussion in
+        http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00085.html.
+
+2012-03-08  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-mark-function): Make it leave a mark at
+        the starting position; make it extend the marked region when
+        invoked repeatedly - all under appropriate circumstances.
+        Fixes bugs #5525, #10906.
+
+2012-03-08  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (locate-dominating-file, dir-locals-find-file):
+        Undo 2012-03-06 change.
+
 2012-03-07  Eli Zaretskii  <eliz@gnu.org>
 
-        * international/quail.el (quail-help): Force
-        bidi-paragraph-direction be left-to-right.  See discussion in
+        * international/quail.el (quail-help):
+        Force bidi-paragraph-direction be left-to-right.  See discussion in
         http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
         for the reason.
 
-2012-03-07  Michael Albinus  <Michael.Albinus@alcatel-lucent.com>
+2012-03-07  Michael Albinus  <michael.albinus@gmx.de>
 
         Avoid superfluous registering of signals.  (Bug#10807)
 
@@ -133,16 +325,16 @@
         New variables for...
         (c-state-semi-safe-place): New function.  Here, in a macro is "safe".
         (c-invalidate-state-cache-1): New stuff for c-state-semi-safe-place.
-        (c-in-literal, c-literal-limits, c-determine-limit-get-base): Use
-        c-state-semi-safe-place.
+        (c-in-literal, c-literal-limits, c-determine-limit-get-base):
+        Use c-state-semi-safe-place.
 
-        * progmodes/cc-langs.el (c-get-state-before-change-functions): Add
-        c-invalidate-macro-cache to the C, C++, Obj entries.
+        * progmodes/cc-langs.el (c-get-state-before-change-functions):
+        Add c-invalidate-macro-cache to the C, C++, Obj entries.
 
 2012-03-02  Michael Albinus  <michael.albinus@gmx.de>
 
-        * jka-compr.el (jka-compr-call-process): Apply
-        `file-accessible-directory-p' only when the default directory is
+        * jka-compr.el (jka-compr-call-process):
+        Apply `file-accessible-directory-p' only when the default directory is
         not remote.
 
 2012-03-01  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index c0a77bd5935..e0bde7c6dc5 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -439,17 +439,18 @@ This is an internal function used by Auto-Revert Mode."
     (let* ((buffer (current-buffer)) size
            (revert
             (or (and buffer-file-name
-                     (file-readable-p buffer-file-name)
                      (if auto-revert-tail-mode
                          ;; Tramp caches the file attributes.  Setting
                          ;; `remote-file-name-inhibit-cache' forces Tramp
                          ;; to reread the values.
                          (let ((remote-file-name-inhibit-cache t))
-                           (/= auto-revert-tail-pos
-                               (setq size
-                                     (nth 7 (file-attributes
-                                             buffer-file-name)))))
+                           (and (file-readable-p buffer-file-name)
+                                (/= auto-revert-tail-pos
+                                    (setq size
+                                          (nth 7 (file-attributes
+                                                  buffer-file-name))))))
                        (and (not (file-remote-p buffer-file-name))
+                            (file-readable-p buffer-file-name)
                             (not (verify-visited-file-modtime buffer)))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 83bda94fefe..f1549ec20b1 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -915,7 +915,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file:
+  (interactive "FExport diary data from file: \n\
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1794,7 +1794,7 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file:
+  (interactive "fImport iCalendar data from file: \n\
 Finto diary file:
 p")
   ;; clean up the diary file
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 4dc5fe4df21..f185c457ee2 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-12  David Engster  <deng@randomsample.de>
+
+        * semantic/db-find.el
+        (semanticdb-find-translate-path-brutish-default): If we don't yet
+        have a proper table for PATH, use `semanticdb-current-database'
+        instead (bug #10343).
+
+2012-03-11  David Engster  <deng@randomsample.de>
+
+        * semantic/wisent/javascript.el (js-mode): Define `js-mode' as
+        child-mode of `javascript-mode' (bug #8445).
+
 2012-02-28  Glenn Morris  <rgm@gnu.org>
 
         * semantic/db.el (semanticdb-search-results-table):
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index ca6a8fbf5ca..15ef3b09238 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -325,8 +325,10 @@ Default action as described in `semanticdb-find-translate-path'."
          (cond ((null path) semanticdb-current-database)
                ((semanticdb-table-p path) (oref path parent-db))
                (t (let ((tt (semantic-something-to-tag-table path)))
-                    ;; @todo - What does this DO ??!?!
-                    (with-current-buffer (semantic-tag-buffer (car tt))
+                    (if tt
+                        ;; @todo - What does this DO ??!?!
+                        (with-current-buffer (semantic-tag-buffer (car tt))
+                          semanticdb-current-database)
                       semanticdb-current-database))))))
     (apply
      #'nconc
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 33644414b30..8ed83e87bce 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -75,6 +75,10 @@ This function overrides `get-local-variables'."
 ;;
 ;; This sets up the javascript parser
 
+;; Since javascript-mode is an alias for js-mode, let it inherit all
+;; the overrides.
+(define-child-mode js-mode javascript-mode)
+
 ;; In semantic-imenu.el, not part of Emacs.
 (defvar semantic-imenu-summary-function)
 
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 7b94b53e6c7..c5b370bfa61 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,4 +1,4 @@
-;;; dabbrev.el --- dynamic abbreviation package
+;;; dabbrev.el --- dynamic abbreviation package  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2012
 ;;   Free Software Foundation, Inc.
@@ -291,9 +291,6 @@ this list."
 ;; Internal variables
 ;;----------------------------------------------------------------
 
-;; Last obarray of completions in `dabbrev-completion'
-(defvar dabbrev--last-obarray nil)
-
 ;; Table of expansions seen so far
 (defvar dabbrev--last-table nil)
 
@@ -321,9 +318,6 @@ this list."
 ;; The buffer we found the expansion last time.
 (defvar dabbrev--last-buffer-found nil)
 
-;; The buffer we last did a completion in.
-(defvar dabbrev--last-completion-buffer nil)
-
 ;; If non-nil, a function to use when copying successive words.
 ;; It should be `upcase' or `downcase'.
 (defvar dabbrev--last-case-pattern nil)
@@ -387,49 +381,46 @@ then it searches *all* buffers."
          (abbrev (dabbrev--abbrev-at-point))
          (beg (progn (search-backward abbrev) (point)))
          (end (progn (search-forward abbrev) (point)))
-         (ignore-case-p (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                 case-fold-search
-                               dabbrev-case-fold-search)
-                             (or (not dabbrev-upcase-means-case-search)
-                                 (string= abbrev (downcase abbrev)))))
-         (my-obarray dabbrev--last-obarray))
-    (save-excursion
-      ;;--------------------------------
-      ;; New abbreviation to expand.
-      ;;--------------------------------
-      (setq dabbrev--last-abbreviation abbrev)
-      ;; Find all expansion
-      (let ((completion-list
-             (dabbrev--find-all-expansions abbrev ignore-case-p))
-            (completion-ignore-case ignore-case-p))
-        ;; Make an obarray with all expansions
-        (setq my-obarray (make-vector (length completion-list) 0))
-        (or (> (length my-obarray) 0)
-            (error "No dynamic expansion for \"%s\" found%s"
-                   abbrev
-                   (if dabbrev--check-other-buffers "" " in this-buffer")))
-        (cond
-         ((or (not ignore-case-p)
-              (not dabbrev-case-replace))
-          (mapc (function (lambda (string)
-                            (intern string my-obarray)))
-                completion-list))
-         ((string= abbrev (upcase abbrev))
-          (mapc (function (lambda (string)
-                            (intern (upcase string) my-obarray)))
-                completion-list))
-         ((string= (substring abbrev 0 1)
-                   (upcase (substring abbrev 0 1)))
-          (mapc (function (lambda (string)
-                            (intern (capitalize string) my-obarray)))
-                completion-list))
-         (t
-          (mapc (function (lambda (string)
-                            (intern (downcase string) my-obarray)))
-                completion-list)))
-        (setq dabbrev--last-obarray my-obarray)
-        (setq dabbrev--last-completion-buffer (current-buffer))))
-    (completion-in-region beg end my-obarray)))
+         (ignore-case-p
+          (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                   case-fold-search
+                 dabbrev-case-fold-search)
+               (or (not dabbrev-upcase-means-case-search)
+                   (string= abbrev (downcase abbrev)))))
+         (list 'uninitialized)
+         (table
+          (lambda (s p a)
+            (if (eq a 'metadata)
+                `(metadata (cycle-sort-function . ,#'identity)
+                           (category . dabbrev))
+              (when (eq list 'uninitialized)
+                (save-excursion
+                  ;;--------------------------------
+                  ;; New abbreviation to expand.
+                  ;;--------------------------------
+                  (setq dabbrev--last-abbreviation abbrev)
+                  ;; Find all expansion
+                  (let ((completion-list
+                         (dabbrev--find-all-expansions abbrev ignore-case-p))
+                        (completion-ignore-case ignore-case-p))
+                    (or (consp completion-list)
+                        (error "No dynamic expansion for \"%s\" found%s"
+                               abbrev
+                               (if dabbrev--check-other-buffers
+                                   "" " in this-buffer")))
+                    (setq list
+                          (cond
+                           ((not (and ignore-case-p dabbrev-case-replace))
+                            completion-list)
+                           ((string= abbrev (upcase abbrev))
+                            (mapcar #'upcase completion-list))
+                           ((string= (substring abbrev 0 1)
+                                     (upcase (substring abbrev 0 1)))
+                            (mapcar #'capitalize completion-list))
+                           (t
+                            (mapcar #'downcase completion-list)))))))
+              (complete-with-action a list s p)))))
+    (completion-in-region beg end table)))
 
 ;;;###autoload
 (defun dabbrev-expand (arg)
@@ -521,12 +512,13 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
       ;;--------------------------------
       (or expansion
           (setq expansion
-                (dabbrev--find-expansion abbrev direction
-                                         (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                                  case-fold-search
-                                                dabbrev-case-fold-search)
-                                              (or (not dabbrev-upcase-means-case-search)
-                                                  (string= abbrev (downcase abbrev))))))))
+                (dabbrev--find-expansion
+                 abbrev direction
+                 (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                          case-fold-search
+                        dabbrev-case-fold-search)
+                      (or (not dabbrev-upcase-means-case-search)
+                          (string= abbrev (downcase abbrev))))))))
     (cond
      ((not expansion)
       (dabbrev--reset-global-variables)
@@ -621,8 +613,6 @@ all skip characters."
 
 (defun dabbrev--reset-global-variables ()
   "Initialize all global variables."
-  ;; dabbrev--last-obarray and dabbrev--last-completion-buffer
-  ;; must not be reset here.
   (setq dabbrev--last-table nil
         dabbrev--last-abbreviation nil
         dabbrev--last-abbrev-location nil
@@ -667,13 +657,13 @@ of the expansion in `dabbrev--last-expansion-location'."
         (let ((case-fold-search ignore-case)
               (count n))
           (while (and (> count 0)
-                      (setq expansion (dabbrev--search abbrev
-                                                       reverse
-                                                       (and ignore-case
-                                                            (if (eq dabbrev-case-distinction 'case-replace)
-                                                                case-replace
-                                                              dabbrev-case-distinction))
-                                                       )))
+                      (setq expansion (dabbrev--search
+                                       abbrev reverse
+                                       (and ignore-case
+                                            (if (eq dabbrev-case-distinction
+                                                    'case-replace)
+                                                case-replace
+                                              dabbrev-case-distinction)))))
             (setq count (1- count))))
         (and expansion
              (setq dabbrev--last-expansion-location (point)))
@@ -763,6 +753,7 @@ of the start of the occurrence."
                                      (- (length dabbrev--friend-buffer-list)))
            (setq dabbrev--last-expansion-location (point-min))
            (setq expansion (dabbrev--try-find abbrev nil 1 ignore-case)))
+         (progress-reporter-done dabbrev--progress-reporter)
          expansion)))))
 
 ;; Compute the list of buffers to scan.
@@ -828,14 +819,15 @@ EXPANSION is the expansion substring to be used this time.
 RECORD-CASE-PATTERN, if non-nil, means set `dabbrev--last-case-pattern'
 to record whether we upcased the expansion, downcased it, or did neither."
   ;;(undo-boundary)
-  (let ((use-case-replace (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                   case-fold-search
-                                 dabbrev-case-fold-search)
-                               (or (not dabbrev-upcase-means-case-search)
-                                   (string= abbrev (downcase abbrev)))
-                               (if (eq dabbrev-case-replace 'case-replace)
-                                   case-replace
-                                 dabbrev-case-replace))))
+  (let ((use-case-replace
+         (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                  case-fold-search
+                dabbrev-case-fold-search)
+              (or (not dabbrev-upcase-means-case-search)
+                  (string= abbrev (downcase abbrev)))
+              (if (eq dabbrev-case-replace 'case-replace)
+                  case-replace
+                dabbrev-case-replace))))
 
     ;; If we upcased or downcased the original expansion,
     ;; do likewise for the subsequent words when we copy them.
@@ -861,12 +853,13 @@ to record whether we upcased the expansion, downcased it, or did neither."
     (let ((expansion-rest (substring expansion 1))
           (first-letter-position (string-match "[[:alpha:]]" abbrev)))
       (if (or (null first-letter-position)
-              (and (not (and (or (string= expansion-rest (downcase expansion-rest))
-                                 (string= expansion-rest (upcase expansion-rest)))
-                             (or (string= abbrev (downcase abbrev))
-                                 (and (string= abbrev (upcase abbrev))
-                                      (> (- (length abbrev) first-letter-position)
-                                         1)))))
+              (and (not
+                    (and (or (string= expansion-rest (downcase expansion-rest))
+                             (string= expansion-rest (upcase expansion-rest)))
+                         (or (string= abbrev (downcase abbrev))
+                             (and (string= abbrev (upcase abbrev))
+                                  (> (- (length abbrev) first-letter-position)
+                                     1)))))
                    (string= abbrev
                             (substring expansion 0 (length abbrev)))))
           (setq use-case-replace nil)))
@@ -950,9 +943,9 @@ Leaves point at the location of the start of the expansion."
       ;; Limited search.
       (save-restriction
         (and dabbrev-limit
-             (narrow-to-region dabbrev--last-expansion-location
-                               (+ (point)
-                                  (if reverse (- dabbrev-limit) dabbrev-limit))))
+             (narrow-to-region
+              dabbrev--last-expansion-location
+              (+ (point) (if reverse (- dabbrev-limit) dabbrev-limit))))
         ;;--------------------------------
         ;; Look for a distinct expansion, using dabbrev--last-table.
         ;;--------------------------------
diff --git a/lisp/dired.el b/lisp/dired.el
index 57bf3c88322..d26e7004cc3 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1964,7 +1964,8 @@ Otherwise, for buffers inheriting from dired-mode, call `toggle-read-only'."
   (interactive)
   (if (eq major-mode 'dired-mode)
       (wdired-change-to-wdired-mode)
-    (toggle-read-only)))
+    (with-no-warnings
+      (toggle-read-only))))
 
 (defun dired-next-line (arg)
   "Move down lines then position at filename.
@@ -2622,58 +2623,61 @@ instead of `dired-actual-switches'."
               (read-file-name "Goto file: "
                               (dired-current-directory))))
      (push-mark)))
-  (setq file (directory-file-name file)) ; does no harm if no directory
-  (let (found case-fold-search dir)
-    (setq dir (or (file-name-directory file)
-                  (error "File name `%s' is not absolute" file)))
-    (save-excursion
-      ;; The hair here is to get the result of dired-goto-subdir
-      ;; without really calling it if we don't have any subdirs.
-      (if (if (string= dir (expand-file-name default-directory))
-              (goto-char (point-min))
-            (and (cdr dired-subdir-alist)
-                 (dired-goto-subdir dir)))
-          (let ((base (file-name-nondirectory file))
-                search-string
-                (boundary (dired-subdir-max)))
-            (setq search-string
-                  (replace-regexp-in-string "\^m" "\\^m" base nil t))
-            (setq search-string
-                  (replace-regexp-in-string "\\\\" "\\\\" search-string nil t))
-            (and (dired-switches-escape-p dired-actual-switches)
-                 (string-match "[ \t\n]" search-string)
-                 ;; FIXME to fix this for all possible file names
-                 ;; (embedded control characters etc), we need to
-                 ;; escape everything that `ls -b' does.
-                 (setq search-string
-                       (replace-regexp-in-string " " "\\ "
-                                                 search-string nil t)
-                       search-string
-                       (replace-regexp-in-string "\t" "\\t"
-                                                 search-string nil t)
-                       search-string
-                       (replace-regexp-in-string "\n" "\\n"
-                                                 search-string nil t)))
-            (while (and (not found)
-                        ;; filenames are preceded by SPC, this makes
-                        ;; the search faster (e.g. for the filename "-"!).
-                        (search-forward (concat " " search-string)
-                                        boundary 'move))
-              ;; Match could have BASE just as initial substring or
-              ;; or in permission bits or date or
-              ;; not be a proper filename at all:
-              (if (equal base (dired-get-filename 'no-dir t))
-                    ;; Must move to filename since an (actually
-                    ;; correct) match could have been elsewhere on the
-                    ;; ;; line (e.g. "-" would match somewhere in the
-                    ;; permission bits).
-                  (setq found (dired-move-to-filename))
-                ;; If this isn't the right line, move forward to avoid
-                ;; trying this line again.
-                (forward-line 1))))))
-    (and found
-         ;; return value of point (i.e., FOUND):
-         (goto-char found))))
+  (unless (file-name-absolute-p file)
+    (error "File name `%s' is not absolute" file))
+  (setq file (directory-file-name file)) ; does no harm if not a directory
+  (let* ((case-fold-search nil)
+         (dir (file-name-directory file))
+         (found (or
+                 ;; First, look for a listing under the absolute name.
+                 (save-excursion
+                   (goto-char (point-min))
+                   (dired-goto-file-1 file file (point-max)))
+                 ;; Otherwise, look for it as a relative name.  The
+                 ;; hair is to get the result of `dired-goto-subdir'
+                 ;; without calling it if we don't have any subdirs.
+                 (save-excursion
+                   (when (if (string= dir (expand-file-name default-directory))
+                             (goto-char (point-min))
+                           (and (cdr dired-subdir-alist)
+                                (dired-goto-subdir dir)))
+                     (dired-goto-file-1 (file-name-nondirectory file)
+                                        file
+                                        (dired-subdir-max)))))))
+    ;; Return buffer position, if found.
+    (if found
+        (goto-char found))))
+
+(defun dired-goto-file-1 (file full-name limit)
+  "Advance to the Dired listing labeled by FILE; return its position.
+Return nil if the listing is not found.  If FILE contains
+characters that would not appear in a Dired buffer, search using
+the quoted forms of those characters.
+
+FULL-NAME specifies the actual file name the listing must have,
+as returned by `dired-get-filename'.  LIMIT is the search limit."
+  (let (str)
+    (setq str (replace-regexp-in-string "\^m" "\\^m"  file nil t))
+    (setq str (replace-regexp-in-string "\\\\" "\\\\" str nil t))
+    (and (dired-switches-escape-p dired-actual-switches)
+         (string-match "[ \t\n]" str)
+         ;; FIXME: to fix this for embedded control characters etc, we
+         ;; should escape everything that `ls -b' does.
+         (setq str (replace-regexp-in-string " " "\\ "  str nil t)
+               str (replace-regexp-in-string "\t" "\\t" str nil t)
+               str (replace-regexp-in-string "\n" "\\n" str nil t)))
+    (let ((found nil)
+          ;; filenames are preceded by SPC, this makes the search faster
+          ;; (e.g. for the filename "-").
+          (search-string (concat " " str)))
+      (while (and (not found)
+                  (search-forward search-string limit 'move))
+        ;; Check that we are in the right place.  Match could have
+        ;; BASE just as initial substring or in permission bits etc.
+        (if (equal full-name (dired-get-filename nil t))
+            (setq found (dired-move-to-filename))
+          (forward-line 1)))
+      found)))
 
 (defvar dired-find-subdir)
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fd0eb029fc3..5b158eb994f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -607,16 +607,25 @@ untar into a directory named DIR; otherwise, signal an error."
         (error "Package does not untar cleanly into directory %s/" dir))))
   (tar-untar-buffer))
 
-(defun package-unpack (name version)
-  (let* ((dirname (concat (symbol-name name) "-" version))
+(defun package-unpack (package version)
+  (let* ((name (symbol-name package))
+         (dirname (concat name "-" version))
          (pkg-dir (expand-file-name dirname package-user-dir)))
     (make-directory package-user-dir t)
     ;; FIXME: should we delete PKG-DIR if it exists?
     (let* ((default-directory (file-name-as-directory package-user-dir)))
       (package-untar-buffer dirname)
-      (package-generate-autoloads (symbol-name name) pkg-dir)
-      (let ((load-path (cons pkg-dir load-path)))
-        (byte-recompile-directory pkg-dir 0 t)))))
+      (package--make-autoloads-and-compile name pkg-dir))))
+
+(defun package--make-autoloads-and-compile (name pkg-dir)
+  "Generate autoloads and do byte-compilation for package named NAME.
+PKG-DIR is the name of the package directory."
+  (package-generate-autoloads name pkg-dir)
+  (let ((load-path (cons pkg-dir load-path)))
+    ;; We must load the autoloads file before byte compiling, in
+    ;; case there are magic cookies to set up non-trivial paths.
+    (load (expand-file-name (concat name "-autoloads") pkg-dir) nil t)
+    (byte-recompile-directory pkg-dir 0 t)))
 
 (defun package--write-file-no-coding (file-name)
   (let ((buffer-file-coding-system 'no-conversion))
@@ -656,9 +665,7 @@ untar into a directory named DIR; otherwise, signal an error."
          nil
          pkg-file
          nil nil nil 'excl))
-      (package-generate-autoloads file-name pkg-dir)
-      (let ((load-path (cons pkg-dir load-path)))
-        (byte-recompile-directory pkg-dir 0 t)))))
+      (package--make-autoloads-and-compile file-name pkg-dir))))
 
 (defmacro package--with-work-buffer (location file &rest body)
   "Run BODY in a buffer containing the contents of FILE at LOCATION.
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 9e7be0f670d..a918f298a4e 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1478,6 +1478,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
   (define-key cua--region-keymap [remap backward-delete-char]   'cua-delete-region)
   (define-key cua--region-keymap [remap backward-delete-char-untabify] 'cua-delete-region)
   (define-key cua--region-keymap [remap delete-char]            'cua-delete-region)
+  (define-key cua--region-keymap [remap delete-forward-char]    'cua-delete-region)
   ;; kill region
   (define-key cua--region-keymap [remap kill-region]            'cua-cut-region)
   (define-key cua--region-keymap [remap clipboard-kill-region]  'cua-cut-region)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 95b77a697f1..e3aade760dc 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1420,6 +1420,7 @@ With prefix arg, indent to that column."
   (define-key cua--rectangle-keymap [remap kill-ring-save]      'cua-copy-rectangle)
   (define-key cua--rectangle-keymap [remap kill-region]         'cua-cut-rectangle)
   (define-key cua--rectangle-keymap [remap delete-char]         'cua-delete-rectangle)
+  (define-key cua--rectangle-keymap [remap delete-forward-char] 'cua-delete-rectangle)
   (define-key cua--rectangle-keymap [remap set-mark-command]    'cua-toggle-rectangle-mark)
 
   (define-key cua--rectangle-keymap [remap forward-char]        'cua-resize-rectangle-right)
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index aa8d647ec11..0c7be145751 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -716,7 +716,7 @@ This will only work for errors raised by WordStar mode functions."
 
 (defun ws-query-replace (from to)
   "In WordStar mode: Search string, remember string for repetition."
-  (interactive "sReplace:
+  (interactive "sReplace: \n\
 sWith: " )
   (setq ws-search-string from)
   (setq ws-search-direction t)
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 22bfe03cab0..be5b849651c 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -192,7 +192,9 @@ If no one is selected, symmetric encryption will be performed.  "
              (if sign
                  (epa-select-keys context
                                   "Select keys for signing.  "))))))
-  (epa-encrypt-region start end recipients sign signers))
+  ;; Don't let some read-only text stop us from encrypting.
+  (let ((inhibit-read-only t))
+    (epa-encrypt-region start end recipients sign signers)))
 
 ;;;###autoload
 (defun epa-mail-import-keys ()
diff --git a/lisp/faces.el b/lisp/faces.el
index 0011e0357a1..bdac3a1bb6a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1516,7 +1516,7 @@ If SPEC is nil, return nil."
   (apply 'set-face-attribute face frame
          (if (eq face 'default)
              ;; For the default face, avoid making any attribute
-             ;; unspecifed.  Instead, set attributes to default values
+             ;; unspecified.  Instead, set attributes to default values
              ;; (see also realize_default_face in xfaces.c).
              (append
               '(:underline nil :overline nil :strike-through nil
diff --git a/lisp/files.el b/lisp/files.el
index 1d54ef81869..cde15c5d0b1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -877,14 +877,13 @@ or mount points potentially requiring authentication as a different user.")
 ;;               (setq dir nil))))
 ;;       nil)))
 
-(defun locate-dominating-file (file name &optional predicate)
+(defun locate-dominating-file (file name)
   "Look up the directory hierarchy from FILE for a file named NAME.
 Stop at the first parent directory containing a file NAME,
 and return the directory.  Return nil if not found.
 
-Optional argument PREDICATE is a function of one argument, a file.
-It should return non-nil if the file is acceptable.  The default is
-`file-exists-p'; you might, e.g., want to use `file-readable-p' instead."
+This function only tests if FILE exists.  If you care about whether
+it is readable, regular, etc., you should test the result."
   ;; We used to use the above locate-dominating-files code, but the
   ;; directory-files call is very costly, so we're much better off doing
   ;; multiple calls using the code in here.
@@ -911,8 +910,11 @@ It should return non-nil if the file is acceptable.  The default is
                     ;;   (setq user (nth 2 (file-attributes file)))
                     ;;   (and prev-user (not (equal user prev-user))))
                     (string-match locate-dominating-stop-dir-regexp file)))
-      (setq try (funcall (or predicate 'file-exists-p)
-                         (expand-file-name name file)))
+      ;; FIXME? maybe this function should (optionally?)
+      ;; use file-readable-p instead.  In many cases, an unreadable
+      ;; FILE is no better than a non-existent one.
+      ;; See eg dir-locals-find-file.
+      (setq try (file-exists-p (expand-file-name name file)))
       (cond (try (setq root file))
             ((equal file (setq file (file-name-directory
                                      (directory-file-name file))))
@@ -3550,7 +3552,7 @@ across different environments and users.")
   "Find the directory-local variables for FILE.
 This searches upward in the directory tree from FILE.
 It stops at the first directory that has been registered in
-`dir-locals-directory-cache' or contains a readable `dir-locals-file'.
+`dir-locals-directory-cache' or contains a `dir-locals-file'.
 If it finds an entry in the cache, it checks that it is valid.
 A cache entry with no modification time element (normally, one that
 has been assigned directly using `dir-locals-set-directory-class', not
@@ -3568,15 +3570,18 @@ of no valid cache entry."
           (if (eq system-type 'ms-dos)
               (dosified-file-name dir-locals-file)
             dir-locals-file))
-         ;; FIXME?  Is it right to silently ignore unreadable files?
-         (locals-file (locate-dominating-file file dir-locals-file-name
-                                              (lambda (file)
-                                                (and (file-readable-p file)
-                                                     (file-regular-p file)))))
+         (locals-file (locate-dominating-file file dir-locals-file-name))
          (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
-    (if locals-file
-        (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+    (and locals-file
+         (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+         ;; Let dir-locals-read-from-file inform us via demoted-errors
+         ;; about unreadable files, etc.
+         ;; Maybe we'd want to keep searching though - that is
+         ;; a locate-dominating-file issue.
+;;;      (or (not (file-readable-p locals-file))
+;;;          (not (file-regular-p locals-file)))
+;;;      (setq locals-file nil))
     ;; Find the best cached value in `dir-locals-directory-cache'.
     (dolist (elt dir-locals-directory-cache)
       (when (and (eq t (compare-strings file nil (length (car elt))
@@ -3618,15 +3623,19 @@ FILE is the name of the file holding the variables to apply.
 The new class name is the same as the directory in which FILE
 is found.  Returns the new class name."
   (with-temp-buffer
-    (insert-file-contents file)
-    (let* ((dir-name (file-name-directory file))
-           (class-name (intern dir-name))
-           (variables (let ((read-circle nil))
-                        (read (current-buffer)))))
-      (dir-locals-set-class-variables class-name variables)
-      (dir-locals-set-directory-class dir-name class-name
-                                      (nth 5 (file-attributes file)))
-      class-name)))
+    ;; Errors reading the file are not very informative.
+    ;; Eg just "Error: (end-of-file)" does not give any clue that the
+    ;; problem is related to dir-locals.
+    (with-demoted-errors
+      (insert-file-contents file)
+      (let* ((dir-name (file-name-directory file))
+             (class-name (intern dir-name))
+             (variables (let ((read-circle nil))
+                          (read (current-buffer)))))
+        (dir-locals-set-class-variables class-name variables)
+        (dir-locals-set-directory-class dir-name class-name
+                                        (nth 5 (file-attributes file)))
+        class-name))))
 
 (defun hack-dir-local-variables ()
   "Read per-directory local variables for the current buffer.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a4c1513926d..1e787642664 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-int.el (gnus-backend-trace): Flip default to nil before Emacs
+        24.1 release.
+
+2012-03-10  David Edmondson  <dme@dme.org>
+
+        * mm-uu.el (mm-uu-forward-extract): Allow for blank lines between the
+        'Forwarded Message' header and the start of the message.
+
 2012-03-04  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * gnus-msg.el (gnus-msg-mail): Call `message-mail' correctly when Gnus
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 8dc691ffe42..1190d79f778 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -247,7 +247,7 @@ If it is down, start it up (again)."
   (eq (nth 1 (assoc method gnus-opened-servers))
       'denied))
 
-(defvar gnus-backend-trace t)
+(defvar gnus-backend-trace nil)
 
 (defun gnus-open-server (gnus-command-method)
   "Open a connection to GNUS-COMMAND-METHOD."
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 327665bdbbf..0cf3730d095 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -187,7 +187,7 @@ This can be either \"inline\" or \"attachment\".")
      nil)
     (verbatim-marks
      ;; slrn-style verbatim marks, see
-     ;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81
+     ;; http://slrn.sourceforge.net/docs/slrn-manual-6.html#process_verbatim_marks
      "^#v\\+"
      "^#v\\-$"
      (lambda () (mm-uu-verbatim-marks-extract 0 0))
@@ -430,7 +430,11 @@ apply the face `mm-uu-extract'."
 
 (defun mm-uu-forward-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer
-                   (progn (goto-char start-point) (forward-line) (point))
+                   (progn
+                     (goto-char start-point)
+                     (forward-line)
+                     (skip-chars-forward "\n")
+                     (point))
                    (progn (goto-char end-point) (forward-line -1) (point)))
                   '("message/rfc822" (charset . gnus-decoded))))
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 17be5534138..536992f5bc8 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2140,11 +2140,10 @@ If optional arg SILENT is non-nil, do not display progress messages."
   (unless silent
     (message "Redisplaying current buffer list..."))
   (let ((blist (ibuffer-current-state-list)))
-    (when (null blist)
-      (if (and (featurep 'ibuf-ext)
+    (when (and (null blist)
+               (featurep 'ibuf-ext)
                (or ibuffer-filtering-qualifiers ibuffer-hidden-filter-groups))
-          (message "No buffers! (note: filtering in effect)")
-        (error "No buffers!")))
+      (message "No buffers! (note: filtering in effect)"))
     (ibuffer-redisplay-engine blist t)
     (unless silent
       (message "Redisplaying current buffer list...done"))
@@ -2174,11 +2173,10 @@ If optional arg SILENT is non-nil, do not display progress messages."
                    (cadr bufs))
                  (ibuffer-current-buffers-with-marks bufs)
                  ibuffer-display-maybe-show-predicates)))
-    (when (null blist)
-      (if (and (featurep 'ibuf-ext)
-               ibuffer-filtering-qualifiers)
-          (message "No buffers! (note: filtering in effect)")
-        (error "No buffers!")))
+    (and (null blist)
+         (featurep 'ibuf-ext)
+         ibuffer-filtering-qualifiers
+         (message "No buffers! (note: filtering in effect)"))
     (unless silent
       (message "Updating buffer list..."))
     (ibuffer-redisplay-engine blist arg)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 561194d710c..7e893a3d751 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -58,6 +58,7 @@
         ("jisx0208" . japanese-jisx0208)
         ("jisx0201" . jisx0201)
         ("jisx0212" . japanese-jisx0212)
+        ("ksx1001" . korean-ksc5601)
         ("ksc5601.1987" . korean-ksc5601)
         ("cns11643.1992.*1" . chinese-cns11643-1)
         ("cns11643.1992.*2" . chinese-cns11643-2)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 48aa013c674..e0e6bfd465b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -825,20 +825,35 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
       (setq i 0)
       (while (< i quail-keyboard-layout-len)
         (when (= (% i 30) 0)
+          ;; Insert LRO to avoid bidi-reordering of keyboard cells.
+          (insert (propertize (string ?\x202d) 'invisible t))
           (setq row (/ i 30))
           (if (> row 1)
               (insert-char 32 (+ row (/ (- row 2) 2)))))
         (setq lower (aref layout i)
               upper (aref layout (1+ i)))
         (insert bar)
-        (if (= (if (stringp lower) (string-width lower) (char-width lower)) 1)
+        (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2)
             (insert " "))
-        (insert lower upper)
-        (if (= (if (stringp upper) (string-width upper) (char-width upper)) 1)
+        (if (and (characterp lower)
+                 (eq (get-char-code-property lower 'general-category) 'Mn))
+            ;; Pad the left and right of non-spacing characters.
+            (setq lower (compose-string (string lower) 0 1
+                                        (format "\t%c\t" lower))))
+        (if (and (characterp upper)
+                 (eq (get-char-code-property upper 'general-category) 'Mn))
+            ;; Pad the left and right of non-spacing characters.
+            (setq upper (compose-string (string upper) 0 1
+                                        (format "\t%c\t" upper))))
+        (insert lower (propertize " " 'invisible t) upper)
+        (if (< (if (stringp upper) (string-width upper) (char-width upper)) 2)
             (insert " "))
         (setq i (+ i 2))
         (if (= (% i 30) 0)
-            (insert bar "\n")))
+            (insert bar
+                    ;; Insert PDF to deny the previously inserted LRO.
+                    (propertize (string ?\x202c) 'invisible t)
+                    "\n")))
       ;; Insert horizontal lines while deleting blank key columns at the
       ;; beginning and end of each line.
       (save-restriction
@@ -849,20 +864,21 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
         ;;(delete-region pos (point)))
         (let ((from1 100) (to1 0) from2 to2)
           (while (not (eobp))
-            (if (looking-at "[| ]*$")
+            (if (looking-at "[| \u202c\u202d]*$")
                 ;; The entire row is blank.
                 (delete-region (point) (match-end 0))
               ;; Delete blank key columns at the head.
-              (if (looking-at " *\\(|    \\)+")
+              (if (looking-at "\u202d? *\\(|     \\)+")
                   (subst-char-in-region (point) (match-end 0) ?| ? ))
               ;; Delete blank key columns at the tail.
-              (if (re-search-forward "\\(    |\\)+$" (line-end-position) t)
+              (if (re-search-forward "\\(     |\\)+\u202c?$"
+                                     (line-end-position) t)
                   (delete-region (match-beginning 0) (point)))
               (beginning-of-line))
             ;; Calculate the start and end columns of a horizontal line.
             (if (eolp)
                 (setq from2 from1 to2 to1)
-              (skip-chars-forward " ")
+              (skip-chars-forward " \u202d")
               (setq from2 (current-column))
               (end-of-line)
               (setq to2 (current-column))
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index a20201fb529..9059da817b6 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -63,12 +63,16 @@ from START (inclusive) to END (exclusive)."
 
 ;;;###autoload
 (defun mail-quote-printable (string &optional wrapper)
-  "Convert a string to the \"quoted printable\" Q encoding.
+  "Convert a string to the \"quoted printable\" Q encoding if necessary.
+If the string contains only ASCII characters and no troublesome ones,
+we return it unconverted.
+
 If the optional argument WRAPPER is non-nil,
 we add the wrapper characters =?ISO-8859-1?Q?....?=."
   (let ((i 0) (result ""))
     (save-match-data
-      (while (string-match "[?=\"\200-\377]" string i)
+      (while (or (string-match "[?=\"]" string i)
+                 (string-match "[^\000-\177]" string i))
         (setq result
               (concat result (substring string i (match-beginning 0))
                       (upcase (format "=%02x"
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2d327c7a0f0..3a9ba8122ab 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1363,8 +1363,7 @@ sets the current buffer's `buffer-file-coding-system' to that of
 (defun rmail-buffers-swapped-p ()
   "Return non-nil if the message collection is in `rmail-view-buffer'."
   ;; This is analogous to tar-data-swapped-p in tar-mode.el.
-  (and (buffer-live-p rmail-view-buffer)
-       rmail-buffer-swapped))
+  rmail-buffer-swapped)
 
 (defun rmail-change-major-mode-hook ()
   ;; Bring the actual Rmail messages back into the main buffer.
@@ -1406,7 +1405,8 @@ If so restore the actual mbox message collection."
         (kill-buffer rmail-view-buffer))))
 
 (defun rmail-view-buffer-kill-buffer-hook ()
-  (error "Can't kill message view buffer by itself"))
+  (error "Can't kill Rmail view buffer `%s' by itself"
+         (buffer-name (current-buffer))))
 
 ;; Set up the permanent locals associated with an Rmail file.
 (defun rmail-perm-variables ()
@@ -4472,7 +4472,11 @@ encoded string (and the same mask) will decode the string."
 
 ;; Used in `write-region-annotate-functions' to write rmail files.
 (defun rmail-write-region-annotate (start end)
-  (when (and (null start) (rmail-buffers-swapped-p))
+  (when (and (null start) rmail-buffer-swapped)
+    (unless (buffer-live-p rmail-view-buffer)
+      (error "Buffer `%s' with real text of `%s' has disappeared"
+             (buffer-name rmail-view-buffer)
+             (buffer-name (current-buffer))))
     (setq rmail-message-encoding buffer-file-coding-system)
     (set-buffer rmail-view-buffer)
     (widen)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 91e0b183a68..f4dfcfcf647 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1085,7 +1085,9 @@ Return non-nil if and only if some part of the header is encoded."
                 (cons selected mm-coding-system-priorities)
               mm-coding-system-priorities))
            (tick (buffer-chars-modified-tick))
-           (rfc2047-encode-encoded-words nil))
+           ;; rms: this proved necessary, but I don't recall why.
+           ;; Can anyone determine why, and state it here?
+           (rfc2047-encode-encoded-words t))
       (rfc2047-encode-message-header)
       (= tick (buffer-chars-modified-tick)))))
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3233cff2768..8e96e2c9438 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -324,7 +324,10 @@ The list is in preference order.")
             (if (re-search-forward "^FCC:" delimline t)
                 ;; Force `mail-do-fcc' to use the encoding of the mail
                 ;; buffer to encode outgoing messages on FCC files.
-                (let ((coding-system-for-write smtpmail-code-conv-from))
+                (let ((coding-system-for-write
+                       ;; mbox files must have Unix EOLs.
+                       (coding-system-change-eol-conversion
+                        smtpmail-code-conv-from 'unix)))
                   (mail-do-fcc delimline)))
             (if mail-interactive
                 (with-current-buffer errbuf
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 1fdf33bf610..6a6bba13523 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -162,7 +162,7 @@ Like CL's `some'."
 (defun complete-with-action (action table string pred)
   "Perform completion ACTION.
 STRING is the string to complete.
-TABLE is the completion table, which should not be a function.
+TABLE is the completion table.
 PRED is a completion predicate.
 ACTION can be one of nil, t or `lambda'."
   (cond
@@ -776,7 +776,8 @@ scroll the window of possible completions."
   (interactive)
   ;; If the previous command was not this,
   ;; mark the completion buffer obsolete.
-  (unless (eq this-command last-command)
+  (setq this-command 'completion-at-point)
+  (unless (eq 'completion-at-point last-command)
     (completion--flush-all-sorted-completions)
     (setq minibuffer-scroll-window nil))
 
@@ -1483,10 +1484,13 @@ exit."
           (minibuffer-completion-predicate predicate)
           (ol (make-overlay start end nil nil t)))
       (overlay-put ol 'field 'completion)
+      ;; HACK: if the text we are completing is already in a field, we
+      ;; want the completion field to take priority (e.g. Bug#6830).
+      (overlay-put ol 'priority 100)
       (when completion-in-region-mode-predicate
         (completion-in-region-mode 1)
         (setq completion-in-region--data
-            (list (current-buffer) start end collection)))
+              (list (current-buffer) start end collection)))
       (unwind-protect
           (call-interactively 'minibuffer-complete)
         (delete-overlay ol)))))
@@ -1653,9 +1657,10 @@ The completion method is determined by `completion-at-point-functions'."
         ;; introduce a corresponding hook (plus another for word-completion,
         ;; and another for force-completion, maybe?).
         (overlay-put ol 'field 'completion)
+        (overlay-put ol 'priority 100)
         (completion-in-region-mode 1)
         (setq completion-in-region--data
-            (list (current-buffer) start end collection))
+              (list (current-buffer) start end collection))
         (unwind-protect
             (call-interactively 'minibuffer-completion-help)
           (delete-overlay ol))))
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index fbc83bf1df0..feef78a305f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1039,7 +1039,8 @@ It will be registered for all objects created by `dbus-register-object'."
                     (car (last key))
                     (list :variant (cdar (last (car val))))))))
          dbus-registered-objects-table)
-        (list result))))))
+        ;; Return the result, or an empty array.
+        (list :array (or result '(:signature "{sv}"))))))))
 
  
 ;; Initialize :system and :session buses.  This adds their file
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 84343b7de00..a8e969a18c5 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -570,10 +570,10 @@ whole threads.  Function returns t if messages were found."
                mairix-output-buffer)))
     (zerop rval)))
 
-(defun mairix-replace-illegal-chars (header)
-  "Replace illegal characters in HEADER for mairix query."
+(defun mairix-replace-invalid-chars (header)
+  "Replace invalid characters in HEADER for mairix query."
   (when header
-    (while (string-match "[^-.@/,& [:alnum:]]" header)
+    (while (string-match "[^-.@/,^=~& [:alnum:]]" header)
       (setq header (replace-match "" t t header)))
     (while (string-match "[& ]" header)
       (setq header (replace-match "," t t header)))
@@ -620,7 +620,7 @@ See %s for details" mairix-output-buffer)))
          (concat
           (nth 1 cur)
           ":"
-          (mairix-replace-illegal-chars
+          (mairix-replace-invalid-chars
            (widget-value
            (cadr (assoc (concat "e" (car (cddr cur))) widgets)))))
          query)))
@@ -652,9 +652,17 @@ Fill in VALUES if based on an article."
     (kill-all-local-variables)
     (erase-buffer)
     (widget-insert
-     "Specify your query for Mairix (check boxes for activating fields):\n\n")
+     "Specify your query for Mairix using check boxes for activating fields.\n\n")
     (widget-insert
-     "(Whitespaces will be converted to ',' (i.e. AND). Use '/' for OR.)\n\n")
+     (concat "Use ~word        to match messages "
+             (propertize "not" 'face 'italic)
+             " containing the word)\n"
+             "    substring=   to match words containing the substring\n"
+             "    substring=N  to match words containing the substring, allowing\n"
+             "                  up to N errors(missing/extra/different letters)\n"
+             "    ^substring=  to match the substring at the beginning of a word.\n"))
+    (widget-insert
+     "Whitespace will be converted to ',' (i.e. AND).  Use '/' for OR.\n\n")
     (setq mairix-widgets (mairix-widget-build-editable-fields values))
     (when (member 'flags mairix-widget-other)
       (widget-insert "\nFlags:\n      Seen:     ")
@@ -935,7 +943,7 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
               (lambda (field)
                 (list (car (cddr field))
                       (if (car field)
-                          (mairix-replace-illegal-chars
+                          (mairix-replace-invalid-chars
                            (funcall get-mail-header (car field)))
                         nil))))
              mairix-widget-fields-list)))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index a22288e7d4e..f9122e7245e 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -86,18 +86,9 @@ as the first attribute on the previous line."
   :group 'nxml
   :type 'integer)
 
-(defcustom nxml-bind-meta-tab-to-complete-flag (not window-system)
-  "Non-nil means bind M-TAB in `nxml-mode-map' to `nxml-complete'.
-C-return will be bound to `nxml-complete' in any case.
-M-TAB gets swallowed by many window systems/managers, and
-`documentation' will show M-TAB rather than C-return as the
-binding for `nxml-complete' when both are bound.  So it's better
-to bind M-TAB only when it will work."
+(defcustom nxml-bind-meta-tab-to-complete-flag t
+  "Non-nil means to use nXML completion in \\[completion-at-point]."
   :group 'nxml
-  :set (lambda (sym flag)
-         (set-default sym flag)
-         (when (and (boundp 'nxml-mode-map) nxml-mode-map)
-           (define-key nxml-mode-map "\M-\t" (and flag 'nxml-complete))))
   :type 'boolean)
 
 (defcustom nxml-prefer-utf-16-to-utf-8-flag nil
@@ -418,9 +409,7 @@ reference.")
     (define-key map "\C-c\C-o" nxml-outline-prefix-map)
     (define-key map [S-mouse-2] 'nxml-mouse-hide-direct-text-content)
     (define-key map "/" 'nxml-electric-slash)
-    (define-key map [C-return] 'nxml-complete)
-    (when nxml-bind-meta-tab-to-complete-flag
-      (define-key map "\M-\t" 'nxml-complete))
+    (define-key map "\M-\t" 'completion-at-point)
     map)
   "Keymap for nxml-mode.")
 
@@ -479,7 +468,7 @@ the start-tag, point, and end-tag are all left on separate lines.
 If `nxml-slash-auto-complete-flag' is non-nil, then inserting a `</'
 automatically inserts the rest of the end-tag.
 
-\\[nxml-complete] performs completion on the symbol preceding point.
+\\[completion-at-point] performs completion on the symbol preceding point.
 
 \\[nxml-dynamic-markup-word] uses the contents of the current buffer
 to choose a tag to put around the word preceding point.
@@ -555,6 +544,8 @@ Many aspects this mode can be customized using
         (nxml-clear-inside (point-min) (point-max))
         (nxml-with-invisible-motion
           (nxml-scan-prolog)))))
+  (add-hook 'completion-at-point-functions
+            #'nxml-completion-at-point-function nil t)
   (add-hook 'after-change-functions 'nxml-after-change nil t)
   (add-hook 'change-major-mode-hook 'nxml-cleanup nil t)
 
@@ -1654,6 +1645,11 @@ depend on `nxml-completion-hook'."
     (ding)
     (message "Cannot complete in this context")))
 
+(defun nxml-completion-at-point-function ()
+  "Call `nxml-complete' to perform completion at point."
+  (when nxml-bind-meta-tab-to-complete-flag
+    #'nxml-complete))
+
 ;;; Movement
 
 (defun nxml-forward-balanced-item (&optional arg)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 509bb203f78..55ab6c9981c 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1958,7 +1958,12 @@ with a brace block."
 
 (defun c-mark-function ()
   "Put mark at end of the current top-level declaration or macro, point at beginning.
-If point is not inside any then the closest following one is chosen.
+If point is not inside any then the closest following one is
+chosen.  Each successive call of this command extends the marked
+region by one function.
+
+A mark is left where the command started, unless the region is already active
+\(in Transient Mark mode).
 
 As opposed to \\[c-beginning-of-defun] and \\[c-end-of-defun], this
 function does not require the declaration to contain a brace block."
@@ -1974,8 +1979,24 @@ function does not require the declaration to contain a brace block."
 
     (if (not decl-limits)
         (error "Cannot find any declaration")
-      (goto-char (car decl-limits))
-      (push-mark (cdr decl-limits) nil t))))
+      (let* ((extend-region-p
+              (and (eq this-command 'c-mark-function)
+                   (eq last-command 'c-mark-function)))
+             (push-mark-p (and (eq this-command 'c-mark-function)
+                               (not extend-region-p)
+                               (not (and transient-mark-mode mark-active)))))
+        (if push-mark-p (push-mark (point)))
+        (if extend-region-p
+            (progn
+              (exchange-point-and-mark)
+              (setq decl-limits (c-declaration-limits t))
+              (when (not decl-limits)
+                (exchange-point-and-mark)
+                (error "Cannot find any declaration"))
+              (goto-char (cdr decl-limits))
+              (exchange-point-and-mark))
+          (goto-char (car decl-limits))
+          (push-mark (cdr decl-limits) nil t))))))
 
 (defun c-cpp-define-name ()
   "Return the name of the current CPP macro, or NIL if we're not in one."
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 3b33ac894f2..f392971e7d1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -236,7 +236,7 @@
 
 (defun c-invalidate-macro-cache (beg end)
   ;; Called from a before-change function.  If the change region is before or
-  ;; in the macro characterised by `c-macro-cache' etc., nullify it
+  ;; in the macro characterized by `c-macro-cache' etc., nullify it
   ;; appropriately.  BEG and END are the standard before-change-functions
   ;; parameters.  END isn't used.
   (cond
@@ -2163,7 +2163,7 @@ comment at the start of cc-engine.el for more info."
 (make-variable-buffer-local 'c-state-semi-nonlit-pos-cache-limit)
 ;; An upper limit on valid entries in `c-state-semi-nonlit-pos-cache'.  This is
 ;; reduced by buffer changes, and increased by invocations of
-;; `c-state-literal-at'.  FIMXE!!!
+;; `c-state-literal-at'.  FIXME!!!
 
 (defsubst c-state-pp-to-literal (from to)
   ;; Do a parse-partial-sexp from FROM to TO, returning either
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 8ea255e49dd..89450cd2276 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3269,8 +3269,12 @@ DOC is an optional documentation string."
   (let* ((frame (gdb-current-buffer-frame))
          (file (bindat-get-field frame 'fullname))
          (line (bindat-get-field frame 'line)))
-    (when file
-      (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line)))
+    (if file
+      (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line)
+    ;; If we're unable to get a file name / line for $PC, simply
+    ;; follow $PC, disassembling the next 10 (x ~15 (on IA) ==
+    ;; 150 bytes) instructions.
+    "-data-disassemble -s $pc -e \"$pc + 150\" -- 0"))
   gdb-disassembly-handler
   ;; We update disassembly only after we have actual frame information
   ;; about all threads, so no there's `update' signal in this list
@@ -3329,8 +3333,12 @@ DOC is an optional documentation string."
       (gdb-table-add-row table
                          (list
                           (bindat-get-field instr 'address)
-                          (apply #'format "<%s+%s>:"
-                                 (gdb-get-many-fields instr 'func-name 'offset))
+                          (let
+                              ((func-name (bindat-get-field instr 'func-name))
+                               (offset (bindat-get-field instr 'offset)))
+                            (if func-name
+                                (format "<%s+%s>:" func-name offset)
+                              ""))
                           (bindat-get-field instr 'inst)))
       (when (string-equal (bindat-get-field instr 'address)
                           address)
diff --git a/lisp/replace.el b/lisp/replace.el
index 349e63d4201..9fbaa279079 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2116,13 +2116,13 @@ make, or the user didn't cancel the call."
   (if query-replace-lazy-highlight
       (let ((isearch-string string)
             (isearch-regexp regexp)
+            ;; Set isearch-word to nil because word-replace is regexp-based,
+            ;; so `isearch-search-fun' should not use `word-search-forward'.
+            (isearch-word nil)
             (search-whitespace-regexp nil)
             (isearch-case-fold-search case-fold)
             (isearch-forward t)
             (isearch-error nil))
-        ;; Set isearch-word to nil because word-replace is regexp-based,
-        ;; so `isearch-search-fun' should not use `word-search-forward'.
-        (if (and isearch-word isearch-regexp) (setq isearch-word nil))
         (isearch-lazy-highlight-new-loop range-beg range-end))))
 
 (defun replace-dehighlight ()
diff --git a/lisp/savehist.el b/lisp/savehist.el
index c1515fa48ce..a65906a1676 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -369,9 +369,11 @@ trimming of history lists to `history-length' items."
   "Return non-nil if VALUE is printable."
   (cond
    ;; Quick response for oft-encountered types known to be printable.
-   ((stringp value))
    ((numberp value))
    ((symbolp value))
+   ;; String without properties
+   ((and (stringp value)
+         (equal-including-properties value (substring-no-properties value))))
    (t
     ;; For others, check explicitly.
     (with-temp-buffer
diff --git a/lisp/server.el b/lisp/server.el
index 34ac5d7ba23..ed83225eccd 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -706,9 +706,29 @@ Server mode runs a process that accepts commands from the
           (pp v)
           (let ((text (buffer-substring-no-properties
                        (point-min) (point-max))))
-            (server-send-string
-             proc (format "-print %s\n"
-                          (server-quote-arg text)))))))))
+            (server-reply-print (server-quote-arg text) proc)))))))
+
+(defconst server-msg-size 1024
+  "Maximum size of a message sent to a client.")
+
+(defun server-reply-print (qtext proc)
+  "Send a `-print QTEXT' command to client PROC.
+QTEXT must be already quoted.
+This handles splitting the command if it would be bigger than
+`server-msg-size'."
+  (let ((prefix "-print ")
+        part)
+    (while (> (+ (length qtext) (length prefix) 1) server-msg-size)
+      ;; We have to split the string
+      (setq part (substring qtext 0 (- server-msg-size (length prefix) 1)))
+      ;; Don't split in the middle of a quote sequence
+      (if (string-match "\\(^\\|[^&]\\)\\(&&\\)+$" part)
+          ;; There is an uneven number of & at the end
+          (setq part (substring part 0 -1)))
+      (setq qtext (substring qtext (length part)))
+      (server-send-string proc (concat prefix part "\n"))
+      (setq prefix "-print-nonl "))
+    (server-send-string proc (concat prefix qtext "\n"))))
 
 (defun server-create-tty-frame (tty type proc)
   (unless tty
@@ -911,6 +931,11 @@ The following commands are accepted by the client:
   Print STRING on stdout.  Used to send values
   returned by -eval.
 
+`-print-nonl STRING'
+  Print STRING on stdout.  Used to continue a
+  preceding -print command that would be too big to send
+  in a single message.
+
 `-error DESCRIPTION'
   Signal an error and delete process PROC.
 
@@ -1534,46 +1559,54 @@ only these files will be asked to be saved."
 Returns the result of the evaluation, or signals an error if it
 cannot contact the specified server.  For example:
   \(server-eval-at \"server\" '(emacs-pid))
-returns the process ID of the Emacs instance running \"server\".
-This function requires the use of TCP sockets. "
-  (or server-use-tcp
-      (error "This function requires TCP sockets"))
-  (let ((auth-file (expand-file-name server server-auth-dir))
-        (coding-system-for-read 'binary)
-        (coding-system-for-write 'binary)
-        address port secret process)
-    (unless (file-exists-p auth-file)
-      (error "No such server definition: %s" auth-file))
+returns the process ID of the Emacs instance running \"server\"."
+  (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
+         (server-file (expand-file-name server server-dir))
+         (coding-system-for-read 'binary)
+         (coding-system-for-write 'binary)
+         address port secret process)
+    (unless (file-exists-p server-file)
+      (error "No such server: %s" server))
     (with-temp-buffer
-      (insert-file-contents auth-file)
-      (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
-        (error "Invalid auth file"))
-      (setq address (match-string 1)
-            port (string-to-number (match-string 2)))
-      (forward-line 1)
-      (setq secret (buffer-substring (point) (line-end-position)))
-      (erase-buffer)
-      (unless (setq process (open-network-stream "eval-at" (current-buffer)
-                                                 address port))
-        (error "Unable to contact the server"))
-      (set-process-query-on-exit-flag process nil)
-      (process-send-string
-       process
-       (concat "-auth " secret " -eval "
-               (replace-regexp-in-string
-                " " "&_" (format "%S" form))
-               "\n"))
+      (when server-use-tcp
+        (let ((coding-system-for-read 'no-conversion))
+          (insert-file-contents server-file)
+          (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
+            (error "Invalid auth file"))
+          (setq address (match-string 1)
+                port (string-to-number (match-string 2)))
+          (forward-line 1)
+          (setq secret (buffer-substring (point) (line-end-position)))
+          (erase-buffer)))
+      (unless (setq process (make-network-process
+                             :name "eval-at"
+                             :buffer (current-buffer)
+                             :host address
+                             :service (if server-use-tcp port server-file)
+                             :family (if server-use-tcp 'ipv4 'local)
+                             :noquery t))
+               (error "Unable to contact the server"))
+      (if server-use-tcp
+          (process-send-string process (concat "-auth " secret "\n")))
+      (process-send-string process
+                           (concat "-eval "
+                                   (server-quote-arg (format "%S" form))
+                                   "\n"))
       (while (memq (process-status process) '(open run))
         (accept-process-output process 0 10))
       (goto-char (point-min))
       ;; If the result is nil, there's nothing in the buffer.  If the
       ;; result is non-nil, it's after "-print ".
-      (when (search-forward "\n-print" nil t)
-        (let ((start (point)))
-          (while (search-forward "&_" nil t)
-            (replace-match " " t t))
-          (goto-char start)
-          (read (current-buffer)))))))
+      (let ((answer ""))
+        (while (re-search-forward "\n-print\\(-nonl\\)? " nil t)
+          (setq answer
+                (concat answer
+                        (buffer-substring (point)
+                                          (progn (skip-chars-forward "^\n")
+                                                 (point))))))
+        (if (not (equal answer ""))
+            (read (decode-coding-string (server-unquote-arg answer)
+                                        'emacs-internal)))))))
 
 
 (provide 'server)
diff --git a/lisp/simple.el b/lisp/simple.el
index 45daf99f614..936037f5caa 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -893,16 +893,23 @@ that uses or sets the mark."
 ;; Counting lines, one way or another.
 
 (defun goto-line (line &optional buffer)
-  "Goto LINE, counting from line 1 at beginning of buffer.
-Normally, move point in the current buffer, and leave mark at the
-previous position.  With just \\[universal-argument] as argument,
-move point in the most recently selected other buffer, and switch to it.
+  "Go to LINE, counting from line 1 at beginning of buffer.
+If called interactively, a numeric prefix argument specifies
+LINE; without a numeric prefix argument, read LINE from the
+minibuffer.
+
+If optional argument BUFFER is non-nil, switch to that buffer and
+move to line LINE there.  If called interactively with \\[universal-argument]
+as argument, BUFFER is the most recently selected other buffer.
 
-If there's a number in the buffer at point, it is the default for LINE.
+Prior to moving point, this function sets the mark (without
+activating it), unless Transient Mark mode is enabled and the
+mark is already active.
 
 This function is usually the wrong thing to use in a Lisp program.
 What you probably want instead is something like:
-  (goto-char (point-min)) (forward-line (1- N))
+  (goto-char (point-min))
+  (forward-line (1- N))
 If at all possible, an even better solution is to use char counts
 rather than line counts."
   (interactive
@@ -3062,7 +3069,8 @@ before the Emacs kill and one can still paste it using \\[yank] \\[yank-pop]."
   :version "23.2")
 
 (defcustom kill-do-not-save-duplicates nil
-  "Do not add a new string to `kill-ring' when it is the same as the last one."
+  "Do not add a new string to `kill-ring' if it duplicates the last one.
+The comparison is done using `equal-including-properties'."
   :type 'boolean
   :group 'killing
   :version "23.2")
@@ -3090,7 +3098,10 @@ argument should still be a \"useful\" string for such uses."
         (signal 'args-out-of-range
                 (list string "yank-handler specified for empty string"))))
   (unless (and kill-do-not-save-duplicates
-               (equal string (car kill-ring)))
+               ;; Due to text properties such as 'yank-handler that
+               ;; can alter the contents to yank, comparison using
+               ;; `equal' is unsafe.
+               (equal-including-properties string (car kill-ring)))
     (if (fboundp 'menu-bar-update-yank-menu)
         (menu-bar-update-yank-menu string (and replace (car kill-ring)))))
   (when save-interprogram-paste-before-kill
@@ -3101,10 +3112,10 @@ argument should still be a \"useful\" string for such uses."
                        (nreverse interprogram-paste)
                      (list interprogram-paste)))
           (unless (and kill-do-not-save-duplicates
-                       (equal s (car kill-ring)))
+                       (equal-including-properties s (car kill-ring)))
             (push s kill-ring))))))
   (unless (and kill-do-not-save-duplicates
-               (equal string (car kill-ring)))
+               (equal-including-properties string (car kill-ring)))
     (if (and replace kill-ring)
         (setcar kill-ring string)
       (push string kill-ring)
diff --git a/lisp/sort.el b/lisp/sort.el
index d38e475fd39..8cfe69f9458 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -423,7 +423,7 @@ For example: to sort lines in the region by the first word on each line
   ;; using negative prefix arg to mean "reverse" is now inconsistent with
   ;; other sort-.*fields functions but then again this was before, since it
   ;; didn't use the magnitude of the arg to specify anything.
-  (interactive "P\nsRegexp specifying records to sort:
+  (interactive "P\nsRegexp specifying records to sort: \n\
 sRegexp specifying key within record: \nr")
   (cond ((or (equal key-regexp "") (equal key-regexp "\\&"))
          (setq key-regexp 0))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 89211b2b86e..bb1debb4552 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -3987,11 +3987,11 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
 
 (defun speedbar-unhighlight-one-tag-line ()
   "Unhighlight the currently highlighted line."
-  (if speedbar-highlight-one-tag-line
-      (progn
-        (speedbar-delete-overlay speedbar-highlight-one-tag-line)
-        (setq speedbar-highlight-one-tag-line nil)))
-  (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line))
+  (when (and speedbar-highlight-one-tag-line
+             (not (eq this-command 'handle-switch-frame)))
+    (speedbar-delete-overlay speedbar-highlight-one-tag-line)
+    (setq speedbar-highlight-one-tag-line nil)
+    (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line)))
 
 (defun speedbar-recenter-to-top ()
   "Recenter the current buffer so point is on the top of the window."
diff --git a/lisp/subr.el b/lisp/subr.el
index 00a030c744c..e0b099dd16b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3026,13 +3026,12 @@ the buffer list."
            (set-buffer ,old-buffer))))))
 
 (defmacro save-window-excursion (&rest body)
-  "Execute BODY, preserving window sizes and contents.
-Return the value of the last form in BODY.
-Restore which buffer appears in which window, where display starts,
-and the value of point and mark for each window.
-Also restore the choice of selected window.
-Also restore which buffer is current.
-Does not restore the value of point in current buffer.
+  "Execute BODY, then restore previous window configuration.
+This macro saves the window configuration on the selected frame,
+executes BODY, then calls `set-window-configuration' to restore
+the saved window configuration.  The return value is the last
+form in BODY.  The window configuration is also restored if BODY
+exits nonlocally.
 
 BEWARE: Most uses of this macro introduce bugs.
 E.g. it should not be used to try and prevent some code from opening
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 55aa9194904..960649bdbc9 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * url-http.el (url-http-end-of-document-sentinel): Handle
+        keepalive expiry by calling url-http again (Bug#10223).
+        (url-http): New arg, for the above.
+
+2012-03-11  Devon Sean McCullough  <emacs-hacker2012@jovi.net>
+
+        * url-http.el (url-http-find-free-connection): Don't pass a nil
+        argument to url-http-mark-connection-as-busy (bug#10891).
+
 2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * url-queue.el (url-queue-kill-job): Delete the process sentinel
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0c911260ca5..a4726489814 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -27,6 +27,7 @@
 (eval-when-compile (require 'cl))
 (defvar url-http-extra-headers)
 (defvar url-http-target-url)
+(defvar url-http-no-retry)
 (defvar url-http-proxy)
 (defvar url-http-connection-opened)
 (require 'url-gw)
@@ -153,38 +154,40 @@ request.")
 
 (defun url-http-find-free-connection (host port)
   (let ((conns (gethash (cons host port) url-http-open-connections))
-        (found nil))
-    (while (and conns (not found))
+        (connection nil))
+    (while (and conns (not connection))
       (if (not (memq (process-status (car conns)) '(run open connect)))
           (progn
             (url-http-debug "Cleaning up dead process: %s:%d %S"
                             host port (car conns))
             (url-http-idle-sentinel (car conns) nil))
-        (setq found (car conns))
-        (url-http-debug "Found existing connection: %s:%d %S" host port found))
+        (setq connection (car conns))
+        (url-http-debug "Found existing connection: %s:%d %S" host port connection))
       (pop conns))
-    (if found
+    (if connection
         (url-http-debug "Reusing existing connection: %s:%d" host port)
       (url-http-debug "Contacting host: %s:%d" host port))
     (url-lazy-message "Contacting host: %s:%d" host port)
-    (url-http-mark-connection-as-busy
-     host port
-     (or found
-         (let ((buf (generate-new-buffer " *url-http-temp*")))
-           ;; `url-open-stream' needs a buffer in which to do things
-           ;; like authentication.  But we use another buffer afterwards.
-           (unwind-protect
-               (let ((proc (url-open-stream host buf host port)))
-                 ;; url-open-stream might return nil.
-                 (when (processp proc)
-                   ;; Drop the temp buffer link before killing the buffer.
-                   (set-process-buffer proc nil))
-                 proc)
-             ;; If there was an error on connect, make sure we don't
-             ;; get queried.
-             (when (get-buffer-process buf)
-               (set-process-query-on-exit-flag (get-buffer-process buf) nil))
-             (kill-buffer buf)))))))
+
+    (unless connection
+      (let ((buf (generate-new-buffer " *url-http-temp*")))
+        ;; `url-open-stream' needs a buffer in which to do things
+        ;; like authentication.  But we use another buffer afterwards.
+        (unwind-protect
+            (let ((proc (url-open-stream host buf host port)))
+              ;; url-open-stream might return nil.
+              (when (processp proc)
+                ;; Drop the temp buffer link before killing the buffer.
+                (set-process-buffer proc nil)
+                (setq connection proc)))
+          ;; If there was an error on connect, make sure we don't
+          ;; get queried.
+          (when (get-buffer-process buf)
+            (set-process-query-on-exit-flag (get-buffer-process buf) nil))
+          (kill-buffer buf))))
+
+    (if connection
+        (url-http-mark-connection-as-busy host port connection))))
 
 ;; Building an HTTP request
 (defun url-http-user-agent-string ()
@@ -873,19 +876,26 @@ should be shown to the user."
               url-http-open-connections))
 
 (defun url-http-end-of-document-sentinel (proc why)
-  ;; Sentinel used for old HTTP/0.9 or connections we know are going
-  ;; to die as the 'end of document' notifier.
+  ;; Sentinel used to handle (i) terminated old HTTP/0.9 connections,
+  ;; and (ii) closed connection due to reusing a HTTP connection which
+  ;; we believed was still alive, but which the server closed on us.
+  ;; We handle case (ii) by calling `url-http' again.
   (url-http-debug "url-http-end-of-document-sentinel in buffer (%s)"
                   (process-buffer proc))
   (url-http-idle-sentinel proc why)
   (when (buffer-name (process-buffer proc))
     (with-current-buffer (process-buffer proc)
       (goto-char (point-min))
-      (if (not (looking-at "HTTP/"))
-          ;; HTTP/0.9 just gets passed back no matter what
-          (url-http-activate-callback)
-        (if (url-http-parse-headers)
-            (url-http-activate-callback))))))
+      (cond ((not (looking-at "HTTP/"))
+             (if url-http-no-retry
+                 ;; HTTP/0.9 just gets passed back no matter what
+                 (url-http-activate-callback)
+               ;; Call `url-http' again if our connection expired.
+               (erase-buffer)
+               (url-http url-current-object url-callback-function
+                         url-callback-arguments (current-buffer))))
+            ((url-http-parse-headers)
+             (url-http-activate-callback))))))
 
 (defun url-http-simple-after-change-function (st nd length)
   ;; Function used when we do NOT know how long the document is going to be
@@ -1163,11 +1173,14 @@ the end of the document."
       (goto-char (point-max)))))
 
 ;;;###autoload
-(defun url-http (url callback cbargs)
+(defun url-http (url callback cbargs &optional retry-buffer)
   "Retrieve URL via HTTP asynchronously.
 URL must be a parsed URL.  See `url-generic-parse-url' for details.
 When retrieval is completed, the function CALLBACK is executed with
-CBARGS as the arguments."
+CBARGS as the arguments.
+
+Optional arg RETRY-BUFFER, if non-nil, specifies the buffer of a
+previous `url-http' call, which is being re-attempted."
   (check-type url vector "Need a pre-parsed URL.")
   (declare (special url-current-object
                     url-http-end-of-headers
@@ -1188,7 +1201,8 @@ CBARGS as the arguments."
   (let* ((host (url-host (or url-using-proxy url)))
          (port (url-port (or url-using-proxy url)))
          (connection (url-http-find-free-connection host port))
-         (buffer (generate-new-buffer (format " *http %s:%d*" host port))))
+         (buffer (or retry-buffer
+                     (generate-new-buffer (format " *http %s:%d*" host port)))))
     (if (not connection)
         ;; Failed to open the connection for some reason
         (progn
@@ -1218,6 +1232,7 @@ CBARGS as the arguments."
                        url-http-extra-headers
                        url-http-data
                        url-http-target-url
+                       url-http-no-retry
                        url-http-connection-opened
                        url-http-proxy))
           (set (make-local-variable var) nil))
@@ -1233,6 +1248,7 @@ CBARGS as the arguments."
               url-callback-arguments cbargs
               url-http-after-change-function 'url-http-wait-for-headers-change-function
               url-http-target-url url-current-object
+              url-http-no-retry retry-buffer
               url-http-connection-opened nil
               url-http-proxy url-using-proxy)
 
@@ -1259,6 +1275,7 @@ CBARGS as the arguments."
     (with-current-buffer (process-buffer proc)
       (cond
        (url-http-connection-opened
+        (setq url-http-no-retry t)
         (url-http-end-of-document-sentinel proc why))
        ((string= (substring why 0 4) "open")
         (setq url-http-connection-opened t)
diff --git a/lisp/window.el b/lisp/window.el
index edd8a113876..f79041e0e6c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3273,7 +3273,7 @@ Otherwise, the window starts are chosen so as to minimize the
 amount of redisplay; this is convenient on slow terminals."
   (interactive "P")
   (let ((old-window (selected-window))
-        (old-point (point))
+        (old-point (window-point-1))
         (size (and size (prefix-numeric-value size)))
         moved-by-window-height moved new-window bottom)
     (when (and size (< size 0) (< (- size) window-min-height))
@@ -3282,22 +3282,27 @@ amount of redisplay; this is convenient on slow terminals."
     (setq new-window (split-window nil size))
     (unless split-window-keep-point
       (with-current-buffer (window-buffer)
-        (goto-char (window-start))
-        (setq moved (vertical-motion (window-height)))
-        (set-window-start new-window (point))
-        (when (> (point) (window-point new-window))
-          (set-window-point new-window (point)))
-        (when (= moved (window-height))
-          (setq moved-by-window-height t)
-          (vertical-motion -1))
-        (setq bottom (point)))
-      (and moved-by-window-height
-           (<= bottom (point))
-           (set-window-point old-window (1- bottom)))
-      (and moved-by-window-height
-           (<= (window-start new-window) old-point)
-           (set-window-point new-window old-point)
-           (select-window new-window)))
+        ;; Use `save-excursion' around vertical movements below
+        ;; (Bug#10971).  Note: When the selected window's buffer has a
+        ;; header line, up to two lines of the buffer may not show up
+        ;; in the resulting configuration.
+        (save-excursion
+          (goto-char (window-start))
+          (setq moved (vertical-motion (window-height)))
+          (set-window-start new-window (point))
+          (when (> (point) (window-point new-window))
+            (set-window-point new-window (point)))
+          (when (= moved (window-height))
+            (setq moved-by-window-height t)
+            (vertical-motion -1))
+          (setq bottom (point)))
+        (and moved-by-window-height
+             (<= bottom (point))
+             (set-window-point-1 old-window (1- bottom)))
+        (and moved-by-window-height
+             (<= (window-start new-window) old-point)
+             (set-window-point new-window old-point)
+             (select-window new-window))))
     ;; Always copy quit-restore parameter in interactive use.
     (let ((quit-restore (window-parameter old-window 'quit-restore)))
       (when quit-restore
diff --git a/src/ChangeLog b/src/ChangeLog
index ef57223b9ca..1ec148b30c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2012-03-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
+
+2012-03-12  Chong Yidong  <cyd@gnu.org>
+
+        * eval.c (inhibit_lisp_code): Rename from
+        inhibit_window_configuration_change_hook; move from window.c.
+
+        * xfns.c (unwind_create_frame_1, Fx_create_frame):
+        * window.c (run_window_configuration_change_hook)
+        (syms_of_window): Callers changed.
+
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * keymap.c (Fkey_description): Doc fix (Bug#9700).
+
+        * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452).
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * frame.c (other_visible_frames): Don't assume the selected frame
+        is visible (Bug#10955).
+
+2012-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (compare_overlays): Avoid qsort's instability (bug#6830).
+
+2012-03-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (x_wm_set_size_hint): Use one row in call to
+        FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than
+        zero (Bug#10954).
+
 2012-03-03  Glenn Morris  <rgm@gnu.org>
 
         * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.
@@ -195,8 +229,8 @@
 
 2012-02-04  Eli Zaretskii  <eliz@gnu.org>
 
-        * w32.c (get_emacs_configuration_options): Include
-        --enable-checking, if specified, in the return value.
+        * w32.c (get_emacs_configuration_options):
+        Include --enable-checking, if specified, in the return value.
 
 2012-02-04  Martin Rudalics  <rudalics@gmx.at>
 
@@ -302,8 +336,8 @@
 2012-01-19  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (save_window_save, Fcurrent_window_configuration)
-        (Vwindow_persistent_parameters): Do not use Qstate.  Rewrite
-        doc-strings.
+        (Vwindow_persistent_parameters): Do not use Qstate.
+        Rewrite doc-strings.
 
 2012-01-19  Kenichi Handa  <handa@m17n.org>
 
@@ -477,9 +511,9 @@
         * nsselect.m (CUT_BUFFER_SUPPORT): Remove define.
         (symbol_to_nsstring): Fix indentation.
         (ns_symbol_to_pb): New function.
-        (Fns_get_selection_internal): Renamed from Fns_get_cut_buffer_internal.
-        (Fns_rotate_cut_buffers_internal): Removed.
-        (Fns_store_selection_internal): Renamed from
+        (Fns_get_selection_internal): Rename from Fns_get_cut_buffer_internal.
+        (Fns_rotate_cut_buffers_internal): Remove.
+        (Fns_store_selection_internal): Rename from
         Fns_store_cut_buffer_internal.
         (ns_get_foreign_selection, Fx_own_selection_internal)
         (Fx_disown_selection_internal, Fx_selection_exists_p)
@@ -620,7 +654,7 @@
         (coding_set_destination): Return how many bytes
         coding->destination was relocated.
         (CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET)
-        (CODING_CHAR_CHARSET_P): Adjusted for the avove changes.
+        (CODING_CHAR_CHARSET_P): Adjust for the avove changes.
 
 2011-12-05  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
diff --git a/src/buffer.c b/src/buffer.c
index 1577254d92a..1fea19b0d65 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2864,6 +2864,12 @@ compare_overlays (const void *v1, const void *v2)
     return s1->beg < s2->beg ? -1 : 1;
   if (s1->end != s2->end)
     return s2->end < s1->end ? -1 : 1;
+  /* Avoid the non-determinism of qsort by choosing an arbitrary ordering
+     between "equal" overlays.  The result can still change between
+     invocations of Emacs, but it won't change in the middle of
+     `find_field' (bug#6830).  */
+  if (XHASH (s1->overlay) != XHASH (s2->overlay))
+    return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
   return 0;
 }
 
diff --git a/src/editfns.c b/src/editfns.c
index bbeb5033664..a41565d8588 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -663,10 +663,11 @@ is after LIMIT, then LIMIT will be returned instead.  */)
 
 DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
        doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
-
 A field is a region of text with the same `field' property.
-If NEW-POS is nil, then the current point is used instead, and set to the
-constrained position if that is different.
+
+If NEW-POS is nil, then use the current point instead, and move point
+to the resulting constrained position, in addition to returning that
+position.
 
 If OLD-POS is at the boundary of two fields, then the allowable
 positions for NEW-POS depends on the value of the optional argument
diff --git a/src/eval.c b/src/eval.c
index 344228741cb..4a3f5083b3b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -124,6 +124,12 @@ Lisp_Object Vsignaling_function;
 
 int handling_signal;
 
+/* If non-nil, Lisp code must not be run since some part of Emacs is
+   in an inconsistent state.  Currently, x-create-frame uses this to
+   avoid triggering window-configuration-change-hook while the new
+   frame is half-initialized.  */
+Lisp_Object inhibit_lisp_code;
+
 static Lisp_Object funcall_lambda (Lisp_Object, ptrdiff_t, Lisp_Object *);
 static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
 static int interactive_p (int);
@@ -3766,6 +3772,8 @@ alist of active lexical bindings.  */);
   staticpro (&Vsignaling_function);
   Vsignaling_function = Qnil;
 
+  inhibit_lisp_code = Qnil;
+
   defsubr (&Sor);
   defsubr (&Sand);
   defsubr (&Sif);
diff --git a/src/frame.c b/src/frame.c
index 8505398a260..1db24cc80e7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1118,41 +1118,32 @@ Otherwise, include all frames.  */)
 static int
 other_visible_frames (FRAME_PTR f)
 {
-  /* We know the selected frame is visible,
-     so if F is some other frame, it can't be the sole visible one.  */
-  if (f == SELECTED_FRAME ())
-    {
-      Lisp_Object frames;
-      int count = 0;
+  Lisp_Object frames;
 
-      for (frames = Vframe_list;
-           CONSP (frames);
-           frames = XCDR (frames))
-        {
-          Lisp_Object this;
+  for (frames = Vframe_list; CONSP (frames); frames = XCDR (frames))
+    {
+      Lisp_Object this = XCAR (frames);
+      if (f == XFRAME (this))
+        continue;
 
-          this = XCAR (frames);
-          /* Verify that the frame's window still exists
-             and we can still talk to it.  And note any recent change
-             in visibility.  */
+      /* Verify that we can still talk to the frame's X window,
+         and note any recent change in visibility.  */
 #ifdef HAVE_WINDOW_SYSTEM
-          if (FRAME_WINDOW_P (XFRAME (this)))
-            {
-              x_sync (XFRAME (this));
-              FRAME_SAMPLE_VISIBILITY (XFRAME (this));
-            }
+      if (FRAME_WINDOW_P (XFRAME (this)))
+        {
+          x_sync (XFRAME (this));
+          FRAME_SAMPLE_VISIBILITY (XFRAME (this));
+        }
 #endif
 
-          if (FRAME_VISIBLE_P (XFRAME (this))
-              || FRAME_ICONIFIED_P (XFRAME (this))
-              /* Allow deleting the terminal frame when at least
-                 one X frame exists!  */
-              || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f)))
-            count++;
-        }
-      return count > 1;
+      if (FRAME_VISIBLE_P (XFRAME (this))
+          || FRAME_ICONIFIED_P (XFRAME (this))
+          /* Allow deleting the terminal frame when at least one X
+             frame exists.  */
+          || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f)))
+        return 1;
     }
-  return 1;
+  return 0;
 }
 
 /* Delete FRAME.  When FORCE equals Qnoelisp, delete FRAME
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 1ed5833bd5c..4dbef65dedf 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1304,10 +1304,13 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
 
   hint_flags |= GDK_HINT_BASE_SIZE;
   base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f);
-  base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0)
+  /* Use one row here so base_height does not become zero.
+     Gtk+ and/or Unity on Ubuntu 12.04 can't handle it.  */
+  base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
     + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
 
   check_frame_size (f, &min_rows, &min_cols);
+  if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */
 
   size_hints.base_width = base_width;
   size_hints.base_height = base_height;
diff --git a/src/keymap.c b/src/keymap.c
index 0ae055213c3..ecaeb32896e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2043,8 +2043,9 @@ static Lisp_Object Qsingle_key_description, Qkey_description;
 DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0,
        doc: /* Return a pretty description of key-sequence KEYS.
 Optional arg PREFIX is the sequence of keys leading up to KEYS.
-Control characters turn into "C-foo" sequences, meta into "M-foo",
-spaces are put between sequence elements, etc.  */)
+For example, [?\C-x ?l] is converted into the string \"C-x l\".
+
+The `kbd' macro is an approximate inverse of this.  */)
   (Lisp_Object keys, Lisp_Object prefix)
 {
   int len = 0;
diff --git a/src/lisp.h b/src/lisp.h
index f2177ad789d..678c48e8ff3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2941,6 +2941,7 @@ extern Lisp_Object Qinhibit_quit, Qclosure;
 extern Lisp_Object Qand_rest;
 extern Lisp_Object Vautoload_queue;
 extern Lisp_Object Vsignaling_function;
+extern Lisp_Object inhibit_lisp_code;
 extern int handling_signal;
 #if BYTE_MARK_STACK
 extern struct catchtag *catchlist;
diff --git a/src/window.c b/src/window.c
index df315a2366c..2a9d308b836 100644
--- a/src/window.c
+++ b/src/window.c
@@ -124,9 +124,6 @@ static int window_initialized;
 /* Hook to run when window config changes.  */
 static Lisp_Object Qwindow_configuration_change_hook;
 
-/* If non-nil, run_window_configuration_change_hook does nothing.  */
-Lisp_Object inhibit_window_configuration_change_hook;
-
 /* Used by the function window_scroll_pixel_based */
 static int window_scroll_pixel_based_preserve_x;
 static int window_scroll_pixel_based_preserve_y;
@@ -2899,7 +2896,7 @@ run_window_configuration_change_hook (struct frame *f)
     = Fdefault_value (Qwindow_configuration_change_hook);
   XSETFRAME (frame, f);
 
-  if (NILP (Vrun_hooks) || !NILP (inhibit_window_configuration_change_hook))
+  if (NILP (Vrun_hooks) || !NILP (inhibit_lisp_code))
     return;
 
   /* Use the right buffer.  Matters when running the local hooks.  */
@@ -6532,8 +6529,6 @@ syms_of_window (void)
   window_scroll_preserve_hpos = -1;
   window_scroll_preserve_vpos = -1;
 
-  inhibit_window_configuration_change_hook = Qnil;
-
   DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function,
                doc: /* Non-nil means call as function to display a help buffer.
 The function is called with one argument, the buffer to be displayed.
diff --git a/src/window.h b/src/window.h
index f4a5f52b9a5..ea127ca95a8 100644
--- a/src/window.h
+++ b/src/window.h
@@ -810,10 +810,6 @@ extern Lisp_Object Vmouse_window;
 
 extern Lisp_Object Vmouse_event;
 
-/* If non-nil, run_window_configuration_change_hook does nothing.  */
-
-extern Lisp_Object inhibit_window_configuration_change_hook;
-
 EXFUN (Fnext_window, 3);
 EXFUN (Fselect_window, 2);
 EXFUN (Fset_window_buffer, 3);
diff --git a/src/xfns.c b/src/xfns.c
index 6fcd129e4a4..6f08ada1bb9 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2952,7 +2952,7 @@ unwind_create_frame (Lisp_Object frame)
 static Lisp_Object
 unwind_create_frame_1 (Lisp_Object val)
 {
-  inhibit_window_configuration_change_hook = val;
+  inhibit_lisp_code = val;
   return Qnil;
 }
 
@@ -3337,9 +3337,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
      Vframe_list.  */
   {
     int count2 = SPECPDL_INDEX ();
-    record_unwind_protect (unwind_create_frame_1,
-                           inhibit_window_configuration_change_hook);
-    inhibit_window_configuration_change_hook = Qt;
+    record_unwind_protect (unwind_create_frame_1, inhibit_lisp_code);
+    inhibit_lisp_code = Qt;
 
     x_default_parameter (f, parms, Qmenu_bar_lines,
                          NILP (Vmenu_bar_mode)