1 files changed, 12 insertions, 2 deletions

@@ -316,8 +316,9 @@ ARG is passed to `backward-kill-word'."
 
 (defun +save-some-buffers-p ()
   "Predicate for `save-some-buffers-default-predicate'.
-It returns nil with remote files."
-  (not (file-remote-p (buffer-file-name))))
+It returns nil with remote files and those without attached files."
+  (and (buffer-file-name)
+       (not (file-remote-p (buffer-file-name)))))
 
 ;; https://www.wwwtech.de/articles/2013/may/emacs:-jump-to-matching-paren-beginning-of-block
 (defun +goto-matching-paren (&optional arg)
@@ -333,6 +334,14 @@ It returns nil with remote files."
    ((looking-back "[\[\(\{]" 1) (backward-char) (forward-sexp arg))
    (t (up-list arg t t))))
 
+(defun +delete-window-or-bury-buffer ()
+  "Delete the current window, or bury the current buffer.
+If the current window is the only window, bury the buffer."
+  (interactive)
+  (condition-case e
+      (delete-window)
+    (t (bury-buffer))))
+
 
 ;;; Bindings
 
@@ -348,6 +357,7 @@ It returns nil with remote files."
 (global-set-key (kbd "C-x 4 n") #'clone-buffer)
 ;; https://christiantietze.de/posts/2022/07/shift-click-in-emacs-to-select/
 (global-set-key (kbd "S-<down-mouse-1>") #'mouse-set-mark)
+(global-set-key (kbd "C-x 0") #'+delete-window-or-bury-buffer)
 
 
 ;;; Required libraries