Merge from origin/emacs-27

071483b6f5 Fix reverting customizations
43203d5068 * lisp/loadup.el: Set max-specpdl-size to 1800 when loadin...
fab3674b36 Revert "Raise default max-specpdl-size value"
42f66aa502 ; Fix NEWS.24
bb9402e6e9 Raise default max-specpdl-size value

1 files changed, 7 insertions, 3 deletions

diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 8207a8ca59a..60c2b4dfc66 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -3604,10 +3604,12 @@ advertised at the time.)
 
 ** Debugger changes
 
-*** New macro `condition-case-unless-debug' (this was actually added in
-Emacs 23.1 as condition-case-no-debug, but not advertised)
+*** New macro `condition-case-unless-debug'.
+(This was actually added in Emacs 23.1 as condition-case-no-debug, but
+not advertised)
 
-*** The macro `with-demoted-errors' was added in Emacs 23.1, but not advertised.
+*** The macro `with-demoted-errors'.
+It was also added in Emacs 23.1, but not advertised.
 
 *** Variable `stack-trace-on-error' removed.
 
@@ -3691,6 +3693,8 @@ argument is supplied (see Trash changes, above).
 
 *** New file predicates: `file-equal-p', `file-in-directory-p'.
 
+*** New function `file-size-human-readable'.
+
 ** Tool-bars can display separators.
 Tool-bar separators are handled like menu separators in menu-bar maps,
 i.e. via menu entries of the form `(menu-item "--")'.