summaryrefslogtreecommitdiff
path: root/bin/emacsclient
Commit message (Collapse)AuthorAge
* http->https in some license headersSean Whitton2024-04-12
|
* update bindingSean Whitton2023-06-27
|
* reduce use of Shift modifier in i3 & Sway configsSean Whitton2023-05-21
|
* emacsclient wrapper: don't try to call ls on non-existent directorySean Whitton2023-02-03
|
* emacsclient wrapper: don't call realpath & ss on non-existent socketSean Whitton2023-02-03
|
* emacsclient wrapper: create symlinks to sockets under /tmpSean Whitton2023-01-28
|
* emacsclient wrapper: check whether /run/user/$(id -u) existsSean Whitton2023-01-27
|
* emacsclient wrapper: ensure sockets directory existsSean Whitton2023-01-27
|
* emacsclient wrapper: check for getopt(1)Sean Whitton2023-01-17
| | | | | Not necessary because if the attempt to invoke getopt(1) fails we call the defer function anyway, but this has documentation value.
* emacsclient wrapper: get_listener: find the youngest processSean Whitton2023-01-17
|
* emacsclient wrapper: don't SIGTERM in-tree if gdbmacs unresponsiveSean Whitton2023-01-14
|
* emacsclient wrapper: C-i E handles case where primary daemon wedgedSean Whitton2023-01-14
|
* emacsclient wrapper: fix -l option to getopt(1)Sean Whitton2023-01-14
|
* emacsclient wrapper: indentation fixesSean Whitton2023-01-14
|
* emacsclient wrapper: use 'exec -a' when giving up and have bashSean Whitton2023-01-13
| | | | Also, reexecute with bash first to avoid checking the other commands twice.
* emacsclient wrapper: use getopt(1) to break up clustered short optsSean Whitton2023-01-13
|
* emacsclient wrapper: handle --spw/* options when we give up earlySean Whitton2023-01-13
|
* emacsclient wrapper: introduce more uses of timeoutsSean Whitton2023-01-13
| | | | | | | | Also improve handling of exit codes of intermediate gdbmacs requests. Where these use gdb-wait-for-pending, if they don't exit zero, it means we couldn't even submit the request, not just that it couldn't be fulfilled. Also fix inotifywait(1) event type delete => delete_self.
* emacsclient wrapper: factor out fail(), notify-send on unknown EmacsSean Whitton2023-01-06
|
* emacsclient wrapper: fix some missing quotationSean Whitton2023-01-06
|
* emacsclient wrapper: call notify-send only if stderr not a terminalSean Whitton2023-01-06
|
* more Emacs linked working trees, attempt a number of simplificationsSean Whitton2022-12-27
|
* tidy and simplify shell initSean Whitton2022-11-24
| | | | | | | Rely on SPWCRONTAB property to set PATH for cronjobs, and otherwise rely on .profile, .xsessionrc etc. to set PATH, once, at login. Just archive scripts I haven't used lately which might otherwise need more significant adjustments, or appear to be broken in other ways.
* emacsclient wrapper: don't fail completely if bash not on PATHSean Whitton2022-11-14
|
* emacsclient wrapper: check other commands we want to use are on PATHSean Whitton2022-11-14
|
* emacsclient wrapper: pass nicer zeroth arg to installed programsSean Whitton2022-10-29
| | | | In-tree Emacs gets confused if we do something similar for that.
* emacsclient wrapper: use correct umask when creating $locks_dirSean Whitton2022-10-29
| | | | In particular, we don't want to create XDG_RUNTIME_DIR other than as 700.
* emacsclient wrapper: ensure Emacs puts sockets under XDG_RUNTIME_DIRSean Whitton2022-10-29
|
* emacsclient wrapper: -sgdbmacs implies --spw/installedSean Whitton2022-10-29
|
* replace emacs.git workstation integration commitSean Whitton2022-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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))
* emacsclient wrapper: fix case when passed both -V and --spw/no-startSean Whitton2022-10-29
|
* emacsclient wrapper: hide pwdx(1) stderrSean Whitton2022-10-29
|
* emacsclient wrapper: use gdb-wait-for-pending when detaching gdbmacsSean Whitton2022-10-29
|
* emacsclient wrapper: add locking around starting up daemonsSean Whitton2022-10-29
|
* emacsclient wrapper: fix commentSean Whitton2022-10-29
|
* emacsclient wrapper: initialise remaining variablesSean Whitton2022-10-29
|
* emacsclient wrapper: use XDG_RUNTIME_DIRSean Whitton2022-10-29
|
* have gdbmacs start up Emacs rather than attach to itSean Whitton2022-10-29
| | | | | Additionally, either re-use or kill the GUD interaction buffer rather than calling `gdb-reset' ourselves: killing it is the documented way to reset.
* emacsclient wrapper: start inotifywait(1) earlierSean Whitton2022-10-29
|
* emacsclient wrapper: use cleaner booleansSean Whitton2022-10-29
|
* emacsclient wrapper: better handle lack of ss(8)Sean Whitton2022-10-29
|
* gdbmacs instance, s.t. can always run Emacs under gdb, and for GnusSean Whitton2022-09-30
|
* add --socket-name support to emacsclient(1) wrapperSean Whitton2022-09-30
|
* implement updating Lisp image env vars & refactorSean Whitton2022-06-09
|
* combine s/d/emacsclient & update-emacs-daemon-environmentSean Whitton2022-04-15