branch: elpa/julia-mode
commit 7c1603c37f38b27d0247fca18cf0280b8b6e2375
Author: Marten Lienen <[email protected]>
Commit: Yichao Yu <[email protected]>
Use more common name for indentation setting
---
julia-mode.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/julia-mode.el b/julia-mode.el
index 916a274..401f84e 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -42,7 +42,7 @@
(defvar julia-mode-hook nil)
-(defvar julia-basic-offset)
+(defvar julia-indent-offset)
(defface julia-macro-face
'((t :inherit font-lock-preprocessor-face))
@@ -367,7 +367,7 @@ Do not move back beyond MIN."
(and pos
(progn
(goto-char pos)
- (+ julia-basic-offset (current-indentation))))))
+ (+ julia-indent-offset (current-indentation))))))
(defsubst julia--safe-backward-char ()
"Move back one character, but don't error if we're at the
@@ -436,7 +436,7 @@ with it. Returns nil if we're not within nested parens."
(end-of-line) (backward-char 1)
(and (equal (char-after (point)) ?=)
(not (julia-in-comment)))))
- (+ julia-basic-offset (current-indentation))
+ (+ julia-indent-offset (current-indentation))
nil)))
;; Indent according to how many nested blocks we are in.
(save-excursion
@@ -444,7 +444,7 @@ with it. Returns nil if we're not within nested parens."
(forward-to-indentation 0)
(let ((endtok (julia-at-keyword julia-block-end-keywords)))
(ignore-errors (+ (julia-last-open-block (- (point)
julia-max-block-lookback))
- (if endtok (- julia-basic-offset) 0)))))
+ (if endtok (- julia-indent-offset) 0)))))
;; Otherwise, use the same indentation as previous line.
(save-excursion (forward-line -1)
(current-indentation))
@@ -655,7 +655,7 @@ c"))
(set (make-local-variable 'syntax-propertize-function)
julia-syntax-propertize-function))
(set (make-local-variable 'indent-line-function) 'julia-indent-line)
- (set (make-local-variable 'julia-basic-offset) 4)
+ (set (make-local-variable 'julia-indent-offset) 4)
(setq indent-tabs-mode nil)
(setq imenu-generic-expression julia-imenu-generic-expression)
(imenu-add-to-menubar "Imenu"))