From b755d988b498b19bd9a70a5dd8c6597ceb14a372 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 30 Apr 2016 23:35:27 +0800 Subject: [PATCH] Autoload cursor-sensor-inhibit (bug#23406) * lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-inhibit): Autoload. * lisp/isearch.el (isearch-update): Remove boundp check. --- lisp/emacs-lisp/cursor-sensor.el | 1 + lisp/isearch.el | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el index f1ab82ecc4a..2231179de1c 100644 --- a/lisp/emacs-lisp/cursor-sensor.el +++ b/lisp/emacs-lisp/cursor-sensor.el @@ -31,6 +31,7 @@ ;;; Code: +;;;###autoload (defvar cursor-sensor-inhibit nil) (defun cursor-sensor--intangible-p (pos) diff --git a/lisp/isearch.el b/lisp/isearch.el index 48354d39d48..17b5ef14cb6 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -840,7 +840,6 @@ See the command `isearch-forward-symbol' for more information." (isearch-update))))) -(defvar cursor-sensor-inhibit) ;; isearch-mode only sets up incremental search for the minor mode. ;; All the work is done by the isearch-mode commands. @@ -973,8 +972,7 @@ The last thing is to trigger a new round of lazy highlighting." (setq cursor-sensor-inhibit (delq 'isearch cursor-sensor-inhibit)))) (setq isearch--current-buffer (current-buffer)) (make-local-variable 'cursor-sensor-inhibit) - (unless (boundp 'cursor-sensor-inhibit) - (setq cursor-sensor-inhibit nil)) + (setq cursor-sensor-inhibit nil) ;; Suspend things like cursor-intangible during Isearch so we can search ;; even within intangible text. (push 'isearch cursor-sensor-inhibit)) -- 2.39.2