summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:07:00 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:07:00 -0700
commit1a86b5d6074d26d1a3a978cb52b2147b6f359694 (patch)
tree5b609435fb29b6f62766ddd51d8649013913970e /etc
parentc5823cdae3de078e6db58df25769011ef3e52f36 (diff)
parentd4c6774f40b6ae1fad091f66e8e43913bc9a2724 (diff)
Merge from origin/emacs-25
d4c6774 Fix missing point information in undo 3a9d629 Avoid crashes when buffer modification hooks clobber match data 178b2f5 Note combine-and-quote-strings doesn't shell quote dec7567 Explain when package-initialize isn't called 113d1e2 Fix escaping in sh-indent-after-continuation docstr 80e2044 ; * etc/NEWS: Improve previous change. 5bb9e6c ; * etc/NEWS: Document how to avoid horizontal scroll bars. 38f4b8e Clarify the documentation of back-references in replacements
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f845c1d776..c9b33c8226 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2452,6 +2452,15 @@ scroll bars on the selected frame.
'scroll-bar-height' to set horizontal scroll bars and their height
for individual frames and in 'default-frame-alist'.
+***** The 'horizontal-scroll-bars' parameter was already present and non-nil
+by default in Emacs 24 and before (although it didn't have any
+effect). This could cause a problem if you share your desktop files
+with older versions of Emacs: saving desktop in Emacs before v25.1,
+then restoring it in v25.1 would turn on horizontal scroll bars in all
+buffers. To resolve this issue, put this in your ~/.emacs init file:
+
+ (modify-all-frames-parameters '((horizontal-scroll-bars . nil)))
+
**** New functions 'frame-scroll-bar-height' and
'window-scroll-bar-height' return the height of horizontal scroll
bars on a specific frame or window.