[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master dc2fb41 06/15: Improve regexps
From: |
Artur Malabarba |
Subject: |
[elpa] master dc2fb41 06/15: Improve regexps |
Date: |
Thu, 03 Sep 2015 11:01:20 +0000 |
branch: master
commit dc2fb41c0adc3d9c00ac74a0c86a2f0a7f8d985a
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Improve regexps
---
nameless.el | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/nameless.el b/nameless.el
index 04f5a40..1de75b6 100644
--- a/nameless.el
+++ b/nameless.el
@@ -99,14 +99,17 @@
(save-excursion
(ignore-errors
(backward-up-list)
- (forward-sexp -2)
- (looking-at-p "def\\(un\\|macro\\)\\_>"))))
+ (or (progn (forward-sexp -1)
+ (looking-at-p "[a-z-]lambda\\_>"))
+ (progn (forward-sexp -1)
+ (looking-at-p
"\\(cl-\\)?def\\(un\\|macro\\|inline\\)\\*?\\_>"))))))
(defun nameless-insert-name (&optional self-insert)
"Insert the name of current package, with a hyphen."
(interactive "P")
(if (or self-insert
(not nameless-current-name)
+ (eq (char-before) ?\\)
(nameless--in-arglist-p)
(string-match (rx (or (syntax symbol)
(syntax word)))
@@ -116,7 +119,7 @@
(defun nameless--name-regexp (name)
"Return a regexp of the current name."
- (concat "\\<\\(" (regexp-quote name) "-\\)\\(\\s_\\|\\sw\\)"))
+ (concat "\\_<\\(" (regexp-quote name) "-\\)\\(\\s_\\|\\sw\\)"))
;;; Minor mode
@@ -134,6 +137,8 @@
(setq nameless-current-name-regexp (nameless--name-regexp
nameless-current-name)))
(nameless--add-keywords nameless-current-name-regexp))
(nameless-mode -1))
+ (setq nameless-current-name nil)
+ (setq nameless-current-name-regexp nil)
(nameless--remove-keywords)))
;; (font-lock-remove-keywords)
- [elpa] master updated (4de2352 -> e0a3544), Artur Malabarba, 2015/09/03
- [elpa] master dc2fb41 06/15: Improve regexps,
Artur Malabarba <=
- [elpa] master 3074f24 01/15: Initial commit, Artur Malabarba, 2015/09/03
- [elpa] master f662c5e 10/15: Fix composition, Artur Malabarba, 2015/09/03
- [elpa] master 2cd0e01 03/15: Autoload, Artur Malabarba, 2015/09/03
- [elpa] master 1a1719a 02/15: Add file, Artur Malabarba, 2015/09/03
- [elpa] master 7c425ed 12/15: Documentation, Artur Malabarba, 2015/09/03
- [elpa] master e23d22c 04/15: Implement disabling the mode too, Artur Malabarba, 2015/09/03
- [elpa] master e8922a6 05/15: Only hide prefix if something is written after it, Artur Malabarba, 2015/09/03
- [elpa] master 3690ce8 13/15: Add nameless-insert-name-or-self-insert command, Artur Malabarba, 2015/09/03
- [elpa] master b81dadf 08/15: Add nameless-affect-indentation variable, to decide between display and compose, Artur Malabarba, 2015/09/03
- [elpa] master 59d6da9 07/15: Change defaults a bit, Artur Malabarba, 2015/09/03