From a64a0a9487ab32569208f720ea2748dc790e71ef Mon Sep 17 00:00:00 2001 From: condy Date: Wed, 5 Jun 2024 22:28:55 +0800 Subject: [PATCH] elisp-refs, emms, pdf, xwidget: Use kill-current-buffer kill-this-buffer says > This command can be reliably invoked only from the menu bar, > otherwise it could decide to silently do nothing. --- modes/elisp-refs/evil-collection-elisp-refs.el | 4 ++-- modes/emms/evil-collection-emms.el | 4 ++-- modes/pdf/evil-collection-pdf.el | 6 +++--- modes/xwidget/evil-collection-xwidget.el | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modes/elisp-refs/evil-collection-elisp-refs.el b/modes/elisp-refs/evil-collection-elisp-refs.el index 92339c76..c146c044 100644 --- a/modes/elisp-refs/evil-collection-elisp-refs.el +++ b/modes/elisp-refs/evil-collection-elisp-refs.el @@ -1,6 +1,6 @@ ;;; evil-collection-elisp-refs.el --- Evil bindings for Elisp Refs -*- lexical-binding: t -*- -;; Copyright (C) 2017 James Nguyen +;; Copyright (C) 2017, 2024 James Nguyen ;; Author: James Nguyen ;; Maintainer: James Nguyen @@ -46,7 +46,7 @@ (kbd "RET") 'elisp-refs-visit-match ;; quit - "q" 'kill-this-buffer)) + "q" 'kill-current-buffer)) (provide 'evil-collection-elisp-refs) ;;; evil-collection-elisp-refs.el ends here diff --git a/modes/emms/evil-collection-emms.el b/modes/emms/evil-collection-emms.el index be300adf..d4d78389 100644 --- a/modes/emms/evil-collection-emms.el +++ b/modes/emms/evil-collection-emms.el @@ -1,6 +1,6 @@ ;;; evil-collection-emms.el --- Evil bindings for EMMS -*- lexical-binding: t -*- -;; Copyright (C) 2017 Pierre Neidhardt +;; Copyright (C) 2017, 2024 Pierre Neidhardt ;; Author: Pierre Neidhardt ;; Maintainer: James Nguyen @@ -239,7 +239,7 @@ The return value is the yanked text." "C" 'emms-metaplaylist-mode-new-buffer "." 'emms-metaplaylist-mode-center-current "D" 'emms-metaplaylist-mode-kill-buffer - "q" 'kill-this-buffer) + "q" 'kill-current-buffer) (evil-set-initial-state 'emms-stream-mode 'normal) (evil-collection-define-key 'normal 'emms-stream-mode-map diff --git a/modes/pdf/evil-collection-pdf.el b/modes/pdf/evil-collection-pdf.el index e9986959..22eff17f 100644 --- a/modes/pdf/evil-collection-pdf.el +++ b/modes/pdf/evil-collection-pdf.el @@ -1,6 +1,6 @@ ;;; evil-collection-pdf.el --- Evil bindings for pdf-tools -*- lexical-binding: t -*- -;; Copyright (C) 2017 Pierre Neidhardt +;; Copyright (C) 2017, 2024 Pierre Neidhardt ;; Author: Pierre Neidhardt ;; Maintainer: James Nguyen @@ -195,8 +195,8 @@ instead, which is useless and counterintuitive." ;; quit "q" 'quit-window - "Q" 'kill-this-buffer - "ZQ" 'kill-this-buffer + "Q" 'kill-current-buffer + "ZQ" 'kill-current-buffer "ZZ" 'quit-window) diff --git a/modes/xwidget/evil-collection-xwidget.el b/modes/xwidget/evil-collection-xwidget.el index 2a121619..ab197f14 100644 --- a/modes/xwidget/evil-collection-xwidget.el +++ b/modes/xwidget/evil-collection-xwidget.el @@ -1,6 +1,6 @@ ;;; evil-collection-xwidget.el --- Evil bindings for Xwidget -*- lexical-binding: t -*- -;; Copyright (C) 2020, 2022 Ruslan Kamashev +;; Copyright (C) 2020, 2022, 2024 Ruslan Kamashev ;; Author: Ruslan Kamashev ;; Maintainer: James Nguyen @@ -72,7 +72,7 @@ F is the name of function, N is the pixel height." (setq evil-collection-xwidget-webkit-last-closed-tab-url (xwidget-webkit-uri (xwidget-webkit-current-session))) (let ((kill-buffer-query-functions nil)) - (kill-this-buffer))) + (kill-current-buffer))) (defun evil-collection-xwidget-webkit-restore-last-closed-tab () "Restore last closed tab."