[Emacs-diffs] master 6fbfd36 1/5: Remove XEmacs compat code from tempo.el

[Lars Ingebrigtsen]

branch: master
commit 6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove XEmacs compat code from tempo.el
    
    * lisp/tempo.el (tempo-insert-template): Remove XEmacs compat code.
---
 lisp/tempo.el | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lisp/tempo.el b/lisp/tempo.el
index e3b9c76..e28ef32 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))))
 
 ;;;