Fix bad conflict resolution.

1 files changed, 0 insertions, 368 deletions

diff --git a/ChangeLog b/ChangeLog
index abd96daeb..550694f86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,374 +6,6 @@
 
 	* 12319: Completion/User/_perl_builtin_funcs: Get also /usr/share/man.
 
-2000-07-17  Tanaka Akira  <akr@zsh.org>
-
-	* 12274: Test/53completion.ztst, Test/55arguments.ztst,
-	Test/.distfiles: separates _arguments tests.
-
-2000-07-17  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* Config/version.mk: 3.1.9-dev-3.
-
-2000-07-17  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12266: Src/Zle/computil.c: don't treat non-option arguments as
- 	options
-	
-2000-07-17  Wayne Davison  <wayned@users.sourceforge.net>
-
-	* 12265: Src/hist.c: Fixed gethistent().  Fixed a race condition
-	in the SHARE_HISTORY code that could fail to import some shared
-	history lines from other shells.
-
-2000-07-16  Wayne Davison  <wayned@users.sourceforge.net>
-
-	* 12260: Src/hist.c: Added unmeta() calls.  Fixed lockhistfile().
-
-2000-07-13  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12247: Src/init.c, Src/params.c, Src/prompt.c: remove hostnam
-	internal variable and use $HOST wherever hostname is needed.
-
-	* 12242: Fr. Br. George (George V Kouryachy) and pws:
-	Doc/Zsh/prompt.yo, Src/prompt.c: negative integers in prompt
-	escapes count from the other end of the appropriate string.
-
-2000-07-13  Sven Wischnowsky  <wischnow@zsh.org>
-	
-	* 12243: Src/hist.c: try to get (z) parameter flag parsing for
- 	conditions right
-
-	* 12241: Completion/Core/_main_complete, Src/Zle/computil.c: fix
- 	for _arguments with single-letter options: recognize
- 	option-strings with multiple options; in _main_complete stop
- 	trying completers when one called _message, don't display warnings
- 	in such cases
-	
-	* 12238: Src/Zle/zle_thingy.c: fix zle widget -n num with num>9
-	
-	* 12237: Src/hist.c, Src/lex.c: slightly improved (z) flag for
- 	parsing conditions; recognising glob flags in conditions still
- 	doesn't work
-	
-2000-07-12  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12231: Completion/Core/compinstall: fix setting of list-prompt.
-
-2000-07-12  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12229: Doc/Zsh/compsys.yo: fix for list-prompt docs
-	
-	* 12228: Src/hist.c, Src/lex.c: fix for (z) flag, don't take # as
- 	comment
-	
-2000-07-12  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12227: Completion/Core/compinstall: add select-prompt handling
-	and correct menu entry and missing local parameters.
-
-2000-07-12  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12226: Completion/Core/_main_complete: don't start menu
- 	selection with only select=long
-	
-	* 12225: Completion/Linux/_rpm: check if options were completed
-	
-2000-07-11  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12222: Src/exec.c: ignore EINTR in helper processe for
-	tee and cat with multios.  It might be considered unfortunate
-	that the shell is liable to exit on SIGPIPE if these disappear
-	early.
-
-	* 12220: Src/exec.c: print error message for unfound autoload
-	function body at lower locallevel.
-
-2000-07-10  Bart Schaefer  <schaefer@zsh.org>
-
-	* unposted: Completion/User/_killall: Complete process IDs and
-	names for all processes when EUID is 0 (root); suggested by
-	Thomas Kohler in 12202 and followups.
-
-2000-07-10  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12208: Completion/Core/_path_files: avoid insertion of `+'
- 	before ~1/<TAB>; don't use undeclared local $tmp
-	
-2000-07-08  Tanaka Akira  <akr@zsh.org>
-
-	* 12201: Completion/User/_java: fix completion for jar. complete
-	package qualified class names. fix typos.
-
-2000-07-07  Bart Schaefer  <schaefer@brasslantern.com>
-
-	* 12193: configure.in, Src/Builtins/rlimits.mdd: Fix unnecessary
-	rebuilds of rlimits.o on platforms where getrlimit() is not found.
-
-2000-07-06  Oliver Kiddle  <opk@zsh.org>
-
-	* 12181: Completion/AIX/_lscfg, Completion/AIX/_object_classes,
-	Completion/AIX/_physical_volumes, Completion/AIX/_smit,
-	Completion/AIX/_volume_groups, Completion/User/_printers: updates
-	and additions to completions for AIX commands
-
-2000-07-05  Oliver Kiddle  <opk@zsh.org>
-
-	* 12177: Doc/Zsh/compsys.yo, Completion/Builtins/_unhash,
-	Doc/Zsh/compwid.yo, Doc/Zsh/expn.yo, Doc/Zsh/mod_zutil.yo: add more
-	standard tags to docs and fix typos
-
-2000-07-05  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12171: Completion/User/_arp: get return status right
-	
-2000-07-05  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12167: Test/Makefile.in: Ignore failure exit from "for" loop
-	so that cleanup code following it will be executed.
-
-2000-07-04  Oliver Kiddle  <opk@zsh.org>
-
-	* 12165: Completion/User/_arp: new completion for arp
-
-2000-07-04  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12160: Completion/Core/compdump: Return failure early if the
-	dot-file directory is not writable.
-
-2000-07-04  Oliver Kiddle  <opk@zsh.org>
-
-	* unposted: Src/params.c, Src/Zle/compcore.c, Src/Zle/zle_utils.c:
-	AIX dependency fixes
-
-2000-07-04  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12158: Src/Modules/parameter.c: cast pid_t to int for printing.
-
-2000-07-04  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12156: Completion/Core/_expand, Completion/Core/_path_files: add
- 	some $(print...)s because of possible math-parse errors
-
-2000-07-03  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12149: acconfig.h, configure.in, Src/Modules/zftp.c:
-	h_errno wasn't found on HPUX 10.20.  Maybe in some library.
-	
-2000-07-03  Adam Spiers  <adam@spiers.net>
-
-	* 12152: Completion/User/_perl: tweak completion of Perl script
-	parameters to perl.
-
-2000-07-03  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12151: Test/Makefile.in, Test/comptest: Point ZDOTDIR into the
-	Test directory itself, and clean up .zcompdump after testing.
-
-	* 12148: Completion/Core/_path_files: Followup to 12133 as
-	suggested by Sven in 12137: Don't merge display-ordering glob
-	flags into the parens in $(...) expressions.
-
-2000-07-03  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12146: Doc/Makefile.in: reintroduce mysteriously disappeared
-	code do install info files in directory.
-
-	* 12140: Completion/Core/compinit, Completion/Core/compinstall,
-	Doc/Zsh/compsys.yo: compinstall calls compinit after styles
-	are defined; compinit checks for _expand completer and if
-	necessary rebinds ^i to complete-word.
-
-	* Config/version.mk: 3.1.9-dev-2.
-
-	* 12138: Src/params.c, Test/06arith.ztst: setting of array
-	elements in math context didn't work (ever). 
-
-	* 12121: Src/utils.c, Doc/Zsh/options.yo: save and restore stopmsg
-	for precmd, fix #ifdef's for variable declaration in read_poll().
-
-2000-07-03  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12134: Completion/Core/_main_complete, Doc/Zsh/compsys.yo,
- 	Doc/Zsh/mod_complist.yo, Src/Zle/comp.h, Src/Zle/compcore.c,
- 	Src/Zle/complist.c: change format style with warnings tag, don't
- 	add descriptions as matches; make a-a-i-n-h in menu selection work
- 	even without matches
-	
-2000-07-02  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12133: Completion/Core/_expand, Completion/Core/_path_files:
-	Discard error output from parameter expansions and use "eval" to
-	protect the completion system from parse errors and other garbage
-	in the strings taken from the command line.
-
-2000-06-29  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12125: Src/parse.c, Test/09funcdef.ztst: fix for `foo () print
- 	bar' (function definitions without braces)
-	
-	* 12122: Completion/Core/_main_complete: reverse meaning of yes=num
- 	again
-
-	* 12119: Completion/Core/_complete, Completion/Core/_normal: try
- 	to return the right value
-	
-	* 12118: Completion/Core/_expand: don't expand partially typed
- 	parameter expansions
-	
-	* 12115: Completion/Core/_expand, Doc/Zsh/compsys.yo: change
- 	suffix style to still do expansion if the suffix contains
- 	something to expand
-	
-	* 12114: Completion/Core/_main_complete, Doc/Zsh/compsys.yo: even
- 	more fun with the menu style (no=num, yes=long-list, reverse
- 	meaning of yes=num)
-	
-	* 12113: Completion/Core/_expand, Src/Zle/zle_tricky.c: quote
- 	brace-strings
-	
-2000-06-28  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12112: Src/params.c: Don't make namedirs out of hash elements.
-
-2000-06-28  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12109: Completion/Core/_complete: make _complete return the
- 	right value
-	
-	* 12107: Completion/Core/_setup, Src/Zle/complist.c: fix for
- 	list-colors handling
-	
-	* 12105: Completion/Core/_main_complete: reset _comp_mesg (saying
- 	whether there were messages) appropriately
-	
-	* Jan Fedak: 12097: Completion/User/_ssh: use _ports when
-	completing remote ports
-
-	* Andrej: 12094: Doc/Zsh/compsys.yo: a bit of cleanup
-
-	* 12099: Completion/Core/_oldlist: make _oldlist not use the dummy
- 	match added for the warning
-	
-	* 12093: Src/Zle/compcore.c, Src/Zle/complist.c, Src/Zle/compresult.c:
- 	make a-a-i-n-h in menu selection work with one match; better undo
- 	behaviour for menu selection
-	
-2000-06-27  Bart Schaefer  <schaefer@brasslantern.com>
-
-	* 12086: Doc/Zsh/compsys.yo: Move _use_lo doc into alphabetical
-	order; separate _files and _path_files for same reason.
-
-2000-06-27  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* users/3219: Completion/Core/_main_complete, Doc/Zsh/compsys.yo:
-	menu style accepts yes=x to start menu completion if there are at
-	least x matches
-	
-	* Andrej: 12084: Src/Modules/zpty.c: don't close slave if not yet open
-
-	* 12082: Doc/Zsh/compsys.yo: document _use_lo
-	
-2000-06-27  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* Andrej: 12081: Src/Modules/zpty.c: compiles under Cygwin, but
-	still glitches.
-
-2000-06-26  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
-
-	* unposted: Src/builtin.c, Src/utils.c: move read_poll to utils.c
-	as suggested by Bart.
-
-2000-06-26  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12076: Completion/Core/compinstall: overwrote file if no
-	style information; overwrote symbolic link instead of following;
-	didn't check file name for sanity.
-
-2000-06-26  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12074: Doc/Zsh/builtins.yo, Doc/Zsh/manual.yo: Remove one more
-	reference to compfmt; add missing menu items to node listing.
-
-2000-06-26  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12073: Src/builtin.c, Src/utils.c, Doc/Zsh/builtins.yo: first
-	pass at `read -t' which tests for availability of input before
-	inputting.
-
-2000-06-26  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* users/3208: Completion/User/_use_lo: default completion even if
-	there are options
-	
-	* 12070: Completion/Core/_ignored: fix for completer lookup in
- 	_ignored
-	
-	* 12068: Doc/Zsh/mod_computil.yo, Src/Zle/computil.c: remove
- 	compfmt; a bit of explanation for compfiles and compgroups
-	
-	* 12067: Completion/Core/_history, Src/Zle/zle_tricky.c: typo in
- 	_history; missing free()s in zle_tricky.c
-	
-	* 12066: Src/Zle/computil.c: missing allocation of list for option
- 	arguments
-	
-2000-06-25  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12063: Doc/Zsh/builtins.yo, Doc/Zsh/compwid.yo,
-	Doc/Zsh/mod_computil.yo, Doc/Zsh/mod_zutil.yo: Fix typos; assorted
-	clarification and reformatting.
-
-2000-06-23  Peter Stephenson  <pws@cambridgesiliconradio.com>
-
-	* 12044: Src/builtin.c:  read -A assigned an unnecessary null
-	if there was trailing whitespace; careful of distinction between
-	whitespace and non-whitespace field separators.
-
-2000-06-23  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12041,12043 : Completion/Core/compinit: even more compinit stuff,
- 	change prompt, search for insecure parent dirs
-	
-2000-06-22  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
-
-	* 12040: Src/builtin.c: typeset -r on existing parameter set
-	the readonly flag before assigning any value on the same command
-	line.
-
-2000-06-22  Bart Schaefer  <schaefer@zsh.org>
-
-	* 12039: Test/comptest: Use "compinit -u" to avoid a possible
-	prompt about security of the directories; point ZDOTDIR into
-	the temporary test directory for the .zcompdump file.
-
-2000-06-22  Sven Wischnowsky  <wischnow@zsh.org>
-
-	* 12033: Completion/Core/compinit: followup to compinit-security
- 	patch
-	
-	* 12029: Completion/Builtins/_arrays, Completion/Builtins/_zstyle,
- 	Completion/Commands/_bash_completions,
- 	Completion/Commands/_history_complete_word,
- 	Completion/Core/_history, Completion/Core/_main_complete,
- 	Completion/Core/_parameters, Completion/Core/_setup,
- 	Completion/Core/_tags, Completion/Debian/_apt,
- 	Completion/X/_x_extension, Doc/Zsh/compsys.yo, Doc/Zsh/compwid.yo,
- 	Src/zsh.h, Src/Zle/compcore.c, Src/Zle/compctl.c,
- 	Src/Zle/complist.c, Src/Zle/computil.c: allow subscripts for
- 	compadd -[ak]; new style for history completion; better
- 	list-colors handling
-	
-2000-06-22  Clint Adams  <schizo@debian.org>
-
-	* 12027: Completion/User/_mailboxes: fix splitting problem in
-	12024, add intelligence for mutt mailboxes in $maildirectory
-	not specified in muttrc.
-
-	* 12024: Completion/User/_mailboxes: handle multiple mailboxes
-	lines in muttrc.
-
-=======
 2000-07-19  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* 12318: Doc/Zsh/options.yo, Src/builtin.c, Src/exec.c, Src/hist.c,