diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 5 | ||||
| -rw-r--r-- | etc/emacs.service | 2 |
2 files changed, 4 insertions, 3 deletions
| @@ -78,10 +78,11 @@ affected by this, as SGI stopped supporting IRIX in December 2013. | |||
| 78 | 78 | ||
| 79 | * Startup Changes in Emacs 26.1 | 79 | * Startup Changes in Emacs 26.1 |
| 80 | 80 | ||
| 81 | ** New option '--new-daemon'. This is the same as '--daemon', except | 81 | +++ |
| 82 | ** New option '--fg-daemon'. This is the same as '--daemon', except | ||
| 82 | it runs in the foreground and does not fork. This is intended for | 83 | it runs in the foreground and does not fork. This is intended for |
| 83 | modern init systems such as systemd, which manage many of the traditional | 84 | modern init systems such as systemd, which manage many of the traditional |
| 84 | aspects of daemon behavior themselves. '--old-daemon' is now an alias | 85 | aspects of daemon behavior themselves. '--bg-daemon' is now an alias |
| 85 | for '--daemon'. | 86 | for '--daemon'. |
| 86 | 87 | ||
| 87 | +++ | 88 | +++ |
diff --git a/etc/emacs.service b/etc/emacs.service index d9f7fc569d2..b29177b120c 100644 --- a/etc/emacs.service +++ b/etc/emacs.service | |||
| @@ -8,7 +8,7 @@ Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ | |||
| 8 | 8 | ||
| 9 | [Service] | 9 | [Service] |
| 10 | Type=simple | 10 | Type=simple |
| 11 | ExecStart=emacs --new-daemon | 11 | ExecStart=emacs --fg-daemon |
| 12 | ExecStop=emacsclient --eval "(kill-emacs)" | 12 | ExecStop=emacsclient --eval "(kill-emacs)" |
| 13 | Environment=SSH_AUTH_SOCK=%t/keyring/ssh | 13 | Environment=SSH_AUTH_SOCK=%t/keyring/ssh |
| 14 | Restart=on-failure | 14 | Restart=on-failure |