auto upstream

33 files changed, 436 insertions, 206 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 18e76e01400..601949af88e 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
+
 2012-12-21  Glenn Morris  <rgm@gnu.org>
 
         * emacs-xtra.texi (copying): The FSF does not sell copies of this.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index cc5ecc475af..d50a841d509 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1917,7 +1917,7 @@ used as a cheap preview (@code{sgml-tags-invisible}).
   The major mode for editing XML documents is called nXML mode.  This
 is a powerful major mode that can recognize many existing XML schema
 and use them to provide completion of XML elements via
-@kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
+@kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
 validation with error highlighting.  To enable nXML mode in an
 existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
 xml-mode}.  Emacs uses nXML mode for files which have the extension
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e701f61c6b0..64973ca38c5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,21 @@
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Vertical Scrolling): Fix typos (Bug#13267).
+
+2013-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (Overlay Properties): Mention field.  (Bug#13364)
+
+2013-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * hooks.texi (Standard Hooks): Use @item, not @itemx, as the first
+        directive in a group of items.
+
+2013-01-05  Chong Yidong  <cyd@gnu.org>
+
+        * keymaps.texi (Key Sequences): Remove obsolete sentence
+        (Bug#13356).
+
 2013-01-04  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
 
         * hash.texi (Defining Hash): Fix typo.  (Bug#13345)
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b1a096b24df..cc6e980dadc 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1559,6 +1559,14 @@ mouse onto the text in the overlay, Emacs displays a help string in the
 echo area, or in the tooltip window.  For details see @ref{Text
 help-echo}.
 
+@item field
+@kindex field @r{(overlay property)}
+@c Copied from Special Properties.
+Consecutive characters with the same @code{field} property constitute a
+@emph{field}.  Some motion functions including @code{forward-word} and
+@code{beginning-of-line} stop moving at a field boundary.
+@xref{Fields}.
+
 @item modification-hooks
 @kindex modification-hooks @r{(overlay property)}
 This property's value is a list of functions to be called if any
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 40a3c162f58..745393f8166 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -121,7 +121,7 @@ The command loop runs this soon after @code{post-command-hook} (q.v.).
 @item delete-terminal-functions
 @xref{Multiple Terminals}.
 
-@itemx pop-up-frame-function
+@item pop-up-frame-function
 @itemx split-window-preferred-function
 @xref{Choosing Window Options}.
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index c4bbe303bf9..cb6c785905c 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -94,9 +94,6 @@ Manual}.
 (kbd "<f1> SPC") @result{} [f1 32]
 (kbd "C-M-<down>") @result{} [C-M-down]
 @end example
-
-This macro is not meant for use with arguments that vary---only
-with string constants.
 @end defun
 
 @node Keymap Basics
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b3c143496dd..792002add81 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3054,10 +3054,11 @@ pixels.  In this case, the return value is @var{lines}.
 @end defun
 
 @defvar auto-window-vscroll
-If this variable is non-@code{nil}, the line-move, scroll-up, and
-scroll-down functions will automatically modify the vertical scroll
-position to scroll through display rows that are taller than the height
-of the window, for example in the presence of large images.
+If this variable is non-@code{nil}, the @code{line-move},
+@code{scroll-up}, and @code{scroll-down} functions will automatically
+modify the vertical scroll position to scroll through display rows
+that are taller than the height of the window, for example in the
+presence of large images.
 @end defvar
 
 @node Horizontal Scrolling
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b0c39ce8507..79214acc102 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,38 @@
+2013-01-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * autotype.texi: Remove undefined command @subtitlefont.
+        * cc-mode.texi: Likewise.
+
+        * org.texi (Advanced features): Use `@w{ }' instead of `@ ' in
+        @item argument.
+        (Property searches): Use \\ instead of @backslashchar{}.
+        * pgg.texi (VERSION): Move @set below @setfilename.
+
+2013-01-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * ada-mode.texi: Remove braces from @title argument.
+        * eudc.texi: Likewise.
+        * smtpmail.texi: Likewise.
+        * auth.texi (VERSION): Set before first use.
+        * emacs-gnutls.texi (VERSION): Likewise.
+        * pgg.texi (VERSION): Likewise.
+        * ede.texi (Top): Rename from top, all uses changed.
+        * eshell.texi: Add missing argument to @sp.
+        * forms.texi (Top): Reorder menu to match structure.
+        * htmlfontify.texi (Customisation): Add missing @item in
+        @enumerate.
+        * org.texi (Advanced features): Add missing argument for @item.
+        (Property searches): Use @backslashchar{} in macro argument.
+        * pcl-cvs.texi: Add missing argument to @sp.
+        (Movement commands): Fix use of @itemx.
+        * vip.texi (Misc Commands, Viewing the Buffer): Likewise.
+        * reftex.texi (Options (Creating Citations)): Add missing newline
+        before @end.
+        * tramp.texi (Obtaining Tramp): Remove extra dots.
+        (Configuration): Reorder menu to match structure.
+        (Remote shell setup): Replace literal NUL character by \0.
+        * viper.texi (Marking): Add missing argument for @item.
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index a5988684e06..926d6a5749c 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -25,7 +25,7 @@ modify this GNU manual.''
 
 @titlepage
 @sp 10
-@title{Ada Mode}
+@title Ada Mode
 @sp 2
 @subtitle An Emacs major mode for programming in Ada
 @subtitle Ada Mode Version 4.00
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 72b0338fb68..36ee400acca 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -2,11 +2,11 @@
 
 @include gnus-overrides.texi
 
+@set VERSION 0.3
+
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
-@set VERSION 0.3
-
 @copying
 This file describes the Emacs auth-source library.
 
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index ad6a2902b1e..137ed6b43e8 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -37,8 +37,7 @@ modify this GNU manual.''
 
 @center @titlefont{Autotyping}
 @sp 2
-@center @subtitlefont{Convenient features for text that you enter
-frequently in Emacs}
+@center Convenient features for text that you enter frequently in Emacs
 @sp 2
 @center Daniel Pfeiffer
 @center additions by Dave Love
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index f63c6c54a16..55b7028101a 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -188,7 +188,7 @@ modify this GNU manual.''
 
 @center @titlefont{CC Mode 5.32}
 @sp 2
-@center @subtitlefont{A GNU Emacs mode for editing C and C-like languages}
+@center A GNU Emacs mode for editing C and C-like languages
 @sp 2
 @center Barry A. Warsaw, Martin Stjernholm, Alan Mackenzie
 
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 2001c8fef68..cadd815025c 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -63,7 +63,7 @@ modify this GNU manual.''
 
 @contents
 
-@node top, EDE Project Concepts, (dir), (dir)
+@node Top, EDE Project Concepts, (dir), (dir)
 @top EDE
 @comment  node-name,  next,  previous,  up
 
@@ -91,7 +91,7 @@ learn and adopt GNU ways of doing things.
 * GNU Free Documentation License::  The license for this documentation.
 @end menu
 
-@node EDE Project Concepts, EDE Mode, top, top
+@node EDE Project Concepts, EDE Mode, Top, Top
 @chapter @ede{} Project Concepts
 
 @ede{} is a generic interface for managing projects.  It specifies a
@@ -126,7 +126,7 @@ of search to files in a single target, or to discover the location of
 documentation or interface files.  @ede{} can provide this
 information.
 
-@node EDE Mode, Quick Start, EDE Project Concepts, top
+@node EDE Mode, Quick Start, EDE Project Concepts, Top
 @chapter @ede{} Mode
 
 @ede{} is implemented as a minor mode, which augments other modes such
@@ -143,7 +143,7 @@ bar.  This menu provides several menu items for high-level @ede{}
 commands.  These menu items, and their corresponding keybindings, are
 independent of the type of project you are actually working on.
 
-@node Quick Start, Creating a project, EDE Mode, top
+@node Quick Start, Creating a project, EDE Mode, Top
 @chapter Quick Start
 
 Once you have @ede{} enabled, you can create a project.  This chapter
@@ -439,7 +439,7 @@ C-c . R RET RET
 If your program takes command line arguments, you can type them in
 when it offers the command line you want to use to run your program.
 
-@node Creating a project, Modifying your project, Quick Start, top
+@node Creating a project, Modifying your project, Quick Start, Top
 @chapter Creating a project
 
 To create a new project, first visit a file that you want to include
@@ -497,7 +497,7 @@ the top-most project's makefile as a starting place for the build.  How
 the toplevel project handles subprojects in the build process is
 dependent on that project's type.
 
-@node Modifying your project, Building and Debugging, Creating a project, top
+@node Modifying your project, Building and Debugging, Creating a project, Top
 @chapter Modifying your project
 
 In this chapter, we describe the generic features for manipulating
@@ -678,7 +678,7 @@ block for ``configurations''.  Add a new named configuration here.
 To switch between different active configurations, modify the
 ``configuration default'' slot.
 
-@node Building and Debugging, Miscellaneous commands, Modifying your project, top
+@node Building and Debugging, Miscellaneous commands, Modifying your project, Top
 @chapter Building and Debugging
 
 @ede{} provides the following ``project-aware'' compilation and
@@ -697,7 +697,7 @@ Build a distribution file for your project.
 
 These commands are also available from the @samp{Development} menu.
 
-@node Miscellaneous commands, Extending EDE, Building and Debugging, top
+@node Miscellaneous commands, Extending EDE, Building and Debugging, Top
 @chapter Miscellaneous commands
 
 If you opt to go in and edit @ede{} project files directly---for
@@ -1093,7 +1093,7 @@ You can add your own locate tool but subclassing from
 methods.  See the code in @file{ede-locate.el} for GNU Global as a
 simple example.
 
-@node Extending EDE, GNU Free Documentation License, Miscellaneous commands, top
+@node Extending EDE, GNU Free Documentation License, Miscellaneous commands, Top
 @chapter Extending @ede{}
 
 This chapter is intended for users who want to write new parts or fix
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index b046eff3c08..740dfee41ed 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -1,10 +1,10 @@
 \input texinfo                  @c -*-texinfo-*-
 
+@set VERSION 0.3
+
 @setfilename ../../info/emacs-gnutls
 @settitle Emacs GnuTLS Integration @value{VERSION}
 
-@set VERSION 0.3
-
 @copying
 This file describes the Emacs GnuTLS integration.
 
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 58597599cdb..504940c5c6b 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -32,9 +32,9 @@ modify this GNU manual.''
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{Eshell: The Emacs Shell}
 @ignore
 @sp 2
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index b92aacc88f0..5b06cc7f11a 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -35,8 +35,8 @@ modify this GNU manual.''
 @footnotestyle end
 
 @titlepage
-@title{EUDC Manual}
-@subtitle{The Emacs Unified Directory Client}
+@title EUDC Manual
+@subtitle The Emacs Unified Directory Client
 @author by Oscar Figueiredo
 @code{1.30b}
 
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index fb888941357..43ffab26c9b 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -87,8 +87,8 @@ how to present it.
 * Miscellaneous::               Forms mode messages and other remarks.
 * Error Messages::              List of error messages forms mode can produce.
 * Long Example::                A more complex control file example.
-* GNU Free Documentation License:: The license for this documentation.
 * Credits::                     Thanks everyone.
+* GNU Free Documentation License:: The license for this documentation.
 * Index::                       Index to this manual.
 @end menu
 @end ifnottex
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index d6904740778..911cdd3cd5f 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -1520,9 +1520,12 @@ Regex used to parse an etags entry: must have 3 subexps, corresponding,
 in order, to:
 
 @enumerate
-   The tag
-   The line
-   The character (point) at which the tag occurs
+@item
+The tag
+@item
+The line
+@item
+The character (point) at which the tag occurs
 @end enumerate
 
 @item hfy-index-file
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 737c186a5a4..47ee0954671 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3027,7 +3027,7 @@ lines will be left alone by this command.
 Selects this line for global recalculation with @kbd{C-u C-c *}, but
 not for automatic recalculation.  Use this when automatic
 recalculation slows down editing too much.
-@item
+@item @w{ }
 Unmarked lines are exempt from recalculation with @kbd{C-u C-c *}.
 All lines that should be recalculated should be marked with @samp{#}
 or @samp{*}.
@@ -5050,7 +5050,7 @@ FILE         @r{The filename the entry is located in.}
 To create sparse trees and special lists with selection based on properties,
 the same commands are used as for tag searches (@pxref{Tag searches}).
 @table @kbd
-@orgcmdkkc{C-c / m,C-c \,org-match-sparse-tree}
+@orgcmdkkc{C-c / m,C-c \\,org-match-sparse-tree}
 Create a sparse tree with all matching entries.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
 @orgcmd{C-c a m,org-tags-view}
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 0749ceefd01..7c294591d0e 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -31,9 +31,9 @@ modify this GNU manual.''
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{PCL-CVS---The Emacs Front-End to CVS}
 @ignore
 @sp 2
@@ -682,7 +682,7 @@ the fact that the buffer is a PCL-CVS buffer:
 These keys move the cursor one file forward, towards the end of the
 buffer (@code{cvs-mode-next-line}).@refill
 
-@itemx p
+@item p
 This key moves one file backward, towards the beginning of the buffer
 (@code{cvs-mode-previous-line}).
 @end table
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 6326f84420c..a18a22e649f 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -3,9 +3,9 @@
 @include gnus-overrides.texi
 
 @setfilename ../../info/pgg
-@settitle PGG @value{VERSION}
 
 @set VERSION 0.1
+@settitle PGG @value{VERSION}
 
 @copying
 This file describes PGG @value{VERSION}, an Emacs interface to various
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index c5b95e4754a..0ee206b1a4d 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -4611,7 +4611,8 @@ prompt for values.  Possible values are:
 @example
 nil     @r{Never prompt for optional arguments}
 t       @r{Always prompt}
-maybe   @r{Prompt only if @code{reftex-citation} was called with C-u prefix arg}@end example
+maybe   @r{Prompt only if @code{reftex-citation} was called with C-u prefix arg}
+@end example
 Unnecessary empty optional arguments are removed before insertion into
 the buffer.  See @code{reftex-cite-cleanup-optional-args}.
 @end defopt
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index ede4d2a2382..dce90d06012 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -24,9 +24,9 @@ modify this GNU manual.''
 @end direntry
 
 @titlepage
-@title{Emacs SMTP Library}
-@subtitle{An Emacs package for sending mail via SMTP}
-@author{Simon Josefsson, Alex Schroeder}
+@title Emacs SMTP Library
+@subtitle An Emacs package for sending mail via SMTP
+@author Simon Josefsson, Alex Schroeder
 @page
 @vskip 0pt plus 1filll
 @insertcopying
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2df3b4265d0..a683425868a 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -374,7 +374,7 @@ This release includes the full documentation and code for
 @value{tramp}, suitable for installation.  But Emacs (22 or later)
 includes @value{tramp} already, and there is a @value{tramp} package
 for XEmacs, as well.  So maybe it is easier to just use those.  But if
-you want the bleeding edge, read on@dots{...}
+you want the bleeding edge, read on@dots{}
 
 For the especially brave, @value{tramp} is available from Git.  The Git
 version is the latest version of the code and may contain incomplete
@@ -515,8 +515,8 @@ Method}.
 * Connection caching::          Reusing connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
-* Windows setup hints::         Issues with Cygwin ssh.
 * Auto-save and Backup::        Auto-save and Backup.
+* Windows setup hints::         Issues with Cygwin ssh.
 @end menu
 
 
@@ -1899,7 +1899,7 @@ of your (local or remote) host, you might need to adapt this. Example:
           "passwort" "Passwort"
           ;; Fran@,{c}ais
           "mot de passe" "Mot de passe") t)
-      ".*:
+      ".*:\0? *"))
 @end lisp
 
 In parallel, it might also be necessary to adapt
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index dbf83df46d3..01048d43dbf 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -677,9 +677,9 @@ Call last remembered keyboard macro.
 Suspend Emacs.
 @item Z Z
 Exit Emacs.
