From 85f3c14b2f45dbe0c88df3569143340019fd63a1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 17 Jun 2016 16:01:07 -0400 Subject: [PATCH] Optimization: buffer-local-value instead of with-current-buffer --- core/core-eval.el | 2 +- core/defuns/defuns-buffers.el | 2 +- core/defuns/defuns-popups.el | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/core-eval.el b/core/core-eval.el index 694cb4ef1..b460fd452 100644 --- a/core/core-eval.el +++ b/core/core-eval.el @@ -38,7 +38,7 @@ (:custom (lambda (b &rest _) (when (and (featurep 'repl-toggle) (string-prefix-p "*" (buffer-name (get-buffer b)))) - (with-current-buffer b repl-toggle-mode)))) + (buffer-local-value 'repl-toggle-mode b)))) :popup t :align below :size 16 :select t) (map! :map repl-toggle-mode-map diff --git a/core/defuns/defuns-buffers.el b/core/defuns/defuns-buffers.el index 7257e69da..50ce2f300 100644 --- a/core/defuns/defuns-buffers.el +++ b/core/defuns/defuns-buffers.el @@ -86,7 +86,7 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" ;;;###autoload (defun doom/get-buffers-in-modes (modes &optional buffer-list) "Get a list of buffers whose major-mode is one of MODES" - (--filter (with-current-buffer it (memq major-mode modes)) + (--filter (memq (buffer-local-value 'major-mode it) modes) (or buffer-list (doom/get-buffers)))) ;;;###autoload diff --git a/core/defuns/defuns-popups.el b/core/defuns/defuns-popups.el index e0578c043..7cb0fc6d9 100644 --- a/core/defuns/defuns-popups.el +++ b/core/defuns/defuns-popups.el @@ -27,12 +27,12 @@ ;;;###autoload (defun doom/popup-p (&optional window) - "Whether WINDOW is a shackle popup window or not. If WINDOW is nil, use -current window." - (let ((window (or window (selected-window)))) - (and (window-live-p window) - (with-selected-window window (bound-and-true-p doom-popup-mode)) - window))) + "Whether WINDOW is a popup window or not. If WINDOW is nil, use current +window. Returns nil or the popup window." + (setq window (or window (selected-window))) + (and (window-live-p window) + (buffer-local-value 'doom-popup-mode (window-buffer window)) + window)) ;;;###autoload (defun doom/popups-p ()