branch: elpa/scala-mode commit 970d88eeff82df635ee12336ab1eb185585f30c6 Author: jilen <jilen.zh...@gmail.com> Commit: Sam Halliday <sam.halli...@gmail.com>
make keywords match case sensitive (#133) --- scala-mode-indent.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scala-mode-indent.el b/scala-mode-indent.el index 24c68c1..aa033fd 100644 --- a/scala-mode-indent.el +++ b/scala-mode-indent.el @@ -295,8 +295,9 @@ and are infact a sign of run-on. Reserved-symbols not included.") ((looking-at scala-indent:mustNotTerminate-line-beginning-re) t) ;; YES: end of prev line must not terminate - ((scala-syntax:looking-back-token - scala-indent:mustBeContinued-line-end-re) + ((let ((case-fold-search nil)) + (scala-syntax:looking-back-token + scala-indent:mustBeContinued-line-end-re)) t) ;; YES: this line starts with type param ((= (char-after) ?\[) @@ -542,7 +543,8 @@ keyword, or nil if not." (when point (goto-char point)) (scala-syntax:beginning-of-code-line) (or (scala-syntax:looking-back-token scala-syntax:body-start-re 3) - (scala-syntax:looking-back-token scala-indent:control-keywords-other-re) + (let ((case-fold-search nil)) + (scala-syntax:looking-back-token scala-indent:control-keywords-other-re)) (progn ;; if, else if (when (scala-syntax:looking-back-token ")" 1) @@ -561,7 +563,8 @@ keyword, or nil if not." (let ((declaration-end (scala-indent:body-p point))) (when declaration-end (goto-char declaration-end) - (if (looking-at scala-indent:control-keywords-re) + (if (let ((case-fold-search nil)) + (looking-at scala-indent:control-keywords-re)) (point) (when (scala-indent:backward-sexp-to-beginning-of-line) (scala-indent:goto-run-on-anchor