branch: elpa/julia-mode
commit 7304a4aae119d3c9582747e4a4269bc594f288f1
Author: Jeff Bezanson <jeff.bezan...@gmail.com>
Commit: Yichao Yu <yyc1...@gmail.com>
rename None to Union(), and Nothing to Void. fixes #8423
I also use Bottom === Union() some places in Base.
remove a couple redundant show methods that snuck in somehow.
remove some missed 0.3 deprecations in cconvert.
---
julia-mode.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/julia-mode.el b/julia-mode.el
index 1ba6800..59c14e0 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -145,7 +145,7 @@
(defconst julia-font-lock-keywords
(list
-
'("\\<\\(\\|Uint\\(8\\|16\\|32\\|64\\|128\\)\\|Int\\(8\\|16\\|32\\|64\\|128\\)\\|BigInt\\|Integer\\|BigFloat\\|FloatingPoint\\|Float16\\|Float32\\|Float64\\|Complex128\\|Complex64\\|ComplexPair\\|Bool\\|Char\\|DataType\\|Number\\|Real\\|Int\\|Uint\\|Array\\|DArray\\|AbstractArray\\|AbstractVector\\|AbstractMatrix\\|AbstractSparseMatrix\\|SubArray\\|StridedArray\\|StridedVector\\|StridedMatrix\\|VecOrMat\\|StridedVecOrMat\\|DenseArray\\|Range\\|OrdinalRange\\|StepRange\\|UnitRange\\|Fl
[...]
+
'("\\<\\(\\|Uint\\(8\\|16\\|32\\|64\\|128\\)\\|Int\\(8\\|16\\|32\\|64\\|128\\)\\|BigInt\\|Integer\\|BigFloat\\|FloatingPoint\\|Float16\\|Float32\\|Float64\\|Complex128\\|Complex64\\|ComplexPair\\|Bool\\|Char\\|DataType\\|Number\\|Real\\|Int\\|Uint\\|Array\\|DArray\\|AbstractArray\\|AbstractVector\\|AbstractMatrix\\|AbstractSparseMatrix\\|SubArray\\|StridedArray\\|StridedVector\\|StridedMatrix\\|VecOrMat\\|StridedVecOrMat\\|DenseArray\\|Range\\|OrdinalRange\\|StepRange\\|UnitRange\\|Fl
[...]
font-lock-type-face)
(cons julia-keyword-regex 'font-lock-keyword-face)
(cons julia-macro-regex 'font-lock-keyword-face)
