Merge branch 'maint'

Conflicts:
	lib/observer/src/crashdump_viewer.erl
	lib/sasl/src/sasl.appup.src
	lib/stdlib/src/stdlib.appup.src

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
index f206d7e4c9..bdcb13f22d 100644
--- a/lib/observer/src/cdv_term_cb.erl
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -30,23 +30,31 @@ detail_pages() ->
     [{"Term", fun init_term_page/2}].
 
 init_term_page(ParentWin, {Type, [Term, Tab]}) ->
+    observer_lib:report_progress({ok,"Expanding term"}),
+    observer_lib:report_progress({ok,start_pulse}),
     Expanded = expand(Term, true),
     BinSaved = expand(Term, Tab),
+    observer_lib:report_progress({ok,stop_pulse}),
     cdv_multi_wx:start_link(
       ParentWin,
       [{"Format \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab)}},
        {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab)}},
        {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab)}},
+       {"Format \~tw",cdv_html_wx,{Type,format_term_fun("~tw",BinSaved,Tab)}},
        {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab)}},
        {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab)}}]).
 
 format_term_fun(Format,Term,Tab) ->
     fun() ->
+            observer_lib:report_progress({ok,"Formatting term"}),
+            observer_lib:report_progress({ok,start_pulse}),
 	    try io_lib:format(Format,[Term]) of
 		Str -> {expand, plain_html(Str), Tab}
 	    catch error:badarg ->
 		    Warning = "This term can not be formatted with " ++ Format,
 		    observer_html_lib:warning(Warning)
+            after
+                    observer_lib:report_progress({ok,stop_pulse})
 	    end
     end.