extended to cover the case for composite_emacs. (cherry picked from commit ad3f4b2778c18b1922b45500094cd30997fe66cd)
extended to cover the case for composite_emacs.
(cherry picked from commit ad3f4b2778c18b1922b45500094cd30997fe66cd)

andrzejsliwa/wrangler,tdb/wrangler,bsmr-erlang/wrangler,arcusfelis/wrangler,prowessproject/wrangler,arcusfelis/wrangler