From 26c18dfff4cf3859f43278b0bbbbd7df572bf300 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 12 Aug 2011 16:05:54 +0800 Subject: [PATCH 1/3] Fix indentation for upstream slime --- src/swank/commands/indent.clj | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/swank/commands/indent.clj b/src/swank/commands/indent.clj index bafa9a81..a9f470a4 100644 --- a/src/swank/commands/indent.clj +++ b/src/swank/commands/indent.clj @@ -49,7 +49,6 @@ (when (or (= body-position 'defun) (not (neg? body-position))) (list (name (:name (meta var))) - '. body-position))))) (defn- get-cache-update-for-var @@ -68,7 +67,7 @@ (remove nil? (map (partial get-cache-update-for-var find-in-cache) (vals (ns-interns ns)))))) (defn- update-indentation-delta - "Update the cache and return the changes in a (symbol '. indent) list. + "Update the cache and return the changes in a (symbol indent) list. If FORCE is true then check all symbols, otherwise only check symbols belonging to the buffer package" ([cache-ref load-all-ns?] -- 1.7.7 From 4da89520a01a4cb4463f995a678e5f0ecc877256 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 12 Aug 2011 16:06:16 +0800 Subject: [PATCH 2/3] Fix eval-for-emacs for slime upstream --- src/swank/core.clj | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/swank/core.clj b/src/swank/core.clj index 540f50cd..40646071 100644 --- a/src/swank/core.clj +++ b/src/swank/core.clj @@ -243,7 +243,7 @@ values." (send-to-emacs `(:return ~(thread-name (current-thread)) (:ok ~result) ~id))) ;; swank function not defined, abort - (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort) ~id)))) + (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort ~(str (Exception. (str "unknow swank function " (first form))))) ~id)))) (catch Throwable t ;; Thread/interrupted clears this thread's interrupted status; if ;; Thread.stop was called on us it may be set and will cause an @@ -255,19 +255,19 @@ values." (cond (debug-quit-exception? t) (do - (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort) ~id)) + (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort ~(str (.getCause t))) ~id)) (if-not (zero? *sldb-level*) (throw t))) (debug-abort-exception? t) (do - (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort) ~id)) + (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort ~(str (.getCause t))) ~id)) (if-not (zero? *sldb-level*) (throw debug-abort-exception))) (debug-continue-exception? t) (do - (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort) ~id)) + (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort ~(str (.getCause t))) ~id)) (throw t)) (debugger-exception? t) @@ -281,7 +281,7 @@ values." (if debug-swank-clojure t (or (.getCause t) t)) id) ;; reply with abort - (finally (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort) ~id))))))))) + (finally (send-to-emacs `(:return ~(thread-name (current-thread)) (:abort ~(str (.getCause t))) ~id))))))))) (defn- add-active-thread [thread] (dosync -- 1.7.7 From ce233660abca967d73a71a400d46ee0d1aa8fa2e Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 13 Aug 2011 02:31:37 +0800 Subject: [PATCH 3/3] Update the protocol version --- src/swank/core.clj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/swank/core.clj b/src/swank/core.clj index 40646071..1aed2032 100644 --- a/src/swank/core.clj +++ b/src/swank/core.clj @@ -8,7 +8,7 @@ (:require (swank.util.concurrent [mbox :as mb]))) ;; Protocol version -(defonce protocol-version (atom "20100404")) +(defonce protocol-version (atom "2011-10-19")) ;; Emacs packages (def #^{:dynamic true} *current-package*) -- 1.7.7