Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
cs24-19fa
git_rec_nano
Commits
1e5064ef
Commit
1e5064ef
authored
7 years ago
by
Benno Schulenberg
Browse files
Options
Download
Email Patches
Plain Diff
tweaks: fix a typo, remove a blank line, and improve some comments
parent
5b40bad6
master
feature/match-parens
refactor/readbility
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/history.c
+1
-1
src/history.c
src/nano.c
+0
-1
src/nano.c
src/text.c
+5
-10
src/text.c
with
6 additions
and
12 deletions
+6
-12
src/history.c
View file @
1e5064ef
...
...
@@ -227,7 +227,7 @@ char *get_history_completion(filestruct **h, char *s, size_t len)
* match, or len is 0. Return s. */
return
(
char
*
)
s
;
}
#endif
/* EN
S
ABLE_TABCOMP */
#endif
/* ENABLE_TABCOMP */
void
history_error
(
const
char
*
msg
,
...)
{
...
...
This diff is collapsed.
Click to expand it.
src/nano.c
View file @
1e5064ef
...
...
@@ -1487,7 +1487,6 @@ void terminal_init(void)
if
(
!
newterm_set
)
{
#endif
raw
();
nonl
();
noecho
();
...
...
This diff is collapsed.
Click to expand it.
src/text.c
View file @
1e5064ef
...
...
@@ -1122,13 +1122,11 @@ bool execute_command(const char *command)
return
FALSE
;
}
/* Before we start reading the forked command's output, we set
* things up so that Ctrl-C will cancel the new process. */
/* Enable interpretation of the special control keys so that we get
/* Re-enable interpretation of the special control keys so that we get
* SIGINT when Ctrl-C is pressed. */
enable_signals
();
/* Set things up so that Ctrl-C will terminate the forked process. */
if
(
sigaction
(
SIGINT
,
NULL
,
&
newaction
)
==
-
1
)
{
sig_failed
=
TRUE
;
nperror
(
"sigaction"
);
...
...
@@ -1140,9 +1138,6 @@ bool execute_command(const char *command)
}
}
/* Note that now oldaction is the previous SIGINT signal handler,
* to be restored later. */
f
=
fdopen
(
fd
[
0
],
"rb"
);
if
(
f
==
NULL
)
nperror
(
"fdopen"
);
...
...
@@ -1152,12 +1147,12 @@ bool execute_command(const char *command)
if
(
wait
(
NULL
)
==
-
1
)
nperror
(
"wait"
);
/* If it was changed, restore the handler for SIGINT. */
if
(
!
sig_failed
&&
sigaction
(
SIGINT
,
&
oldaction
,
NULL
)
==
-
1
)
nperror
(
"sigaction"
);
/* Restore the terminal to its previous state. In the process,
* disable interpretation of the special control keys so that we can
* use Ctrl-C for other things. */
/* Restore the terminal to its desired state, and disable
* interpretation of the special control keys again. */
terminal_init
();
return
TRUE
;
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help