From aa64cf94266a331c1fbb6b80b76e4b53bb6c8a9f Mon Sep 17 00:00:00 2001 From: Siddharth Shekar Date: Thu, 30 May 2019 18:54:58 -0700 Subject: [PATCH] Replace kill-this-buffer with kill-current-buffer As per the documentation for kill-this-buffer, it should only be invoked from the menu and behaves unpredictably when invoked programmatically. --- core/autoload/buffers.el | 4 ++-- core/autoload/debug.el | 4 ++-- core/autoload/files.el | 2 +- core/autoload/ui.el | 2 +- core/core-ui.el | 2 +- modules/app/regex/autoload/regex.el | 2 +- modules/config/default/+evil-bindings.el | 10 +++++----- modules/editor/evil/+commands.el | 2 +- modules/editor/evil/+everywhere.el | 2 +- modules/lang/ess/config.el | 2 +- modules/term/eshell/autoload/eshell.el | 2 +- modules/tools/magit/config.el | 2 +- modules/tools/pdf/config.el | 2 +- modules/ui/tabbar/config.el | 6 +++--- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el index 4c69ef253..dd75bf8f9 100644 --- a/core/autoload/buffers.el +++ b/core/autoload/buffers.el @@ -250,10 +250,10 @@ regex PATTERN. Returns the number of killed buffers." ;;;###autoload (defun doom*switch-to-fallback-buffer-maybe (orig-fn) - "Advice for `kill-this-buffer'. If in a dedicated window, delete it. If there + "Advice for `kill-current-buffer'. If in a dedicated window, delete it. If there are no real buffers left OR if all remaining buffers are visible in other windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original -`kill-this-buffer'." +`kill-current-buffer'." (let ((buf (current-buffer))) (cond ((window-dedicated-p) (delete-window)) diff --git a/core/autoload/debug.el b/core/autoload/debug.el index 63def8873..0e96c61f7 100644 --- a/core/autoload/debug.el +++ b/core/autoload/debug.el @@ -190,7 +190,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!" (define-key map (kbd "C-c C-d") #'doom--run-vanilla-doom) (define-key map (kbd "C-c C-p") #'doom--run-vanilla-doom+) (define-key map (kbd "C-c C-f") #'doom--run-full-doom) - (define-key map (kbd "C-c C-k") #'kill-this-buffer) + (define-key map (kbd "C-c C-k") #'kill-current-buffer) map)) (define-derived-mode doom-sandbox-emacs-lisp-mode emacs-lisp-mode "Sandbox Elisp" @@ -289,7 +289,7 @@ will be automatically appended to the result." backtrace) ""))) (local-set-key (kbd "C-c C-c") #'doom--report-bug) - (local-set-key (kbd "C-c C-k") #'kill-this-buffer) + (local-set-key (kbd "C-c C-k") #'kill-current-buffer) (setq header-line-format "C-c C-c to submit / C-c C-k to close") ;; (narrow-to-region (point-min) pos) diff --git a/core/autoload/files.el b/core/autoload/files.el index 3a11646be..076723583 100644 --- a/core/autoload/files.el +++ b/core/autoload/files.el @@ -187,7 +187,7 @@ file if it exists, without confirmation." (when-let* ((dest (doom--copy-file old-path new-path force-p))) (when (file-exists-p old-path) (delete-file old-path)) - (kill-this-buffer) + (kill-current-buffer) (doom--forget-file old-path new-path) (doom--update-file new-path) (find-file new-path) diff --git a/core/autoload/ui.el b/core/autoload/ui.el index a631c7b6b..1c96f6deb 100644 --- a/core/autoload/ui.el +++ b/core/autoload/ui.el @@ -178,7 +178,7 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" (setq doom--buffer-narrowed-origin old-buf))) (narrow-to-region beg end)) (doom--buffer-narrowed-origin - (kill-this-buffer) + (kill-current-buffer) (switch-to-buffer doom--buffer-narrowed-origin) (setq doom--buffer-narrowed-origin nil)) (t diff --git a/core/core-ui.el b/core/core-ui.el index 8fcbb48b0..df76a4fdd 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -574,7 +574,7 @@ it to fix all that visual noise." (doom-silence-motion-key delete-char "") ;; Switch to `doom-fallback-buffer' if on last real buffer -(advice-add #'kill-this-buffer :around #'doom*switch-to-fallback-buffer-maybe) +(advice-add #'kill-current-buffer :around #'doom*switch-to-fallback-buffer-maybe) (provide 'core-ui) ;;; core-ui.el ends here diff --git a/modules/app/regex/autoload/regex.el b/modules/app/regex/autoload/regex.el index 881200fd6..1c64490fe 100644 --- a/modules/app/regex/autoload/regex.el +++ b/modules/app/regex/autoload/regex.el @@ -33,7 +33,7 @@ (define-key map "\C-c\C-c" #'+regex-update-buffers) (define-key map "\C-c\C-r" #'=regex/replace) (define-key map "\C-c\C-k" #'+regex/quit) - (define-key map [remap kill-this-buffer] #'+regex/quit) + (define-key map [remap kill-current-buffer] #'+regex/quit) (define-key map [remap kill-buffer] #'+regex/quit) map) "TODO") diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index f6403799a..1becd81d2 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -50,7 +50,7 @@ (:after vc-annotate :map vc-annotate-mode-map - [remap quit-window] #'kill-this-buffer) + [remap quit-window] #'kill-current-buffer) (:map (help-mode-map helpful-mode-map) :n "o" 'ace-link-help) @@ -65,7 +65,7 @@ :m "[o" #'outline-previous-visible-heading :n "]b" #'next-buffer :n "[b" #'previous-buffer - :n "zx" #'kill-this-buffer + :n "zx" #'kill-current-buffer :n "ZX" #'bury-buffer :n "gp" #'+evil/reselect-paste :n "g=" #'evil-numbers/inc-at-pt @@ -458,7 +458,7 @@ :n "d" #'gist-kill-current :n "e" #'gist-edit-current-description :n "f" #'gist-fork - :n "q" #'kill-this-buffer + :n "q" #'kill-current-buffer :n "s" #'gist-star :n "S" #'gist-unstar :n "y" #'gist-print-current-url) @@ -564,7 +564,7 @@ :desc "Switch buffer" "B" #'switch-to-buffer) (:unless (featurep! :ui workspaces) :desc "Switch buffer" "b" #'switch-to-buffer) - :desc "Kill buffer" "k" #'kill-this-buffer + :desc "Kill buffer" "k" #'kill-current-buffer :desc "Next buffer" "n" #'next-buffer :desc "New empty buffer" "N" #'evil-buffer-new :desc "Kill other buffers" "o" #'doom/kill-other-buffers @@ -855,7 +855,7 @@ To change these keys see `+default-repeat-keys'." (after! view (define-key view-mode-map [escape] #'View-quit-all)) (after! man - (evil-define-key* 'normal Man-mode-map "q" #'kill-this-buffer)) + (evil-define-key* 'normal Man-mode-map "q" #'kill-current-buffer)) ;; Minibuffer (define-key! evil-ex-completion-map diff --git a/modules/editor/evil/+commands.el b/modules/editor/evil/+commands.el index 626df8936..a110e673d 100644 --- a/modules/editor/evil/+commands.el +++ b/modules/editor/evil/+commands.el @@ -136,7 +136,7 @@ If BANG, search Doom documentation." (evil-ex-define-cmd "grevert" #'git-gutter:revert-hunk) ;;; Dealing with buffers -(evil-ex-define-cmd "k[ill]" #'doom/kill-this-buffer) +(evil-ex-define-cmd "k[ill]" #'doom/kill-current-buffer) (evil-ex-define-cmd "k[ill]all" #'+evil:kill-all-buffers) (evil-ex-define-cmd "k[ill]m" #'+evil:kill-matching-buffers) (evil-ex-define-cmd "k[ill]o" #'doom/kill-other-buffers) diff --git a/modules/editor/evil/+everywhere.el b/modules/editor/evil/+everywhere.el index a2b0c270a..06354e9fb 100644 --- a/modules/editor/evil/+everywhere.el +++ b/modules/editor/evil/+everywhere.el @@ -200,7 +200,7 @@ and complains if a module is loaded too early (during startup)." (+evil-collection-init (if EMACS26+ 'replace "replace"))) (evil-define-key* 'normal process-menu-mode-map - "q" #'kill-this-buffer + "q" #'kill-current-buffer "d" #'process-menu-delete-process) ;; Load the rest diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el index 249c9264a..741a778b4 100644 --- a/modules/lang/ess/config.el +++ b/modules/lang/ess/config.el @@ -24,7 +24,7 @@ (map! (:after ess-help :map ess-help-mode-map - :n "q" #'kill-this-buffer + :n "q" #'kill-current-buffer :n "Q" #'ess-kill-buffer-and-go :n "K" #'ess-display-help-on-object :n "go" #'ess-display-help-in-browser diff --git a/modules/term/eshell/autoload/eshell.el b/modules/term/eshell/autoload/eshell.el index 293124891..f83750540 100644 --- a/modules/term/eshell/autoload/eshell.el +++ b/modules/term/eshell/autoload/eshell.el @@ -240,7 +240,7 @@ delete." (unless (eq major-mode 'eshell-mode) (user-error "Not in an eshell buffer")) (let ((+eshell-kill-window-on-exit t)) - (kill-this-buffer))) + (kill-current-buffer))) ;; diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 795f50f3e..96df02b18 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -60,7 +60,7 @@ It is passed a user and repository name.") (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite")) :config ;; All forge list modes are derived from `forge-topic-list-mode' - (map! :map forge-topic-list-mode-map :n "q" #'kill-this-buffer) + (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer) (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil) (set-popup-rule! "^\\*\\(?:[^/]+/[^ ]+ #[0-9]+\\*$\\|Issues\\|Pull-Requests\\|forge\\)" :ignore t)) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index 2f22d3983..43e5fd289 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -6,7 +6,7 @@ (unless noninteractive (pdf-tools-install)) - (map! :map pdf-view-mode-map :gn "q" #'kill-this-buffer) + (map! :map pdf-view-mode-map :gn "q" #'kill-current-buffer) (defun +pdf|cleanup-windows () "Kill left-over annotation buffers when the document is killed." diff --git a/modules/ui/tabbar/config.el b/modules/ui/tabbar/config.el index e887013d9..ae5f12cb3 100644 --- a/modules/ui/tabbar/config.el +++ b/modules/ui/tabbar/config.el @@ -58,9 +58,9 @@ (+tabbar|remove-buffer))))) (advice-add #'bury-buffer :around #'+tabbar*bury-buffer) -(defun +tabbar*kill-this-buffer (&rest _) +(defun +tabbar*kill-current-buffer (&rest _) (+tabbar|remove-buffer)) -(advice-add #'kill-this-buffer :before #'+tabbar*kill-this-buffer) +(advice-add #'kill-current-buffer :before #'+tabbar*kill-current-buffer) (defun +tabbar|remove-buffer () (set-window-parameter @@ -71,7 +71,7 @@ (interactive) (call-interactively (cond ((cdr (window-parameter nil 'tabbar-buffers)) - #'kill-this-buffer) + #'kill-current-buffer) ((fboundp '+workspace/close-window-or-workspace) #'+workspace/close-window-or-workspace) (#'delete-window))))