Mercurial > emacs
changeset 63962:a465377d3280
(tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p. Uses changed.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 03 Jul 2005 19:27:05 +0000 |
parents | 96ba90fe813a |
children | bca488f8a2c4 |
files | lisp/emulation/tpu-edt.el |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/tpu-edt.el Sun Jul 03 19:25:36 2005 +0000 +++ b/lisp/emulation/tpu-edt.el Sun Jul 03 19:27:05 2005 +0000 @@ -309,9 +309,9 @@ ;;; o tpu-mark o tpu-set-mark ;;; o mode line section o tpu-load-xkeys ;;; -(defconst tpu-lucid-emacs19-p +(defconst tpu-lucid-emacs-p (string-match "Lucid" emacs-version) - "Non-nil if we are running Lucid Emacs version 19.") + "Non-nil if we are running Lucid Emacs.") ;;; ;;; Global Keymaps @@ -338,7 +338,7 @@ (defvar tpu-original-global-map global-map "Original global keymap.") -(and tpu-lucid-emacs19-p +(and tpu-lucid-emacs-p (defvar minibuffer-local-ns-map (make-sparse-keymap) "Hack to give Lucid Emacs the same maps as ordinary Emacs.")) @@ -459,7 +459,7 @@ (setq tpu-mark-flag (if transient-mark-mode "" (if (tpu-mark) " @" " "))) (force-mode-line-update)) -(cond (tpu-lucid-emacs19-p +(cond (tpu-lucid-emacs-p (add-hook 'zmacs-deactivate-region-hook 'tpu-update-mode-line) (add-hook 'zmacs-activate-region-hook 'tpu-update-mode-line)) (t @@ -541,7 +541,7 @@ "TPU-edt version of the mark function. Return the appropriate value of the mark for the current version of Emacs." - (cond (tpu-lucid-emacs19-p (mark (not zmacs-regions))) + (cond (tpu-lucid-emacs-p (mark (not zmacs-regions))) (and mark-active (mark (not transient-mark-mode))))) (defun tpu-set-mark (pos) @@ -549,7 +549,7 @@ Sets the mark at POS and activates the region according to the current version of Emacs." (set-mark pos) - (and tpu-lucid-emacs19-p pos (zmacs-activate-region))) + (and tpu-lucid-emacs-p pos (zmacs-activate-region))) (defun tpu-string-prompt (prompt history-symbol) "Read a string with PROMPT." @@ -2395,7 +2395,7 @@ (setq file (expand-file-name file))) (tpu-xkeys-file (setq file (expand-file-name tpu-xkeys-file))) - (tpu-lucid-emacs19-p + (tpu-lucid-emacs-p (setq file (convert-standard-filename (expand-file-name "~/.tpu-lucid-keys")))) (t