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
5b8de9c5
Commit
5b8de9c5
authored
Feb 11, 2008
by
Stefan Monnier
Browse files
(Fdelete_terminal): Clean up the `force' path.
parent
d725f53d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
src/ChangeLog
src/ChangeLog
+4
-0
src/terminal.c
src/terminal.c
+10
-9
No files found.
src/ChangeLog
View file @
5b8de9c5
2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
* terminal.c (Fdelete_terminal): Clean up the `force' path.
2008-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
* frame.c (Qnoelisp): New symbol.
...
...
src/terminal.c
View file @
5b8de9c5
...
...
@@ -305,19 +305,20 @@ but if the second argument FORCE is non-nil, you may do so. */)
(
terminal
,
force
)
Lisp_Object
terminal
,
force
;
{
struct
terminal
*
t
,
*
p
;
t
=
get_terminal
(
terminal
,
0
);
struct
terminal
*
t
=
get_terminal
(
terminal
,
0
);
if
(
!
t
)
return
Qnil
;
p
=
terminal_list
;
while
(
p
&&
(
p
==
t
||
!
TERMINAL_ACTIVE_P
(
p
)))
p
=
p
->
next_terminal
;
if
(
NILP
(
force
)
&&
!
p
)
error
(
"Attempt to delete the sole active display terminal"
);
if
(
NILP
(
force
))
{
struct
terminal
*
p
=
terminal_list
;
while
(
p
&&
(
p
==
t
||
!
TERMINAL_ACTIVE_P
(
p
)))
p
=
p
->
next_terminal
;
if
(
!
p
)
error
(
"Attempt to delete the sole active display terminal"
);
}
if
(
t
->
delete_terminal_hook
)
(
*
t
->
delete_terminal_hook
)
(
t
);
...
...
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