[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 55aab32 7/7: Merge commit '68160bad14b031b069f30f1bd494ba4
From: |
Artur Malabarba |
Subject: |
[elpa] master 55aab32 7/7: Merge commit '68160bad14b031b069f30f1bd494ba4f252321c1' |
Date: |
Mon, 22 Feb 2016 16:16:00 +0000 |
branch: master
commit 55aab326a1213fac44ff0ec2a8df34cc3f79e205
Merge: e3a5dbc 68160ba
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Merge commit '68160bad14b031b069f30f1bd494ba4f252321c1'
---
packages/sotlisp/sotlisp.el | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el
index 09728cb..a4cd9dc 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.4.1
+;; Version: 1.5.1
;; 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
@@ -98,7 +98,17 @@
"Non-nil if point is at the start of a sexp.
Specially, avoids matching inside argument lists."
(and (eq (char-before) ?\()
- (not (sotlisp--looking-back "(\\(defun\\s-+.*\\|lambda\\s-+\\)("))
+ (not (sotlisp--looking-back
"(\\(defun\\s-+.*\\|\\(lambda\\|dolist\\|dotimes\\)\\s-+\\)("))
+ (save-excursion
+ (forward-char -1)
+ (condition-case er
+ (progn
+ (backward-up-list)
+ (forward-sexp -1)
+ (not
+ (looking-at-p (rx (* (or (syntax word) (syntax symbol) "-"))
+ "let" symbol-end))))
+ (error t)))
(not (string-match (rx (syntax symbol)) (string last-command-event)))))
(defun sotlisp--function-quote-p ()
@@ -252,11 +262,13 @@ The space char is not included. Any \"$\" are also
removed."
("dfv" . "defvar $ t\n \"\"")
("dk" . "define-key ")
("dl" . "dolist (it $)")
+ ("dt" . "dotimes (it $)")
("dmp" . "derived-mode-p '")
("dm" . "defmacro $ ()\n \"\"\n ")
("dr" . "delete-region ")
("dv" . "defvar $ t\n \"\"")
("e" . "error \"$\"")
+ ("ef" . "executable-find ")
("efn" . "expand-file-name ")
("eol" . "end-of-line")
("f" . "format \"$\"")
@@ -340,7 +352,7 @@ The space char is not included. Any \"$\" are also
removed."
("sf" . "search-forward $ nil 'noerror")
("sfr" . "search-forward-regexp $ nil 'noerror")
("sic" . "self-insert-command")
- ("sl" . "string<")
+ ("sl" . "setq-local ")
("sm" . "string-match \"$\"")
("smd" . "save-match-data")
("sn" . "symbol-name ")
@@ -354,6 +366,8 @@ The space char is not included. Any \"$\" are also
removed."
("sw" . "selected-window$")
("syp" . "symbolp ")
("tap" . "thing-at-point 'symbol")
+ ("tf" . "thread-first ")
+ ("tl" . "thread-last ")
("u" . "unless ")
("ul" . "up-list")
("up" . "unwind-protect\n(progn $)")
- [elpa] master updated (e3a5dbc -> 55aab32), Artur Malabarba, 2016/02/22
- [elpa] master d5d5ae4 4/7: More abbrev, Artur Malabarba, 2016/02/22
- [elpa] master 16c8b37 5/7: More abbrev, Artur Malabarba, 2016/02/22
- [elpa] master e7d585b 1/7: Don't expand in let bindings (Finally!!!), Artur Malabarba, 2016/02/22
- [elpa] master 68160ba 6/7: Version bump, Artur Malabarba, 2016/02/22
- [elpa] master 55aab32 7/7: Merge commit '68160bad14b031b069f30f1bd494ba4f252321c1',
Artur Malabarba <=
- [elpa] master b512a3d 2/7: More abbrevs, Artur Malabarba, 2016/02/22
- [elpa] master c43b31e 3/7: Improvements to sotlisp--function-form-p, Artur Malabarba, 2016/02/22