From 175dd75a3dae1ee5c60c4fb4b837763d14723d9e Mon Sep 17 00:00:00 2001 From: liljencrantz Date: Sat, 6 Oct 2007 20:55:27 +1000 Subject: [PATCH] Tiny touchups of docs and code darcs-hash:20071006105527-75c98-339c5d7ec2fbae0c2d4dc93552db85c389971a6a.gz --- builtin.c | 2 +- doc_src/index.hdr.in | 3 ++- reader.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin.c b/builtin.c index cd80d622d..68e0957cc 100644 --- a/builtin.c +++ b/builtin.c @@ -133,7 +133,7 @@ static int builtin_stdin; static hash_table_t *desc=0; /** - The underyion IO redirections behind the current builtin. This + The underlying IO redirections behind the current builtin. This should normally not be used - sb_out and friends are already configured to handle everything. */ diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 3a6530d51..23b39a201 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -936,7 +936,8 @@ started by fish, those in lowercase are not exported. This rule is not enforced by fish, but it is good coding practice to use casing to distinguish between exported and unexported variables. \c fish also uses several variables internally. Such variables are prefixed with -the string __FISH or __fish. These should be ignored by the user. +the string __FISH or __fish. These should never be used by the +user. Changing their value may break fish. \subsection variables-status The status variable diff --git a/reader.c b/reader.c index d6ac49db2..447a62ffc 100644 --- a/reader.c +++ b/reader.c @@ -3131,7 +3131,8 @@ int reader_read( int fd, io_data_t *io ) is handled by proc_push_interactive/proc_pop_interactive. */ - proc_push_interactive( ((fd == 0) && isatty(STDIN_FILENO))); + int inter = ((fd == STDIN_FILENO) && isatty(STDIN_FILENO)); + proc_push_interactive( inter ); res= is_interactive?read_i():read_ni( fd, io );