From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 7 Dec 2011 13:59:43 +0000 (-0500)
Subject: commit bash-20061019 snapshot
X-Git-Tag: bash-4.0-alpha~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66658bece384b7bd48745191955c864d8143f8c7;p=thirdparty%2Fbash.git

commit bash-20061019 snapshot
---

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 2806bf35d..2ff1a1689 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -8889,8 +8889,8 @@ Makefile.in
 	- descend into `po' and run make recursively for the various clean
 	  targets
 
-				    1/4
-				    ---
+				 1/4/2004
+				 --------
 include/shmbutil.h
 	- two new macros:  BACKUP_CHAR(str, strsize, i), which backs up one
 	  multibyte character in STR starting at index I, and
@@ -12718,8 +12718,8 @@ jobs.c
 	- in delete_job, if find_last_proc returns NULL, don't try to call
 	  bgp_delete
 
-				    1/7
-				    ---
+				 1/7/2006
+				 --------
 doc/bash.1
 	- patch from Tim Waugh to replace some literal single quotes with
 	  \(aq, the groff special character for it
@@ -13756,3 +13756,11 @@ parse.y
 	- change read_token_word to skip over `(' and `|' if PST_REGEXP is
 	  set, since those characters are legitimate regexp chars (but still
 	  parse matched pairs of parens)
+
+				   10/16
+				   -----
+builtins/ulimit.def
+	- add -e and -r to $SHORT_DOC usage string
+
+po/ru.po
+	- fix encoding; Russian text in the file is actually encoded in KOI8-R
diff --git a/builtins/ulimit.def b/builtins/ulimit.def
index 2d2e7b2b8..0279295fa 100644
--- a/builtins/ulimit.def
+++ b/builtins/ulimit.def
@@ -24,7 +24,7 @@ $PRODUCES ulimit.c
 $BUILTIN ulimit
 $FUNCTION ulimit_builtin
 $DEPENDS_ON !_MINIX
-$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
+$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit]
 Ulimit provides control over the resources available to processes
 started by the shell, on systems that allow such control.  If an
 option is given, it is interpreted as follows:
diff --git a/parse.y b/parse.y
index 63e577eca..7a83d46fb 100644
--- a/parse.y
+++ b/parse.y
@@ -3433,9 +3433,9 @@ read_token_word (character)
 	 we need to special-case characters special to both the shell and
 	 regular expressions.  Right now, that is only '(' and '|'. */ /*)*/
       if MBTEST((parser_state & PST_REGEXP) && (character == '(' || character == '|'))		/*)*/
-        {
-          if (character == '|')
-            goto got_character;
+	{
+	  if (character == '|')
+	    goto got_character;
 
 	  push_delimiter (dstack, character);
 	  ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
@@ -3450,7 +3450,7 @@ read_token_word (character)
 	  FREE (ttok);
 	  dollar_present = all_digit_token = 0;
 	  goto next_character;
-        }
+	}
 #endif /* COND_REGEXP */
 
 #ifdef EXTENDED_GLOB
diff --git a/patchlevel.h b/patchlevel.h
index 246f7eed9..f2b9572d7 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 0
+#define PATCHLEVEL 1
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/po/ru.po b/po/ru.po
index 5eecad930..13efb9d0c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgstr ""
 "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -2557,4 +2557,3 @@ msgstr ""
 "ðÏËÁÚÙ×ÁÅÔ ×ÏÚÍÏÖÎÙÅ ÄÏÐÏÌÎÅÎÉÑ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÐÃÉÊ. ðÒÅÄÐÏÌÁÇÁÅÔÓÑ,\n"
 "    ÞÔÏ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ×ÎÕÔÒÉ ÆÕÎËÃÉÊ ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÇÅÎÅÒÉÒÕÀÝÅÊ ×ÏÚÍÏÖÎÙÅ ÄÏÐÏÌÎÅÎÉÑ.\n"
 "    åÓÌÉ ÎÅÏÂÑÚÁÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ óìï÷ï ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ, ÔÏ ÂÕÄÕÔ ÓÇÅÎÅÒÉÒÏ×ÁÎÙ ÔÏÌØËÏ ÓÏ×ÐÁÄÅÎÉÑ Ó óìï÷ï."
-