(tutorial--describe-nonstandard-key): Adjust for new

format of "menu" description.
(tutorial--find-changed-keys): Describe the specific menu a
command is in.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab816434da1c8c8115cca1c8177b9499806299db..acddbece4bd6534db9ec7034fd8baaf7eeca973c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2007-06-07  Glenn Morris  <rgm@gnu.org>
 
+       * emacs-lisp/bytecomp.el (byte-compile-warnings): Add new option
+       `make-local'.
+       (byte-compile-warnings-safe-p): Add `make-local'.
+       (byte-compile-make-variable-buffer-local): Allow
+       byte-compile-warnings to suppress this warning.
+
        * tutorial.el (tutorial--describe-nonstandard-key): Adjust for new
        format of "menu" description.
        (tutorial--find-changed-keys): Describe the specific menu a

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 4856d178056c5c0320674618aaf7bc4e7556499b..384b9b8415cce58a5a2a19ff2fb8ac0566f045da 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -155,9 +155,9 @@ options:
                           " RET instead."))
               (insert "\n\nWith your current key bindings"
                       " you can use "
-                      (if (string-equal "the menus" where)
+                      (if (string-match "^the .*menus?$" where)
                           ""
-                        "the key ")
+                        "the key")
                       where
                       " to get the function `"
                       (format "%s" db)
@@ -406,7 +406,7 @@ where
   WHERE       is a text describing the key sequences to which DEF-FUN is
               bound now (or, if it is remapped, a key sequence
               for the function it is remapped to)
-  REMARK      is a list with info about rebinding.  It has either of
+  REMARK      is a list with info about rebinding. It has either of
               these formats:
 
                 \(TEXT cua-mode)
@@ -434,14 +434,26 @@ where
               (key-fun (if (eq def-fun 'ESC-prefix)
                            (lookup-key global-map [27])
                          (key-binding key)))
-              (where (where-is-internal (if rem-fun rem-fun def-fun))))
+              (where (where-is-internal (if rem-fun rem-fun def-fun)))
+              cwhere)
          (if where
              (progn
-               (setq where (key-description (car where)))
+               (setq cwhere (car where)
+                     where (key-description cwhere))
                (when (and (< 10 (length where))
                           (string= (substring where 0 (length "<menu-bar>"))
                                    "<menu-bar>"))
-                 (setq where "the menus")))
+                 (setq where
+                       (if (and (vectorp cwhere)
+                                (setq cwhere (elt cwhere 1))
+                                (setq cwhere
+                                      (cadr
+                                       (assoc cwhere
+                                              (lookup-key global-map
+                                                          [menu-bar]))))
+                                (stringp cwhere))
+                           (format "the `%s' menu" cwhere)
+                         "the menus"))))
            (setq where ""))
          (setq remark nil)
          (unless
@@ -915,7 +927,7 @@ See `get-lang-string' for more information.")
 In certain places Emacs can replace a string shown to the user with
 a language specific string.  This function retrieves such strings.
 
-LANG is the language specification.  It should be one of those
+LANG is the language specification. It should be one of those
 strings that can be returned by `read-language-name'.  STRINGID
 is a symbol that specifies the string to retrieve.