summaryrefslogtreecommitdiff
path: root/.emacs.d
Commit message (Collapse)AuthorAge
* revert to customising transient-cycles-window-buffers-cycle-... keysSean Whitton2022-11-08
| | | | We can use customisation comments to indicate what the numbers mean.
* move calling log-edit-show-diff into log-edit-hookSean Whitton2022-11-08
|
* drop log-edit-show-files from log-edit-hookSean Whitton2022-11-08
|
* set transient-cycles-window-buffers-cycle-... keys with setoptSean Whitton2022-11-07
| | | | Otherwise they get rewritten to integers, which is undesirable.
* move setting skeleton-end-newline out of a subsectionSean Whitton2022-11-06
|
* Revert "fix raise-frame on Sway using advice"Sean Whitton2022-11-06
| | | | This reverts commit 6718f7d4420c821bca1303d56ade37560443a137.
* rework some of my cycling bindings inc. introduce use of windmoveSean Whitton2022-11-06
|
* spw/back-and-forth-noselect: select the window & rename the commandSean Whitton2022-11-06
| | | | I belive this should have been done in 5ae9d445, as part of undoing 9a8a8b2d.
* add spw/on-host-primary-pSean Whitton2022-10-31
|
* irssi -> rcirc initial configurationSean Whitton2022-10-31
|
* spw/paredit-ctl-j: avoid lexically binding some dynamic varsSean Whitton2022-10-31
|
* spw/dired-copy-filename-as-kill: several improvementsSean Whitton2022-10-31
| | | | | | | | - Quote even when just one file. - Don't behave like M-& when invoked from subdirectory header line. - Tweak comments.
* spw/daemon-lock-self: don't sleep foreverSean Whitton2022-10-29
| | | | If the quit gets stuck and I have to kill -9, the sleep(1) can survive.
* 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))
* have two confmacs* abbrevs and update & improve commentSean Whitton2022-10-29
|
* try out starting an instance of flock(1) early in kill-emacs-hookSean Whitton2022-10-29
|
* spw/gdbmacs-attach: simplify beginning of function slightlySean Whitton2022-10-29
|
* try a bg colour for gdbmacs which doesn't clash with showing diffsSean 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.
* spw/diff-discard-hunk: attempt to simplifySean Whitton2022-10-18
|
* spw/diff-discard-hunk: use save-window-excursion w/ diff-apply-hunkSean Whitton2022-10-18
|
* spw/diff-discard-hunk: save buffers that weren't already modifiedSean Whitton2022-10-18
|
* add spw/dired-copy-filename-as-killSean Whitton2022-10-18
|
* reduce tramp-verboseSean Whitton2022-10-16
|
* try out bongo-insert-album-coversSean Whitton2022-10-15
|
* add spw/git-format-patchSean Whitton2022-10-14
|
* bind C-l in icomplete-fido-mode-map to clear inputSean Whitton2022-10-14
|
* try out a different unix-word-rubout when completing filenamesSean Whitton2022-10-14
|
* set native-comp-async-jobs-numberSean Whitton2022-10-04
|
* disable mouse-autoselect-windowSean Whitton2022-10-02
|
* rework & refactor spw/set-tmux-background-modeSean Whitton2022-10-01
|
* spw/log-view-git-fixup: revert Log View after calling log-edit-doneSean Whitton2022-09-30
| | | | Helpful with spw/vc-next-action-for-git-fixup.
* add spw/vc-next-action-for-git-fixupSean Whitton2022-09-30
|
* stop disabling tool-bar-modeSean Whitton2022-09-30
|
* cl-case quotation fixesSean Whitton2022-09-30
|
* gdbmacs instance, s.t. can always run Emacs under gdb, and for GnusSean Whitton2022-09-30
|
* Revert "add workaround for Emacs bug#57986"Sean Whitton2022-09-30
| | | | This reverts commit b8b1c7ea87cce1287a518e50da0cec2d79e74878.
* add gnus/summary-save-all-partsSean Whitton2022-09-22
|
* spw/log-view-git-rebase: drop noop trailing name of current branchSean Whitton2022-09-22
|
* load git-commit.el immediately & mention git-commit-mode in commentSean Whitton2022-09-22
| | | | | | While git-rebase-mode has an entry in auto-mode-alist at Emacs startup, git-commit-mode will not be activated in COMMIT_EDITMSG buffers until and unless the library has been loaded.
* Emacs bug#57807 is now resolvedSean Whitton2022-09-21
|
* switch to manually merging To: and Cc: for wide repliesSean Whitton2022-09-21
|
* drop Mail::Box::File::Message headers when resendingSean Whitton2022-09-21
|
* add workaround for Emacs bug#57986Sean Whitton2022-09-21
|
* spw/gnus-goto should not save-current-buffer the group bufferSean Whitton2022-09-20
|
* spw/log-view-git-fixup: drop some superfluous newlinesSean Whitton2022-09-19
|
* spw/log-view-git-reset: --mixed not --softSean Whitton2022-09-19
| | | | This fits better with how Emacs VC tries to eschew use of the staging area.
* spw/log-view-git-fixup: when there is *vc-log*, actually commitSean Whitton2022-09-19
|
* move spw/dotfiles-rebase binding & bind spw/run-or-restore-gudSean Whitton2022-09-19
|
* move spw/expand-region-to-whole-lines-and-activate bindingSean Whitton2022-09-19
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 08:59:18 +0000