diff options
| author | Artur Malabarba <453029+Malabarba@users.noreply.github.com> | 2023-01-12 09:59:05 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 09:59:05 -0300 |
| commit | e468f3eea4518b9827419611868c897dce20453f (patch) | |
| tree | 1a34b1b7a52d9055a4caad7015a334d971b88d2b | |
| parent | a3a1ce3ec0c5724bcbfe553d831bd4f6b3fe863a (diff) | |
| parent | 264d58353efee4094ac989a6bbaefdde602566a6 (diff) | |
Merge pull request #29 from equwal/masterexternals/nameless
Fix issue #28 where nil nameless-separator is compared to strings.
| -rw-r--r-- | README.org | 2 | ||||
| -rw-r--r-- | nameless.el | 7 |
2 files changed, 4 insertions, 5 deletions
@@ -103,7 +103,7 @@ you package uses. Most packages use hyphens, but some use ~/~, ~|~, or ~:~. You can also set it to ~nil~ globally and the separator will never be -hidden. +hidden, and will not be inserted with `-name-insert-` functions. ** Indentation and paragraph filling Hiding parts of symbols could affect the way Emacs indents your code and fills your paragraphs. Nameless lets you decide whether you want diff --git a/nameless.el b/nameless.el index 98301e9..0da3c87 100644 --- a/nameless.el +++ b/nameless.el @@ -149,6 +149,7 @@ Value can also be nil, in which case the separator is never hidden." (beg (match-beginning 1)) (end (match-end 1)) (private-prefix (and nameless-private-prefix + nameless-separator (equal nameless-separator (substring (match-string 0) -1))))) (when private-prefix (setq beg (match-beginning 0)) @@ -232,11 +233,10 @@ configured, or if `nameless-current-name' is nil." (unless noerror (user-error "No name for alias `%s', see `nameless-aliases'" alias)))) (if nameless-current-name - (progn (insert nameless-current-name nameless-separator) + (progn (insert nameless-current-name (or nameless-separator "")) t) (unless noerror (user-error "No name for current buffer, see `nameless-current-name'"))))) - (defun nameless-insert-name-or-self-insert (&optional self-insert) "Insert the name of current package, with a hyphen. If point is in an argument list, or if we're typing an escaped @@ -252,13 +252,12 @@ character, insert the current character literally instead." (delete-region l (point)) (unless (nameless-insert-name 'noerror) (call-interactively #'self-insert-command))))) - (put 'nameless-insert-name-or-self-insert 'delete-selection t) (defun nameless--name-regexp (name) "Return a regexp of the current name." (concat "\\_<@?\\(" (regexp-quote name) - nameless-separator "\\)\\(\\s_\\|\\sw\\)")) + (or nameless-separator "") "\\)\\(\\s_\\|\\sw\\)")) (defun nameless--filter-string (s) "Remove from string S any disply or composition properties. |