Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

29 files changed, 431 insertions, 259 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c3a7343aa8f..d5f3095908b 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,17 @@
+2013-06-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * basic.texi (Moving Point): Document visual-order-cursor-movement
+        and its effect on right-char and left-char.
+
+2013-06-28  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi (Acknowledgments): Small update.
+
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.
+        Try to check that we do not miss any in future.
+
 2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
 
         * vc1-xtra.texi (Revision Tags): Add a cross reference.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 43de825ea70..2fec57f838b 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -19,6 +19,9 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
+
 # Where to find the source code.  $(srcdir) will be the doc/emacs subdirectory
 # of the source tree.  This is set by configure's `--srcdir' option.
 srcdir=@srcdir@
@@ -195,7 +198,12 @@ dist:
           -e 's/^\(buildinfodir *=\).*/\1 ./' \
           -e 's/^\(clean:.*\)/\1 infoclean/' \
           -e "s/@ver[s]ion@/${version}/" \
+          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
           ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
+        @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
+          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+        fi
         tar -cf emacs-manual-${version}.tar emacs-manual-${version}
         rm -rf emacs-manual-${version}
 
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 92874ad6276..47e5be88ce1 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -115,6 +115,10 @@ Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
+Stephen Berman wrote @file{todo-mode.el} (based on the original version
+by Oliver Seidel), a package for maintaining @file{TODO} list files.
+
+@item
 Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
 
 @item
@@ -1115,10 +1119,6 @@ wrote parts of the IRC client ERC (q.v.).
 Randal Schwartz wrote @file{pp.el}, a pretty-printer for lisp objects.
 
 @item
-Oliver Seidel wrote @file{todo-mode.el}, a package for maintaining
-@file{TODO} list files.
-
-@item
 Manuel Serrano wrote the Flyspell package, which does spell checking
 as you type.
 
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index b9bc391d1cf..a840f912656 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -153,10 +153,17 @@ Move forward one character (@code{forward-char}).
 @item @key{right}
 @kindex RIGHT
 @findex right-char
+@vindex visual-order-cursor-movement
+@cindex cursor, visual-order motion
 This command (@code{right-char}) behaves like @kbd{C-f}, with one
 exception: when editing right-to-left scripts such as Arabic, it
 instead moves @emph{backward} if the current paragraph is a
-right-to-left paragraph.  @xref{Bidirectional Editing}.
+right-to-left paragraph.  @xref{Bidirectional Editing}.  If
+@code{visual-order-cursor-movement} is non-@code{nil}, this command
+moves to the character that is to the right of the current screen
+position, moving to the next or previous screen line as appropriate.
+Note that this might potentially move point many buffer positions
+away, depending on the surrounding bidirectional context.
 
 @item C-b
 @kindex C-b
@@ -168,7 +175,10 @@ Move backward one character (@code{backward-char}).
 @findex left-char
 This command (@code{left-char}) behaves like @kbd{C-b}, except it
 moves @emph{forward} if the current paragraph is right-to-left.
-@xref{Bidirectional Editing}.
+@xref{Bidirectional Editing}.  If @code{visual-order-cursor-movement}
+is non-@code{nil}, this command moves to the character that is to the
+left of the current screen position, moving to the previous or next
+screen line as appropriate.
 
 @item C-n
 @itemx @key{down}
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 13fa516af66..7daeca3bf38 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1267,9 +1267,12 @@ minibuffer, and displays the differences between the two files in a
 buffer named @file{*diff*}.  This works by running the @command{diff}
 program, using options taken from the variable @code{diff-switches}.
 The value of @code{diff-switches} should be a string; the default is
-@code{"-c"} to specify a context diff.  @xref{Top,, Diff, diff,
-Comparing and Merging Files}, for more information about the
-@command{diff} program.
+@code{"-c"} to specify a context diff.
+@c Note that the actual name of the info file is diffutils.info,
+@c but it adds a dir entry for diff too.
+@c On older systems, only "info diff" works, not "info diffutils".
+@xref{Top,, Diff, diff, Comparing and Merging Files}, for more
+information about the @command{diff} program.
 
   The output of the @code{diff} command is shown using a major mode
 called Diff mode.  @xref{Diff Mode}.
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index de3e05777cd..c8bd5027fa0 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1804,4 +1804,6 @@ jump when point traverses reordered bidirectional text.  Similarly, a
 highlighted region covering a contiguous range of character positions
 may look discontinuous if the region spans reordered text.  This is
 normal and similar to the behavior of other programs that support
-bidirectional text.
+bidirectional text.  If you set @code{visual-order-cursor-movement} to
+a non-@code{nil} value, cursor motion by the arrow keys follows the
+visual order on screen (@pxref{Moving Point, visual-order movement}).
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index f80f9e175fa..62f35b2ee83 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1370,6 +1370,7 @@ mailboxes, etc.  It is able to access remote mailboxes using the POP3
 or IMAP4 protocol, and can retrieve mail from them using a TLS
 encrypted channel.  It also accepts mailbox arguments in @acronym{URL}
 form.  The detailed description of mailbox @acronym{URL}s can be found
