From 3345e3407d3d373fdbd2ac2a5655ca566d9f94d2 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 20 Mar 2015 11:18:22 +0000 Subject: [PATCH] Normalizing some whitespace, removing an old comment, and placing another one better. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5141 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ src/nano.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5085a5fe..697a36a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-20 Benno Schulenberg + * src/nao.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager): + Normalize the whitespace, remove an old comment, and place another + one better. + 2015-03-17 Benno Schulenberg * src/text.c (do_alt_speller): Do not set the modified flag when an external spell checker didn't make any changes. This fixes diff --git a/src/nano.c b/src/nano.c index 38f3bb06..f095670a 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1180,20 +1180,20 @@ void finish_stdin_pager(void) /* Read whatever we did get from stdin. */ f = fopen("/dev/stdin", "rb"); - if (f == NULL) - nperror("fopen"); + if (f == NULL) + nperror("fopen"); read_file(f, 0, "stdin", TRUE, FALSE); ttystdin = open("/dev/tty", O_RDONLY); if (!ttystdin) - die(_("Couldn't reopen stdin from keyboard, sorry\n")); + die(_("Couldn't reopen stdin from keyboard, sorry\n")); dup2(ttystdin,0); close(ttystdin); if (!pager_input_aborted) tcgetattr(0, &oldterm); if (!pager_sig_failed && sigaction(SIGINT, &pager_oldaction, NULL) == -1) - nperror("sigaction"); + nperror("sigaction"); terminal_init(); doupdate(); } @@ -1201,7 +1201,6 @@ void finish_stdin_pager(void) /* Cancel reading from stdin like a pager. */ RETSIGTYPE cancel_stdin_pager(int signal) { - /* Currently do nothing, just handle the intr silently. */ pager_input_aborted = TRUE; } @@ -1213,13 +1212,13 @@ void stdin_pager(void) tcsetattr(0, TCSANOW, &oldterm); fprintf(stderr, _("Reading from stdin, ^C to abort\n")); - /* Set things up so that Ctrl-C will cancel the new process. */ /* Enable interpretation of the special control keys so that * we get SIGINT when Ctrl-C is pressed. */ #ifndef NANO_TINY enable_signals(); #endif + /* Set things up so that SIGINT will cancel the new process. */ if (sigaction(SIGINT, NULL, &pager_newaction) == -1) { pager_sig_failed = TRUE; nperror("sigaction"); -- 2.39.5