[nongnu] elpa/julia-mode 274e4c5 009/352: adding convert() and conversion syntax

[ELPA Syncer]

branch: elpa/julia-mode
commit 274e4c5bae829a83e54d0ca7a839845ea900e4ff
Author: Jeff Bezanson <bezanson@post.harvard.edu>
Commit: Yichao Yu <yyc1992@gmail.com>

    adding convert() and conversion syntax
---
 julia-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/julia-mode.el b/julia-mode.el
index 55e8a1e..86472d9 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -45,14 +45,14 @@
          (mapconcat
           'identity
           '("if" "else" "elseif" "while" "for" "begin" "end" "block"
-            "try" "return" "local" "type" "function" "new" "quote"
-           "typealias" "break" "continue")
+            "try" "catch" "return" "local" "type" "function" "new" "quote"
+           "typealias" "break" "continue" "conversion" "global")
           "\\|") "\\)\\>")
      'font-lock-keyword-face)
     '("\\\\\\s-*\".*?\"" . font-lock-string-face)))
 
 (defconst julia-block-start-keywords
-  (list "if" "while" "for" "begin" "try" "type" "function"))
+  (list "if" "while" "for" "begin" "try" "type" "function" "conversion"))
 
 (defconst julia-block-other-keywords
   (list "else" "elseif"))