+@c Note this node seems to be missing in some versions of mailutils.info?
 in @ref{URL,,,mailutils,Mailbox URL Formats}.  In short, a
 @acronym{URL} is:
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 5e4655506f6..a1fd9303866 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.  (Bug#14660)
+        Try to check that we do not miss any in future.
+
 2013-04-24  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last
@@ -28,7 +33,7 @@
         * emacs-lisp-intro.texi (defcustom, defun)
         (simplified-beginning-of-buffer, defvar, Building Robots, Review)
         (save-excursion): `defun' and `defcustom' are now macros rather
-        than special forms. (Bug#13853)
+        than special forms.  (Bug#13853)
 
 2013-03-16  Glenn Morris  <rgm@gnu.org>
 
@@ -48,7 +53,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * emacs-lisp-intro.texi (Files List):
         directory-files-and-attributes now outputs t for attribute that's
         now a placeholder.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 338b4ad86c4..b60c752e92b 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -19,6 +19,8 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
 srcdir = @srcdir@
 version=@version@
 
@@ -107,7 +109,12 @@ dist:
           -e 's/^\(buildinfodir *=\).*/\1 ./' \
           -e 's/^\(clean:.*\)/\1 infoclean/' \
           -e "s/@ver[s]ion@/${version}/" \
+          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
           ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+        @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
+          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+        fi
         tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
         rm -rf emacs-lispintro-${version}
 
diff --git a/doc/lispintro/README b/doc/lispintro/README
index 360d6296b70..d1e15bc6d89 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -12,43 +12,6 @@ environment.
 This third edition of 2006 Oct 31 updates the previous editions to GNU
 Emacs 22.
 
-The Texinfo source file `emacs-lisp-intro.texi', formats without
-reported error using `pdfeTeXk', Version 3.141592-1.21a-2.2 (Web2C
-7.5.4) and texinfo.tex version 2006-08-26.17 started by `texi2dvi'
-version 4.8, and with `makeinfo' version 4.8.
-
-This directory contains the following Encapsulated PostScript figures:
-
-  cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps, cons-5.eps
-  drawers.eps, lambda-1.eps, lambda-2.eps, lambda-3.eps
-
-See the beginning of the `emacs-lisp-intro.texi' file for appropriate
-settings.  These figures are not necessary; they are merely nice to
-look at --- without them you get the same figures printed with ASCII
-characters.
-
-Whether and how you print PostScript depends on your site.  You not
-only need to set 'print-postscript-figures' before creating the .dvi
-file, but then must convert the .dvi file to .ps with a 'dvips' or
-equivalent command.
-
-On some systems you will see an error message when `psfig.tex' is
-loaded for the last two .eps files:
-
-            ! No room for a new \write .
-
-If this happens, try `epsf.tex' instead of `psfig.tex', or try typing
-RET at the error; the formatting may continue successfully.
-
-Or else find the section that says:
-
- @c !!! Clear print-postscript-figures if the computer formatting this
- @c     document is too small and cannot handle all the diagrams and figures.
- @c clear print-postscript-figures
-
-and change the file so it reads:   @clear print-postscript-figures
-This will prevent TeX from attempting to load the last few .eps files.
-
 You will find additional instructions on formatting in the beginning
 of the Texinfo file 'emacs-lisp-intro.texi'.  Best Wishes!
 
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index ce4da17658e..221376e2353 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -10,19 +10,44 @@
 
 @include emacsver.texi
 
-@c ---------
+@c ================ How to Print a Book in Various Sizes ================
+
+@c This book can be printed in any of three different sizes.
+@c Set the following @-commands appropriately.
+
+@c     7 by 9.25 inches:
+@c              @smallbook
+@c              @clear largebook
+
+@c     8.5 by 11 inches:
+@c              @c smallbook
+@c              @set largebook
+
+@c     European A4 size paper:
+@c              @c smallbook
+@c              @afourpaper
+@c              @set largebook
+
+@c (Note: if you edit the book so as to change the length of the
+@c table of contents, you may have to change the value of `pageno' below.)
+
 @c <<<< For hard copy printing, this file is now
 @c      set for smallbook, which works for all sizes
 @c      of paper, and with PostScript figures >>>>
+
 @set smallbook
 @ifset smallbook
 @smallbook
 @clear  largebook
 @end ifset
+
+@c ================ Included Figures ================
+
+@c If you clear this, the figures will be printed as ASCII diagrams
+@c rather than PostScript/PDF.
+@c (This is not relevant to Info, since Info only handles ASCII.)
 @set print-postscript-figures
-@c set largebook
 @c clear print-postscript-figures
-@c ---------
 
 @comment %**end of header
 
@@ -41,37 +66,6 @@
 @set edition-number 3.10
 @set update-date 28 October 2009
 
-@c ================ Included Figures ================
-
-@c Set  print-postscript-figures  if you print PostScript figures.
-@c If you clear this, the ten figures will be printed as ASCII diagrams.
-@c (This is not relevant to Info, since Info only handles ASCII.)
-@c Your site may require editing changes to print PostScript; in this
-@c case, search for `print-postscript-figures' and make appropriate changes.
-
-@c ================ How to Print a Book in Various Sizes ================
-
-@c This book can be printed in any of three different sizes.
-@c In the above header, set @-commands appropriately.
-
-@c     7 by 9.25 inches:
-@c              @smallbook
-@c              @clear largebook
-
-@c     8.5 by 11 inches:
-@c              @c smallbook
-@c              @set largebook
-
-@c     European A4 size paper:
-@c              @c smallbook
-@c              @afourpaper
-@c              @set largebook
-
-@c (Note: if you edit the book so as to change the length of the
-@c table of contents, you may have to change the value of `pageno' below.)
-
-@c ================ End of Formatting Sections ================
-
 @c For next or subsequent edition:
 @c   create function using with-output-to-temp-buffer
 @c   create a major mode, with keymaps
@@ -9523,10 +9517,6 @@ This sounds more complicated than it is and is easier seen in a diagram:
 @sp 1
 @tex
 @center @image{cons-1}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-1.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -9586,10 +9576,6 @@ bouquet
 @sp 1
 @tex
 @center @image{cons-2}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-2.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -9635,10 +9621,6 @@ bouquet
 @sp 1
 @tex
 @center @image{cons-2a}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-2a.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -9702,10 +9684,6 @@ bouquet        flowers
 @sp 1
 @tex
 @center @image{cons-3}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-3.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -9774,10 +9752,6 @@ bouquet                       flowers
 @sp 1
 @tex
 @center @image{cons-4}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-4.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -9891,10 +9865,6 @@ Here is a fanciful representation:
 @sp 1
 @tex
 @center @image{drawers}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/drawers.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -10067,10 +10037,6 @@ kill-ring     kill-ring-yank-pointer
 @sp 1
 @tex
 @center @image{cons-5}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-5.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -20878,10 +20844,7 @@ equivalent of @code{multiply-by-seven} is:
 @noindent
 If we want to multiply 3 by 7, we can write:
 
-@c !!! Clear print-postscript-figures if the computer formatting this
-@c     document is too small and cannot handle all the diagrams and figures.
 @c clear print-postscript-figures
-@c set print-postscript-figures
 @c lambda example diagram #1
 @ifnottex
 @smallexample
@@ -20897,10 +20860,6 @@ If we want to multiply 3 by 7, we can write:
 @sp 1
 @tex
 @center @image{lambda-1}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-1.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -20939,10 +20898,6 @@ Similarly, we can write:
 @sp 1
 @tex
 @center @image{lambda-2}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-2.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
@@ -20978,10 +20933,6 @@ If we want to divide 100 by 50, we can write:
 @sp 1
 @tex
 @center @image{lambda-3}
-%%%% old method of including an image
-% \input /usr/local/lib/tex/inputs/psfig.tex
-% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-3.eps}}
-% \catcode`\@=0 %
 @end tex
 @sp 1
 @end ifset
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e14f7543443..dc0c1564735 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,58 @@
+2013-06-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Bidirectional Display): Document move-point-visually.
+
+2013-06-29  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * buffers.texi (Buffer File Name): Fix typo.
+
+2013-06-26  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * tips.texi (Coding Conventions): Improve wording.
+
+2013-06-24  Glenn Morris  <rgm@gnu.org>
+
+        * loading.texi (Autoload): Fix typo.
+
+        * variables.texi (Lexical Binding): Fix typo.
+
+        * functions.texi (Anonymous Functions): Put back ' removed 2012-10-23.
+
+2013-06-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * display.texi (ImageMagick Images): Mention :max-width and
+        :max-height.
+
+2013-06-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * numbers.texi (Math Functions): Remove obsolete function log10.
+
+2013-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * modes.texi (Mode Line Data, Properties in Mode): Advertise `keymap'
+        rather than `local-map'.
+
+        * keymaps.texi (Active Keymaps): Fix documentation of
+        set-temporary-overlay-map and overriding-terminal-local-map.
+
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dist): Edit more configure variables.
+        Try to check that we do not miss any in future.
+
+2013-06-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * text.texi (Undo, Changing Properties): Fix typos.
+
+2013-06-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * text.texi (Changing Properties): Document `add-face-text-property'.
+
+2013-06-17  Kenichi Handa  <handa@gnu.org>
+
+        * display.texi (Face Attributes): Refer to "Low-Level font" (not
+        "Font Selection") in the explanation of :font attribute (bug#14629).
+
 2013-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * loading.texi (Hooks for Loading): Don't document after-load-alist.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8e04d085c60..19cf2cc4a5d 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -19,6 +19,9 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
+
 # Standard configure variables.
 srcdir = @srcdir@
 
@@ -163,7 +166,12 @@ dist:
           -e 's/^\(buildinfodir *=\).*/\1 ./' \
           -e 's/^\(clean:.*\)/\1 infoclean/' \
           -e "s/@ver[s]ion@/${version}/" \
+          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
           ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+        @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
+          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+        fi
         tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
         rm -rf emacs-lispref-${version}
 
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 7ed1876e4b1..01269851250 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -488,8 +488,9 @@ Normally, this function asks the user for confirmation if there
 already is a buffer visiting @var{filename}.  If @var{no-query} is
 non-@code{nil}, that prevents asking this question.  If there already
 is a buffer visiting @var{filename}, and the user confirms or
-@var{query} is non-@code{nil}, this function makes the new buffer name
-unique by appending a number inside of @samp{<@dots{}>} to @var{filename}.
+@var{no-query} is non-@code{nil}, this function makes the new
+buffer name unique by appending a number inside of @samp{<@dots{}>} to
+@var{filename}.
 
 If @var{along-with-file} is non-@code{nil}, that means to assume that
 the former visited file has been renamed to @var{filename}.  In this
@@ -1064,7 +1065,7 @@ Buffer foo.changed modified; kill anyway? (yes or no) @kbd{yes}
 @end deffn
 
 @defvar kill-buffer-query-functions
-After confirming unsaved changes, @code{kill-buffer} calls the functions
+Before confirming unsaved changes, @code{kill-buffer} calls the functions
 in the list @code{kill-buffer-query-functions}, in order of appearance,
 with no arguments.  The buffer being killed is the current buffer when
 they are called.  The idea of this feature is that these functions will
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 4adcfdf8f4f..44fbc66a60e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1655,26 +1655,26 @@ if it becomes empty (i.e., if its length becomes zero).  If you give
 an empty overlay a non-@code{nil} @code{evaporate} property, that deletes
 it immediately.
 
-@item local-map
-@cindex keymap of character (and overlays)
-@kindex local-map @r{(overlay property)}
-If this property is non-@code{nil}, it specifies a keymap for a portion
-of the text.  The property's value replaces the buffer's local map, when
-the character after point is within the overlay.  @xref{Active Keymaps}.
-
 @item keymap
+@cindex keymap of character (and overlays)
 @kindex keymap @r{(overlay property)}
-The @code{keymap} property is similar to @code{local-map} but overrides the
-buffer's local map (and the map specified by the @code{local-map}
-property) rather than replacing it.
+If this property is non-@code{nil}, it specifies a keymap for a portion of the
+text.  This keymap is used when the character after point is within the
+overlay, and takes precedence over most other keymaps.  @xref{Active Keymaps}.
+
+@item local-map
+@kindex local-map @r{(overlay property)}
+The @code{local-map} property is similar to @code{keymap} but replaces the
+buffer's local map rather than augmenting existing keymaps.  This also means it
+has lower precedence than minor mode keymaps.
 @end table
 
-The @code{local-map} and @code{keymap} properties do not affect a
+The @code{keymap} and @code{local-map} properties do not affect a
 string displayed by the @code{before-string}, @code{after-string}, or
 @code{display} properties.  This is only relevant for mouse clicks and
 other mouse events that fall on the string, since point is never on
 the string.  To bind special mouse events for the string, assign it a
-@code{local-map} or @code{keymap} text property.  @xref{Special
+@code{keymap} or @code{local-map} text property.  @xref{Special
 Properties}.
 
 @node Finding Overlays
@@ -2126,7 +2126,8 @@ used automatically to handle certain shades of gray.
 
 @item :font
 The font used to display the face.  Its value should be a font object.
-@xref{Font Selection}, for information about font objects.
+@xref{Low-Level Font}, for information about font objects, font specs,
+and font entities.
 
 When specifying this attribute using @code{set-face-attribute}
 (@pxref{Attribute Functions}), you may also supply a font spec, a font
@@ -3260,7 +3261,9 @@ to @var{value}.
 properties are intermediate between a font object and a font spec:
 like a font object, and unlike a font spec, it refers to a single,
 specific font.  Unlike a font object, creating a font entity does not
-load the contents of that font into computer memory.
+load the contents of that font into computer memory.  Emacs may open
+multiple font objects of different sizes from a single font entity
+referring to a scalable font.
 
 @defun find-font font-spec &optional frame
 This function returns a font entity that best matches the font spec
@@ -4650,6 +4653,15 @@ image.  If only one of them is specified, the other one will be
 calculated so as to preserve the aspect ratio.  If both are specified,
 aspect ratio may not be preserved.
 
+@item :max-width, :max-height
+The @code{:max-width} and @code{:max-height} keywords are used for
+scaling if the size of the image of the image exceeds these values.
+If @code{:width} is set it will have precedence over @code{max-width},
+and if @code{:height} is set it will have precedence over
+@code{max-height}, but you can otherwise mix these keywords as you
+wish.  @code{:max-width} and @code{:max-height} will always preserve
+the aspect ratio.
+
 @item :rotation
 Specifies a rotation angle in degrees.
 
@@ -6419,6 +6431,26 @@ determined dynamically by Emacs.  For buffers whose value of
 buffers, this function always returns @code{left-to-right}.
 @end defun
 
+@cindex visual-order cursor motion
+  Sometimes there's a need to move point in strict visual order,
+either to the left or to the right of its current screen position.
+Emacs provides a primitive to do that.
+
+@defun move-point-visually direction
+This function moves point of the currently selected window to the
+buffer position that appears immediately to the right or to the left
+of point on the screen.  If @var{direction} is positive, point will
+move one screen position to the right, otherwise it will move one
+screen position to the left.  Note that, depending on the surrounding
+bidirectional context, this could potentially move point many buffer
+positions away.  If invoked at the end of a screen line, the function
+moves point to the rightmost or leftmost screen position of the next
+or previous screen line, as appropriate for the value of
+@var{direction}.
+
+The function returns the new buffer position as its value.
+@end defun
+
 @cindex layout on display, and bidirectional text
 @cindex jumbled display of bidirectional text
 @cindex concatenating bidirectional strings
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 7768c147827..fcd345ef83b 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -974,10 +974,11 @@ Note that we do not quote the @code{lambda} form.
 compiled.  This would not happen if, say, you had constructed the
 anonymous function by quoting it as a list:
 
+@c Do not unquote this lambda!
 @example
 @group
 (defun double-property (symbol prop)
-  (change-property symbol prop (lambda (x) (* 2 x))))
+  (change-property symbol prop '(lambda (x) (* 2 x))))
 @end group
 @end example
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 822e952ef98..ef020364082 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -663,17 +663,16 @@ additional active keymaps through the variable
 
   The highest precedence normal keymap comes from the @code{keymap}
 text or overlay property.  If that is non-@code{nil}, it is the first
-keymap to be processed, in normal circumstances.  Next comes
-any keymap added by the function @code{set-temporary-overlay-map}.
-@xref{Controlling Active Maps}.
+keymap to be processed, in normal circumstances.
 
   However, there are also special ways for programs to substitute
 other keymaps for some of those.  The variable
 @code{overriding-local-map}, if non-@code{nil}, specifies a keymap
 that replaces all the usual active keymaps except the global keymap.
-Another way to do this is with @code{overriding-terminal-local-map};
-it operates on a per-terminal basis.  These variables are documented
-below.
+
+The very highest precedence keymap comes from
+@code{overriding-terminal-local-map}; it operates on a per-terminal basis and
+is normally used for modal/transient keybindings.
 
 @cindex major mode keymap
   Since every buffer that uses the same major mode normally uses the
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 4c0f0d73e41..dab8e8d1255 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -461,7 +461,7 @@ and calls @code{define-key}; not even if the variable name is the same
 symbol @var{function}.
 
 @cindex function cell in autoload
-if @var{function} already has non-void function definition that is not
+If @var{function} already has a non-void function definition that is not
 an autoload object, this function does nothing and returns @code{nil}.
 Otherwise, it constructs an autoload object (@pxref{Autoload Type}),
 and stores it as the function definition for @var{function}.  The
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 7d42d2591d6..59729380ea7 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1800,7 +1800,7 @@ display of the text just as they would text in the buffer.  Any
 characters which have no @code{face} properties are displayed, by
 default, in the face @code{mode-line} or @code{mode-line-inactive}
 (@pxref{Standard Faces,,, emacs, The GNU Emacs Manual}).  The
-@code{help-echo} and @code{local-map} properties in @var{string} have
+@code{help-echo} and @code{keymap} properties in @var{string} have
 special meanings.  @xref{Properties in Mode}.
 
 @item @var{symbol}
@@ -2205,7 +2205,7 @@ The value of @code{global-mode-string}.
   Certain text properties are meaningful in the
 mode line.  The @code{face} property affects the appearance of text; the
 @code{help-echo} property associates help strings with the text, and
-@code{local-map} can make the text mouse-sensitive.
+@code{keymap} can make the text mouse-sensitive.
 
   There are four ways to specify text properties for text in the mode
 line:
@@ -2229,7 +2229,7 @@ structure, and make @var{form} evaluate to a string that has a text
 property.
 @end enumerate
 
-  You can use the @code{local-map} property to specify a keymap.  This
+  You can use the @code{keymap} property to specify a keymap.  This
 keymap only takes real effect for mouse clicks; binding character keys
 and function keys to it has no effect, since it is impossible to move
 point into the mode line.
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index eeebac6bf72..2b6f31b670b 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -1156,11 +1156,6 @@ This function returns the logarithm of @var{arg}, with base
 returns a NaN.
 @end defun
 
-@defun log10 arg
-This function returns the logarithm of @var{arg}, with base 10:
-@code{(log10 @var{x})} @equiv{} @code{(log @var{x} 10)}.
-@end defun
-
 @defun expt x y
 This function returns @var{x} raised to power @var{y}.  If both
 arguments are integers and @var{y} is positive, the result is an
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6d5a39d887a..c10458b39ae 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1226,7 +1226,7 @@ list, which is in the variable @code{buffer-undo-list}.
 
 @defvar buffer-undo-list
 This buffer-local variable's value is the undo list of the current
-buffer. A value of @code{t} disables the recording of undo information.
+buffer.  A value of @code{t} disables the recording of undo information.
 @end defvar
 
 Here are the kinds of elements an undo list can have:
@@ -2805,6 +2805,28 @@ from the specified range of text.  Here's an example:
 Do not rely on the return value of this function.
 @end defun
 
+@defun add-face-text-property start end face &optional appendp object
+@code{face} text attributes can be combined.  If you want to make a
+section both italic and green, you can either define a new face that
+have those attributes, or you can add both these attributes separately
+to text:
+
+@example
+(add-face-text-property @var{start} @var{end} 'italic)
+(add-face-text-property @var{start} @var{end} '(:foreground "#00ff00"))
+@end example
+
+The attribute is (by default) prepended to the list of face
+attributes, and the first attribute of the same type takes
+precedence.  So if you have two @code{:foreground} specifications, the
+first one will take effect.
+
+If you pass in @var{appendp}, the attribute will be appended instead
+of prepended, which means that it will have no effect if there is
+already an attribute of the same type.
+
+@end defun
+
   The easiest way to make a string with text properties
 is with @code{propertize}:
 
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index c40ae408f7f..2e3760e573e 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -54,12 +54,12 @@ You should choose a short word to distinguish your program from other
 Lisp programs.  The names of all global symbols in your program, that
 is the names of variables, constants, and functions, should begin with
 that chosen prefix.  Separate the prefix from the rest of the name
-with a hyphen, @samp{-}.  Use two hyphens if the symbol is not meant
-to be used by other packages.  This practice helps avoid name
-conflicts, since all global variables in Emacs Lisp share the same
-name space, and all functions share another name space@footnote{The
-benefits of a Common Lisp-style package system are considered not to
-outweigh the costs.}.
+with a hyphen, @samp{-}.  This practice helps avoid name conflicts,
+since all global variables in Emacs Lisp share the same name space,
+and all functions share another name space@footnote{The benefits of a
+Common Lisp-style package system are considered not to outweigh the
+costs.}.  Use two hyphens to separate prefix and name if the symbol is
+not meant to be used by other packages.
 
 Occasionally, for a command name intended for users to use, it is more
 convenient if some words come before the package's name prefix.  And
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 4bcf7985f0c..4a38fa9ccd5 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -988,7 +988,7 @@ Here is an example:
   (setq my-ticker (lambda ()
                     (setq x (1+ x)))))
     @result{} (closure ((x . 0) t) ()
-          (1+ x))
+          (setq x (1+ x)))
 
 (funcall my-ticker)
     @result{} 1
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0837c8e06f2..d0f229a9c9e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,42 @@
+2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Client-Side IMAP Splitting):
+        Note that `nnimap-inbox' now can be a list.
+
+2013-06-24  Glenn Morris  <rgm@gnu.org>
+
+        * eshell.texi: Fix cross-references to other manuals.
+
+2013-06-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):
+        Remove; not needed now we use a standard html layout for the faq.
+        (clean): Remove HTML_TARGETS, emacs-faq.text.
+
+2013-06-21  Eduard Wiebe  <usenet@pusto.de>
+
+        * flymake.texi (Parsing the output, Customizable variables):
+        Add reference to `flymake-warning-predicate'.
+
+2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Top, Configuration): Insert section `Predefined
+        connection information' in menu.
+        (Predefined connection information): New section.
+        (Android shell setup): Make a reference to `Predefined connection
+        information'.
+
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (infoclean): New, split from maintainer-clean.
+        (maintainer-clean): Run infoclean.
+        (dist): New rule, to make tarfile for www.gnu.org.
+
 2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
 
-        * sieve.texi: (Managing Sieve): Fix port in example, fix documentation
+        * sieve.texi (Managing Sieve): Fix port in example, fix documentation
         for keys q and Q.
         (Standards): Reference RFC5804 as the defining document of the
         managesieve protocol.
@@ -46,7 +82,7 @@
 
 2013-03-31  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.texi: (Basic Operations on Units): Streamline some
+        * calc.texi (Basic Operations on Units): Streamline some
         descriptions.
 
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
@@ -85,8 +121,8 @@
 
 2013-03-08  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.texi (Basic Operations on Units): Fix
-        cross-reference.
+        * calc.texi (Basic Operations on Units):
+        Fix cross-reference.
 
 2013-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -124,8 +160,8 @@
 
         * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"
         and "plink2" entries.  "plink2" is obsolete for a long time.
-        (External methods): Remove "scp1" and "scp2" entries.  Explain
-        user name and host name specification for "adb".
+        (External methods): Remove "scp1" and "scp2" entries.
+        Explain user name and host name specification for "adb".
 
 2013-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -205,8 +241,8 @@
         from ede new.
         (Simple projects): Re-write to not talk about ede-simple-project
         which is deprecated, and instead use the term to mean projects
-        that don't do much management, just project wrapping.  Add
-        ede-generic-project link.
+        that don't do much management, just project wrapping.
+        Add ede-generic-project link.
         (ede-generic-project): New node (bug#11441).
 
 2013-02-07  Glenn Morris  <rgm@gnu.org>
@@ -345,8 +381,8 @@
 
 2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Browse Foreign Server): Document
-        `gnus-browse-delete-group'.
+        * gnus.texi (Browse Foreign Server):
+        Document `gnus-browse-delete-group'.
 
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
@@ -501,7 +537,7 @@
 
         Release MH-E manual version 8.4.
 
-        * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
+        * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
         Update for release 8.4.
 
         * mh-e.texi (Sequences): Add mh-whitelist-preserves-sequences-flag.
@@ -563,8 +599,8 @@
         * ses.texi: Doc for ses-rename-cell, ses-repair-cell-reference-all & ses-range.
         In all file place SES into @acronym{...}.
         (Advanced Features): Add key index and function index for
-        ses-set-header-row. Add description for function
-        ses-rename-cell. Add description for function
+        ses-set-header-row.  Add description for function
+        ses-rename-cell.  Add description for function
         ses-repair-cell-reference-all.
         (Ranges in formulas): Add description for ses-range flags.
 
@@ -583,8 +619,8 @@
         Improve docs for url-queue-*.
         (Supported URL Types): Copyedits.  Delete empty subnodes.
 
-        * url.texi (Introduction): Rename from Getting Started.  Rewrite
-        the introduction.
+        * url.texi (Introduction): Rename from Getting Started.
+        Rewrite the introduction.
         (URI Parsing): Rewrite.  Omit the obsolete attributes slot.
 
 2012-11-10  Glenn Morris  <rgm@gnu.org>
@@ -684,14 +720,14 @@
 
 2012-10-26  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Installation): Update the link to Org's ELPA.  Also
-        don't mention org-install.el anymore as the replacement file
+        * org.texi (Installation): Update the link to Org's ELPA.
+        Also don't mention org-install.el anymore as the replacement file
         org-loaddefs.el is now loaded by org.el.
 
 2012-10-25  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Frequently Asked Questions): Mention
-        `tramp-completion-reread-directory-timeout' for performance
+        * tramp.texi (Frequently Asked Questions):
+        Mention `tramp-completion-reread-directory-timeout' for performance
         improvement.
 
 2012-10-25  Glenn Morris  <rgm@gnu.org>
@@ -814,8 +850,8 @@
         (Referencing Labels): Update regarding reference styles.
         (Citation Styles): Mention support for ConTeXt.
         (Options (Defining Label Environments)): Fix typo.
-        (Options (Creating Citations)): Document
-        `reftex-cite-key-separator'.
+        (Options (Creating Citations)):
+        Document `reftex-cite-key-separator'.
 
 2012-09-30  Achim Gratz  <Stromeko@Stromeko.DE>
 
@@ -847,8 +883,8 @@
 
 2012-09-30  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Installation, Feedback, Batch execution): Use
-        (add-to-list 'load-path ... t) for the contrib dir.
+        * org.texi (Installation, Feedback, Batch execution):
+        Use (add-to-list 'load-path ... t) for the contrib dir.
 
         * org.texi (results): Update documentation for ":results drawer"
         and ":results org".
@@ -875,8 +911,8 @@
         (Agenda commands): Reorder.  Document `*' to toggle persistent
         marks.
 
-        * org.texi (Agenda dispatcher): Mention
-        `org-toggle-agenda-sticky'.
+        * org.texi (Agenda dispatcher):
+        Mention `org-toggle-agenda-sticky'.
         (Agenda commands, Exporting Agenda Views): Fix typo.
 
         * org.texi (Templates in contexts, Setting Options): Update to
@@ -957,7 +993,7 @@
 
         * org.texi: The sections in the Exporting section of the manual
         left out articles in the description of the org-export-as-*
-        commands, among other places. This patch adds them, adds a few
+        commands, among other places.  This patch adds them, adds a few
         missing prepositions, and switches instances of "an HTML" to "a
         html" for internal consistency.
 
@@ -1005,7 +1041,7 @@
 2012-09-30  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.texi (Literal examples): Remove reference to unknown
-        `org-export-latex-minted' variable. Also simplify footnote since
+        `org-export-latex-minted' variable.  Also simplify footnote since
         `org-export-latex-listings' documentation is exhaustive already.
 
         * org.texi (Plain lists): Remove reference to now hard-coded
@@ -1046,13 +1082,13 @@
         simplifications.
         (Basic Simplifications): Rename from "Limited Simplifications"
         Replace "limited" by "basic" throughout.
-        (Algebraic Simplifications):  Indicate that the algebraic
+        (Algebraic Simplifications): Indicate that the algebraic
         simplifications are done by default.
-        (Unsafe Simplifications):  Mention `m E'.
+        (Unsafe Simplifications): Mention `m E'.
         (Simplification of Units): Mention `m U'.
         (Trigonometric/Hyperbolic Functions, Reducing and Mapping)
-        (Kinds of Declarations, Functions for Declarations):  Mention
-        "algebraic simplifications" instead of `a s'.
+        (Kinds of Declarations, Functions for Declarations):
+        Mention "algebraic simplifications" instead of `a s'.
         (Algebraic Entry): Remove mention of default simplifications.
 
 2012-07-30  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -1084,8 +1120,8 @@
 
 2012-07-06  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Multi-hops): Introduce
-        `tramp-restricted-shell-hosts-alist'.
+        * tramp.texi (Multi-hops):
+        Introduce `tramp-restricted-shell-hosts-alist'.
 
 2012-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -1277,8 +1313,8 @@
         (Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
         (Asynchronous Methods): Fix description of
         dbus-call-method-asynchronously.
-        (Receiving Method Calls): Fix some minor errors.  Add
-        dbus-interface-emacs.
+        (Receiving Method Calls): Fix some minor errors.
+        Add dbus-interface-emacs.
         (Signals): Describe unicast signals and the new match rules.
         (Alternative Buses): Add the PRIVATE optional argument to
         dbus-init-bus.  Describe its new return value.  Add dbus-setenv.
@@ -1311,8 +1347,8 @@
 
 2012-04-09  Eli Zaretskii  <eliz@gnu.org>
 
-        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add
-        emacs-gnutls.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean):
+        Add emacs-gnutls.
         ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets.
 
 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
@@ -1415,7 +1451,7 @@
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
-        * org.texi (Key bindings and useful functions): Updated babel key
+        * org.texi (Key bindings and useful functions): Update babel key
         binding documentation in manual.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
@@ -1516,8 +1552,8 @@
 
 2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Customizing the IMAP Connection): Mention
-        nnimap-record-commands.
+        * gnus.texi (Customizing the IMAP Connection):
+        Mention nnimap-record-commands.
 
 2012-02-10  Glenn Morris  <rgm@gnu.org>
 