-@itemx Q
+@item Q
 Query replace.
-@itemx R
+@item R
 Replace.
 @end table
 
@@ -944,11 +944,11 @@ Scroll text of current window upward almost full screen.  You can go
 @kindex 002 @kbd{C-b} (@code{vip-scroll-back})
 Scroll text of current window downward almost full screen.  You can go
 @i{backward} in the buffer by this command (@code{vip-scroll-back}).
-@itemx C-d
+@item C-d
 @kindex 004 @kbd{C-d} (@code{vip-scroll-up})
 Scroll text of current window upward half screen.  You can go
 @i{down} in the buffer by this command (@code{vip-scroll-down}).
-@itemx C-u
+@item C-u
 @kindex 025 @kbd{C-u} (@code{vip-scroll-down})
 Scroll text of current window downward half screen.  You can go
 @i{up} in the buffer by this command (@code{vip-scroll-up}).
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 9a291dc19bb..9bcecf8e3de 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -3465,7 +3465,7 @@ Exchange point and mark.
 Exchange point and mark and go to the first CHAR on line.
 @item '<a-z>
 Go to specified Viper mark.
-@item
+@item `<a-z>
 Go to specified Viper mark and go to the first CHAR on line.
 @end table
 @kindex @kbd{m<a-z>}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b54d34743c..9425ca5cdc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2013-01-06  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-methods): Add `tramp-tmpdir' entry.
