Skip to content

Make usable again in Emacs 27 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2019
Merged

Make usable again in Emacs 27 #448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4b13c
Remove redundant uses of 'one-or-more'
dgutov Nov 27, 2019
e35b356
Remove two more 'one-or-more' uses
dgutov Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions elixir-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
;; The first character of an identifier must be a letter or an underscore.
;; After that, they may contain any alphanumeric character + underscore.
;; Additionally, the final character may be either `?' or `!'.
(identifiers . ,(rx (one-or-more (any "A-Z" "a-z" "_"))
(identifiers . ,(rx (any "A-Z" "a-z" "_")
(zero-or-more (any "A-Z" "a-z" "0-9" "_"))
(optional (or "?" "!"))))
(keyword . ,(rx symbol-start
Expand All @@ -151,11 +151,11 @@
;; or `!'.
(module-names . ,(rx symbol-start
(optional (or "%" "&"))
(one-or-more (any "A-Z"))
(any "A-Z")
(zero-or-more (any "A-Z" "a-z" "_" "0-9"))
(zero-or-more
(and "."
(one-or-more (any "A-Z" "_"))
(any "A-Z" "_")
(zero-or-more (any "A-Z" "a-z" "_" "0-9"))))
(optional (or "!" "?"))
symbol-end))
Expand Down Expand Up @@ -304,7 +304,7 @@ is used to limit the scan."
(elixir-match-interpolation 0 font-lock-variable-name-face t)

;; Module attributes
(,(elixir-rx (and "@" (1+ identifiers)))
(,(elixir-rx (and "@" identifiers))
0 elixir-attribute-face)

;; Keywords
Expand Down Expand Up @@ -399,7 +399,7 @@ is used to limit the scan."
1 font-lock-variable-name-face)

;; Map keys
(,(elixir-rx (group (and (one-or-more identifiers) ":")) space)
(,(elixir-rx (group (and identifiers ":")) space)
1 elixir-atom-face)

;; Pseudovariables
Expand Down