aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-03 03:19:07 +0000
committerGlenn Morris2007-08-03 03:19:07 +0000
commit501d63d62db20dedc26a803bcc601d89915f5c52 (patch)
tree3fa0b885414bef85ce0a9d1038c348d7a1cc3867
parentfd2a7b94b3d89d6d46e7ec2776b25d27842ec34b (diff)
downloademacs-501d63d62db20dedc26a803bcc601d89915f5c52.tar.gz
emacs-501d63d62db20dedc26a803bcc601d89915f5c52.zip
Revert previous change, which was only supposed to be in trunk.
-rw-r--r--lisp/emacs-lisp/pp.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index a5cefff399f..21175a03b4d 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -103,7 +103,6 @@ Also add the value to the front of the list in the variable `values'."
103 (interactive 103 (interactive
104 (list (read-from-minibuffer "Eval: " nil read-expression-map t 104 (list (read-from-minibuffer "Eval: " nil read-expression-map t
105 'read-expression-history))) 105 'read-expression-history)))
106 (message "Evaluating...")
107 (setq values (cons (eval expression) values)) 106 (setq values (cons (eval expression) values))
108 (let* ((old-show-function temp-buffer-show-function) 107 (let* ((old-show-function temp-buffer-show-function)
109 ;; Use this function to display the buffer. 108 ;; Use this function to display the buffer.
@@ -127,16 +126,13 @@ Also add the value to the front of the list in the variable `values'."
127 (progn 126 (progn
128 (select-window window) 127 (select-window window)
129 (run-hooks 'temp-buffer-show-hook)) 128 (run-hooks 'temp-buffer-show-hook))
130 (select-window old-selected) 129 (select-window old-selected)))
131 (message "Evaluating...done. \
132See buffer *Pp Eval Output*.")))
133 (message "%s" (buffer-substring (point-min) (point))) 130 (message "%s" (buffer-substring (point-min) (point)))
134 )))))) 131 ))))))
135 (with-output-to-temp-buffer "*Pp Eval Output*" 132 (with-output-to-temp-buffer "*Pp Eval Output*"
136 (pp (car values)) 133 (pp (car values))
137 (with-current-buffer standard-output 134 (with-current-buffer standard-output
138 (emacs-lisp-mode) 135 (emacs-lisp-mode)
139 (setq buffer-read-only nil)
140 (set (make-local-variable 'font-lock-verbose) nil))))) 136 (set (make-local-variable 'font-lock-verbose) nil)))))
141 137
142;;;###autoload 138;;;###autoload