Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
cd8b5aa3
Commit
cd8b5aa3
authored
Mar 15, 1995
by
Karl Heuer
Browse files
Rename perdisplay to kboard.
parent
92b61838
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
73 additions
and
73 deletions
+73
-73
src/callint.c
src/callint.c
+35
-35
src/macros.c
src/macros.c
+38
-38
No files found.
src/callint.c
View file @
cd8b5aa3
...
...
@@ -55,25 +55,25 @@ clear_prefix_arg ()
Vprefix_arg
=
Qnil
;
if
(
!
current_prefix_partial
)
{
current_
perdisplay
->
prefix_factor
=
Qnil
;
current_
perdisplay
->
prefix_value
=
Qnil
;
current_
perdisplay
->
prefix_sign
=
1
;
current_
perdisplay
->
prefix_partial
=
0
;
current_
kboard
->
prefix_factor
=
Qnil
;
current_
kboard
->
prefix_value
=
Qnil
;
current_
kboard
->
prefix_sign
=
1
;
current_
kboard
->
prefix_partial
=
0
;
}
}
void
finalize_prefix_arg
()
{
if
(
!
NILP
(
current_
perdisplay
->
prefix_factor
))
Vprefix_arg
=
Fcons
(
current_
perdisplay
->
prefix_factor
,
Qnil
);
else
if
(
NILP
(
current_
perdisplay
->
prefix_value
))
Vprefix_arg
=
(
current_
perdisplay
->
prefix_sign
>
0
?
Qnil
:
Qminus
);
else
if
(
current_
perdisplay
->
prefix_sign
>
0
)
Vprefix_arg
=
current_
perdisplay
->
prefix_value
;
if
(
!
NILP
(
current_
kboard
->
prefix_factor
))
Vprefix_arg
=
Fcons
(
current_
kboard
->
prefix_factor
,
Qnil
);
else
if
(
NILP
(
current_
kboard
->
prefix_value
))
Vprefix_arg
=
(
current_
kboard
->
prefix_sign
>
0
?
Qnil
:
Qminus
);
else
if
(
current_
kboard
->
prefix_sign
>
0
)
Vprefix_arg
=
current_
kboard
->
prefix_value
;
else
XSETINT
(
Vprefix_arg
,
-
XINT
(
current_
perdisplay
->
prefix_value
));
current_
perdisplay
->
prefix_partial
=
0
;
XSETINT
(
Vprefix_arg
,
-
XINT
(
current_
kboard
->
prefix_value
));
current_
kboard
->
prefix_partial
=
0
;
}
static
void
...
...
@@ -296,8 +296,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
}
else
if
(
EQ
(
funcar
,
Qmocklisp
))
{
#ifdef MULTI_
PERDISPLAY
display
_locked
=
1
;
#ifdef MULTI_
KBOARD
kboard
_locked
=
1
;
#endif
return
ml_apply
(
fun
,
Qinteractive
);
}
...
...
@@ -352,8 +352,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
Vcommand_history
=
Fcons
(
Fcons
(
function
,
values
),
Vcommand_history
);
}
#ifdef MULTI_
PERDISPLAY
display
_locked
=
1
;
#ifdef MULTI_
KBOARD
kboard
_locked
=
1
;
#endif
return
apply1
(
function
,
specs
);
}
...
...
@@ -655,8 +655,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
if
(
varies
[
i
]
>=
1
&&
varies
[
i
]
<=
4
)
XSETINT
(
args
[
i
],
marker_position
(
args
[
i
]));
#ifdef MULTI_
PERDISPLAY
display
_locked
=
1
;
#ifdef MULTI_
KBOARD
kboard
_locked
=
1
;
#endif
{
...
...
@@ -705,17 +705,17 @@ Repeating \\[universal-argument] without digits or minus sign\n\
if
(
!
current_prefix_partial
)
{
/* First C-u */
XSETFASTINT
(
current_
perdisplay
->
prefix_factor
,
4
);
current_
perdisplay
->
prefix_value
=
Qnil
;
current_
perdisplay
->
prefix_sign
=
1
;
current_
perdisplay
->
prefix_partial
=
1
;
XSETFASTINT
(
current_
kboard
->
prefix_factor
,
4
);
current_
kboard
->
prefix_value
=
Qnil
;
current_
kboard
->
prefix_sign
=
1
;
current_
kboard
->
prefix_partial
=
1
;
}
else
if
(
!
NILP
(
current_
perdisplay
->
prefix_factor
))
else
if
(
!
NILP
(
current_
kboard
->
prefix_factor
))
{
/* Subsequent C-u */
XSETINT
(
current_
perdisplay
->
prefix_factor
,
XINT
(
current_
perdisplay
->
prefix_factor
)
*
4
);
current_
perdisplay
->
prefix_partial
=
1
;
XSETINT
(
current_
kboard
->
prefix_factor
,
XINT
(
current_
kboard
->
prefix_factor
)
*
4
);
current_
kboard
->
prefix_partial
=
1
;
}
else
{
...
...
@@ -730,9 +730,9 @@ DEFUN ("negative-argument", Fnegative_argument, Snegative_argument, 0, 0, "",
\\
[universal-argument] following digits or minus sign ends the argument."
)
()
{
current_
perdisplay
->
prefix_factor
=
Qnil
;
current_
perdisplay
->
prefix_sign
*=
-
1
;
current_
perdisplay
->
prefix_partial
=
1
;
current_
kboard
->
prefix_factor
=
Qnil
;
current_
kboard
->
prefix_sign
*=
-
1
;
current_
kboard
->
prefix_partial
=
1
;
}
DEFUN
(
"digit-argument"
,
Fdigit_argument
,
Sdigit_argument
,
0
,
0
,
""
,
...
...
@@ -744,12 +744,12 @@ DEFUN ("digit-argument", Fdigit_argument, Sdigit_argument, 0, 0, "",
if
(
!
(
INTEGERP
(
last_command_char
)
&&
(
c
=
(
XINT
(
last_command_char
)
&
0177
))
>=
'0'
&&
c
<=
'9'
))
error
(
"digit-argument must be bound to a digit key"
);
current_
perdisplay
->
prefix_factor
=
Qnil
;
if
(
NILP
(
current_
perdisplay
->
prefix_value
))
XSETFASTINT
(
current_
perdisplay
->
prefix_value
,
0
);
XSETINT
(
current_
perdisplay
->
prefix_value
,
XINT
(
current_
perdisplay
->
prefix_value
)
*
10
+
(
c
-
'0'
));
current_
perdisplay
->
prefix_partial
=
1
;
current_
kboard
->
prefix_factor
=
Qnil
;
if
(
NILP
(
current_
kboard
->
prefix_value
))
XSETFASTINT
(
current_
kboard
->
prefix_value
,
0
);
XSETINT
(
current_
kboard
->
prefix_value
,
XINT
(
current_
kboard
->
prefix_value
)
*
10
+
(
c
-
'0'
));
current_
kboard
->
prefix_partial
=
1
;
}
syms_of_callint
()
...
...
src/macros.c
View file @
cd8b5aa3
...
...
@@ -42,30 +42,30 @@ Non-nil arg (prefix arg) means append to last macro defined;\n\
(
append
)
Lisp_Object
append
;
{
if
(
!
NILP
(
current_
perdisplay
->
defining_kbd_macro
))
if
(
!
NILP
(
current_
kboard
->
defining_kbd_macro
))
error
(
"Already defining kbd macro"
);
if
(
!
current_
perdisplay
->
kbd_macro_buffer
)
if
(
!
current_
kboard
->
kbd_macro_buffer
)
{
current_
perdisplay
->
kbd_macro_bufsize
=
30
;
current_
perdisplay
->
kbd_macro_buffer
current_
kboard
->
kbd_macro_bufsize
=
30
;
current_
kboard
->
kbd_macro_buffer
=
(
Lisp_Object
*
)
malloc
(
30
*
sizeof
(
Lisp_Object
));
}
update_mode_lines
++
;
if
(
NILP
(
append
))
{
current_
perdisplay
->
kbd_macro_ptr
=
current_
perdisplay
->
kbd_macro_buffer
;
current_
perdisplay
->
kbd_macro_end
=
current_
perdisplay
->
kbd_macro_buffer
;
current_
kboard
->
kbd_macro_ptr
=
current_
kboard
->
kbd_macro_buffer
;
current_
kboard
->
kbd_macro_end
=
current_
kboard
->
kbd_macro_buffer
;
message
(
"Defining kbd macro..."
);
}
else
{
message
(
"Appending to kbd macro..."
);
current_
perdisplay
->
kbd_macro_ptr
=
current_
perdisplay
->
kbd_macro_end
;
Fexecute_kbd_macro
(
current_
perdisplay
->
Vlast_kbd_macro
,
current_
kboard
->
kbd_macro_ptr
=
current_
kboard
->
kbd_macro_end
;
Fexecute_kbd_macro
(
current_
kboard
->
Vlast_kbd_macro
,
make_number
(
1
));
}
current_
perdisplay
->
defining_kbd_macro
=
Qt
;
current_
kboard
->
defining_kbd_macro
=
Qt
;
return
Qnil
;
}
...
...
@@ -83,32 +83,32 @@ An argument of zero means repeat until error.")
(
arg
)
Lisp_Object
arg
;
{
if
(
NILP
(
current_
perdisplay
->
defining_kbd_macro
))
error
(
"Not defining kbd macro."
);
if
(
NILP
(
current_
kboard
->
defining_kbd_macro
))
error
(
"Not defining kbd macro."
);
if
(
NILP
(
arg
))
XSETFASTINT
(
arg
,
1
);
else
CHECK_NUMBER
(
arg
,
0
);
if
(
!
NILP
(
current_
perdisplay
->
defining_kbd_macro
))
if
(
!
NILP
(
current_
kboard
->
defining_kbd_macro
))
{
current_
perdisplay
->
defining_kbd_macro
=
Qnil
;
current_
kboard
->
defining_kbd_macro
=
Qnil
;
update_mode_lines
++
;
current_
perdisplay
->
Vlast_kbd_macro
=
make_event_array
((
current_
perdisplay
->
kbd_macro_end
-
current_
perdisplay
->
kbd_macro_buffer
),
current_
perdisplay
->
kbd_macro_buffer
);
current_
kboard
->
Vlast_kbd_macro
=
make_event_array
((
current_
kboard
->
kbd_macro_end
-
current_
kboard
->
kbd_macro_buffer
),
current_
kboard
->
kbd_macro_buffer
);
message
(
"Keyboard macro defined"
);
}
if
(
XFASTINT
(
arg
)
==
0
)
Fexecute_kbd_macro
(
current_
perdisplay
->
Vlast_kbd_macro
,
arg
);
Fexecute_kbd_macro
(
current_
kboard
->
Vlast_kbd_macro
,
arg
);
else
{
XSETINT
(
arg
,
XINT
(
arg
)
-
1
);
if
(
XINT
(
arg
)
>
0
)
Fexecute_kbd_macro
(
current_
perdisplay
->
Vlast_kbd_macro
,
arg
);
Fexecute_kbd_macro
(
current_
kboard
->
Vlast_kbd_macro
,
arg
);
}
return
Qnil
;
}
...
...
@@ -118,24 +118,24 @@ An argument of zero means repeat until error.")
store_kbd_macro_char
(
c
)
Lisp_Object
c
;
{
if
(
!
NILP
(
current_
perdisplay
->
defining_kbd_macro
))
if
(
!
NILP
(
current_
kboard
->
defining_kbd_macro
))
{
if
((
current_
perdisplay
->
kbd_macro_ptr
-
current_
perdisplay
->
kbd_macro_buffer
)
==
current_
perdisplay
->
kbd_macro_bufsize
)
if
((
current_
kboard
->
kbd_macro_ptr
-
current_
kboard
->
kbd_macro_buffer
)
==
current_
kboard
->
kbd_macro_bufsize
)
{
register
Lisp_Object
*
new
;
current_
perdisplay
->
kbd_macro_bufsize
*=
2
;
new
=
(
Lisp_Object
*
)
xrealloc
(
current_
perdisplay
->
kbd_macro_buffer
,
(
current_
perdisplay
->
kbd_macro_bufsize
current_
kboard
->
kbd_macro_bufsize
*=
2
;
new
=
(
Lisp_Object
*
)
xrealloc
(
current_
kboard
->
kbd_macro_buffer
,
(
current_
kboard
->
kbd_macro_bufsize
*
sizeof
(
Lisp_Object
)));
current_
perdisplay
->
kbd_macro_ptr
+=
new
-
current_
perdisplay
->
kbd_macro_buffer
;
current_
perdisplay
->
kbd_macro_end
+=
new
-
current_
perdisplay
->
kbd_macro_buffer
;
current_
perdisplay
->
kbd_macro_buffer
=
new
;
current_
kboard
->
kbd_macro_ptr
+=
new
-
current_
kboard
->
kbd_macro_buffer
;
current_
kboard
->
kbd_macro_end
+=
new
-
current_
kboard
->
kbd_macro_buffer
;
current_
kboard
->
kbd_macro_buffer
=
new
;
}
*
current_
perdisplay
->
kbd_macro_ptr
++
=
c
;
*
current_
kboard
->
kbd_macro_ptr
++
=
c
;
}
}
...
...
@@ -144,7 +144,7 @@ store_kbd_macro_char (c)
finalize_kbd_macro_chars
()
{
current_
perdisplay
->
kbd_macro_end
=
current_
perdisplay
->
kbd_macro_ptr
;
current_
kboard
->
kbd_macro_end
=
current_
kboard
->
kbd_macro_ptr
;
}
DEFUN
(
"call-last-kbd-macro"
,
Fcall_last_kbd_macro
,
Scall_last_kbd_macro
,
...
...
@@ -158,12 +158,12 @@ defining others, use \\[name-last-kbd-macro].")
(
prefix
)
Lisp_Object
prefix
;
{
if
(
!
NILP
(
current_
perdisplay
->
defining_kbd_macro
))
if
(
!
NILP
(
current_
kboard
->
defining_kbd_macro
))
error
(
"Can't execute anonymous macro while defining one"
);
else
if
(
NILP
(
current_
perdisplay
->
Vlast_kbd_macro
))
else
if
(
NILP
(
current_
kboard
->
Vlast_kbd_macro
))
error
(
"No kbd macro has been defined"
);
else
Fexecute_kbd_macro
(
current_
perdisplay
->
Vlast_kbd_macro
,
prefix
);
Fexecute_kbd_macro
(
current_
kboard
->
Vlast_kbd_macro
,
prefix
);
return
Qnil
;
}
...
...
@@ -238,7 +238,7 @@ syms_of_macros ()
defsubr
(
&
Scall_last_kbd_macro
);
defsubr
(
&
Sexecute_kbd_macro
);
DEFVAR_
DISPLAY
(
"defining-kbd-macro"
,
defining_kbd_macro
,
DEFVAR_
KBOARD
(
"defining-kbd-macro"
,
defining_kbd_macro
,
"Non-nil while a keyboard macro is being defined. Don't set this!"
);
DEFVAR_LISP
(
"executing-macro"
,
&
Vexecuting_macro
,
...
...
@@ -247,7 +247,7 @@ syms_of_macros ()
DEFVAR_LISP_NOPRO
(
"executing-kbd-macro"
,
&
Vexecuting_macro
,
"Currently executing keyboard macro (string or vector); nil if none executing."
);
DEFVAR_
DISPLAY
(
"last-kbd-macro"
,
Vlast_kbd_macro
,
DEFVAR_
KBOARD
(
"last-kbd-macro"
,
Vlast_kbd_macro
,
"Last kbd macro defined, as a string or vector; nil if none defined."
);
}
...
...
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