@@ -1588,8 +1624,8 @@
 
 2012-01-03  Bernt Hansen  <bernt@norang.ca>
 
-        * org.texi (Agenda commands): Document
-        `org-clock-report-include-clocking-task'.
+        * org.texi (Agenda commands):
+        Document `org-clock-report-include-clocking-task'.
 
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
 
@@ -1674,8 +1710,8 @@
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Buffer-wide header arguments): Update
-        documentation to reflect removal of #+PROPERTIES.
+        * org.texi (Buffer-wide header arguments):
+        Update documentation to reflect removal of #+PROPERTIES.
 
 2012-01-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1836,7 +1872,7 @@
 
         * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
         release 8.3.
-        (Preface): Updated support information.
+        (Preface): Update support information.
         (From Bill Wohler): Reset text to original version.  As a
         historical quote, the tense should be correct in the time that it
         was written.
@@ -2038,8 +2074,8 @@
 
 2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Dynamic blocks, Structure editing): Mention
-        the function `org-narrow-to-block'.
+        * org.texi (Dynamic blocks, Structure editing):
+        Mention the function `org-narrow-to-block'.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2066,15 +2102,15 @@
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and
+        * org.texi (Conflicts): Change "yasnippets" to "yasnippet" and
         added extra whitespace around functions to be consistent with the
         rest of the section.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Evaluating code blocks): Expanded discussion of
