Merge changes from emacs-23 branch.

5 files changed, 27 insertions, 8 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f5c66806764..fe64ca9d835 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-08  Christoph  <cschol2112@googlemail.com>
+
+        * control.texi (Handling Errors) <error-message-string>: Fix arg name.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * modes.texi (Defining Minor Modes): Use C-backspace, not C-delete.
+        Suggested by Štěpán Němec <stepnem@gmail.com>.
+
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.texi (High-Level Completion): Document args of
+        `read-buffer-function' (bug#5625).
+
 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * frames.texi (Layout Parameters): Add doc for tool-bar-position.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 1c4447e9eb5..16564677f32 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1039,7 +1039,7 @@ to @code{condition-case} whose error condition you want to re-throw.
 @xref{Definition of signal}.
 @end defspec
 
-@defun error-message-string error-description
+@defun error-message-string error-descriptor
 This function returns the error message string for a given error
 descriptor.  It is useful if you want to handle an error by printing the
 usual error message for that error.  @xref{Definition of signal}.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 3588704b054..9bc6be432ae 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1222,10 +1222,11 @@ Buffer name (default foo): @point{}
 @end defun
 
 @defopt read-buffer-function
-This variable specifies how to read buffer names.  For example, if you
-set this variable to @code{iswitchb-read-buffer}, all Emacs commands
-that call @code{read-buffer} to read a buffer name will actually use the
-@code{iswitchb} package to read it.
+This variable specifies how to read buffer names.  The function is
+called with the arguments passed to @code{read-buffer}.  For example,
+if you set this variable to @code{iswitchb-read-buffer}, all Emacs
+commands that call @code{read-buffer} to read a buffer name will
+actually use the @code{iswitchb} package to read it.
 @end defopt
 
 @defopt read-buffer-completion-ignore-case
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c095a9e195d..3953da59b93 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1494,7 +1494,7 @@ See the command \\[hungry-electric-delete]."
  ;; The indicator for the mode line.
  " Hungry"
  ;; The minor mode bindings.
- '(([C-delete] . hungry-electric-delete))
+ '(([C-backspace] . hungry-electric-delete))
  :group 'hunger)
 @end smallexample
 
@@ -1526,8 +1526,8 @@ See the command \\[hungry-electric-delete]."
  :lighter " Hungry"
  ;; The minor mode bindings.
  :keymap
- '(([C-delete] . hungry-electric-delete)
-   ([C-M-delete]
+ '(([C-backspace] . hungry-electric-delete)
+   ([C-M-backspace]
     . (lambda ()
         (interactive)
         (hungry-electric-delete t))))
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 566fab45fbf..56dd6336108 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.texi (Footnotes, Tables in HTML export): Fix typos.
+
 2010-08-08  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Making Selections, Selecting Subformulas)