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

Replace kill-this-buffer with kill-current-buffer

Browse source 
As per the documentation for kill-this-buffer, it should only be invoked
from the menu and behaves unpredictably when invoked programmatically.
This commit is contained in:
Siddharth Shekar 2019-05-30 18:54:58 -07:00
parent 0c743afcfd
commit aa64cf9426
14 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/buffers.el
View file

@ -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))

4
core/autoload/debug.el
View file

@ -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)

2
core/autoload/files.el
View file

@ -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)

2
core/autoload/ui.el
View file

@ -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

2
core/core-ui.el
View file

@ -574,7 +574,7 @@ it to fix all that visual noise."
(doom-silence-motion-key delete-char "<delete>")
;; 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

2
modules/app/regex/autoload/regex.el
View file

@ -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")

10
modules/config/default/+evil-bindings.el
View file

@ -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

2
modules/editor/evil/+commands.el
View file

@ -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)

2
modules/editor/evil/+everywhere.el
View file

@ -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

2
modules/lang/ess/config.el
View file

@ -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

2
modules/term/eshell/autoload/eshell.el
View file

@ -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)))
;;

2
modules/tools/magit/config.el
View file

@ -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))

2
modules/tools/pdf/config.el
View file

@ -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."

6
modules/ui/tabbar/config.el
View file

@ -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))))