aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-01-22 11:46:44 +0100
committerDan Gudmundsson <[email protected]>2014-01-22 11:46:44 +0100
commit2d102988bd1a2d4f3aba534bccd3b57d458c102f (patch)
treec28d416042eada101bbb8629ba2bc0ffccec942d /lib
parent5245c80ac760a2757611a39fd3923e31ec4aeb21 (diff)
parentfbefef025128e65fdfb562b485820dcb1ab04e99 (diff)
downloadotp-2d102988bd1a2d4f3aba534bccd3b57d458c102f.tar.gz
otp-2d102988bd1a2d4f3aba534bccd3b57d458c102f.tar.bz2
otp-2d102988bd1a2d4f3aba534bccd3b57d458c102f.zip
Merge remote-tracking branch 'vinoski/vinoski/emacs-sexp-error' into vinoski/emacs-fixes
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/emacs/erlang.el2
-rw-r--r--lib/tools/emacs/test.erl.indented5
-rw-r--r--lib/tools/emacs/test.erl.orig5
3 files changed, 11 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 6bd221f88f..3a868f1300 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -3045,7 +3045,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 0de626125c..0dc1b47f0d 100644
--- a/lib/tools/emacs/test.erl.indented
+++ b/lib/tools/emacs/test.erl.indented
@@ -744,3 +744,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 57263d573b..c7d2dc4ce5 100644
--- a/lib/tools/emacs/test.erl.orig
+++ b/lib/tools/emacs/test.erl.orig
@@ -744,3 +744,8 @@ commas_first() ->
] }
]
}.
+
+
+%% this used to result in a scan-sexp error
+[{
+}].