1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge branch 'scratch/no-purespace' into 'master'

This commit is contained in:
Stefan Kangas 2025-02-01 04:56:52 +01:00
commit bf97946d7d
181 changed files with 2108 additions and 9370 deletions

View file

@ -355,7 +355,7 @@ looked for.
Setting `init-file-user' does not prevent Emacs from loading
`site-start.el'. The only way to do that is to use `--no-site-file'.")
(defcustom site-run-file (purecopy "site-start")
(defcustom site-run-file "site-start"
"File containing site-wide run-time initializations.
This file is loaded at run-time before `user-init-file'. It contains
inits that need to be in place for the entire site, but which, due to
@ -427,13 +427,6 @@ from being initialized."
(defvar no-blinking-cursor nil)
(defvar pure-space-overflow nil
"Non-nil if building Emacs overflowed pure space.")
(defvar pure-space-overflow-message (purecopy "\
Warning Warning!!! Pure space overflow !!!Warning Warning
\(See the node Pure Storage in the Lisp manual for details.)\n"))
(defcustom tutorial-directory
(file-name-as-directory (expand-file-name "tutorials" data-directory))
"Directory containing the Emacs TUTORIAL files."
@ -1107,7 +1100,7 @@ init-file, or to a default value if loading is not possible."
;; Else, perhaps the user init file was compiled
(when (and (equal (file-name-extension user-init-file) "eln")
;; The next test is for builds without native
;; compilation support or builds with unexec.
;; compilation support.
(boundp 'comp-eln-to-el-h))
(if-let* ((source (gethash (file-name-nondirectory
user-init-file)
@ -1696,11 +1689,11 @@ Changed settings will be marked as \"CHANGED outside of Customize\"."
`((changed ((t :background ,color)))))
(put 'cursor 'face-modified t))))
(defcustom initial-scratch-message (purecopy "\
(defcustom initial-scratch-message "\
;; This buffer is for text that is not saved, and for Lisp evaluation.
;; To create a file, visit it with `\\[find-file]' and enter text in its buffer.
")
"
"Initial documentation displayed in *scratch* buffer at startup.
If this is nil, no message will be displayed."
:type '(choice (text :tag "Message")
@ -2099,8 +2092,6 @@ splash screen in another window."
(erase-buffer)
(setq default-directory command-line-default-directory)
(make-local-variable 'startup-screen-inhibit-startup-screen)
(if pure-space-overflow
(insert pure-space-overflow-message))
;; Insert the permissions notice if the user has yet to grant Emacs
;; storage permissions.
(when (fboundp 'android-before-splash-screen)
@ -2142,8 +2133,6 @@ splash screen in another window."
(setq buffer-undo-list t)
(let ((inhibit-read-only t))
(erase-buffer)
(if pure-space-overflow
(insert pure-space-overflow-message))
(fancy-splash-head)
(dolist (text fancy-about-text)
(apply #'fancy-splash-insert text)
@ -2209,8 +2198,6 @@ splash screen in another window."
(setq default-directory command-line-default-directory)
(setq-local tab-width 8)
(if pure-space-overflow
(insert pure-space-overflow-message))
;; Insert the permissions notice if the user has yet to grant
;; Emacs storage permissions.
(when (fboundp 'android-before-splash-screen)
@ -2526,23 +2513,12 @@ A fancy display is used on graphic displays, normal otherwise."
(defalias 'about-emacs #'display-about-screen)
(defalias 'display-splash-screen #'display-startup-screen)
;; This avoids byte-compiler warning in the unexec build.
;; This avoids byte-compiler warning in non-pdumper builds.
(declare-function pdumper-stats "pdumper.c" ())
(defun command-line-1 (args-left)
"A subroutine of `command-line'."
(display-startup-echo-area-message)
(when (and pure-space-overflow
(not noninteractive)
;; If we were dumped with pdumper, we don't care about
;; pure-space overflow.
(or (not (fboundp 'pdumper-stats))
(null (pdumper-stats))))
(display-warning
'initialization
"Building Emacs overflowed pure space.\
(See the node Pure Storage in the Lisp manual for details.)"
:warning))
;; `displayable-buffers' is a list of buffers that may be displayed,
;; which includes files parsed from the command line arguments and