HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up comment convention on the arch-tag lines.
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
pp.el
diff --git
a/lisp/emacs-lisp/pp.el
b/lisp/emacs-lisp/pp.el
index
93e30fb
..
9ce852f
100644
(file)
--- a/
lisp/emacs-lisp/pp.el
+++ b/
lisp/emacs-lisp/pp.el
@@
-1,6
+1,7
@@
;;; pp.el --- pretty printer for Emacs Lisp
;;; pp.el --- pretty printer for Emacs Lisp
-;; Copyright (C) 1989, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Randal Schwartz <merlyn@stonehenge.com>
;; Keywords: lisp
;; Author: Randal Schwartz <merlyn@stonehenge.com>
;; Keywords: lisp
@@
-9,7
+10,7
@@
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version
2
, or (at your option)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-19,13
+20,15
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Code:
;;; Commentary:
;;; Code:
+(defvar font-lock-verbose)
+
(defgroup pp nil
"Pretty printer for Emacs Lisp."
:prefix "pp-"
(defgroup pp nil
"Pretty printer for Emacs Lisp."
:prefix "pp-"
@@
-67,7
+70,7
@@
to make output that `read' can handle, whenever this is possible."
(save-excursion
(backward-char 1)
(skip-chars-backward "'`#^")
(save-excursion
(backward-char 1)
(skip-chars-backward "'`#^")
- (when (and (not (bobp)) (memq (char-before) '(?\ ?\t ?\n)))
+ (when (and (not (bobp)) (memq (char-before) '(?\
s
?\t ?\n)))
(delete-region
(point)
(progn (skip-chars-backward " \t\n") (point)))
(delete-region
(point)
(progn (skip-chars-backward " \t\n") (point)))
@@
-95,11
+98,12
@@
Output stream is STREAM, or value of `standard-output' (which see)."
;;;###autoload
(defun pp-eval-expression (expression)
;;;###autoload
(defun pp-eval-expression (expression)
- "Evaluate EXPRESSION and pretty-print value into a new display buffer.
-If the pretty-printed value fits on one line, the message line is used
-instead. The value is also consed onto the front of the list
-in the variable `values'."
- (interactive "xPp-eval: ")
+ "Evaluate EXPRESSION and pretty-print its value.
+Also add the value to the front of the list in the variable `values'."
+ (interactive
+ (list (read-from-minibuffer "Eval: " nil read-expression-map t
+ 'read-expression-history)))
+ (message "Evaluating...")
(setq values (cons (eval expression) values))
(let* ((old-show-function temp-buffer-show-function)
;; Use this function to display the buffer.
(setq values (cons (eval expression) values))
(let* ((old-show-function temp-buffer-show-function)
;; Use this function to display the buffer.
@@
-123,13
+127,16
@@
in the variable `values'."
(progn
(select-window window)
(run-hooks 'temp-buffer-show-hook))
(progn
(select-window window)
(run-hooks 'temp-buffer-show-hook))
- (select-window old-selected)))
+ (select-window old-selected)
+ (message "Evaluating...done. \
+See buffer *Pp Eval Output*.")))
(message "%s" (buffer-substring (point-min) (point)))
))))))
(with-output-to-temp-buffer "*Pp Eval Output*"
(pp (car values))
(with-current-buffer standard-output
(emacs-lisp-mode)
(message "%s" (buffer-substring (point-min) (point)))
))))))
(with-output-to-temp-buffer "*Pp Eval Output*"
(pp (car values))
(with-current-buffer standard-output
(emacs-lisp-mode)
+ (setq buffer-read-only nil)
(set (make-local-variable 'font-lock-verbose) nil)))))
;;;###autoload
(set (make-local-variable 'font-lock-verbose) nil)))))
;;;###autoload
@@
-172,5
+179,5
@@
Ignores leading comment characters."
(provide 'pp) ; so (require 'pp) works
(provide 'pp) ; so (require 'pp) works
-;;
;
arch-tag: b0f7c65b-02c7-42bb-9ee3-508a59b8fbb9
+;; arch-tag: b0f7c65b-02c7-42bb-9ee3-508a59b8fbb9
;;; pp.el ends here
;;; pp.el ends here