From: Dave Love Date: Sat, 16 Oct 1999 21:30:20 +0000 (+0000) Subject: (edebug-install-read-eval-functions) X-Git-Tag: emacs-pretest-21.0.90~6415 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=faa5fa58af50b4a3818c83f731657f2712e4ddb5;p=emacs.git (edebug-install-read-eval-functions) (edebug-uninstall-read-eval-functions): Use load-read-function, avoiding elisp-eval. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0abe6fe5df..424274a2aee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +1999-10-16 Dave Love + + * emacs-lisp/edebug.el (edebug-install-read-eval-functions) + (edebug-uninstall-read-eval-functions): Use load-read-function, + avoiding elisp-eval. + 1999-10-16 Sam Steingold * emacs-lisp/cl-indent.el (common-lisp-indent-function): Use `eq' diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 4ec31b91853..97b85a2564c 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -504,9 +504,6 @@ Return the result of the last expression in BODY." ;; read is redefined to maybe instrument forms. ;; eval-defun is redefined to check edebug-all-forms and edebug-all-defs. -;; Use the Lisp version of eval-region. -(require 'eval-reg "eval-reg") - ;; Save the original read function (or (fboundp 'edebug-original-read) (defalias 'edebug-original-read (symbol-function 'read))) @@ -615,15 +612,13 @@ or if an error occurs, leave point after it with mark at the original point." (defun edebug-install-read-eval-functions () (interactive) ;; Don't install if already installed. - (if (eq (symbol-function 'read) 'edebug-read) nil - (elisp-eval-region-install) - (defalias 'read 'edebug-read) + (unless load-read-function + (setq load-read-function 'edebug-read) (defalias 'eval-defun 'edebug-eval-defun))) (defun edebug-uninstall-read-eval-functions () (interactive) - (elisp-eval-region-uninstall) - (defalias 'read (symbol-function 'edebug-original-read)) + (setq load-read-function nil) (defalias 'eval-defun (symbol-function 'edebug-original-eval-defun)))