diff options
| author | Lars Ingebrigtsen | 2019-06-12 22:49:19 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-12 23:26:56 +0200 |
| commit | 6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9 (patch) | |
| tree | 663d543ae2b0287de9727f0bea3f8d17809377fd | |
| parent | 468517c8b8322b07e202a2036e718e182ec569db (diff) | |
| download | emacs-6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9.tar.gz emacs-6fbfd36bf4e6c30d21eaf37b6114b9a4504df0b9.zip | |
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 | |||
| 294 | mode, ON-REGION is ignored and assumed true if the region is active." | 294 | mode, ON-REGION is ignored and assumed true if the region is active." |
| 295 | (unwind-protect | 295 | (unwind-protect |
| 296 | (progn | 296 | (progn |
| 297 | (if (or (and (boundp 'transient-mark-mode) ; For Emacs | 297 | (if (or (and transient-mark-mode |
| 298 | transient-mark-mode | 298 | mark-active)) |
| 299 | mark-active) | ||
| 300 | (if (featurep 'xemacs) | ||
| 301 | (and zmacs-regions (mark)))) | ||
| 302 | (setq on-region t)) | 299 | (setq on-region t)) |
| 303 | (and on-region | 300 | (and on-region |
| 304 | (set-marker tempo-region-start (min (mark) (point))) | 301 | (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." | |||
| 313 | (tempo-insert-mark (point-marker))) | 310 | (tempo-insert-mark (point-marker))) |
| 314 | (tempo-forward-mark)) | 311 | (tempo-forward-mark)) |
| 315 | (tempo-forget-insertions) | 312 | (tempo-forget-insertions) |
| 316 | ;; Should I check for zmacs here too??? | 313 | (and transient-mark-mode |
| 317 | (and (boundp 'transient-mark-mode) | ||
| 318 | transient-mark-mode | ||
| 319 | (deactivate-mark)))) | 314 | (deactivate-mark)))) |
| 320 | 315 | ||
| 321 | ;;; | 316 | ;;; |