[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master af81566 5/5: Merge commit '5c540d26479df04e7fc6b9979270745
From: |
Artur Malabarba |
Subject: |
[elpa] master af81566 5/5: Merge commit '5c540d26479df04e7fc6b99792707457df174528' |
Date: |
Fri, 25 Sep 2015 23:08:17 +0000 |
branch: master
commit af815663b8a7f52f7af8effaecdb887dca17ba0a
Merge: 4f16bbc 5c540d2
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Merge commit '5c540d26479df04e7fc6b99792707457df174528'
---
packages/sotlisp/sotlisp.el | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el
index 5e3dcb4..f1536a0 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.3
+;; Version: 1.4
;; 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
@@ -360,6 +360,7 @@ The space char is not included. Any \"$\" are also
removed."
("wl" . "when-let (($))")
("we" . "window-end")
("ws" . "window-start")
+ ("wsw" . "with-selected-window ")
("wtb" . "with-temp-buffer")
("wtf" . "with-temp-file ")
)
@@ -596,6 +597,7 @@ With a prefix argument, defines a `defvar' instead of a
`defcustom'."
"Uncomment a sexp around point."
(interactive "P")
(let* ((initial-point (point-marker))
+ (inhibit-field-text-motion t)
(p)
(end (save-excursion
(when (elt (syntax-ppss) 4)
@@ -607,25 +609,31 @@ With a prefix argument, defines a `defvar' instead of a
`defcustom'."
(point-marker)))
(beg (save-excursion
(forward-line 0)
- (while (= end (save-excursion
- (comment-forward (point-max))
- (point)))
+ (while (and (not (bobp))
+ (= end (save-excursion
+ (comment-forward (point-max))
+ (point))))
(forward-line -1))
(goto-char (line-end-position))
(re-search-backward comment-start-skip
(line-beginning-position)
t)
- (while (looking-at-p comment-start-skip)
- (forward-char -1))
+ (ignore-errors
+ (while (looking-at comment-start-skip)
+ (forward-char -1))
+ (unless (looking-at "[\n\r[:blank]]")
+ (forward-char 1)))
(point-marker))))
(unless (= beg end)
(uncomment-region beg end)
(goto-char p)
;; Indentify the "top-level" sexp inside the comment.
- (while (and (ignore-errors (backward-up-list) t)
- (>= (point) beg))
- (skip-chars-backward (rx (syntax expression-prefix)))
- (setq p (point-marker)))
+ (ignore-errors
+ (while (>= (point) beg)
+ (backward-prefix-chars)
+ (skip-chars-backward "\r\n[:blank:]")
+ (setq p (point-marker))
+ (backward-up-list)))
;; Re-comment everything before it.
(ignore-errors
(comment-region beg p))
@@ -639,7 +647,7 @@ With a prefix argument, defines a `defvar' instead of a
`defcustom'."
;; If this is a closing delimiter, pull it up.
(goto-char end)
(skip-chars-forward "\r\n[:blank:]")
- (when (= 5 (car (syntax-after (point))))
+ (when (eq 5 (car (syntax-after (point))))
(delete-indentation))))
;; Without a prefix, it's more useful to leave point where
;; it was.