15 files changed, 49 insertions, 33 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 5d4184e3fb4..e308d68b75d 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1451,7 +1451,7 @@ Run @var{body} with @var{var} bound to each value that
 @end defmac
 
 The Common Lisp loop facility also contains features for working with
-iterators.  See @xref{Loop Facility,,,cl,Common Lisp Extensions}.
+iterators.  @xref{Loop Facility,,,cl,Common Lisp Extensions}.
 
 The following piece of code demonstrates some important principles of
 working with iterators.
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 2f9d898c9b0..ab07d389282 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2378,7 +2378,7 @@ safe.
 A form that creates temporary bindings (@code{condition-case},
 @code{dolist}, @code{dotimes}, @code{lambda}, @code{let}, or
 @code{let*}), if all args are safe and the symbols to be bound are not
-explicitly risky (see @pxref{File Local Variables}).
+explicitly risky (@pxref{File Local Variables}).
 @item
 An assignment using @code{add-to-list}, @code{setq}, @code{push}, or
 @code{pop}, if all args are safe and the symbols to be assigned are
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 27c5d77579f..f41607c5dc0 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3023,7 +3023,7 @@ Its value should have one of the forms described in this table.
 
 @strong{Warning:} Do not design an element of @code{font-lock-keywords}
 to match text which spans lines; this does not work reliably.
-For details, see @xref{Multiline Font Lock}.
+For details, @pxref{Multiline Font Lock}.
 
 You can use @var{case-fold} in @code{font-lock-defaults} to specify
 the value of @code{font-lock-keywords-case-fold-search} which says
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 47206a406fd..8b0750abbf6 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1912,7 +1912,10 @@ the command returns the decoded text as a multibyte string without
 inserting it.
 
 If decoded text is inserted in some buffer, this command returns the
-length of the decoded text.
+length of the decoded text.  If that buffer is a unibyte buffer
+(@pxref{Selecting a Representation}), the internal representation of
+the decoded text (@pxref{Text Representations}) is inserted into the
+buffer as individual bytes.
 
 This command puts a @code{charset} text property on the decoded text.
 The value of the property states the character set used to decode the
@@ -1931,7 +1934,9 @@ contains 8-bit bytes in their multibyte form).
 
 If optional argument @var{buffer} specifies a buffer, the decoded text
 is inserted in that buffer after point (point does not move).  In this
-case, the return value is the length of the decoded text.
+case, the return value is the length of the decoded text.  If that
+buffer is a unibyte buffer, the internal representation of the decoded
+text is inserted into it as individual bytes.
 
 @cindex @code{charset}, text property
 This function puts a @code{charset} text property on the decoded text.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 527a3ab420c..77077934673 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -840,8 +840,8 @@ The argument @var{character-set} is a string, like the inside of a
 terminate it, and @samp{\} quotes @samp{^}, @samp{-} or @samp{\}.
 Thus, @code{"a-zA-Z"} skips over all letters, stopping before the
 first nonletter, and @code{"^a-zA-Z"} skips nonletters stopping before
-the first letter.  See @xref{Regular Expressions}.  Character classes
-can also be used, e.g., @code{"[:alnum:]"}.  See @pxref{Char Classes}.
+the first letter (@pxref{Regular Expressions}).  Character classes
+can also be used, e.g., @code{"[:alnum:]"} (@pxref{Char Classes}).
 
 If @var{limit} is supplied (it must be a number or a marker), it
 specifies the maximum position in the buffer that point can be skipped
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 6db2c96f2dc..df6709e38c2 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -1060,7 +1060,7 @@ there's a piece of normal text without having to think much about it.
 and so on.
 
 You can configure the exact way comments get filled and broken, and
