diff options
author | Steve Vinoski <[email protected]> | 2014-01-10 19:57:58 -0500 |
---|---|---|
committer | Steve Vinoski <[email protected]> | 2014-01-10 19:57:58 -0500 |
commit | fbefef025128e65fdfb562b485820dcb1ab04e99 (patch) | |
tree | 35ee66c1ede8c1da9c6821395d2b1927a468404f | |
parent | 25237481ccccd3ddfa74582dc267632ad618ba30 (diff) | |
download | otp-fbefef025128e65fdfb562b485820dcb1ab04e99.tar.gz otp-fbefef025128e65fdfb562b485820dcb1ab04e99.tar.bz2 otp-fbefef025128e65fdfb562b485820dcb1ab04e99.zip |
fix indentation error from scan-sexp in erlang.el
Fix an indentation error being returned by scan-sexp, and add a new
indentation test case for the error.
-rw-r--r-- | lib/tools/emacs/erlang.el | 2 | ||||
-rw-r--r-- | lib/tools/emacs/test.erl.indented | 5 | ||||
-rw-r--r-- | lib/tools/emacs/test.erl.orig | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index c395d22356..3ab73dca86 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -3038,7 +3038,7 @@ This assumes that the preceding expression is either simple \(i.e. an atom) or parenthesized." (save-excursion (or arg (setq arg 1)) - (forward-sexp (- arg)) + (ignore-errors (forward-sexp (- arg))) (let ((col (current-column))) (skip-chars-backward " \t") ;; Special hack to handle: (note line break) diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented index 7e61bcc45b..ba173a8cc2 100644 --- a/lib/tools/emacs/test.erl.indented +++ b/lib/tools/emacs/test.erl.indented @@ -731,3 +731,8 @@ commas_first() -> ] } ] }. + + +%% this used to result in a scan-sexp error +[{ + }]. diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig index 932758997d..cb3d1f94dc 100644 --- a/lib/tools/emacs/test.erl.orig +++ b/lib/tools/emacs/test.erl.orig @@ -731,3 +731,8 @@ commas_first() -> ] } ] }. + + +%% this used to result in a scan-sexp error +[{ +}]. |