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

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc etc/NEWS
index de2e0b6bd89d19fe5bc2fc26bb1c6c29739fd15c,5883b4df2a7df417d684f2c99d551fd658296273..b2a44e4fd06b462cbe8a3fb6563f34a107d7e849
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -104,17 -92,13 +104,18 @@@ plus, minus, check-mark, start, etc
  The 'tool-bar-position' frame parameter can be set to 'bottom' on all
  window systems other than Nextstep.
  
 ++++
 +** 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`.
+ The code that allowed "..." to be expanded in the "*Backtrace*" buffer
+ should now work anywhere the data is generated by 'cl-print'.
  
- *** hash-tables' contents can be expanded via the ellipsis
+ *** hash-tables' contents can be expanded via the ellipsis.
  
  ** Modeline elements can now be right-aligned.
  Anything following the symbol 'mode-line-format-right-align' in

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/wid-edit.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/xdisp.c
Simple merge