From 39afa422ad0b3cef00292e260d424b7cd589b90d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Jan 2016 09:55:00 +0200 Subject: [PATCH] Fix tests for active region in hideif.el * lisp/progmodes/hideif.el (hif-evaluate-macro, hide-ifdef-block): Use 'use-region-p' to test whether to operate on region, instead of testing 'mark-active'. --- lisp/progmodes/hideif.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index a75a322b33..8a87eb9770 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1591,7 +1591,7 @@ not be expanded." '(nil nil))) (let ((case-fold-search nil)) (save-excursion - (unless mark-active + (unless (use-region-p) (setq rstart nil rend nil) (beginning-of-line) (when (and (re-search-forward hif-macro-expr-prefix-regexp nil t) @@ -1922,7 +1922,7 @@ Return as (TOP . BOTTOM) the extent of ifdef block." With optional prefix argument ARG, also hide the #ifdefs themselves." (interactive "P\nr") (let ((hide-ifdef-lines arg)) - (if mark-active + (if (use-region-p) (let ((hif-recurse-level (1+ hif-recurse-level))) (hif-recurse-on start end t) (setq mark-active nil)) -- 2.39.2