+        * org.texi (Evaluating code blocks): Expand discussion of
         #+call: line syntax.
-        (Header arguments in function calls): Expanded discussion of
+        (Header arguments in function calls): Expand discussion of
         #+call: line syntax.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
@@ -2104,12 +2140,12 @@
 
 2011-08-15  Tom Dye  <tsd@tsdye.com>
 
-        * org.texi (cache): Improved documentation of code block caches.
+        * org.texi (cache): Improve documentation of code block caches.
 
 2011-08-15  Tom Dye  <tsd@tsdye.com>
 
-        * org.texi (Code block specific header arguments): Documentation
-        of multi-line header arguments.
+        * org.texi (Code block specific header arguments):
+        Documentation of multi-line header arguments.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2165,15 +2201,15 @@
 
 2011-07-04  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Cleanup remote connections): Add
-        `tramp-cleanup-this-connection'.
+        * tramp.texi (Cleanup remote connections):
+        Add `tramp-cleanup-this-connection'.
 
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Subscription Methods): Link to "Group Levels" to explain
         zombies.
         (Checking New Groups): Ditto (bug#8974).
-        (Checking New Groups): Moved the reference to the right place.
+        (Checking New Groups): Move the reference to the right place.
 
 2011-07-03  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
@@ -2200,8 +2236,8 @@
 
 2011-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Summary Mail Commands): Document
