Skip to content

update livescript-mode.el #3

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

Open
Atlas48 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update livescript-mode.el #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3213038
update livescript-mode.el
Atlas48 May 13, 2019
906cd05
a few more keywords
Atlas48 May 13, 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
11 changes: 6 additions & 5 deletions livescript-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
;; Customizable Variables
;;

(defconst livescript-mode-version "0.4.1"
(defconst livescript-mode-version "0.4.2"
"The version of `livescript-mode'.")

(defgroup livescript nil
Expand All @@ -152,7 +152,7 @@
:type 'integer
:group 'livescript)

(defcustom livescript-command "livescript"
(defcustom livescript-command "lsc"
"The LiveScript command used for evaluating code."
:type 'string
:group 'livescript)
Expand All @@ -167,7 +167,7 @@
:type 'string
:group 'livescript)

(defcustom livescript-args-repl '("-i")
(defcustom livescript-args-repl '("")
"The arguments to pass to `livescript-command' to start a REPL."
:type 'list
:group 'livescript)
Expand Down Expand Up @@ -385,7 +385,7 @@ called `livescript-compiled-buffer-name'."
'("if" "else" "new" "return" "try" "catch"
"finally" "throw" "break" "continue" "for" "in" "while"
"delete" "instanceof" "typeof" "switch" "super" "extends"
"class" "until" "loop"))
"class" "until" "loop" "require"))

;; Reserved keywords either by JS or CS.
(defvar livescript-js-reserved
Expand All @@ -396,7 +396,8 @@ called `livescript-compiled-buffer-name'."
;; LiveScript keywords.
(defvar livescript-cs-keywords
'("then" "unless" "and" "or" "is" "own"
"isnt" "not" "of" "by" "when"))
"isnt" "not" "of" "by" "when" "typeof!"
"require!" "export"))

;; Iced LiveScript keywords
(defvar iced-livescript-cs-keywords
Expand Down