mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
format of "menu" description.
(tutorial--find-changed-keys): Describe the specific menu a
command is in.
This commit is contained in:
Glenn Morris 2007-06-07 06:59:46 +00:00
parent 91ffa53601
commit 04cc80ae25
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

26
lisp/tutorial.el
View file

@ -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.