diff options
| author | Henrik Nord <[email protected]> | 2014-01-14 14:38:19 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-01-14 14:38:22 +0100 |
| commit | dd41becd704be23008129c84d9a044e6b52d0695 (patch) | |
| tree | 2305bd792701a674554d0eb3e0036d8724d8d2d7 /lib | |
| parent | e77f48d8278d037191ceec1ec5906081b815c408 (diff) | |
| parent | 4786edd54b57497f70a22decad21acd1b5557709 (diff) | |
| download | otp-dd41becd704be23008129c84d9a044e6b52d0695.tar.gz otp-dd41becd704be23008129c84d9a044e6b52d0695.tar.bz2 otp-dd41becd704be23008129c84d9a044e6b52d0695.zip | |
Merge branch 'puzza007/remove-query-reserved-word-from-emacs-mode'
* puzza007/remove-query-reserved-word-from-emacs-mode:
remove support for query keyword from emacs mode
OTP-11568
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index c1e9bec6ae..fd90e3a870 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -620,7 +620,6 @@ resulting regexp is surrounded by \\_< and \\_>." "if" "let" "of" - "query" "receive" "try" "when") @@ -2608,7 +2607,7 @@ Value is list (stack token-start token-type in-what)." (erlang-skip-blank to))) (eq (following-char) ?\()) (erlang-push (list 'fun token (current-column)) stack))) - ((looking-at "\\(begin\\|query\\)[^_a-zA-Z0-9]") + ((looking-at "\\(begin\\)[^_a-zA-Z0-9]") (erlang-push (list 'begin token (current-column)) stack)) ;; Normal when case ;;((looking-at "when\\s ") @@ -3118,7 +3117,7 @@ This assumes that the preceding expression is either simple (defun erlang-at-keyword () "Are we looking at an Erlang keyword which will increase indentation?" - (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|query\\|" + (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|" "of\\|receive\\|after\\|catch\\|try\\)[^_a-zA-Z0-9]"))) (defun erlang-at-operator () |