summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-06-23 11:32:24 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-06-23 11:32:24 -0400
commit5d2638bd31586fc276ddd4444a49627e855cf7fa (patch)
tree5546b75f40f2fa8ce7afab34b667351dd786fa10 /lisp/emulation
parentf6a09385237ca681010b5510e3786dd1cc538098 (diff)
downloademacs-5d2638bd31586fc276ddd4444a49627e855cf7fa.tar.gz
* lisp/simple.el (handle-shift-selection, exchange-point-and-mark)
(activate-mark): Set transient-mark-mode buffer-locally. (transient-mark-mode): Use&set the global value. * lisp/mouse.el (mouse-set-region-1, mouse-drag-track): Idem. * lisp/org/org-compat.el (activate-mark): Idem. * lisp/emulation/edt.el (edt-emulation-off): Save&restore the global transient-mark-mode setting. * lisp/obsolete/pc-select.el (pc-selection-mode): Use the transient-mark-mode function. Fixes: debbugs:6316
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/edt.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index a32fb612adb..e0e2660b70a 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -2033,7 +2033,8 @@ created."
;; Make highlighting of selected text work properly for EDT commands.
(if (featurep 'emacs)
(progn
- (setq edt-orig-transient-mark-mode transient-mark-mode)
+ (setq edt-orig-transient-mark-mode
+ (default-value 'transient-mark-mode))
(add-hook 'activate-mark-hook
(function
(lambda ()
@@ -2068,7 +2069,7 @@ created."
(edt-reset)
(force-mode-line-update t)
(if (featurep 'emacs)
- (setq transient-mark-mode edt-orig-transient-mark-mode))
+ (setq-default transient-mark-mode edt-orig-transient-mark-mode))
(message "Original key bindings restored; EDT Emulation disabled"))
(defun edt-default-menu-bar-update-buffers ()