summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-02-08 00:25:16 +0100
committerStefan Kangas <stefan@marxist.se>2021-02-08 00:25:16 +0100
commit7d4d577ed14fb2519ea2eaecb11c8ecff658f147 (patch)
treef19b3bfdc2c8e8b748e53fb748450334a02dace3 /lisp/vc/ediff-util.el
parent651aefa31246a786891e2e743800dbf753223928 (diff)
downloademacs-7d4d577ed14fb2519ea2eaecb11c8ecff658f147.tar.gz
emacs-7d4d577ed14fb2519ea2eaecb11c8ecff658f147.tar.bz2
emacs-7d4d577ed14fb2519ea2eaecb11c8ecff658f147.zip
Prefer setq-local in a few more places
* lisp/calc/calc-embed.el (calc-embedded-make-info): * lisp/calc/calcalg2.el (calcFunc-integ): * lisp/comint.el (comint-mode): * lisp/epa.el (epa--list-keys, epa--show-key): * lisp/epg.el (epg--start): * lisp/vc/ediff-util.el (ediff-activate-mark): Prefer setq-local.
Diffstat (limited to 'lisp/vc/ediff-util.el')
-rw-r--r--lisp/vc/ediff-util.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index f955ba8283a..9909dcd5424 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3998,8 +3998,8 @@ Mail anyway? (y or n) ")
(define-obsolete-function-alias 'ediff-deactivate-mark #'deactivate-mark "27.1")
(defun ediff-activate-mark ()
- (make-local-variable 'transient-mark-mode)
- (setq mark-active 'ediff-util transient-mark-mode t))
+ (setq mark-active 'ediff-util)
+ (setq-local transient-mark-mode t))
(define-obsolete-function-alias 'ediff-nuke-selective-display #'ignore "27.1")