adapting to proof-shell-unicode. Coq has not been adapted to the

-emacs-U option.

2 files changed, 6 insertions, 3 deletions

diff --git a/coq/coq-local-vars.el b/coq/coq-local-vars.el
index ba52abf9..f01227b3 100644
--- a/coq/coq-local-vars.el
+++ b/coq/coq-local-vars.el
@@ -116,7 +116,7 @@ These variable describes the coqtop arguments to be launched on this file.
 Optional argument OLDVALUE specifies the previous value of `coq-prog-args', it
 will be used to suggest values to the user."
   (let* ((olddirs (coq-extract-directories-from-args oldvalue))
-	 (progargs '("-emacs"))
+	 (progargs (if proof-shell-unicode '("-emacs-U") '("-emacs")))
 	 (option))
     ;; first suggest preious directories
     (while olddirs
diff --git a/coq/coq.el b/coq/coq.el
index 273b42d7..5f4ab118 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -39,7 +39,10 @@
 ;; -translate will be added automatically to this list if `coq-translate-to-v8'
 ;; is set.
 ;; coq-prog-args is set by defpgcustom in proof-config
-(setq coq-prog-args  '("-emacs"))
+(defcustom coq-prog-args '("-emacs") "")
+(if proof-shell-unicode 
+    (setq coq-prog-args '("-emacs-U"))
+  (setq coq-prog-args '("-emacs")))
 
 ;; List of environment settings d to pass to Coq process.
 ;; On Windows you might need something like:
@@ -777,7 +780,7 @@ This is specific to `coq-mode'."
 				"| sed s/coqc/coqtop/"))))
 	  (concat 
 	   (substring command 0 (string-match " [^ ]*$" command))
-	   " -emacs"))
+	   (if proof-shell-unicode '("-emacs-U") '("-emacs"))))
       coq-prog-name)))