Mercurial > emacs
diff lisp/emulation/tpu-edt.el @ 85688:b210bba3f477
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:07:17 +0000 |
parents | 0203f02d33db c6da63ecc892 |
children | da67dc2c4510 4bc33ffdda1a |
line wrap: on
line diff
--- a/lisp/emulation/tpu-edt.el Sat Oct 27 00:25:43 2007 +0000 +++ b/lisp/emulation/tpu-edt.el Sat Oct 27 09:07:17 2007 +0000 @@ -273,6 +273,7 @@ ;;; Code: +(eval-when-compile (require 'cl)) ;; we use picture-mode functions (require 'picture) @@ -2378,6 +2379,7 @@ (tpu-error (message "Sorry, couldn't copy - %s." (cdr conditions))))) (kill-buffer "*TPU-Notice*"))) +(defvar tpu-edt-old-global-values nil) ;;; ;;; Start and Stop TPU-edt @@ -2386,6 +2388,8 @@ (defun tpu-edt-on () "Turn on TPU/edt emulation." (interactive) + ;; To clean things up (and avoid cycles in the global map). + (tpu-edt-off) ;; First, activate tpu-global-map, while protecting the original keymap. (set-keymap-parent tpu-global-map global-map) (setq global-map tpu-global-map) @@ -2396,9 +2400,12 @@ (tpu-set-mode-line t) (tpu-advance-direction) ;; set page delimiter, display line truncation, and scrolling like TPU - (setq-default page-delimiter "\f") - (setq-default truncate-lines t) - (setq scroll-step 1) + (dolist (varval '((page-delimiter . "\f") + (truncate-lines . t) + (scroll-step . 1))) + (push (cons (car varval) (default-value (car varval))) + tpu-edt-old-global-values) + (set-default (car varval) (cdr varval))) (tpu-set-control-keys) (and window-system (tpu-load-xkeys nil)) (tpu-arrow-history) @@ -2415,9 +2422,9 @@ (tpu-reset-control-keys nil) (remove-hook 'post-command-hook 'tpu-search-highlight) (tpu-set-mode-line nil) - (setq-default page-delimiter "^\f") - (setq-default truncate-lines nil) - (setq scroll-step 0) + (while tpu-edt-old-global-values + (let ((varval (pop tpu-edt-old-global-values))) + (set-default (car varval) (cdr varval)))) ;; Remove tpu-global-map from the global map. (let ((map global-map)) (while map @@ -2425,7 +2432,7 @@ (if (eq tpu-global-map parent) (set-keymap-parent map (keymap-parent parent)) (setq map parent))))) - (ad-disable-regexp "\\`tpu-") + (ignore-errors (ad-disable-regexp "\\`tpu-")) (setq tpu-edt-mode nil))