From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Fri, 24 Jul 2015 14:40:41 +0000 (+0200)
Subject: Merge branch release-5-1
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=5750bfe806310856448a1e7baf46a7d648d1185e

Merge branch release-5-1

Conflicts:
	src/gromacs/commandline/shellcompletions.cpp
Removed line no longer appropriate, now that zsh completion
is supported. Master had changed the previous line, which
git flags as a merge conflict.

Change-Id: Id9d37615b2bd121b1206ca0e6e8eac62fcf38f01
---

5750bfe806310856448a1e7baf46a7d648d1185e
diff --cc src/gromacs/commandline/shellcompletions.cpp
index a0ef63e4c6,ce9f08a717..520ff46909
--- a/src/gromacs/commandline/shellcompletions.cpp
+++ b/src/gromacs/commandline/shellcompletions.cpp
@@@ -217,8 -217,7 +217,7 @@@ TextOutputStream &ShellCompletionWriter
  
  void ShellCompletionWriter::startCompletions()
  {
 -    impl_->file_.reset(new File(impl_->binaryName_ + "-completion.bash", "w"));
 +    impl_->file_.reset(new TextWriter(impl_->binaryName_ + "-completion.bash"));
-     impl_->file_->writeLine("shopt -s extglob");
  }
  
  void ShellCompletionWriter::writeModuleCompletions(