From c9b6a3a6d3d4890ec0fc6d72a757a8abfa567215 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 3 Jul 2005 19:27:34 +0000 Subject: [PATCH] (tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p. Uses changed. --- lisp/ChangeLog | 1 + lisp/emulation/tpu-edt.el | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce58a6dd5c4..7de1ee9a6b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -9,6 +9,7 @@ * emulation/tpu-edt.el (tpu-emacs19-p): Var deleted. All references simplified. + (tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p. Uses changed. * textmodes/artist.el (artist-key-is-drawing) (artist-key-endpoint1, artist-key-poly-point-list) diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index 27f348853f1..02b4da7bedc 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -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 @@ GOLD is the ASCII 7-bit escape sequence OP.") (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 @@ GOLD is the ASCII 7-bit escape sequence OP.") (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 @@ Otherwise sets the tpu-match markers to nil and returns nil." "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 @@ version of Emacs." 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 @@ If FILE is nil, try to load a default file. The default file names are (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 -- 2.39.2