diff options
| author | Miles Bader | 2006-04-21 05:39:14 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-04-21 05:39:14 +0000 |
| commit | 7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee (patch) | |
| tree | dc3853824edd4a6d426ab69a584a70c53a230dd0 /src/keymap.c | |
| parent | cfc2051d0ed5a268528a647ab0911a2f5cc451de (diff) | |
| parent | f67d6742cb77a21087e40ae7ee4c84556ca18970 (diff) | |
| download | emacs-7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee.tar.gz emacs-7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 226-238)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.
* gnus--rel--5.10 (patch 86-90)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index e5122c84efc..6930ed08d8c 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3391,7 +3391,7 @@ describe_map (map, prefix, elt_describer, partial, shadow, | |||
| 3391 | if (vect[i].shadowed) | 3391 | if (vect[i].shadowed) |
| 3392 | { | 3392 | { |
| 3393 | SET_PT (PT - 1); | 3393 | SET_PT (PT - 1); |
| 3394 | insert_string (" (shadowed)"); | 3394 | insert_string ("\n (that binding is currently shadowed by another mode)"); |
| 3395 | SET_PT (PT + 1); | 3395 | SET_PT (PT + 1); |
| 3396 | } | 3396 | } |
| 3397 | } | 3397 | } |