Run debian-startup and set debian-emacs-flavor

Emacs runs debian-startup and sets debian-emacs-flavor.

* Emacs runs debian-startup during the startup process unless
  site-run-file is false.

* The global variable debian-emacs-flavor is bound to 'emacs.

Author: Rob Browning <rlb@defaultvalue.org>

diff --git a/lisp/startup.el b/lisp/startup.el
index 9ebd4c1a707df94ed7e9d10424d58ed01365844d..052ba7b2c66ce34dc7507a53c243cad77fe78991 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -438,6 +438,10 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
   :type 'directory
   :initialize #'custom-initialize-delay)
 
+(defconst debian-emacs-flavor 'emacs
+  "A symbol representing the particular debian flavor of emacs running.
+Something like 'emacs, 'xemacs21, etc.")
+
 (defun normal-top-level-add-subdirs-to-load-path ()
   "Recursively add all subdirectories of `default-directory' to `load-path'.
 More precisely, this uses only the subdirectories whose names
@@ -1375,7 +1379,14 @@ please check its value")
         ;; Sites should not disable the startup screen.
         ;; Only individuals should disable the startup screen.
         (let ((inhibit-startup-screen inhibit-startup-screen))
-         (load site-run-file t t)))
+          (progn
+            ;; This form has been added by Debian to load all the
+            ;; debian package snippets (dh-elpa, etc.).  It's in here
+            ;; because we want -q to kill it too.
+            (if (load "debian-startup" t t nil)
+                (debian-startup debian-emacs-flavor))
+            ;; This is the normal upstream behavior
+            (load site-run-file t t))))
 
     ;; Load that user's init file, or the default one, or none.
     (startup--load-user-init-file