Merge remote-tracking branch 'origin/master' into feature/android

diff --cc etc/NEWS
index d0bbec185193e783f1064e9bdb2bef5dae98c981,d7f5fdc4cbb3a82d6cb1f5ab1cc71fded842a8dc..9f09bb0245d91c7a17fe0d571f54a9d83a736ed0
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -104,12 -92,8 +104,13 @@@ plus, minus, check-mark, start, etc
  The 'tool-bar-position' frame parameter can be set to 'bottom' on all
  window systems other than Nextstep.
  
- ** You can expand the "..." truncation everywhere.
 ++++
 +** New global minor mode 'modifier-bar-mode'.
 +When this minor mode is enabled, buttons representing modifier keys
 +are displayed along the tool bar.
 +
+ ** cl-print
+ *** You can expand the "..." truncation everywhere.
  The code that allowed "..." to be expanded in the *Backtrace* should
  now work anywhere the data is generated by `cl-print`.
  

diff --cc lisp/startup.el
Simple merge

diff --cc src/frame.h
Simple merge