diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-12 22:49:19 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-12 23:26:56 +0200 |
| commit | 6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9 (patch) | |
| tree | 663d543ae2b0287de9727f0bea3f8d17809377fd | |
| parent | 468517c8b8322b07e202a2036e718e182ec569db (diff) | |
| download | emacs-6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9.tar.gz | |
Remove XEmacs compat code from tempo.el
* lisp/tempo.el (tempo-insert-template): Remove XEmacs compat code.
| -rw-r--r-- | lisp/tempo.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/tempo.el b/lisp/tempo.el index e3b9c76a5b8..e28ef326884 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -294,11 +294,8 @@ TEMPLATE is the template to be inserted. If ON-REGION is non-nil the mode, ON-REGION is ignored and assumed true if the region is active." (unwind-protect (progn - (if (or (and (boundp 'transient-mark-mode) ; For Emacs - transient-mark-mode - mark-active) - (if (featurep 'xemacs) - (and zmacs-regions (mark)))) + (if (or (and transient-mark-mode + mark-active)) (setq on-region t)) (and on-region (set-marker tempo-region-start (min (mark) (point))) @@ -313,9 +310,7 @@ mode, ON-REGION is ignored and assumed true if the region is active." (tempo-insert-mark (point-marker))) (tempo-forward-mark)) (tempo-forget-insertions) - ;; Should I check for zmacs here too??? - (and (boundp 'transient-mark-mode) - transient-mark-mode + (and transient-mark-mode (deactivate-mark)))) ;;; |