From c19bcad845155e27fc01689354365c732775345f Mon Sep 17 00:00:00 2001
From: Soonho Kong <soonhok@cs.cmu.edu>
Date: Thu, 14 Aug 2014 08:42:52 -0700
Subject: [PATCH] fix(emacs): add and use lean-string-join

---
 src/emacs/lean-info.el | 5 ++---
 src/emacs/lean-type.el | 5 ++---
 src/emacs/lean-util.el | 4 ++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/emacs/lean-info.el b/src/emacs/lean-info.el
index 72f437ea1..b6e845a23 100644
--- a/src/emacs/lean-info.el
+++ b/src/emacs/lean-info.el
@@ -5,7 +5,6 @@
 ;;
 
 (require 'cl-lib)
-(require 'subr-x)
 (require 'lean-util)
 (require 'lean-debug)
 
@@ -32,7 +31,7 @@
 (defun lean-typeinfo-body (typeinfo)
   (cl-third typeinfo))
 (defun lean-typeinfo-body-str (typeinfo)
-  (string-join (lean-typeinfo-body typeinfo) "\n"))
+  (lean-string-join (lean-typeinfo-body typeinfo) "\n"))
 
 ;; -- Test
 (cl-assert (lean-typeinfo-str-p "-- TYPE|121|2"))
@@ -60,7 +59,7 @@
   (cl-second overload))
 (defun lean-overload-names (overload)
   (cl-loop for seq in (cl-third overload)
-           collect (string-join seq "\n")))
+           collect (lean-string-join seq "\n")))
 (defun lean-overload-str-p (str)
   (string-prefix-p "-- OVERLOAD|" str))
 (defun lean-overload-str-seq-p (seq)
diff --git a/src/emacs/lean-type.el b/src/emacs/lean-type.el
index f02edf5a9..fd12023ce 100644
--- a/src/emacs/lean-type.el
+++ b/src/emacs/lean-type.el
@@ -5,10 +5,9 @@
 ;;
 
 (require 'cl-lib)
-(require 'subr-x)
 (require 'lean-variable)
-(require 'lean-cmd)
 (require 'lean-util)
+(require 'lean-cmd)
 (require 'lean-server)
 (require 'lean-debug)
 
@@ -79,7 +78,7 @@ The return valus has the form of '([symbol-string] [start-pos])"
             (when overload-names
               (format "\n%s with %s"
                       (propertize "overloaded" 'face 'font-lock-keyword-face)
-                      (string-join (cdr overload-names) ", "))))
+                      (lean-string-join (cdr overload-names) ", "))))
            (output-str (concat type-output-str overload-output-str)))
       (message output-str))))
 
diff --git a/src/emacs/lean-util.el b/src/emacs/lean-util.el
index 420f7f0b2..284ac9118 100644
--- a/src/emacs/lean-util.el
+++ b/src/emacs/lean-util.el
@@ -16,6 +16,10 @@
   (or (string-prefix-p line str)
       (search (concat "\n" line) str)))
 
+(defun lean-string-join (strings &optional separator)
+  "Join all STRINGS using SEPARATOR."
+  (mapconcat 'identity strings separator))
+
 (defun lean-grab-line (n)
   "Return the contents of line n"
   (let* ((cur-line-number (line-number-at-pos))