commit bash-20150327 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 79b06c6c569577d11e4eddea1cc055b4d5261fc4..e8032ccfbe94f03f241b55610623bca2324238f2 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -8208,3 +8208,10 @@ builtins/declare.def
          This happens with nameref variables referencing variables set to
          the empty string.
          Fixes bug reported by Arthur200000 <arthur200126@163.com> 
+
+                                  3/23
+                                  ----
+doc/{bash.1,bashref.texi}
+       - INVOCATION: add language to make it clear that non-interactive login
+         shells execute ~/.bash_logout if they run the `exit' builtin.  From a
+         question from Christoph Anton Mitterer <calestyo@scientia.net>

diff --git a/doc/bash.1 b/doc/bash.1
index f8deeb84189040d927e7b93f88b58f5c50cbd8f2..548410a734bde3d0d0bfc72f3c80c8a3cd6242f0 100644 (file)
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -5,12 +5,12 @@
 .\"    Case Western Reserve University
 .\"    chet.ramey@case.edu
 .\"
-.\"    Last Change: Sat Mar 21 20:10:48 EDT 2015
+.\"    Last Change: Mon Mar 23 11:25:25 EDT 2015
 .\"
 .\" bash_builtins, strip all but Built-Ins section
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH BASH 1 "2015 March 21" "GNU Bash 4.4"
+.TH BASH 1 "2015 March 23" "GNU Bash 4.4"
 .\"
 .\" There's some problem with having a `@'
 .\" in a tagged paragraph with the BSD man macros.
@@ -324,7 +324,8 @@ The
 .B \-\-noprofile
 option may be used when the shell is started to inhibit this behavior.
 .PP
-When a login shell exits,
+When an interactive login shell exits,
+or a non-interactive login shell executes the \fBexit\fP builtin command,
 .B bash
 reads and executes commands from the file \fI~/.bash_logout\fP, if it
 exists.

diff --git a/doc/bashref.texi b/doc/bashref.texi
index 397e1d6576672cee6cca1b92b1ae86616fa8e970..5f79550fb43884a65ed5d04cad11ddb52836dce8 100644 (file)
--- a/doc/bashref.texi
+++ b/doc/bashref.texi
@@ -6252,7 +6252,9 @@ and executes commands from the first one that exists and is readable.
 The @option{--noprofile} option may be used when the shell is started to
 inhibit this behavior.
 
-When a login shell exits, Bash reads and executes commands from
+When an interactive login shell exits,
+or a non-interactive login shell executes the @code{exit} builtin command,
+Bash reads and executes commands from
 the file @file{~/.bash_logout}, if it exists.
 
 @subsubheading Invoked as an interactive non-login shell

diff --git a/doc/version.texi b/doc/version.texi
index 987d57d2aeb8b81cd23631d927a3972873f7a598..0b4ba4f5b58d7c34be94219f50bf587c5e527146 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -2,10 +2,10 @@
 Copyright (C) 1988-2015 Free Software Foundation, Inc.
 @end ignore
 
-@set LASTCHANGE Sat Mar 21 20:10:48 EDT 2015
+@set LASTCHANGE Mon Mar 23 11:25:10 EDT 2015
 
 @set EDITION 4.4
 @set VERSION 4.4
 
-@set UPDATED 21 March 2015
+@set UPDATED 23 March 2015
 @set UPDATED-MONTH March 2015

diff --git a/parse.y b/parse.y
index 074d2639a002a9a54d23eed14bdb370237ae6aee..7d1de3574c4395ef7da0cf3f461c64f2516dee10 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -5128,7 +5128,7 @@ history_delimiting_chars (line)
         command lists.  It's a suboptimal solution. */
       else if (parser_state & PST_CASESTMT)    /* case statement pattern */
        return " ";
-      else     
+      else
        return "; ";                            /* (...) subshell */
     }
   else if (token_before_that == WORD && two_tokens_ago == FUNCTION)

diff --git a/tests/RUN-ONE-TEST b/tests/RUN-ONE-TEST
index 72ec06a2c1fd8dde92acea5e8ac773e35f1d061b..3efcf32d68e9722024b6ca9d67f9e81b2aa5ac04 100755 (executable)
--- a/tests/RUN-ONE-TEST
+++ b/tests/RUN-ONE-TEST
@@ -1,4 +1,4 @@
-BUILD_DIR=/usr/local/build/bash/bash-current
+BUILD_DIR=/usr/local/build/chet/bash/bash-current
 THIS_SH=$BUILD_DIR/bash
 PATH=$PATH:$BUILD_DIR