-where Emacs does auto-filling (see @pxref{Custom Filling and
+where Emacs does auto-filling (@pxref{Custom Filling and
 Breaking}).  Typically, the style system (@pxref{Styles}) will have
 set this up for you, so you probably won't have to bother.
 
@@ -1478,7 +1478,7 @@ normal, with no @kbd{C-u} prefix).
 @end itemize
 
 You can configure the precise circumstances in which newlines get
-inserted (see @pxref{Custom Auto-newlines}).  Typically, the style
+inserted (@pxref{Custom Auto-newlines}).  Typically, the style
 system (@pxref{Styles}) will have set this up for you, so you probably
 won't have to bother.
 
@@ -6853,7 +6853,7 @@ custom line-up function associated with it.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 To configure macros which you invoke without a terminating @samp{;},
-see @xref{Macros with ;}.
+@pxref{Macros with ;}.
 
 Here are the remaining odds and ends regarding indentation:
 
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c7d499884da..7c7612f579c 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1928,7 +1928,7 @@ This executes @var{forms} exactly like a @code{progn}, except that
 errors can be made visible when @code{dbus-debug} is set to @code{t}.
 @end defspec
 
-Incoming D-Bus messages are handled as Emacs events, see @pxref{Misc
+Incoming D-Bus messages are handled as Emacs events, @pxref{Misc
 Events, , , elisp}.  They are retrieved only, when Emacs runs in
 interactive mode.  The generated event has this form:
 
@@ -1952,7 +1952,7 @@ of the D-Bus object emitting the message.  @var{interface} and
 @var{member} denote the message which has been sent.
 
 @var{handler} is the callback function which has been registered for
-this message (see @pxref{Signals}).  When a @code{dbus-event} event
+this message (@pxref{Signals}).  When a @code{dbus-event} event
 arrives, @var{handler} is called with @var{args} as arguments.
 
 In order to inspect the @code{dbus-event} data, you could extend the
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index b6a9d23f7dc..1e3414563f3 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -896,7 +896,7 @@ should not bind @code{dired-x-find-file-other-window} over
 @code{find-file-other-window}.  If you change this variable after
 @file{dired-x.el} is loaded then do @kbd{M-x dired-x-bind-find-file}.  The
 default value of this variable is @code{t}; by default, the binding is not
-done.  See @xref{Optional Installation File At Point}.
+done.  @xref{Optional Installation File At Point}.
 
 @item dired-x-bind-find-file
 @findex dired-x-bind-find-file
@@ -904,7 +904,7 @@ A function, which can be called interactively or in your @file{~/.emacs} file,
 that uses the value of @code{dired-x-hands-off-my-keys} to determine if
 @code{dired-x-find-file} should be bound over @code{find-file} and
 @code{dired-x-find-file-other-window} bound over
-@code{find-file-other-window}.  See @xref{Optional Installation File At Point}.
+@code{find-file-other-window}.  @xref{Optional Installation File At Point}.
 @end table
 
 @node Miscellaneous Commands
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 117b62e9ac8..568f94ba7c1 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -606,7 +606,7 @@ function that will be passed the corresponding attribute values for
 display.
 @end defvar
 
-This variable has protocol-local definitions (see @pxref{Server/Protocol
+This variable has protocol-local definitions (@pxref{Server/Protocol
 Locals}).  For instance, it is defined as follows for LDAP:
 
 @lisp
@@ -714,7 +714,7 @@ name and the remaining words are all considered as surname constituents.
 @var{format}s are in fact not limited to EUDC attribute names, you can
 use server or protocol specific names in them.  It may be safer if you
 do so, to set the variable @code{eudc-inline-query-format} in a protocol
-or server local fashion (see @pxref{Server/Protocol Locals}).
+or server local fashion (@pxref{Server/Protocol Locals}).
 
 For instance you could use the following to match up to three words
 against the @code{cn} attribute of LDAP servers:
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 075f5218414..840cc082054 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -707,7 +707,7 @@ retrieves via POP3?
 
 Yes, if the POP3 server supports the UIDL control (maybe almost servers
 do it nowadays).  To do that, add a @code{:leave VALUE} pair to each
-POP3 mail source.  See @pxref{Mail Source Specifiers} for VALUE.
+POP3 mail source.  @xref{Mail Source Specifiers}, for details on VALUE.
 
 @node FAQ 4 - Reading messages
 @subsection Reading messages
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 540061ef6d8..17b1521f488 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3094,7 +3094,7 @@ You can also use regexp expansions in the rules:
 (sieve header :regex "list-id" "<c++std-\\1.accu.org>")
 @end example
 
-See @pxref{Sieve Commands} for commands and variables that might be of
+@xref{Sieve Commands}, for commands and variables that might be of
 interest in relation to the sieve parameter.
 
 The Sieve language is described in RFC 3028.  @xref{Top, Emacs Sieve,
@@ -12856,7 +12856,7 @@ In the case of a string value, if the @code{match} is a regular
 expression, or if it takes the form @code{(header @var{match}
 @var{regexp})}, a @samp{gnus-match-substitute-replacement} is proceed
 on the value to replace the positional parameters @samp{\@var{n}} by
-the corresponding parenthetical matches (see @xref{Replacing Match,,
+the corresponding parenthetical matches (@pxref{Replacing Match,,
 Replacing the Text that Matched, elisp, The Emacs Lisp Reference
 Manual}.)
 
@@ -24242,7 +24242,7 @@ You must read this section to understand how the Spam package works.
 Do not skip, speed-read, or glance through this section.
 
 Make sure you read the section on the @code{spam.el} sequence of
-events.  See @xref{Extending the Spam package}.
+events.  @xref{Extending the Spam package}.
 
 @cindex spam-initialize
 @vindex spam-use-stat
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index c51b4c35a49..de3b7bbed49 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -10290,7 +10290,7 @@ Org mode can contain @LaTeX{} math fragments, and it supports ways to process
 these for several export back-ends.  When exporting to @LaTeX{}, the code is
 left as it is.  When exporting to HTML, Org can use either
 @uref{http://www.mathjax.org, MathJax} (@pxref{Math formatting in HTML
-export}) or transcode the math into images (see @pxref{Previewing @LaTeX{}
+export}) or transcode the math into images (@pxref{Previewing @LaTeX{}
 fragments}).
 
 @LaTeX{} fragments don't need any special marking at all.  The following
@@ -10356,7 +10356,7 @@ or @file{convert} installed@footnote{These are respectively available at
 and from the @file{imagemagick} suite.  Choose the converter by setting the
 variable @code{org-preview-latex-default-process} accordingly.}, @LaTeX{}
 fragments can be processed to produce images of the typeset expressions to be
-used for inclusion while exporting to HTML (see @pxref{@LaTeX{} fragments}),
+used for inclusion while exporting to HTML (@pxref{@LaTeX{} fragments}),
 or for inline previewing within Org mode.
 
 @vindex org-format-latex-options
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index baa8de4b4dc..8221abdbbaa 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -3697,7 +3697,7 @@ MicroEmacs at the time).
 Here is a summary of @RefTeX{}'s commands which can be executed from
 @LaTeX{} files.  Command which are executed from the special buffers are
 not described here.  All commands are available from the @code{Ref}
-menu.  See @xref{Key Bindings}.
+menu.  @xref{Key Bindings}.
 
 @deffn Command reftex-toc
 Show the table of contents for the current document.  When called with
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 9b70017a385..4112b44e484 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -67,7 +67,8 @@ You should define the options of your own filters in this group."
 A nil value means to save the whole list.
 See the command `recentf-save-list'."
   :group 'recentf
-  :type 'integer)
+  :type '(choice (integer :tag "Entries" :value 1)
+		 (const :tag "No Limit" nil)))
 
 (defcustom recentf-save-file (locate-user-emacs-file "recentf" ".recentf")
   "File to save the recent list into."
diff --git a/src/coding.c b/src/coding.c
index 9cba6494a8d..5b9bfa17dd2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7803,15 +7803,22 @@ encode_coding (struct coding_system *coding)
   SAFE_FREE ();
 }
 
-
-/* Name (or base name) of work buffer for code conversion.  */
+/* Code-conversion operations use internal buffers.  There's a single
+   reusable buffer, which is created the first time it is needed, and
+   then never killed.  When this reusable buffer is being used, the
+   reused_workbuf_in_use flag is set.  If we need another conversion
+   buffer while the reusable one is in use (e.g., if code-conversion
+   is reentered when another code-conversion is in progress), we
+   create temporary buffers using the name of the reusable buffer as
+   the base name, see code_conversion_save below.  These temporary
+   buffers are killed when the code-conversion operations that use
+   them return, see code_conversion_restore below.  */
+
+/* A string that serves as name of the reusable work buffer, and as base
+   name of temporary work buffers used for code-conversion operations.  */
 Lisp_Object Vcode_conversion_workbuf_name;
 
-/* A working buffer used by the top level conversion.  Once it is
-   created, it is never destroyed.  It has the name
-   Vcode_conversion_workbuf_name.  The other working buffers are
-   destroyed after the use is finished, and their names are modified
-   versions of Vcode_conversion_workbuf_name.  */
+/* The reusable working buffer, created once and never killed.  */
 static Lisp_Object Vcode_conversion_reused_workbuf;
 
 /* True iff Vcode_conversion_reused_workbuf is already in use.  */
@@ -9402,7 +9409,8 @@ START and END are buffer positions.
 Optional 4th arguments DESTINATION specifies where the decoded text goes.
 If nil, the region between START and END is replaced by the decoded text.
 If buffer, the decoded text is inserted in that buffer after point (point
-does not move).
+does not move).  If that buffer is unibyte, it receives the individual
+bytes of the internal representation of the decoded text.
 In those cases, the length of the decoded text is returned.
 If DESTINATION is t, the decoded text is returned.
 
@@ -9560,7 +9568,9 @@ if the decoding operation is trivial.
 
 Optional fourth arg BUFFER non-nil means that the decoded text is
 inserted in that buffer after point (point does not move).  In this
-case, the return value is the length of the decoded text.
+case, the return value is the length of the decoded text.  If that
+buffer is unibyte, it receives the individual bytes of the internal
+representation of the decoded text.
 
 This function sets `last-coding-system-used' to the precise coding system
 used (which may be different from CODING-SYSTEM if CODING-SYSTEM is