-        `gnus-summary-reply-to-list-with-original'.
+        * gnus.texi (Summary Mail Commands):
+        Document `gnus-summary-reply-to-list-with-original'.
 
 2011-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -2264,7 +2300,7 @@
 
         * gnus.texi (nnmairix caveats, Setup, Registry Article Refer Method)
         (Fancy splitting to parent, Store arbitrary data):
-        Updated gnus-registry docs.
+        Update gnus-registry docs.
 
 2011-04-13  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -3385,8 +3421,8 @@
 
         Sync with Tramp 2.1.19.
 
-        * tramp.texi (Inline methods, Default Method): Mention
-        `tramp-inline-compress-start-size'.  Remove "kludgy" phrase.
+        * tramp.texi (Inline methods, Default Method):
+        Mention `tramp-inline-compress-start-size'.  Remove "kludgy" phrase.
         Remove remark about doubled "-t" argument.
         (Auto-save and Backup): Remove reference to Emacs 21.
         (Filename Syntax): Describe port numbers.
@@ -6040,7 +6076,7 @@
 2007-10-28  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus.texi (nntp-open-via-telnet-and-telnet): Fix grammar.
-        (Agent Parameters): Updated parameter names to match code.
+        (Agent Parameters): Update parameter names to match code.
         (Group Agent Commands): Corrected 'gnus-agent-fetch-series' as
         'gnus-agent-summary-fetch-series'.
         (Agent and flags): New section providing a generalized discussion
