[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 40f43e6 04/12: Make discovery of current name optional
From: |
Artur Malabarba |
Subject: |
[elpa] master 40f43e6 04/12: Make discovery of current name optional |
Date: |
Wed, 14 Oct 2015 11:49:11 +0000 |
branch: master
commit 40f43e6862adea75003c0620ff85de7ca2c9f7e2
Author: Eivind Fonn <address@hidden>
Commit: Eivind Fonn <address@hidden>
Make discovery of current name optional
- Don't crash in buffers where the current name cannot be found.
- Add option to disable current name entirely
---
nameless.el | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/nameless.el b/nameless.el
index 8b7ce95..e971afb 100644
--- a/nameless.el
+++ b/nameless.el
@@ -82,6 +82,13 @@ variable.")
x)
safe))))
+(defcustom nameless-discover-current-name t
+ "If non-nil, discover package name automatically.
+If nil, `nameless-current-name' must be set explicitly, or left as nil,
+in which case only namespaces from `nameless-global-aliases' and
+`nameless-aliases' are used."
+ :type 'boolean)
+
(defface nameless-face
'((t :inherit font-lock-type-face))
"Face used on `nameless-prefix'")
@@ -242,18 +249,19 @@ Return S."
(define-minor-mode nameless-mode
nil nil " :" `((,(kbd "C-c C--") . nameless-insert-name))
(if nameless-mode
- (if (or nameless-current-name
- (ignore-errors (string-match "\\.el\\'" (lm-get-package-name))))
- (progn
- (unless nameless-current-name
- (setq nameless-current-name (replace-regexp-in-string
"\\(-mode\\)?\\.[^.]*\\'" "" (lm-get-package-name))))
- (add-function :filter-return (local
'filter-buffer-substring-function)
- #'nameless--filter-string)
- (apply #'nameless--add-keywords
- `((nil . ,nameless-current-name)
- ,@nameless-global-aliases
- ,@nameless-aliases)))
- (nameless-mode -1))
+ (progn
+ (when (and (not nameless-current-name)
+ nameless-discover-current-name
+ (ignore-errors (string-match "\\.el\\'"
(lm-get-package-name))))
+ (setq nameless-current-name
+ (replace-regexp-in-string "\\(-mode\\)?\\.[^.]*\\'" ""
(lm-get-package-name))))
+ (add-function :filter-return (local 'filter-buffer-substring-function)
+ #'nameless--filter-string)
+ (apply #'nameless--add-keywords
+ `(,@(when nameless-current-name
+ `((nil . ,nameless-current-name)))
+ ,@nameless-global-aliases
+ ,@nameless-aliases)))
(remove-function (local 'filter-buffer-substring-function)
#'nameless--filter-string)
(setq nameless-current-name nil)
- [elpa] master updated (f6d577b -> 1254161), Artur Malabarba, 2015/10/14
- [elpa] master 9e84a66 09/12: Style changes, Artur Malabarba, 2015/10/14
- [elpa] master d481765 02/12: [Fix #2 again] Private prefixes with the display property, Artur Malabarba, 2015/10/14
- [elpa] master f2b7501 07/12: Document new features, Artur Malabarba, 2015/10/14
- [elpa] master 005cb1f 01/12: Fix :type for nameless-affect-indentation-and-filling, Artur Malabarba, 2015/10/14
- [elpa] master 7ac7d99 08/12: Prepend the nameless face, Artur Malabarba, 2015/10/14
- [elpa] master a3dfd7e 10/12: Add url, Artur Malabarba, 2015/10/14
- [elpa] master 074c4d8 05/12: Merge pull request #11 from TheBB/optional-current-name, Artur Malabarba, 2015/10/15
- [elpa] master 7252f2e 03/12: Mark nameless-affect-indentation-and-filling as safe local, Artur Malabarba, 2015/10/15
- [elpa] master 40f43e6 04/12: Make discovery of current name optional,
Artur Malabarba <=
- [elpa] master 48a3fe4 11/12: Merge commit '9e84a66b07700bebb73592fe320c19794c206ce3', Artur Malabarba, 2015/10/15
- [elpa] master e4087c6 06/12: [Fix #9] Customizable separator, Artur Malabarba, 2015/10/15
- [elpa] master 1254161 12/12: Merge commit 'a3dfd7ecf9c58898241c8d1145eb8e0c875f5448', Artur Malabarba, 2015/10/15