diff options
| author | Dan Gudmundsson <[email protected]> | 2010-03-15 10:46:58 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-03-15 14:09:56 +0100 |
| commit | 228e1f013f99e2d2fb4ee0f7a9cb5d21638756a8 (patch) | |
| tree | 76d265cd44a03fd6fcf35d37e0b7e4bf82791a0d | |
| parent | bffb3a3f3b1406bd6069f9266846b14b307ce026 (diff) | |
| download | otp-228e1f013f99e2d2fb4ee0f7a9cb5d21638756a8.tar.gz otp-228e1f013f99e2d2fb4ee0f7a9cb5d21638756a8.tar.bz2 otp-228e1f013f99e2d2fb4ee0f7a9cb5d21638756a8.zip | |
Fix another -spec() problem
| -rw-r--r-- | lib/tools/emacs/erlang.el | 3 | ||||
| -rw-r--r-- | lib/tools/emacs/test.erl.indented | 2 | ||||
| -rw-r--r-- | lib/tools/emacs/test.erl.orig | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index be2c10ab88..a84f40244d 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -2653,7 +2653,8 @@ Value is list (stack token-start token-type in-what)." (cond ((eq (car (car stack)) '\() (erlang-pop stack) (if (and (eq (car (car stack)) 'fun) - (eq (car (car (cdr stack))) '::)) + (or (eq (car (car (last stack))) 'spec) + (eq (car (car (cdr stack))) '::))) ;; -type() ;; Inside fun type def ') closes fun definition (erlang-pop stack))) ((eq (car (car stack)) 'icr) diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented index 45b876f718..faf1cc68ef 100644 --- a/lib/tools/emacs/test.erl.indented +++ b/lib/tools/emacs/test.erl.indented @@ -146,6 +146,8 @@ | {'del_member', name(), pid()}, #state{}) -> {'noreply', #state{}}. +-spec all(fun((T) -> boolean()), List :: [T]) -> + boolean() when is_subtype(T, term()). % (*) -spec get_closest_pid(term()) -> Return :: pid() diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig index bae17d3ff0..764566005a 100644 --- a/lib/tools/emacs/test.erl.orig +++ b/lib/tools/emacs/test.erl.orig @@ -146,6 +146,8 @@ t15(),t20(),t21(), t22(),t25()}. | {'del_member', name(), pid()}, #state{}) -> {'noreply', #state{}}. +-spec all(fun((T) -> boolean()), List :: [T]) -> + boolean() when is_subtype(T, term()). % (*) -spec get_closest_pid(term()) -> Return :: pid() |