# HG changeset patch
# User catherine.devlin@gmail.com
# Date 1283858749 14400
# Node ID 9f9c69fbb78f93c8ec5a80d7e9456babb509c75a
# Parent  fbd780b5994b6c047a3765fe4e9379af4806ddcf
swallow xclip error

diff -r fbd780b5994b -r 9f9c69fbb78f cmd2.py
--- a/cmd2.py	Wed Jul 07 19:27:21 2010 -0400
+++ b/cmd2.py	Tue Sep 07 07:25:49 2010 -0400
@@ -187,7 +187,7 @@
 else:
     can_clip = False
     try:
-        subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+        subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
         can_clip = True
     except AttributeError:  # check_call not defined, Python < 2.5
         teststring = 'Testing for presence of xclip.'
@@ -651,7 +651,6 @@
           - terminator: ['\n', '\n']
         - terminator: ['\n', '\n']
         '''
-        tstr = 'multiline command /* with comment complete */ is done;'
         outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output')
         
         terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator')