Fix conflicts from previous merge

5 files changed, 17 insertions, 103 deletions

diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index e155b4c..ecc08c8 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -103,29 +103,13 @@ or `org-babel-execute:C++'."
 		     (mapconcat 'identity
 				(if (listp flags) flags (list flags)) " ")
 		     (org-babel-process-file-name tmp-src-file)) ""))))
-<<<<<<< HEAD
-    ((lambda (results)
-       (org-babel-reassemble-table
-	(org-babel-result-cond (cdr (assoc :result-params params))
-	  (org-babel-read results t)
-	  (let ((tmp-file (org-babel-temp-file "c-")))
-	    (with-temp-file tmp-file (insert results))
-	    (org-babel-import-elisp-from-file tmp-file)))
-	(org-babel-pick-name
-	 (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
-	(org-babel-pick-name
-	 (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))
-     (org-babel-trim
-      (org-babel-eval
-       (concat tmp-bin-file (if cmdline (concat " " cmdline) "")) "")))))
-=======
     (let ((results
            (org-babel-trim
             (org-babel-eval
              (concat tmp-bin-file (if cmdline (concat " " cmdline) "")) ""))))
       (org-babel-reassemble-table
        (org-babel-result-cond (cdr (assoc :result-params params))
-	 (org-babel-read results)
+	 (org-babel-read results t)
          (let ((tmp-file (org-babel-temp-file "c-")))
            (with-temp-file tmp-file (insert results))
            (org-babel-import-elisp-from-file tmp-file)))
@@ -134,7 +118,6 @@ or `org-babel-execute:C++'."
        (org-babel-pick-name
         (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))
     ))
