emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docs: revise version check failure message

Browse source 
- Recommend 28.1.
- Swap condition.
This commit is contained in:
Henrik Lissner 2022-09-15 23:28:01 +02:00
parent c7289da99b
commit 85f3b19f61
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lisp/doom.el
View file

@ -73,25 +73,26 @@
(when (< emacs-major-version 27) (when (< emacs-major-version 27)
(user-error (user-error
(concat (concat
"Detected Emacs " emacs-version ", but Doom requires 27.1 or newer.\n\n" "Detected Emacs " emacs-version ", but Doom requires 27.1 or newer (28.1 is\n\n"
"The version of Emacs in use is located at:\n\n " (car command-line-args) "\n\n" "recommended). The current Emacs executable in use is:\n\n " (car command-line-args)
"A guide for installing a newer version of Emacs can be found at:\n\n " "\n\nA guide for installing a newer version of Emacs can be found at:\n\n "
(format "https://docs.doomemacs.org/-/install/%s" (format "https://docs.doomemacs.org/-/install/%s"
(cond ((eq system-type 'darwin) "on-macos") (cond ((eq system-type 'darwin) "on-macos")
((memq system-type '(cygwin windows-nt ms-dos)) "on-windows") ((memq system-type '(cygwin windows-nt ms-dos)) "on-windows")
("on-linux"))) ("on-linux")))
"\n\n" "\n\n"
(if (not noninteractive) (if noninteractive
(concat "If you believe this error is a mistake, run 'doom doctor' on the command line\n" (concat "Alternatively, either update your $PATH environment variable to include the\n"
"to diagnose common issues with your config and system.") "path of the desired Emacs executable OR alter the $EMACS environment variable\n"
(concat "Alternatively, either update your $PATH environment variable to include the\n" "to specify the exact path or command needed to invoke Emacs."
"path of the desired Emacs executable OR alter the $EMACS environment variable\n" (when-let (command (ignore-errors (file-name-nondirectory (cadr (member "--load" command-line-args)))))
"to specify the exact path or command needed to invoke Emacs. For example:\n\n" (concat " For example:\n\n"
(let ((command (ignore-errors (file-name-nondirectory (cadr (member "--load" command-line-args)))))) " $ EMACS=/path/to/valid/emacs " command " ...\n"
(concat " $ EMACS=/path/to/valid/emacs " command " ...\n" " $ EMACS=\"/Applications/Emacs.app/Contents/MacOS/Emacs\" " command " ...\n"
" $ EMACS=\"/Applications/Emacs.app/Contents/MacOS/Emacs\" " command " ...\n" " $ EMACS=\"snap run emacs\" " command " ..."))
" $ EMACS=\"snap run emacs\" " command " ...\n")) "\n\nAborting...")
"\nAborting...")))))) (concat "If you believe this error is a mistake, run 'doom doctor' on the command line\n"
"to diagnose common issues with your config and system."))))))
;; Doom needs to be synced/rebuilt if either Doom or Emacs has been ;; Doom needs to be synced/rebuilt if either Doom or Emacs has been
;; up/downgraded. This is because byte-code isn't backwards compatible, and many ;; up/downgraded. This is because byte-code isn't backwards compatible, and many