diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/authors.el | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-indent.el | 18 | ||||
| -rw-r--r-- | lisp/emacs-lisp/pp.el | 17 |
3 files changed, 21 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index d1710dba7a4..db8c3d5d21a 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -105,6 +105,7 @@ files.") ("Matt Swift" "Matthew Swift") ("Michael R. Mauger" "Michael Mauger") ("Michael D. Ernst" "Michael Ernst") + ("Micha,Ak(Bl Cadilhac" "Michael Cadilhac") ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg") ("Mikio Nakajima" "Nakajima Mikio") ("Paul Eggert" "eggert") diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index c3ceb4c2f3a..f09b72f396f 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -373,14 +373,16 @@ If nil, indent backquoted lists as data, i.e., like quoted lists." ;; Too few elements in pattern. (throw 'exit normal-indent))) ((eq tem 'nil) - (throw 'exit (list normal-indent containing-form-start))) - ((eq tem '&lambda) - (throw 'exit - (cond ((null p) - (list (+ sexp-column 4) containing-form-start)) - ((null (cdr p)) - (+ sexp-column 1)) - (t normal-indent)))) + (throw 'exit (if (consp normal-indent) + normal-indent + (list normal-indent containing-form-start)))) + ((eq tem '&lambda) + (throw 'exit + (cond ((null p) + (list (+ sexp-column 4) containing-form-start)) + ((null (cdr p)) + (+ sexp-column 1)) + (t normal-indent)))) ((integerp tem) (throw 'exit (if (null p) ;not in subforms diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index f30b69ddac0..a9cb2abd741 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -97,13 +97,16 @@ Output stream is STREAM, or value of `standard-output' (which see)." (princ (pp-to-string object) (or stream standard-output))) ;;;###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: ") - (setq values (cons (eval expression) values)) +(defun pp-eval-expression (expval) + "Evaluate an expression, then pretty-print value EXPVAL into a new buffer. +If pretty-printed EXPVAL fits on one line, display it in the echo +area instead. Also add EXPVAL to the front of the list +in the variable `values'. + +Non-interactively, the argument is the value, EXPVAL, not the expression +to evaluate." + (interactive "XPp-eval: ") + (setq values (cons expval values)) (let* ((old-show-function temp-buffer-show-function) ;; Use this function to display the buffer. ;; This function either decides not to display it at all |