Merge commit 'b67364d4825a9bf0a22261809ee9e9060b268198'

diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el
index a4cd9dca38dfa3efb80df60e67abd902ac4b24a0..ee5f6f82aa35080bc0982035a1fb287ebfd6a1e9 100644 (file)
--- a/packages/sotlisp/sotlisp.el
+++ b/packages/sotlisp/sotlisp.el
@@ -6,7 +6,7 @@
 ;; URL: https://github.com/Malabarba/speed-of-thought-lisp
 ;; Keywords: convenience, lisp
 ;; Package-Requires: ((emacs "24.1"))
-;; Version: 1.5.1
+;; Version: 1.5.2
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -469,7 +469,10 @@ If `speed-of-thought-mode' is already on, call ON."
                            #'comment-or-uncomment-sexp
                          #'sotlisp-comment-or-uncomment-sexp))
     ("\C-cf"    . sotlisp-find-or-define-function)
-    ("\C-cv"    . sotlisp-find-or-define-variable)))
+    ("\C-cv"    . sotlisp-find-or-define-variable))
+  (if sotlisp-mode
+      (abbrev-mode 1)
+    (kill-local-variable 'abbrev-mode)))
 
 (defun sotlisp-turn-on-everywhere ()
   "Call-once function to turn on sotlisp everywhere.