Mercurial > emacs
changeset 86531:da67dc2c4510
Don't require cl when compiling.
(tpu-emacs-search, tpu-emacs-rev-search): Declare as functions.
(tpu-edt-off): Use condition-case rather than ignore-errors.
Use with-no-warnings.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 28 Nov 2007 03:59:06 +0000 |
| parents | bc8f1a009d53 |
| children | c44e4015b517 |
| files | lisp/emulation/tpu-edt.el |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/tpu-edt.el Wed Nov 28 03:57:52 2007 +0000 +++ b/lisp/emulation/tpu-edt.el Wed Nov 28 03:59:06 2007 +0000 @@ -273,7 +273,6 @@ ;;; Code: -(eval-when-compile (require 'cl)) ;; we use picture-mode functions (require 'picture) @@ -1367,6 +1366,9 @@ ;; tpu-search-forward (t) tpu-search-reverse (t) ;; tpu-search-forward-exit (t) tpu-search-backward-exit (t) +(declare-function tpu-emacs-search "tpu-edt") +(declare-function tpu-emacs-rev-search "tpu-edt") + (defun tpu-set-search (&optional arg) "Set the search functions and set the search direction to the current direction. If an argument is specified, don't set the search direction." @@ -2432,7 +2434,10 @@ (if (eq tpu-global-map parent) (set-keymap-parent map (keymap-parent parent)) (setq map parent))))) - (ignore-errors (ad-disable-regexp "\\`tpu-")) + ;; Only has an effect if the advice in tpu-extras has been activated. + (condition-case nil + (with-no-warnings (ad-disable-regexp "\\`tpu-")) + (error nil)) (setq tpu-edt-mode nil))