]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into feature/android
authorPo Lu <luangruo@yahoo.com>
Thu, 13 Jul 2023 23:58:49 +0000 (07:58 +0800)
committerPo Lu <luangruo@yahoo.com>
Thu, 13 Jul 2023 23:58:49 +0000 (07:58 +0800)
1  2 
etc/NEWS
lisp/button.el
lisp/files.el
lisp/ielm.el
src/lread.c
src/process.c

diff --cc etc/NEWS
index 8150c71af11e36d7aecfc50d8cb6b6dee42c95c8,3e56fbb973caee400fbffcb816bde26da800abee..d0bbec185193e783f1064e9bdb2bef5dae98c981
+++ b/etc/NEWS
@@@ -104,11 -92,10 +104,15 @@@ 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.
 +
+ ** 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`.
  ** Modeline elements can now be right-aligned.
  Anything following the symbol 'mode-line-format-right-align' in
  'mode-line-format' will be right-aligned.  Exactly where it is
diff --cc lisp/button.el
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/ielm.el
Simple merge
diff --cc src/lread.c
Simple merge
diff --cc src/process.c
Simple merge