->>>>>>> maint
 
 (defun org-babel-C-expand (body params)
   "Expand a block of C or C++ code with org-babel according to
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index b2794db..d797a3f 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -24,18 +24,13 @@
 
 ;;; Commentary:
 
-<<<<<<< HEAD
 ;; Support for evaluating clojure code, relies either on Slime or
 ;; on Nrepl.el for all eval.
-=======
-;; Support for evaluating clojure code, relies on slime for all eval.
->>>>>>> maint
 
 ;; Requirements:
 
 ;; - clojure (at least 1.2.0)
 ;; - clojure-mode
-<<<<<<< HEAD
 ;; - either cider or nrepl.el or SLIME
 
 ;; For cider, see https://github.com/clojure-emacs/cider
@@ -47,13 +42,6 @@
 ;; For nREPL:
 ;; get clojure with https://github.com/technomancy/leiningen
 ;; get nrepl from MELPA (clojure-mode is a dependency).
-=======
-;; - slime
-
-;; By far, the best way to install these components is by following
-;; the directions as set out by Phil Hagelberg (Technomancy) on the
-;; web page: http://technomancy.us/126
->>>>>>> maint
 
 ;;; Code:
 (require 'ob)
@@ -108,7 +96,6 @@
 
 (defun org-babel-execute:clojure (body params)
   "Execute a block of Clojure code with Babel."
-<<<<<<< HEAD
   (let ((expanded (org-babel-expand-body:clojure body params)))
     (case org-babel-clojure-backend
       (cider
@@ -140,21 +127,6 @@
 	   `(swank:eval-and-grab-output
 	     ,(buffer-substring-no-properties (point-min) (point-max)))
 	   (cdr (assoc :package params)))))))))
-=======
-  (require 'slime)
-  (with-temp-buffer
-    (insert (org-babel-expand-body:clojure body params))
-    (let ((result
-           (slime-eval
-            `(swank:eval-and-grab-output
-              ,(buffer-substring-no-properties (point-min) (point-max)))
-            (cdr (assoc :package params)))))
-      (let ((result-params (cdr (assoc :result-params params))))
-        (org-babel-result-cond result-params
-          result
-          (condition-case nil (org-babel-script-escape result)
-            (error result)))))))
->>>>>>> maint
 
 (provide 'ob-clojure)
 
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 12c3c2b..497293b 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2740,16 +2740,8 @@ name is removed, since in that case the process will be executing
 remotely.  The file name is then processed by `expand-file-name'.
 Unless second argument NO-QUOTE-P is non-nil, the file name is
 additionally processed by `shell-quote-argument'"
-<<<<<<< HEAD
-  ((lambda (f) (if no-quote-p f (shell-quote-argument f)))
-   ;; We must apply `expand-file-name' on the whole filename.  If we
-   ;; would apply it on the local filename only, undesired effects
-   ;; like prepending a drive letter on MS Windows could happen.
-   (org-babel-local-file-name (expand-file-name name))))
-=======
-  (let ((f (expand-file-name (org-babel-local-file-name name))))
+  (let ((f (org-babel-local-file-name (expand-file-name name))))
     (if no-quote-p f (shell-quote-argument f))))
->>>>>>> maint
 
 (defvar org-babel-temporary-directory)
 (unless (or noninteractive (boundp 'org-babel-temporary-directory))
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 6bc53f8..3f156d0 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -75,51 +75,26 @@ current directory string."
   "Execute a block of Common Lisp code with Babel."
   (require 'slime)
   (org-babel-reassemble-table
-<<<<<<< HEAD
-   ((lambda (result)
-      (org-babel-result-cond (cdr (assoc :result-params params))
-	result
-	(condition-case nil
-	    (if (member "output" (cdr (assoc :result-params params)))
-		;; read printed output using normal org table parsing
-		(let ((tmp-file (org-babel-temp-file "lisp-output-")))
-		  (with-temp-file tmp-file (insert result))
-		  (org-babel-import-elisp-from-file tmp-file))
-	      ;; read valued output as lisp
-	      (read (org-babel-lisp-vector-to-list result)))
-	  (error result))))
-    (funcall (if (member "output" (cdr (assoc :result-params params)))
-		 #'car #'cadr)
-	     (with-temp-buffer
-	       (insert (org-babel-expand-body:lisp body params))
-	       (slime-eval `(swank:eval-and-grab-output
-			     ,(let ((dir (if (assoc :dir params)
-					     (cdr (assoc :dir params))
-					   default-directory)))
-				(format (format org-babel-lisp-dir-fmt dir)
-					(buffer-substring-no-properties
-					 (point-min) (point-max)))))
-			   (cdr (assoc :package params))))))
-=======
    (let ((result
-          (with-temp-buffer
-            (insert (org-babel-expand-body:lisp body params))
-            (slime-eval `(swank:eval-and-grab-output
-                          ,(let ((dir (if (assoc :dir params)
-                                          (cdr (assoc :dir params))
-                                        default-directory)))
-                             (format
-                              (if dir (format org-babel-lisp-dir-fmt dir)
-                                "(progn %s)")
-                              (buffer-substring-no-properties
-                               (point-min) (point-max)))))
-                        (cdr (assoc :package params))))))
+	  (funcall (if (member "output" (cdr (assoc :result-params params)))
+		       #'car #'cadr)
+		   (with-temp-buffer
+		     (insert (org-babel-expand-body:lisp body params))
+		     (slime-eval `(swank:eval-and-grab-output
+				   ,(let ((dir (if (assoc :dir params)
+						   (cdr (assoc :dir params))
+						 default-directory)))
+				      (format
+				       (if dir (format org-babel-lisp-dir-fmt dir)
+					 "(progn %s)")
+				       (buffer-substring-no-properties
+					(point-min) (point-max)))))
+				 (cdr (assoc :package params)))))))
      (org-babel-result-cond (cdr (assoc :result-params params))
        (car result)
        (condition-case nil
            (read (org-babel-lisp-vector-to-list (cadr result)))
          (error (cadr result)))))
->>>>>>> maint
    (org-babel-pick-name (cdr (assoc :colname-names params))
 			(cdr (assoc :colnames params)))
    (org-babel-pick-name (cdr (assoc :rowname-names params))
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f588a10..88213e3 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1367,21 +1367,13 @@ decides which time to use."
       (setq org--msg-extra "showing time in current clock instance")
       (current-time))
      ((equal cmt "today")
-<<<<<<< HEAD
-      (setq msg-extra "showing today's task time.")
+      (setq org--msg-extra "showing today's task time.")
       (let* ((dt (decode-time (current-time)))
 	     (hour (nth 2 dt))
 	     (day (nth 3 dt)))
 	(if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day)))
 	(setf (nth 2 dt) org-extend-today-until)
 	(setq dt (append (list 0 0) (nthcdr 2 dt)))
-=======
-      (setq org--msg-extra "showing today's task time.")
-      (let* ((dt (decode-time (current-time))))
-	(setq dt (append (list 0 0 0) (nthcdr 3 dt)))
-	(if org-extend-today-until
-	    (setf (nth 2 dt) org-extend-today-until))
->>>>>>> maint
 	(apply 'encode-time dt)))
      ((or (equal cmt "all")
 	  (and (or (not cmt) (equal cmt "auto"))