Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
023b93f6
Commit
023b93f6
authored
Feb 12, 2003
by
Kim F. Storm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed remap-command to command-remapping. All uses changed.
parent
0ab47edc
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
15 deletions
+25
-15
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/help-fns.el
lisp/help-fns.el
+2
-2
lisp/help.el
lisp/help.el
+1
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/keyboard.c
src/keyboard.c
+1
-1
src/keymap.c
src/keymap.c
+10
-10
src/keymap.h
src/keymap.h
+1
-1
No files found.
lisp/ChangeLog
View file @
023b93f6
2003-02-13 Kim F. Storm <storm@cua.dk>
* help.el (where-is): Rename remap-command to command-remapping.
* help-fns.el (describe-function-1): Likewise.
2003-02-12 Glenn Morris <gmorris@ast.cam.ac.uk>
* progmodes/fortran.el (fortran-fill): Fill lines that do not have
...
...
lisp/help-fns.el
View file @
023b93f6
...
...
@@ -291,9 +291,9 @@ The usage info is built from ARGLIST. DOC can be nil."
(
princ
"."
)
(
terpri
)
(
when
(
commandp
function
)
(
let*
((
remapped
(
remap-
command
function
))
(
let*
((
remapped
(
command
-remapping
function
))
(
keys
(
where-is-internal
(
or
remapped
function
)
overriding-local-map
nil
nil
)))
(
or
remapped
function
)
overriding-local-map
nil
nil
)))
(
when
remapped
(
princ
"It is remapped to `"
)
(
princ
(
symbol-name
remapped
))
...
...
lisp/help.el
View file @
023b93f6
...
...
@@ -431,7 +431,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
(
push
symbol
defs
))))
(
princ
(
mapconcat
#'
(
lambda
(
symbol
)
(
let*
((
remapped
(
remap-
command
symbol
))
(
let*
((
remapped
(
command
-remapping
symbol
))
(
keys
(
where-is-internal
symbol
overriding-local-map
nil
nil
remapped
))
(
keys
(
mapconcat
'key-description
keys
", "
)))
...
...
src/ChangeLog
View file @
023b93f6
2003-02-13 Kim F. Storm <storm@cua.dk>
* keymap.c (Fcommand_remapping): Renamed from Fremap_command.
All uses changed.
2003-02-12 Juanma Barranquero <lektu@terra.es>
* eval.c (Fdefmacro): Fix typo.
...
...
src/keyboard.c
View file @
023b93f6
...
...
@@ -1557,7 +1557,7 @@ command_loop_1 ()
if (SYMBOLP (cmd))
{
Lisp_Object cmd1;
if (cmd1 = F
remap_
command (cmd), !NILP (cmd1))
if (cmd1 = Fcommand
_remapping
(cmd), !NILP (cmd1))
cmd = cmd1;
}
...
...
src/keymap.c
View file @
023b93f6
...
...
@@ -97,8 +97,8 @@ Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap;
/* Alist of elements like (DEL . "\d"). */
static
Lisp_Object
exclude_keys
;
/* Pre-allocated 2-element vector for F
remap_
command to use. */
static
Lisp_Object
remap_
command_vector
;
/* Pre-allocated 2-element vector for Fcommand
_remapping
to use. */
static
Lisp_Object
command_
remapping_
vector
;
/* A char with the CHAR_META bit set in a vector or the 0200 bit set
in a string key sequence is equivalent to prefixing with this
...
...
@@ -1068,7 +1068,7 @@ the front of KEYMAP. */)
/* This function may GC (it calls Fkey_binding). */
DEFUN
(
"
remap-
command
"
,
F
remap
_
command
,
S
remap
_command
,
1
,
1
,
0
,
DEFUN
(
"command
-
remap
ping"
,
F
command
_
remap
ping
,
Scommand_remapping
,
1
,
1
,
0
,
doc
:
/* Return the remapping for command COMMAND in current keymaps.
Returns nil if COMMAND is not remapped (or not a symbol). */
)
(
command
)
...
...
@@ -1077,8 +1077,8 @@ Returns nil if COMMAND is not remapped (or not a symbol). */)
if
(
!
SYMBOLP
(
command
))
return
Qnil
;
ASET
(
remap_
command_vector
,
1
,
command
);
return
Fkey_binding
(
remap_
command_vector
,
Qnil
,
Qt
);
ASET
(
command_
remapping_
vector
,
1
,
command
);
return
Fkey_binding
(
command_
remapping_
vector
,
Qnil
,
Qt
);
}
/* Value is number if KEY is too long; nil if valid but has no definition. */
...
...
@@ -1490,7 +1490,7 @@ is non-nil, `key-binding' returns the unmapped command. */)
if
(
NILP
(
no_remap
)
&&
SYMBOLP
(
value
))
{
Lisp_Object
value1
;
if
(
value1
=
F
remap_
command
(
value
),
!
NILP
(
value1
))
if
(
value1
=
Fcommand
_remapping
(
value
),
!
NILP
(
value1
))
value
=
value1
;
}
...
...
@@ -2257,7 +2257,7 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
if
(
NILP
(
no_remap
)
&&
SYMBOLP
(
definition
))
{
Lisp_Object
tem
;
if
(
tem
=
F
remap_
command
(
definition
),
!
NILP
(
tem
))
if
(
tem
=
Fcommand
_remapping
(
definition
),
!
NILP
(
tem
))
return
Qnil
;
}
...
...
@@ -3644,8 +3644,8 @@ and applies even for keys that have ordinary bindings. */);
Qremap
=
intern
(
"remap"
);
staticpro
(
&
Qremap
);
remap_
command_vector
=
Fmake_vector
(
make_number
(
2
),
Qremap
);
staticpro
(
&
remap_
command_vector
);
command_
remapping_
vector
=
Fmake_vector
(
make_number
(
2
),
Qremap
);
staticpro
(
&
command_
remapping_
vector
);
where_is_cache_keymaps
=
Qt
;
where_is_cache
=
Qnil
;
...
...
@@ -3659,7 +3659,7 @@ and applies even for keys that have ordinary bindings. */);
defsubr
(
&
Smake_keymap
);
defsubr
(
&
Smake_sparse_keymap
);
defsubr
(
&
Scopy_keymap
);
defsubr
(
&
S
remap_
command
);
defsubr
(
&
Scommand
_remapping
);
defsubr
(
&
Skey_binding
);
defsubr
(
&
Slocal_key_binding
);
defsubr
(
&
Sglobal_key_binding
);
...
...
src/keymap.h
View file @
023b93f6
...
...
@@ -28,7 +28,7 @@ EXFUN (Fmake_sparse_keymap, 1);
EXFUN
(
Fkeymap_prompt
,
1
);
EXFUN
(
Fdefine_key
,
3
);
EXFUN
(
Flookup_key
,
3
);
EXFUN
(
F
remap_
command
,
1
);
EXFUN
(
Fcommand
_remapping
,
1
);
EXFUN
(
Fkey_binding
,
3
);
EXFUN
(
Fkey_description
,
1
);
EXFUN
(
Fsingle_key_description
,
2
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment