summaryrefslogtreecommitdiff
path: root/lib-src/mr/config
Commit message (Collapse)AuthorAge
* sync from melete ~/doc on erebusarchive/erebusSean Whitton2023-05-21
|
* no longer check out some personal repos on erebusSean Whitton2023-05-18
|
* fix directory name when checking out ~/src/emacs/trunkSean Whitton2023-03-21
|
* return to using 'git update-index' over 'git annex add'Sean Whitton2023-02-23
|
* use 'git annex add' instead of 'git update-index'Sean Whitton2023-02-16
| | | | | It should be harmless to add current versions of the files to the annex, and the 'git update-index' command would fail whenever Gnus created new files.
* move manually-maintained part of all.SCORE to ~/doc/Sean Whitton2023-02-12
|
* add git-update-index(1) calls for lib/priv and src/athprivSean Whitton2023-02-09
|
* drop 'mr stow' & skip performing other actions if repo is not stowedSean Whitton2023-02-09
|
* fix lib/wikiannex fixups exiting non-zero on most hostsSean Whitton2023-01-06
|
* fix command orderingSean Whitton2023-01-03
|
* src/emacs/primary 'mr pull': check we found a branch & output hintSean Whitton2022-12-27
|
* double up a slash in notes to handle em-elecslash here tooSean Whitton2022-12-27
|
* more Emacs linked working trees, attempt a number of simplificationsSean Whitton2022-12-27
|
* check for detached HEADs in 'mr status', drop two old TODOsSean Whitton2022-12-27
| | | | | Additionally, don't look for branches with unpushed commits in linked working trees. This avoids duplication in 'mr status' output for multiple repos.
* add git_repack myrepos actionSean Whitton2022-12-23
|
* somewhat standardise & tidy some licence and copyright informationSean Whitton2022-12-14
|
* implement dropping old versions of score files from src/athprivSean Whitton2022-12-13
|
* replace comment about annex.largefiles in src/athprivSean Whitton2022-12-12
|
* factor out git-verify-commit-spwSean Whitton2022-12-07
|
* replace load-trustdb with something simplerSean Whitton2022-12-07
|
* factor out some linked worktree configurationSean Whitton2022-12-07
|
* myrepos skip for ~/src/emacs: don't assume $1 is the actionSean Whitton2022-12-07
|
* tidy up primary myrepos configurationSean Whitton2022-12-07
|
* myrepos config: improve obtaining username and hostnameSean Whitton2022-12-06
|
* stop setting up 'dgit fetch' post_checkout actionsSean Whitton2022-12-04
| | | | | | | These actions never or almost never get run because we're writing them to the machine-specific ~/.mrconfig. For them to be run, we'd have to nuke the repos and then clone them again using 'mr co', which I never or almost never do for repos registered in ~/.mrconfig.
* replace install-git-hooks script w/ setting core.hooksPath globallySean Whitton2022-12-04
|
* move most repository git config into included files & some tidyingSean Whitton2022-12-04
|
* speed up hstow's restowing, restow in post_update actionsSean Whitton2022-12-03
|
* dotfiles pre_push: always rebase localhost's branch if we amendedSean Whitton2022-12-03
|
* ensure C-x v + for ~/doc doesn't rebaseSean Whitton2022-12-02
|
* drop unused custom git_rebase mr action typeSean Whitton2022-12-02
|
* have 'git pull' rebase by defaultSean Whitton2022-12-02
|
* mr config: improve finding the short hostnameSean Whitton2022-12-02
|
* accept failures to fetch remotes in post_checkoutSean Whitton2022-12-02
|
* don't count erebus as a workstation for myrepos purposesSean Whitton2022-12-02
|
* fix fetching deb-emacs.gitSean Whitton2022-12-02
|
* rebase host-specific branch onto master after amending master's tipSean Whitton2022-11-30
|
* make 'mr pull' for ~/src/emacs able to update from other branchesSean Whitton2022-11-30
|
* replace git-dotfiles-rebase with 'mr pull' and 'mr push' actionsSean Whitton2022-11-30
|
* ~/src/emacs: rely on 'git push-all' to push localhost's branchSean Whitton2022-11-30
|
* add shutting down develacc to emacs-snapshot update instructionsSean Whitton2022-11-30
|
* 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.
* GNU Stow -> hstow, and follow-up tidying & simplificationsSean Whitton2022-11-12
|
* archive invoking archived win32setup.batSean Whitton2022-11-12
|
* src/emacs skip action: fix some operator precedenceSean 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))
* attempt to replace normalise-mrconfig script w/ "include" directiveSean Whitton2022-10-18
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 21:24:59 +0000