Merge from trunk.

4 files changed, 59 insertions, 5 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 153d7e839c3..091a6ffda59 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,22 @@
+2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+            Tim Cross  <theophilusx@gmail.com>  (tiny change)
+            Glenn Morris   <rgm@gnu.org>
+
+        * keymaps.texi (Toolkit Differences): New node.  (Bug#8176)
+
+2011-07-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * help.texi (Keys in Documentation): Revert last change.
+
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * help.texi (Keys in Documentation): Clarify that \= only quotes
+        the next character, and doesn't affect longer sequences in
+        particular (bug#8935).
+
+        * debugging.texi (Using Debugger): Mention
+        @code{eval-expression-debug-on-error} (bug#8549).
+
 2011-07-14  Eli Zaretskii  <eliz@gnu.org>
 
         * display.texi (Other Display Specs): Document that `left-fringe'
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index ed146453df7..d9e807afb88 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -306,6 +306,16 @@ and it is wise to go back to the backtrace buffer and exit the debugger
 the debugger gets out of the recursive edit and kills the backtrace
 buffer.
 
+  When the debugger has been entered, the @code{debug-on-error}
+variable is temporarily set according to
+@code{eval-expression-debug-on-error}.  If the latter variable is
+non-@code{nil}, @code{debug-on-error} will temporarily be set to
+@code{t}.  This means that any further errors that occur while doing a
+debugging session will (by default) trigger another backtrace.  If
+this is not want you want, you can either set
+@code{eval-expression-debug-on-error} to @code{nil}, or set
+@code{debug-on-error} to @code{nil} in @code{debugger-mode-hook}.
+
 @cindex current stack frame
   The backtrace buffer shows you the functions that are executing and
 their argument values.  It also allows you to specify a stack frame by
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 15b2f2079ba..e5cca0622a9 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2019,8 +2019,10 @@ an existing menu, you can specify its position in the menu using
                               various features.
 * Menu Separators::         Drawing a horizontal line through a menu.
 * Alias Menu Items::        Using command aliases in menu items.
+* Toolkit Differences::     Not all toolkits provide the same features.
 @end menu
 
+
 @node Simple Menu Items
 @subsubsection Simple Menu Items
 
@@ -2309,6 +2311,28 @@ itself).  To request this, give the alias symbol a non-@code{nil}
 causes menu items for @code{make-read-only} and @code{make-writable} to
 show the keyboard bindings for @code{toggle-read-only}.
 
+@node Toolkit Differences
+@subsubsection Toolkit Differences
+
+The various toolkits with which you can build Emacs do not all support
+the same set of features for menus.  Some code works as expected with
+one toolkit, but not under another.
+
+One example is menu actions or buttons in a top-level menu-bar.  The
+following works with the Lucid toolkit or on MS Windows, but not with
+GTK or Nextstep, where clicking on the item has no effect.
+
+@example
+(defun menu-action-greet ()
+   (interactive)
+   (message "Hello Emacs User!"))
+
+(defun top-level-menu ()
+  (interactive)
+  (define-key lisp-interaction-mode-map [menu-bar m]
+     '(menu-item "Action Button" menu-action-greet)))
+@end example
+
 @node Mouse Menus
 @subsection Menus and the Mouse
 
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 3da09369882..091765043e3 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1099,11 +1099,12 @@ use short names like @code{x}.
 @node Lexical Binding
 @subsection Use of Lexical Scoping
 
-Emacs Lisp can be evaluated in two different modes: in dynamic binding mode or
-lexical binding mode.  In dynamic binding mode, all local variables use dynamic
-scoping, whereas in lexical binding mode variables that have been declared
-@dfn{special} (i.e., declared with @code{defvar} or @code{defconst}) use
-dynamic scoping and all others use lexical scoping.
+Emacs Lisp can be evaluated in two different modes: in dynamic binding
+mode or lexical binding mode.  In dynamic binding mode, all local
+variables use dynamic scoping, whereas in lexical binding mode
+variables that have been declared @dfn{special} (i.e., declared with
+@code{defvar}, @code{defcustom} or @code{defconst}) use dynamic
+scoping and all others use lexical scoping.
 
 @defvar lexical-binding
 When non-nil, evaluation of Lisp code uses lexical scoping for non-special