@@ -6844,7 +6880,7 @@
         (Tag searches): Document regular expression search for tags.
         (Stuck projects): New section.
         (In-buffer settings): New keywords.
-        (History and Acknowledgments): Updated description.
+        (History and Acknowledgments): Update description.
 
 2007-02-24  Alan Mackenzie  <acm@muc.de>
 
@@ -7076,7 +7112,7 @@
         (Custom agenda views): Section completely rewritten.
         (Summary): Compare with Planner.
         (Feedback): More info about creating backtraces.
-        (Plain lists): Modified example.
+        (Plain lists): Modify example.
         (Breaking down tasks): New section.
         (Custom time format): New section.
         (Time stamps): Document inactive timestamps.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index add1b42a545..4fb4865b8a4 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -24,6 +24,8 @@ SHELL = /bin/sh
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
+version=@version@
+
 ## Where the output files go.
 buildinfodir = $(srcdir)/../../info
 ## Directory with emacsver.texi.
@@ -161,8 +163,6 @@ PDF_TARGETS = \
         wisent.pdf \
         woman.pdf
 
-HTML_TARGETS = emacs-faq.html
-
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
@@ -192,8 +192,6 @@ webhack: clean
 
 dvi: $(DVI_TARGETS)
 
-html: $(HTML_TARGETS)
-
 pdf: $(PDF_TARGETS)
 
 # Note that all the Info targets build the Info files in srcdir.
@@ -400,15 +398,6 @@ faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
 faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
-## This is the name used on the Emacs web-page.
-## sed fixes up links to point to split version of the manual.
-emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(MAKEINFO) $(MAKEINFO_OPTS) --no-split \
-          --css-ref='/layout.css' --html -o $@ ${srcdir}/faq.texi
-        sed -i -e 's|a href="\([a-z]*\)\.html#\([^"]*\)"|a href="manual/html_node/\1/\2.html"|g' \
-          -e 's|/Top\.html|/|g' $@
-emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
 
 flymake : $(buildinfodir)/flymake$(INFO_EXT)
 $(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl}
@@ -718,16 +707,39 @@ mostlyclean:
         rm -f gnustmp.*
 
 clean: mostlyclean
-        rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text
+        rm -f $(DVI_TARGETS) $(PDF_TARGETS)
+        rm -f emacs-misc-${version}.tar*
 
 distclean: clean
 #       rm -f Makefile
 
 ## buildinfodir is relative to srcdir.
-maintainer-clean: distclean
+infoclean:
         cd $(buildinfodir); for file in $(INFO_TARGETS); do \
           file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
           rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
         done
 
+maintainer-clean: distclean infoclean
+
+dist:
+        rm -rf emacs-misc-${version}
+        mkdir emacs-misc-${version}
+        cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \
+          $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
+          emacs-misc-${version}/
+        sed -e 's/@sr[c]dir@/./' \
+          -e 's/^\(emacsdir *=\).*/\1 ./' \
+          -e 's/^\(buildinfodir *=\).*/\1 ./' \
+          -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e "s/@ver[s]ion@/${version}/" \
+          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
+          ${srcdir}/Makefile.in > emacs-misc-${version}/Makefile
+        @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
+          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+        fi
+        tar -cf emacs-misc-${version}.tar emacs-misc-${version}
+        rm -rf emacs-misc-${version}
+
 ### Makefile ends here
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 0da422fe14f..bd0ac0828cc 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -378,12 +378,13 @@ Similar to, but slightly different from, the GNU Coreutils
 
 @item define
 @cmindex define
-Define a varalias.  @xref{Variable Aliases, , , elisp}.
+Define a varalias.
+@xref{Variable Aliases, , , elisp, The Emacs Lisp Reference Manual}.
 
 @item diff
 @cmindex diff
 Use Emacs's internal @code{diff} (not to be confused with
-@code{ediff}).  @xref{Comparing Files, , , elisp}.
+@code{ediff}).  @xref{Comparing Files, , , emacs, The GNU Emacs Manual}.
 
 @item grep
 @cmindex grep