+
+2013-01-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-ls-toolbox-regexp): The file size can
+        consist of mor than one digit.
+        (tramp-adb-file-name-handler-alist): Use
+        `tramp-handle-file-exists-p' consistently.
+        (tramp-adb-file-name-handler): Don't tweak `tramp-default-host'.
+        (tramp-adb-handle-file-exists-p): Remove function.
+        (tramp-adb-file-name-host): New defun.
+        (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
+        Use it.
+        (tramp-adb-maybe-open-connection): Set "remote-path" property.
+
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc.el (vc-next-action): Detect buffer modifications
+        conflicting with locking VCS operation (Bug#11490).
+
+        * vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.
+
+2013-01-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
+        (tramp-adb-handle-directory-files-and-attributes): Fix typos.
+
+2013-01-05  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-adb-handle-file-attributes): More robust
+        parsing of ls output using regular expression (handle filenames
+        with spaces).  Use virtual device number.
+        (tramp-do-parse-file-attributes-with-ls): New defun (Code
+        cleanup).
+
 2013-01-04  Daiki Ueno  <ueno@gnu.org>
 
         * epg.el: Silence byte-compiler warnings.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index b5f99ffc93c..bb9ff015ac3 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -56,8 +56,18 @@
 (defconst tramp-adb-ls-date-regexp
   "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]")
 
+(defconst tramp-adb-ls-toolbox-regexp
+  (concat
+   "^[[:space:]]*\\([-[:alpha:]]+\\)"   ; \1 permissions
+   "[[:space:]]*\\([^[:space:]]+\\)"    ; \2 username
+   "[[:space:]]+\\([^[:space:]]+\\)"    ; \3 group
+   "[[:space:]]+\\([[:digit:]]+\\)"     ; \4 size
+   "[[:space:]]+\\([-[:digit:]]+[[:space:]][:[:digit:]]+\\)" ; \5 date
+   "[[:space:]]+\\(.*\\)$"))            ; \6 filename
+
 ;;;###tramp-autoload
-(add-to-list 'tramp-methods `(,tramp-adb-method))
+(add-to-list 'tramp-methods `(,tramp-adb-method
+                              (tramp-tmpdir "/data/local/tmp")))
 
 ;;;###tramp-autoload
 (eval-after-load 'tramp
@@ -86,8 +96,8 @@
     (file-directory-p . tramp-adb-handle-file-directory-p)
     (file-symlink-p . tramp-handle-file-symlink-p)
     ;; FIXME: This is too sloppy.
-    (file-executable-p . file-exists-p)
-    (file-exists-p . tramp-adb-handle-file-exists-p)
+    (file-executable-p . tramp-handle-file-exists-p)
+    (file-exists-p . tramp-handle-file-exists-p)
     (file-readable-p . tramp-handle-file-exists-p)
     (file-writable-p . tramp-adb-handle-file-writable-p)
     (file-local-copy . tramp-adb-handle-file-local-copy)
@@ -95,6 +105,9 @@
     (expand-file-name . tramp-adb-handle-expand-file-name)
     (find-backup-file-name . tramp-handle-find-backup-file-name)
     (directory-files . tramp-handle-directory-files)
+    (directory-files-and-attributes
+     . tramp-adb-handle-directory-files-and-attributes)
+    (file-name-all-completions . tramp-sh-handle-file-name-all-completions)
     (make-directory . tramp-adb-handle-make-directory)
     (delete-directory . tramp-adb-handle-delete-directory)
     (delete-file . tramp-adb-handle-delete-file)
@@ -127,13 +140,7 @@
   "Invoke the ADB handler for OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
-  (let ((fn (assoc operation tramp-adb-file-name-handler-alist))
-        ;; `tramp-default-host's default value is (system-name).  Not
-        ;; useful for us.
-        (tramp-default-host
-         (unless (equal (eval (car (get 'tramp-default-host 'standard-value)))
-                        tramp-default-host)
-           tramp-default-host)))
+  (let ((fn (assoc operation tramp-adb-file-name-handler-alist)))
     (if fn
         (save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
@@ -280,30 +287,73 @@ pass to the OPERATION."
                    (tramp-shell-quote-argument localname)) "")
         (with-current-buffer (tramp-get-buffer v)
           (tramp-adb-sh-fix-ls-output)
-          (let* ((columns (split-string (buffer-string)))
-                 (mod-string (nth 0 columns))
-                 (is-dir (eq ?d (aref mod-string 0)))
-                 (is-symlink (eq ?l (aref mod-string 0)))
-                 (symlink-target
-                  (and is-symlink
-                       (cadr (split-string (buffer-string) "\\( -> \\|\n\\)"))))
-                 (uid (nth 1 columns))
-                 (gid (nth 2 columns))
-                 (date (format "%s %s" (nth 4 columns) (nth 5 columns)))
-                 (size (string-to-number (nth 3 columns))))
-            (list
-             (or is-dir symlink-target)
-             1                                  ;link-count
-             ;; no way to handle numeric ids in Androids ash
-             (if (eq id-format 'integer) 0 uid)
-             (if (eq id-format 'integer) 0 gid)
-             '(0 0) ; atime
-             (date-to-time date) ; mtime
-             '(0 0) ; ctime
-             size
-             mod-string
-             ;; fake
-             t 1 1)))))))
+          (cdar (tramp-do-parse-file-attributes-with-ls v id-format)))))))
+
+(defun tramp-do-parse-file-attributes-with-ls (vec &optional id-format)
+  "Parse `file-attributes' for Tramp files using the ls(1) command."
+  (with-current-buffer (tramp-get-buffer vec)
+    (goto-char (point-min))
+    (let ((file-properties nil))
+      (while (re-search-forward tramp-adb-ls-toolbox-regexp nil t)
+        (let* ((mod-string (match-string 1))
+               (is-dir (eq ?d (aref mod-string 0)))
+               (is-symlink (eq ?l (aref mod-string 0)))
+               (uid (match-string 2))
+               (gid (match-string 3))
+               (size (string-to-number (match-string 4)))
+               (date (match-string 5))
+               (name (match-string 6))
+               (symlink-target
+                (and is-symlink
+                     (cadr (split-string name "\\( -> \\|\n\\)")))))
+          (push (list
+                 name
+                 (or is-dir symlink-target)
+                 1     ;link-count
+                 ;; no way to handle numeric ids in Androids ash
+                 (if (eq id-format 'integer) 0 uid)
+                 (if (eq id-format 'integer) 0 gid)
+                 '(0 0)                 ; atime
+                 (date-to-time date)    ; mtime
+                 '(0 0)                 ; ctime
+                 size
+                 mod-string
+                 ;; fake
+                 t 1
+                 (tramp-get-device vec))
+                file-properties)))
+      file-properties)))
+
+(defun tramp-adb-handle-directory-files-and-attributes
+  (directory &optional full match nosort id-format)
+  "Like `directory-files-and-attributes' for Tramp files."
+  (when (file-directory-p directory)
+    (with-parsed-tramp-file-name (expand-file-name directory) nil
+      (with-tramp-file-property
+          v localname (format "directory-files-attributes-%s-%s-%s-%s"
+                              full match id-format nosort)
+        (tramp-adb-barf-unless-okay
+         v (format "%s -a -l %s"
+                   (tramp-adb-get-ls-command v)
+                   (tramp-shell-quote-argument localname)) "")
+        (with-current-buffer (tramp-get-buffer v)
+          (tramp-adb-sh-fix-ls-output)
+          (let ((result (tramp-do-parse-file-attributes-with-ls
+                         v (or id-format 'integer))))
+            (when full
+              (setq result
+                    (mapcar
+                     (lambda (x)
+                       (cons (expand-file-name (car x) directory) (cdr x)))
+                     result)))
+            (unless nosort
+              (setq result
+                    (sort result (lambda (x y) (string< (car x) (car y))))))
+            (delq nil
+                  (mapcar (lambda (x)
+                            (if (or (not match) (string-match match (car x)))
+                                x))
+                          result))))))))
 
 (defun tramp-adb-get-ls-command (vec)
   (with-tramp-connection-property vec "ls"
@@ -885,20 +935,19 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
         (tramp-set-connection-property v "process-name" nil)
         (tramp-set-connection-property v "process-buffer" nil)))))
 
-;; Android < 4 doesn't provide test command.
-
-(defun tramp-adb-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-tramp-file-property v localname "file-exists-p"
-      (file-attributes filename))))
-
 ;; Helper functions.
 
+(defun tramp-adb-file-name-host (vec)
+  "Return host component of VEC.
+If it is equal to the default value of `tramp-default-host', `nil' is returned."
+  (let ((host (tramp-file-name-host vec)))
+    (unless (equal host (eval (car (get 'tramp-default-host 'standard-value))))
+      host)))
+
 (defun tramp-adb-execute-adb-command (vec &rest args)
   "Returns nil on success error-output on failure."
-  (when (tramp-file-name-host vec)
-    (setq args (append (list "-s" (tramp-file-name-host vec)) args)))
+  (when (tramp-adb-file-name-host vec)
+    (setq args (append (list "-s" (tramp-adb-file-name-host vec)) args)))
   (with-temp-buffer
     (prog1
         (unless (zerop (apply 'call-process (tramp-adb-program) nil t nil args))
@@ -1006,21 +1055,21 @@ connection if a previous connection has died for some reason."
         (when (and p (processp p)) (delete-process p))
         (if (not devices)
             (tramp-error vec 'file-error "No device connected"))
-        (if (and (tramp-file-name-host vec)
-                 (not (member (tramp-file-name-host vec) devices)))
+        (if (and (tramp-adb-file-name-host vec)
+                 (not (member (tramp-adb-file-name-host vec) devices)))
             (tramp-error
              vec 'file-error
-             "Device %s not connected" (tramp-file-name-host vec)))
+             "Device %s not connected" (tramp-adb-file-name-host vec)))
         (if (and (not (eq (length devices) 1))
-                 (not (tramp-file-name-host vec)))
+                 (not (tramp-adb-file-name-host vec)))
             (tramp-error
              vec 'file-error
              "Multiple Devices connected: No Host/Device specified"))
         (with-tramp-progress-reporter vec 3 "Opening adb shell connection"
           (let* ((coding-system-for-read 'utf-8-dos) ;is this correct?
                  (process-connection-type tramp-process-connection-type)
-                 (args (if (tramp-file-name-host vec)
-                           (list "-s" (tramp-file-name-host vec) "shell")
+                 (args (if (tramp-adb-file-name-host vec)
+                           (list "-s" (tramp-adb-file-name-host vec) "shell")
                          (list "shell")))
                  (p (let ((default-directory
                             (tramp-compat-temporary-file-directory)))
@@ -1056,7 +1105,19 @@ connection if a previous connection has died for some reason."
                  vec 3
                  "Connection reset, because remote host changed from `%s' to `%s'"
                  old-getprop new-getprop)
-                (tramp-adb-maybe-open-connection vec)))))))))
+                (tramp-adb-maybe-open-connection vec)))
+
+            ;; Set "remote-path" connection property.  This is needed
+            ;; for eshell.
+            (tramp-adb-send-command vec "echo \\\"$PATH\\\"")
+            (tramp-set-connection-property
+             vec "remote-path"
+             (split-string
+              (with-current-buffer (tramp-get-connection-buffer vec)
+                ;; Read the expression.
+                (goto-char (point-min))
+                (read (current-buffer)))
+              ":" 'omit-nulls))))))))
 
 (provide 'tramp-adb)
 ;;; tramp-adb.el ends here
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 5a2b47bb34f..99436303fa2 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -703,19 +703,21 @@ Before doing that, check if there are any old backups and get rid of them."
   ;; the state to 'edited and redisplay the mode line.
   (let* ((file buffer-file-name)
          (backend (vc-backend file)))
-    (and backend
-         (or (and (equal (vc-file-getprop file 'vc-checkout-time)
-                         (nth 5 (file-attributes file)))
-                  ;; File has been saved in the same second in which
-                  ;; it was checked out.  Clear the checkout-time
-                  ;; to avoid confusion.
-                  (vc-file-setprop file 'vc-checkout-time nil))
-             t)
-         (eq (vc-checkout-model backend (list file)) 'implicit)
-         (vc-state-refresh file backend)
-         (vc-mode-line file backend))
-    ;; Try to avoid unnecessary work, a *vc-dir* buffer is
-    ;; present if this is true.
+    (cond
+     ((null backend))
+     ((eq (vc-checkout-model backend (list file)) 'implicit)
+      ;; If the file was saved in the same second in which it was
+      ;; checked out, clear the checkout-time to avoid confusion.
+      (if (equal (vc-file-getprop file 'vc-checkout-time)
+                 (nth 5 (file-attributes file)))
+          (vc-file-setprop file 'vc-checkout-time nil))
+      (if (vc-state-refresh file backend)
+          (vc-mode-line file backend)))
+     ;; If we saved an unlocked file on a locking based VCS, that
+     ;; file is not longer up-to-date.
+     ((eq (vc-file-getprop file 'vc-state) 'up-to-date)
+      (vc-file-setprop file 'vc-state nil)))
+    ;; Resynch *vc-dir* buffers, if any are present.
     (when vc-dir-buffers
       (vc-dir-resynch-file file))))
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index fe259806267..9b8b94916c4 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -659,6 +659,10 @@
 (eval-when-compile
   (require 'dired))
 
+(declare-function dired-get-filename "dired" (&optional localp noerror))
+(declare-function dired-move-to-filename "dired" (&optional err eol))
+(declare-function dired-marker-regexp "dired" ())
+
 (unless (assoc 'vc-parent-buffer minor-mode-alist)
   (setq minor-mode-alist
         (cons '(vc-parent-buffer vc-parent-buffer-name)
@@ -1072,6 +1076,17 @@ For old-style locking-based version control systems, like RCS:
          ;; among all the `files'.
          (model (nth 4 vc-fileset)))
 
+    ;; If a buffer has unsaved changes, a checkout would discard those
+    ;; changes, so treat the buffer as having unlocked changes.
+    (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
+      (let ((files files))
+        (while files
+          (let ((buffer (get-file-buffer (car files))))
+            (and buffer
+                 (buffer-modified-p buffer)
+                 (setq state 'unlocked-changes
+                       files nil))))))
+
     ;; Do the right thing
     (cond
      ((eq state 'missing)
diff --git a/src/ChangeLog b/src/ChangeLog
index 8fc876e248c..3b0b295e695 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (echo_add_char): New function, factored out from
+        echo_char.  Don't add a space if the previous echo string was
+        empty (Bug#13255).
+        (echo_char): Use it.
+        (read_key_sequence): When echoing mock input, ensure that the
+        trailing dash is properly added.
+
+2013-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (dump_glyph): Align glyph data better.  Use "pD" instead
+        of a non-portable "t" to print ptrdiff_t values.  Allow up to 9
+        digits for buffer positions, before misalignment starts.  Display
+        "0" for integer "object" field.
+        (dump_glyph_row): Adapt the header line to changes in dump_glyph.
+        Display the newline glyph more unambiguously.
+
 2013-01-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * nsterm.m (ns_draw_underwave):
diff --git a/src/keyboard.c b/src/keyboard.c
index e11ed20d2a0..69463f45034 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -500,97 +500,103 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
 }
 
 
-/* Add C to the echo string, if echoing is going on.
-   C can be a character, which is printed prettily ("M-C-x" and all that
-   jazz), or a symbol, whose name is printed.  */
+/* Add C to the echo string, without echoing it immediately.  C can be
+   a character, which is pretty-printed, or a symbol, whose name is
+   printed.  */
 
 static void
-echo_char (Lisp_Object c)
+echo_add_char (Lisp_Object c)
 {
-  if (current_kboard->immediate_echo)
-    {
-      int size = KEY_DESCRIPTION_SIZE + 100;
-      char *buffer = alloca (size);
-      char *ptr = buffer;
-      Lisp_Object echo_string;
+  int size = KEY_DESCRIPTION_SIZE + 100;
+  char *buffer = alloca (size);
+  char *ptr = buffer;
+  Lisp_Object echo_string;
 
-      echo_string = KVAR (current_kboard, echo_string);
+  echo_string = KVAR (current_kboard, echo_string);
 
-      /* If someone has passed us a composite event, use its head symbol.  */
-      c = EVENT_HEAD (c);
+  /* If someone has passed us a composite event, use its head symbol.  */
+  c = EVENT_HEAD (c);
 
-      if (INTEGERP (c))
+  if (INTEGERP (c))
+    ptr = push_key_description (XINT (c), ptr);
+  else if (SYMBOLP (c))
+    {
+      Lisp_Object name = SYMBOL_NAME (c);
+      int nbytes = SBYTES (name);
+
+      if (size - (ptr - buffer) < nbytes)
         {
-          ptr = push_key_description (XINT (c), ptr);
+          int offset = ptr - buffer;
+          size = max (2 * size, size + nbytes);
+          buffer = alloca (size);
+          ptr = buffer + offset;
         }
-      else if (SYMBOLP (c))
-        {
-          Lisp_Object name = SYMBOL_NAME (c);
-          int nbytes = SBYTES (name);
 
-          if (size - (ptr - buffer) < nbytes)
-            {
-              int offset = ptr - buffer;
-              size = max (2 * size, size + nbytes);
-              buffer = alloca (size);
-              ptr = buffer + offset;
-            }
+      ptr += copy_text (SDATA (name), (unsigned char *) ptr, nbytes,
+                        STRING_MULTIBYTE (name), 1);
+    }
 
-          ptr += copy_text (SDATA (name), (unsigned char *) ptr, nbytes,
-                            STRING_MULTIBYTE (name), 1);
-        }
+  if ((NILP (echo_string) || SCHARS (echo_string) == 0)
+      && help_char_p (c))
+    {
+      const char *text = " (Type ? for further options)";
+      int len = strlen (text);
 
-      if ((NILP (echo_string) || SCHARS (echo_string) == 0)
-          && help_char_p (c))
+      if (size - (ptr - buffer) < len)
         {
-          const char *text = " (Type ? for further options)";
-          int len = strlen (text);
-
-          if (size - (ptr - buffer) < len)
-            {
-              int offset = ptr - buffer;
-              size += len;
-              buffer = alloca (size);
-              ptr = buffer + offset;
-            }
-
-          memcpy (ptr, text, len);
-          ptr += len;
+          int offset = ptr - buffer;
+          size += len;
+          buffer = alloca (size);
+          ptr = buffer + offset;
         }
 
-      /* Replace a dash from echo_dash with a space, otherwise
-         add a space at the end as a separator between keys.  */
-      if (STRINGP (echo_string)
-          && SCHARS (echo_string) > 1)
-        {
-          Lisp_Object last_char, prev_char, idx;
+      memcpy (ptr, text, len);
+      ptr += len;
+    }
 
-          idx = make_number (SCHARS (echo_string) - 2);
-          prev_char = Faref (echo_string, idx);
+  /* Replace a dash from echo_dash with a space, otherwise add a space
+     at the end as a separator between keys.  */
+  if (STRINGP (echo_string) && SCHARS (echo_string) > 1)
+    {
+      Lisp_Object last_char, prev_char, idx;
 
-          idx = make_number (SCHARS (echo_string) - 1);
-          last_char = Faref (echo_string, idx);
+      idx = make_number (SCHARS (echo_string) - 2);
+      prev_char = Faref (echo_string, idx);
 
-          /* We test PREV_CHAR to make sure this isn't the echoing
-             of a minus-sign.  */
-          if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
-            Faset (echo_string, idx, make_number (' '));
-          else
-            echo_string = concat2 (echo_string, build_string (" "));
-        }
-      else if (STRINGP (echo_string))
+      idx = make_number (SCHARS (echo_string) - 1);
+      last_char = Faref (echo_string, idx);
+
+      /* We test PREV_CHAR to make sure this isn't the echoing of a
+         minus-sign.  */
+      if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+        Faset (echo_string, idx, make_number (' '));
+      else
         echo_string = concat2 (echo_string, build_string (" "));
+    }
+  else if (STRINGP (echo_string) && SCHARS (echo_string) > 0)
+    echo_string = concat2 (echo_string, build_string (" "));
 
-      kset_echo_string
-        (current_kboard,
-         concat2 (echo_string, make_string (buffer, ptr - buffer)));
+  kset_echo_string
+    (current_kboard,
+     concat2 (echo_string, make_string (buffer, ptr - buffer)));
+}
+
+/* Add C to the echo string, if echoing is going on.  C can be a
+   character or a symbol.  */
 
+static void
+echo_char (Lisp_Object c)
+{
+  if (current_kboard->immediate_echo)
+    {
+      echo_add_char (c);
       echo_now ();
     }
 }
 
 /* Temporarily add a dash to the end of the echo string if it's not
-   empty, so that it serves as a mini-prompt for the very next character.  */
+   empty, so that it serves as a mini-prompt for the very next
+   character.  */
 
 static void
 echo_dash (void)
@@ -9237,8 +9243,12 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
           key = keybuf[t];
           add_command_key (key);
           if ((FLOATP (Vecho_keystrokes) || INTEGERP (Vecho_keystrokes))
-              && NILP (Fzerop (Vecho_keystrokes)))
-            echo_char (key);
+              && NILP (Fzerop (Vecho_keystrokes))
+              && current_kboard->immediate_echo)
+            {
+              echo_add_char (key);
+              echo_dash ();
+            }
         }
 
       /* If not, we should actually read a character.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index c9096339fcc..880e25334d1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18007,18 +18007,23 @@ dump_glyph_matrix (struct glyph_matrix *matrix, int glyphs)
 void
 dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
 {
-  if (glyph->type == CHAR_GLYPH)
+  if (glyph->type == CHAR_GLYPH
+      || glyph->type == GLYPHLESS_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
-               'C',
+               (glyph->type == CHAR_GLYPH
+                ? 'C'
+                : 'G'),
                glyph->charpos,
                (BUFFERP (glyph->object)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.ch,
                (glyph->u.ch < 0x80 && glyph->u.ch >= ' '
@@ -18031,7 +18036,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == STRETCH_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
                'S',
                glyph->charpos,
@@ -18039,10 +18044,12 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                0,
-               '.',
+               ' ',
                glyph->face_id,
                glyph->left_box_line_p,
                glyph->right_box_line_p);
@@ -18050,7 +18057,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == IMAGE_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
                'I',
                glyph->charpos,
@@ -18058,7 +18065,9 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.img_id,
                '.',
@@ -18069,7 +18078,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == COMPOSITE_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x",
                glyph - row->glyphs[TEXT_AREA],
                '+',
                glyph->charpos,
@@ -18077,7 +18086,9 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.cmp.id);
       if (glyph->u.cmp.automatic)
@@ -18125,10 +18136,10 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
 {
   if (glyphs != 1)
     {
-      fprintf (stderr, "Row Start   End Used oE><\\CTZFesm     X    Y    W    H    V    A    P\n");
-      fprintf (stderr, "======================================================================\n");
+      fprintf (stderr, "Row     Start       End Used oE><\\CTZFesm     X    Y    W    H    V    A    P\n");
+      fprintf (stderr, "==============================================================================\n");
 
-      fprintf (stderr, "%3d %5"pI"d %5"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
+      fprintf (stderr, "%3d %9"pI"d %9"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d  %4d %4d %4d %4d %4d %4d %4d\n",
                vpos,
                MATRIX_ROW_START_CHARPOS (row),
@@ -18153,13 +18164,14 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
                row->visible_height,
                row->ascent,
                row->phys_ascent);
-      fprintf (stderr, "%9"pD"d %5"pD"d\t%5d\n", row->start.overlay_string_index,
+      /* The next 3 lines should align to "Start" in the header.  */
+      fprintf (stderr, "    %9"pD"d %9"pD"d\t%5d\n", row->start.overlay_string_index,
                row->end.overlay_string_index,
                row->continuation_lines_width);
-      fprintf (stderr, "%9"pI"d %5"pI"d\n",
+      fprintf (stderr, "    %9"pI"d %9"pI"d\n",
                CHARPOS (row->start.string_pos),
                CHARPOS (row->end.string_pos));
-      fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
+      fprintf (stderr, "    %9d %9d\n", row->start.dpvec_index,
                row->end.dpvec_index);
     }
 
@@ -18177,7 +18189,7 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
             ++glyph_end;
 
           if (glyph < glyph_end)
-            fprintf (stderr, "  Glyph    Type Pos   O W    Code C Face LR\n");
+            fprintf (stderr, " Glyph#  Type       Pos   O   W     Code      C Face LR\n");
 
           for (; glyph < glyph_end; ++glyph)
             dump_glyph (row, glyph, area);
@@ -18189,15 +18201,24 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
 
       for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
         {
-          char *s = alloca (row->used[area] + 1);
+          char *s = alloca (row->used[area] + 4);
           int i;
 
           for (i = 0; i < row->used[area]; ++i)
             {
               struct glyph *glyph = row->glyphs[area] + i;
-              if (glyph->type == CHAR_GLYPH
-                  && glyph->u.ch < 0x80
-                  && glyph->u.ch >= ' ')
+              if (i == row->used[area] - 1
+                  && area == TEXT_AREA
+                  && INTEGERP (glyph->object)
+                  && glyph->type == CHAR_GLYPH
+                  && glyph->u.ch == ' ')
+                {
+                  strcpy (&s[i], "[\\n]");
+                  i += 4;
+                }
+              else if (glyph->type == CHAR_GLYPH
+                       && glyph->u.ch < 0x80
+                       && glyph->u.ch >= ' ')
                 s[i] = glyph->u.ch;
               else
                 s[i] = '.';