From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 18 Dec 2010 16:28:15 +0000 (-0500)
Subject: * doc/lispref/keymaps.texi (Simple Menu Items, Extended Menu Items):
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80b33766d4693c002464052eb799ecb6eb32f010;p=emacs.git

* doc/lispref/keymaps.texi (Simple Menu Items, Extended Menu Items):
Remove mention of the key-binding-data cache since we don't use it
any more.
* doc/lispref/modes.texi (Derived Modes): Mention prog-mode.

Fixes: debbugs:7542
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ba32adc9e47..157c8580b9c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* modes.texi (Derived Modes): Mention prog-mode.
+
+	* keymaps.texi (Simple Menu Items, Extended Menu Items): Remove mention
+	of the key-binding-data cache since we don't use it any more.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* processes.texi (Shell Arguments):
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index e1052a9912e..4ecdaf0fa5b 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2072,21 +2072,6 @@ look at a menu.  This is because the X toolkit requires the whole tree
 of menus in advance.  To force recalculation of the menu bar, call
 @code{force-mode-line-update} (@pxref{Mode Line Format}).
 
-  You've probably noticed that menu items show the equivalent keyboard key
-sequence (if any) to invoke the same command.  To save time on
-recalculation, menu display caches this information in a sublist in the
-binding, like this:
-
-@c This line is not too long--rms.
-@example
-(@var{item-string} @r{[}@var{help}@r{]} (@var{key-binding-data}) . @var{real-binding})
-@end example
-
-@noindent
-Don't put these sublists in the menu item yourself; menu display
-calculates them automatically.  Don't mention keyboard equivalents in
-the item strings themselves, since that is redundant.
-
 @node Extended Menu Items
 @subsubsection Extended Menu Items
 @kindex menu-item
@@ -2119,14 +2104,6 @@ string.  Thus, the string need not be a constant.  The third element,
 @var{item-property-list}, has the form of a property list which contains
 other information.
 
-  When an equivalent keyboard key binding is cached, the extended menu
-item binding looks like this:
-
-@example
-(menu-item @var{item-name} @var{real-binding} (@var{key-binding-data})
-    . @var{item-property-list})
-@end example
-
   Here is a table of the properties that are supported:
 
 @table @code
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 5f59d4c4b62..0f66ebeb6b1 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -744,7 +744,8 @@ documentation of the major mode.
   The recommended way to define a new major mode is to derive it
 from an existing one using @code{define-derived-mode}.  If there is no
 closely related mode, you can inherit from @code{text-mode},
-@code{special-mode}, or in the worst case @code{fundamental-mode}.
+@code{special-mode}, @code{prog-mode}, or in the worst case
+@code{fundamental-mode}.
 
 @defmac define-derived-mode variant parent name docstring keyword-args@dots{} body@dots{}
 This macro defines @var{variant} as a major mode command, using