From 6e8487e1d4f55d8c21ce6bafb2c028b705523b74 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 28 Apr 2020 15:10:59 -0400 Subject: [PATCH] Fix #2992: wrong-type-arg stringp on switch-to-buffer (switch-to-buffer nil) should switch to other-buffer, as per its documentation, which was not respected by our switch-buffer hook mechanism. --- core/core-ui.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/core-ui.el b/core/core-ui.el index 6ff9e85ba..b742d97e2 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -105,7 +105,10 @@ size.") (defun doom-run-switch-buffer-hooks-a (orig-fn buffer-or-name &rest args) (let ((gc-cons-threshold most-positive-fixnum)) (if (or doom-inhibit-switch-buffer-hooks - (eq (current-buffer) (get-buffer buffer-or-name)) + (eq (current-buffer) + (get-buffer (or buffer-or-name + (if (eq orig-fn #'switch-to-buffer) + (other-buffer))))) (and (eq orig-fn #'switch-to-buffer) (car args))) (apply orig-fn buffer-or-name args) (let ((doom-inhibit-switch-buffer-hooks t)