From 3d5d1b65b39a2ec8573f4040d45d7901248f357b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 3 Jan 2018 03:32:19 -0500 Subject: [PATCH] Move misplaced doom--buffer-narrowed-origin to correct place --- core/autoload/buffers.el | 2 -- core/autoload/editor.el | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el index 83369cd4c..5c6bef38d 100644 --- a/core/autoload/buffers.el +++ b/core/autoload/buffers.el @@ -1,7 +1,5 @@ ;;; core/autoload/buffers.el -*- lexical-binding: t; -*- -(defvar-local doom-buffer--narrowed-origin nil) - ;;;###autoload (defvar doom-real-buffer-functions '() "A list of predicate functions run to determine if a buffer is real. These diff --git a/core/autoload/editor.el b/core/autoload/editor.el index b98d53e75..5f83b80bc 100644 --- a/core/autoload/editor.el +++ b/core/autoload/editor.el @@ -218,6 +218,7 @@ consistent throughout a selected region, depending on `indent-tab-mode'." (tabify beg end) (untabify beg end))) +(defvar-local doom--buffer-narrowed-origin nil) ;;;###autoload (defun doom/narrow-buffer (beg end &optional clone-p) "Restrict editing in this buffer to the current region, indirectly. With CLONE-P, @@ -231,12 +232,12 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" (when clone-p (let ((old-buf (current-buffer))) (switch-to-buffer (clone-indirect-buffer nil nil)) - (setq doom-buffer--narrowed-origin old-buf))) + (setq doom--buffer-narrowed-origin old-buf))) (narrow-to-region beg end)) - (doom-buffer--narrowed-origin + (doom--buffer-narrowed-origin (kill-this-buffer) - (switch-to-buffer doom-buffer--narrowed-origin) - (setq doom-buffer--narrowed-origin nil)) + (switch-to-buffer doom--buffer-narrowed-origin) + (setq doom--buffer-narrowed-origin nil)) (t (widen))))