emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
xarthurx 2018-02-08 09:46:26 +01:00
commit 2b40b3597a
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-packages.el
View file

@ -522,10 +522,10 @@ happen if you manually modify/update/install packages from outside Emacs, while
an Emacs session is running. an Emacs session is running.
This isn't necessary if you use Doom's package management commands because they This isn't necessary if you use Doom's package management commands because they
call `doom/reload-load-path' remotely (through emacsclient)." call `doom//reload-load-path' remotely (through emacsclient)."
(interactive) (interactive)
(byte-recompile-file (expand-file-name "core.el" doom-core-dir) t) (byte-recompile-file (expand-file-name "core.el" doom-core-dir) t)
(cond (noninteractive (cond ((and noninteractive (not (daemonp)))
(require 'server) (require 'server)
(when (server-running-p) (when (server-running-p)
(message "Reloading active Emacs session...") (message "Reloading active Emacs session...")

7
modules/feature/workspaces/autoload/workspaces.el
View file

@ -289,6 +289,13 @@ workspace to delete."
(switch-to-buffer (doom-fallback-buffer)) (switch-to-buffer (doom-fallback-buffer))
(doom/cleanup-session)) (doom/cleanup-session))
;;;###autoload
(defun +workspace/kill-session-and-quit ()
"Kill emacs without saving anything."
(interactive)
(let ((persp-auto-save-opt 0))
(kill-emacs)))
;;;###autoload ;;;###autoload
(defun +workspace/new (&optional name clone-p) (defun +workspace/new (&optional name clone-p)
"Create a new workspace named NAME. If CLONE-P is non-nil, clone the current "Create a new workspace named NAME. If CLONE-P is non-nil, clone the current