| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also attempt to improve readability & commenting in wrapper script.
Archival copy of the workstation integration commit we're replacing:
Date: Sat, 25 Dec 2021 18:05:21 -0700
Subject: Workstation integration of personal development builds branch
---
admin/flagfile.melete | 0
lib-src/emacsclient.c | 7 +++++--
lisp/emacs-lisp/package.el | 1 +
lisp/startup.el | 7 ++++++-
4 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 admin/flagfile.melete
diff --git a/admin/flagfile.melete b/admin/flagfile.melete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 425db8cface..62d71559d3c 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1794,7 +1794,10 @@ start_daemon_and_retry_set_socket (void)
}
else
{
- char emacs[] = "emacs";
+ const char *devel_build_rel = "/src/emacs/src/emacs";
+ char *emacs = xmalloc (strlen (egetenv ("HOME"))
+ + strlen (devel_build_rel) + 1);
+ strcpy ( stpcpy (emacs, egetenv ("HOME")), devel_build_rel);
char daemon_option[] = "--daemon";
char *d_argv[3];
d_argv[0] = emacs;
@@ -1811,7 +1814,7 @@ start_daemon_and_retry_set_socket (void)
d_argv[1] = daemon_arg;
}
# endif
- execvp ("emacs", d_argv);
+ execvp (emacs, d_argv);
message (true, "%s: error starting emacs daemon\n", progname);
exit (EXIT_FAILURE);
}
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d619142d64c..d464e120193 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -312,6 +312,7 @@ package-directory-list
(and (stringp f)
(equal (file-name-nondirectory f) "site-lisp")
(push (expand-file-name "elpa" f) result)))
+ (push "/usr/share/emacs-snapshot/site-lisp/elpa" result)
(nreverse result))
"List of additional directories containing Emacs Lisp packages.
Each directory name should be absolute.
diff --git a/lisp/startup.el b/lisp/startup.el
index 725984b815b..e10d854c368 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1452,7 +1452,12 @@ command-line
;; 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
+ (when site-run-file
+ (let ((file "/etc/emacs/site-start.d/00debian.el"))
+ ;; When the Emacs build invokes Emacs, such as in the
+ ;; Makefile rule for ${unidir}/emoji-labels.el, 00debian.el
+ ;; might not exist. Should be fine to just skip the load.
+ (when (file-readable-p file) (load file)))
;; Sites should not disable the startup screen.
;; Only individuals should disable the startup screen.
(let ((inhibit-startup-screen inhibit-startup-screen))
|