@@ -422,15 +423,18 @@ and @code{("foo" "bar")} both evaluate to @code{("foo" "bar")}.
 @item locate
 @cmindex locate
 Alias to Emacs's @code{locate} function, which simply runs the external
-@command{locate} command and parses the results.  @xref{Dired and `find', , , elisp}.
+@command{locate} command and parses the results.
+@xref{Dired and Find, , , emacs, The GNU Emacs Manual}.
 
 @item make
 @cmindex make
-Run @command{make} through @code{compile}.  @xref{Running Compilations under Emacs, , , elisp}.
+Run @command{make} through @code{compile}.
+@xref{Compilation, , , emacs, The GNU Emacs Manual}.
 
 @item occur
 @cmindex occur
-Alias to Emacs's @code{occur}.  @xref{Other Search-and-Loop Commands, , , elisp}.
+Alias to Emacs's @code{occur}.
+@xref{Other Repeating Search, , , emacs, The GNU Emacs Manual}.
 
 @item printnl
 @cmindex printnl
@@ -648,7 +652,8 @@ variables in command invocations.
 
 @item $#var
 Expands to the length of the value bound to @code{var}.  Raises an error
-if the value is not a sequence (@pxref{Sequences Arrays and Vectors, Sequences, , elisp}).
+if the value is not a sequence
+(@pxref{Sequences Arrays Vectors, Sequences, , elisp, The Emacs Lisp Reference Manual}).
 
 @item $(lisp)
 Expands to the result of evaluating the S-expression @code{(lisp)}.  On
@@ -680,7 +685,8 @@ any regular expression.  So to split on numbers, use @samp{$var["[0-9]+" 10 20]}
 
 @item $var[hello]
 Calls @code{assoc} on @code{var} with @code{"hello"}, expecting it to be
-an alist (@pxref{Association List Type, Association Lists, , elisp}).
+an alist (@pxref{Association List Type, Association Lists, , elisp,
+The Emacs Lisp Reference Manual}).
 
 @item $#var[hello]
 Returns the length of the cdr of the element of @code{var} who car is equal
@@ -693,9 +699,11 @@ to @code{"hello"}.
 Eshell's globbing syntax is very similar to that of Zsh.  Users coming
 from Bash can still use Bash-style globbing, as there are no
 incompatibilities.  Most globbing is pattern-based expansion, but there
-is also predicate-based expansion.  See @ref{Filename Generation, , , zsh}
+is also predicate-based expansion.  See
+@ref{Filename Generation, , , zsh, The Z Shell Manual}
 for full syntax.  To customize the syntax and behaviour of globbing in
-Eshell see the Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
+Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
+The GNU Emacs Manual}.}
 groups ``eshell-glob'' and ``eshell-pred''.
 
 @node Input/Output
@@ -757,7 +765,8 @@ can be disabled and enabled without having to unload and reload them,
 and to provide a common parent Customize group for the
 modules.@footnote{ERC provides a similar module facility.}  An Eshell
 module is defined the same as any other library but one requirement: the
-module must define a Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
+module must define a Customize@footnote{@xref{Customization, , ,
+elisp, The Emacs Lisp Reference Manual}.}
 group using @code{eshell-defgroup} (in place of @code{defgroup}) with
 @code{eshell-module} as the parent group.@footnote{If the module has
 no user-customizable options, then there is no need to define it as an
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index f88bd95008c..d1f3e21c20e 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -311,6 +311,9 @@ Used when looking for a master file.  @xref{Locating a master file}.
 Patterns for error/warning messages in the form @code{(regexp file-idx
 line-idx col-idx err-text-idx)}.  @xref{Parsing the output}.
 
+@item flymake-warning-predicate
+Predicate to classify error text as warning. @xref{Parsing the output}.
+
 @item flymake-compilation-prevents-syntax-check
 A flag indicating whether compilation and syntax check of the same
 file cannot be run simultaneously.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b4d786c4d45..6df72f87fc7 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14240,7 +14240,8 @@ variables are relevant:
 
 @table @code
 @item nnimap-inbox
-This is the @acronym{IMAP} mail box that will be scanned for new mail.
+This is the @acronym{IMAP} mail box that will be scanned for new
+mail.  This can also be a list of mail box names.
 
 @item nnimap-split-methods
 Uses the same syntax as @code{nnmail-split-methods} (@pxref{Splitting
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4c3740f02f7..1121a450ebd 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -214,6 +214,8 @@ Configuring @value{tramp} for use
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -542,6 +544,8 @@ Method}.
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -1727,6 +1731,35 @@ connection related information for this host, and opens the
 connection again.
 
 
+@node Predefined connection information
+@section Setting own connection related information
+
+Sometimes, @var{tramp} is not able to detect correct connection
+related information.  In such cases, you could tell @var{tramp} which
+value it has to take.  Since this could result in errors, it has to be
+used with care.
+
+@vindex tramp-connection-properties
+Such settings can be performed via the list
+@code{tramp-connection-properties}.  An entry in this list has the
+form @code{(@var{regexp} @var{property} @var{value})}.  @var{regexp}
+matches remote file names for which a property shall be predefined.
+It can be @code{nil}.  @var{property} is a string, and @var{value} the
+corresponding value.  @var{property} could be any property found in
+the file @code{tramp-persistency-file-name}.
+
+A special property is @code{"busybox"}.  This must be set, if the
+remote host runs a very restricted busybox as shell, which closes the
+connection at will.  Since there is no reliable test for this,
+@var{tramp} must be indicated this way.  Example:
+
+@lisp
+(add-to-list 'tramp-connection-properties
+             (list (regexp-quote "@trampfn{ssh, user, randomhost.your.domain,}")
+                   "busybox" t))
+@end lisp
+
+
 @node Remote Programs
 @section How @value{tramp} finds and uses programs on the remote machine
 
@@ -1874,7 +1907,7 @@ key.
 
 @var{tramp-password-prompt-regexp} handles the detection of such
 requests for English environments.  When you use another localization
-of your (local or remote) host, you might need to adapt this. Example:
+of your (local or remote) host, you might need to adapt this.  Example:
 
 @lisp
 (setq
@@ -2048,7 +2081,8 @@ You can instruct @value{tramp} by this form:
 @end lisp
 
 @noindent
-with @samp{192.168.0.26} being the IP address of your Android device.
+with @samp{192.168.0.26} being the IP address of your Android device
+(@pxref{Predefined connection information}).
 
 The user settings for the @code{$PATH} environment variable must be
 preserved.  It has also been reported, that the commands in