Imported Upstream version 8.4pl4dfsgupstream/8.4pl4dfsg

1 files changed, 7 insertions, 1 deletions

diff --git a/ide/coq.ml b/ide/coq.ml
index 82cdc726..1d1a7dd0 100644
--- a/ide/coq.ml
+++ b/ide/coq.ml
@@ -1,6 +1,6 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
@@ -51,6 +51,12 @@ let version () =
 let rec read_all_lines in_chan =
   try
     let arg = input_line in_chan in
+    let len = String.length arg  in
+    let arg =
+      if arg.[len - 1] = '\r' then
+	String.sub arg 0 (len - 1)
+      else arg
+    in
     arg::(read_all_lines in_chan)
   with End_of_file -> []