From: Rob Browning <rlb@defaultvalue.org>
Date: Tue, 5 Apr 2011 03:46:22 +0000 (-0500)
Subject: Run debian-startup and set debian-emacs-flavor
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~150^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=381dc48e4f31a00726f44f3723b913aea4485cca;p=emacs.git

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 9d16b59defd..d20431492a7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -434,6 +434,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
@@ -1121,8 +1125,21 @@ please check its value")
     ;; be loaded from site-run-file and wants to test if -q was given
     ;; should check init-file-user instead, since that is already set.
     ;; See cus-edit.el for an example.
-    (if site-run-file
-	(load site-run-file t t))
+
+    ;; Original upstream startup
+    ;; (if site-run-file
+    ;;     (load site-run-file t t))
+    ;;
+
+    ;; Debian startup
+     (if site-run-file
+        (progn
+          ;; Load all the debian package snippets.
+          ;; It's in here because we want -q to kill it too.
+          (if (load "debian-startup" t t nil)
+              (debian-startup debian-emacs-flavor))
+          ;; Now the normal site file...
+          (load site-run-file t t)))
 
     ;; Sites should not disable this.  Only individuals should disable
     ;; the startup screen.