[elpa] master 16506d7 5/5: Merge commit 'fffe8d0b42b143a2e7df0470d9049fa57b6ecac5'

[Artur Malabarba]

branch: master
commit 16506d762e15dffa8e33ced92d85396a9ba86b0a
Merge: 98e1de1 fffe8d0
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit 'fffe8d0b42b143a2e7df0470d9049fa57b6ecac5'
---
 packages/sotlisp/sotlisp.el |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el
index 2ceb382..792fe1d 100644
--- 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.2
+;; Version: 1.6.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
@@ -81,6 +81,7 @@
 ;;   (with-temp-buffer (insert text))
 
 ;;; Code:
+(require 'skeleton)
 
 ;;; Predicates
 (defun sotlisp--auto-paired-p ()
@@ -101,7 +102,7 @@ Specially, avoids matching inside argument lists."
        (not (sotlisp--looking-back 
"(\\(defun\\s-+.*\\|\\(lambda\\|dolist\\|dotimes\\)\\s-+\\)("))
        (save-excursion
          (forward-char -1)
-         (condition-case er
+         (condition-case nil
              (progn
                (backward-up-list)
                (forward-sexp -1)
@@ -203,8 +204,14 @@ See `sotlisp-define-function-abbrev'."
     (skip-chars-backward (rx alnum))
     (let* ((name (buffer-substring (point) r))
            (expansion (gethash name sotlisp--function-table)))
-      (if (not expansion)
-          (progn (goto-char r) nil)
+      (cond
+       ((not expansion) (progn (goto-char r) nil))
+       ((consp expansion)
+        (delete-region (point) r)
+        (let ((skeleton-end-newline nil))
+          (skeleton-insert (cons "" expansion)))
+        t)
+       ((stringp expansion)
         (delete-region (point) r)
         (if (sotlisp--function-quote-p)
             ;; After #' use the simple expansion.
@@ -214,7 +221,7 @@ See `sotlisp-define-function-abbrev'."
           (when (string-match "\\$" expansion)
             (setq sotlisp--needs-moving t)))
         ;; Must be last.
-        (sotlisp--post-expansion-cleanup)))))
+        (sotlisp--post-expansion-cleanup))))))
 
 (put 'sotlisp--expand-function 'no-self-insert t)
 
@@ -295,12 +302,12 @@ The space char is not included.  Any \"$\" are also 
removed."
     ("jos" . "just-one-space")
     ("jr" . "json-read$")
     ("jtr" . "jump-to-register ")
-    ("k" . "kbd \"$\"")
+    ("k" . ("kbd " (format "%S" (key-description (read-key-sequence-vector 
"Key: ")))))
     ("kb" . "kill-buffer")
     ("kn" . "kill-new ")
     ("kp" . "keywordp ")
     ("l" . "lambda ($)")
-    ("la" . "looking-at \"$\"")
+    ("la" . ("looking-at \"" - "\""))
     ("lap" . "looking-at-p \"$\"")
     ("lb" . "looking-back \"$\"")
     ("lbp" . "line-beginning-position")