[Emacs-diffs] Changes to emacs/lisp/emulation/tpu-edt.el

[Richard M . Stallman]

Index: emacs/lisp/emulation/tpu-edt.el
diff -c emacs/lisp/emulation/tpu-edt.el:1.40 
emacs/lisp/emulation/tpu-edt.el:1.41
*** emacs/lisp/emulation/tpu-edt.el:1.40        Sun Jul  3 19:25:20 2005
--- emacs/lisp/emulation/tpu-edt.el     Sun Jul  3 19:27:05 2005
***************
*** 309,317 ****
  ;;;     o tpu-mark              o tpu-set-mark
  ;;;     o mode line section     o tpu-load-xkeys
  ;;;
! (defconst tpu-lucid-emacs19-p
    (string-match "Lucid" emacs-version)
!   "Non-nil if we are running Lucid Emacs version 19.")
  
  ;;;
  ;;;  Global Keymaps
--- 309,317 ----
  ;;;     o tpu-mark              o tpu-set-mark
  ;;;     o mode line section     o tpu-load-xkeys
  ;;;
! (defconst tpu-lucid-emacs-p
    (string-match "Lucid" emacs-version)
!   "Non-nil if we are running Lucid Emacs.")
  
  ;;;
  ;;;  Global Keymaps
***************
*** 338,344 ****
  (defvar tpu-original-global-map global-map
    "Original global keymap.")
  
! (and tpu-lucid-emacs19-p
       (defvar minibuffer-local-ns-map (make-sparse-keymap)
         "Hack to give Lucid Emacs the same maps as ordinary Emacs."))
  
--- 338,344 ----
  (defvar tpu-original-global-map global-map
    "Original global keymap.")
  
! (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,465 ****
    (setq tpu-mark-flag (if transient-mark-mode "" (if (tpu-mark) " @" "  ")))
    (force-mode-line-update))
  
! (cond (tpu-lucid-emacs19-p
         (add-hook 'zmacs-deactivate-region-hook 'tpu-update-mode-line)
         (add-hook 'zmacs-activate-region-hook 'tpu-update-mode-line))
        (t
--- 459,465 ----
    (setq tpu-mark-flag (if transient-mark-mode "" (if (tpu-mark) " @" "  ")))
    (force-mode-line-update))
  
! (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,547 ****
    "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)))
        (and mark-active (mark (not transient-mark-mode)))))
  
  (defun tpu-set-mark (pos)
--- 541,547 ----
    "TPU-edt version of the mark function.
  Return the appropriate value of the mark for the current
  version of Emacs."
!   (cond (tpu-lucid-emacs-p (mark (not zmacs-regions)))
        (and mark-active (mark (not transient-mark-mode)))))
  
  (defun tpu-set-mark (pos)
***************
*** 549,555 ****
  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)))
  
  (defun tpu-string-prompt (prompt history-symbol)
    "Read a string with PROMPT."
--- 549,555 ----
  Sets the mark at POS and activates the region according to the
  current version of Emacs."
    (set-mark pos)
!   (and tpu-lucid-emacs-p pos (zmacs-activate-region)))
  
  (defun tpu-string-prompt (prompt history-symbol)
    "Read a string with PROMPT."
***************
*** 2395,2401 ****
         (setq file (expand-file-name file)))
        (tpu-xkeys-file
         (setq file (expand-file-name tpu-xkeys-file)))
!       (tpu-lucid-emacs19-p
         (setq file (convert-standard-filename
                     (expand-file-name "~/.tpu-lucid-keys"))))
        (t
--- 2395,2401 ----
         (setq file (expand-file-name file)))
        (tpu-xkeys-file
         (setq file (expand-file-name tpu-xkeys-file)))
!       (tpu-lucid-emacs-p
         (setq file (convert-standard-filename
                     (expand-file-name "~/.tpu-lucid-keys"))))
        (t