[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/sotlisp 89dfed2 04/11: Merge pull request #9 from jkitc
From: |
Stefan Monnier |
Subject: |
[elpa] externals/sotlisp 89dfed2 04/11: Merge pull request #9 from jkitchin/master |
Date: |
Fri, 26 Mar 2021 22:43:53 -0400 (EDT) |
branch: externals/sotlisp
commit 89dfed2b5d2e9a3b16bfc47f169412b583626059
Merge: fffe8d0 773b680
Author: Artur Malabarba <Malabarba@users.noreply.github.com>
Commit: GitHub <noreply@github.com>
Merge pull request #9 from jkitchin/master
Fix some typos.
---
README.md | 8 ++++----
sotlisp.el | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index a08172b..a8e2189 100644
--- a/README.md
+++ b/README.md
@@ -21,15 +21,15 @@ However, these are defined in a way such that they ONLY
expand in a
place where you would use a function, so hitting SPC after `(r`
expands to `(require '`, but hitting SPC after `(delete-region r` will
NOT expand the `r`, because that's obviously not a function.
-Furtheromre, `#'r` will expand to `#'require` (note how it ommits that
+Furtheromre, `#'r` will expand to `#'require` (note how it omits that
extra quote, since it would be useless here).
## Commands
-It also defines 4 commands, which really fit into this "follow the
+It also defines four commands, which really fit into this "follow the
thought-flow" way of writing. The bindings are as follows, I
understand these don't fully adhere to conventions, and I'd
-appreaciate suggestions on better bindings.
+appreciate suggestions on better bindings.
- `M-RET` :: Break line, and insert "()" with point in the middle.
- `C-RET` :: Do `forward-up-list', then do M-RET.
@@ -43,7 +43,7 @@ definition for it below the current function and leave point
inside.
- `C-c v` :: Same, but for variable.
With these commands, you just write your code as you think of it. Once
-you hit a "stop-point" of sorts in your tought flow, you hit `C-c f/v`
+you hit a "stop-point" of sorts in your thought flow, you hit `C-c f/v`
on any undefined functions/variables, write their definitions, and hit
`C-u C-SPC` to go back to the main function.
diff --git a/sotlisp.el b/sotlisp.el
index 6f279a3..44a7089 100644
--- a/sotlisp.el
+++ b/sotlisp.el
@@ -43,7 +43,7 @@
;; place where you would use a function, so hitting SPC after "(r"
;; expands to "(require '", but hitting SPC after "(delete-region r"
;; will NOT expand the `r', because that's obviously not a function.
-;; Furtheromre, "#'r" will expand to "#'require" (note how it ommits
+;; Furthermore, "#'r" will expand to "#'require" (note how it omits
;; that extra quote, since it would be useless here).
;;
;;; Commands
@@ -65,7 +65,7 @@
;; - C-c v :: Same, but for variable.
;;
;; With these commands, you just write your code as you think of it. Once
-;; you hit a "stop-point" of sorts in your tought flow, you hit `C-c f/v`
+;; you hit a "stop-point" of sorts in your thought flow, you hit `C-c f/v`
;; on any undefined functions/variables, write their definitions, and hit
;; `C-u C-SPC` to go back to the main function.
;;
@@ -88,7 +88,8 @@
"Non-nil if this buffer auto-inserts parentheses."
(or (bound-and-true-p electric-pair-mode)
(bound-and-true-p paredit-mode)
- (bound-and-true-p smartparens-mode)))
+ (bound-and-true-p smartparens-mode)
+ (bound-and-true-p lispy-mode)))
(defun sotlisp--looking-back (regexp)
(string-match
- [elpa] externals/sotlisp updated (fffe8d0 -> ed2356a), Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp c2936c5 01/11: Fix some typos., Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp cc5730c 08/11: Only expand abbrev when last-command-event is not a symbol char, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp cf14e18 09/11: Recognize argument lists in "let*" forms, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp ae38976 06/11: Merge pull request #10 from Wilfred/fix-typo, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp cc04912 05/11: Fix typo, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp 773b680 03/11: add lispy-mode., Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp 3ecc917 02/11: fix some typos, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp 89dfed2 04/11: Merge pull request #9 from jkitchin/master,
Stefan Monnier <=
- [elpa] externals/sotlisp f7add76 10/11: Recognize argument lists in more def- forms, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp ed2356a 11/11: Merge pull request #12 from yuhan0/patch-1, Stefan Monnier, 2021/03/26
- [elpa] externals/sotlisp d28cdf7 07/11: Only expand abbrev when (sotlisp--whitespace-char-p last-command-event), Stefan Monnier, 2021/03/26