comparison lisp/emacs-lisp/lisp-mode.el @ 55829:fcd2e17daffa

(prin1-char): Catch errors from `string'. (eval-last-sexp-print-value): Print char equivalent regardless of standard-output value.
author Richard M. Stallman <rms@gnu.org>
date Sat, 29 May 2004 15:33:30 +0000
parents a4c5317be59a
children 9650d55ad73d
comparison
equal deleted inserted replaced
55828:af9432138635 55829:fcd2e17daffa
468 (t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-)))) 468 (t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-))))
469 (event-modifiers char) "") 469 (event-modifiers char) "")
470 (cond 470 (cond
471 ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c)) 471 ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
472 ((eq c 127) "\\C-?") 472 ((eq c 127) "\\C-?")
473 (t (string c))))))) 473 (t
474 (condition-case nil
475 (string c)
476 (error nil))))))))
474 477
475 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal) 478 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
476 "Evaluate sexp before point; print value in minibuffer. 479 "Evaluate sexp before point; print value in minibuffer.
477 With argument, print output into current buffer." 480 With argument, print output into current buffer."
478 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))) 481 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)))
536 (print-level eval-expression-print-level) 539 (print-level eval-expression-print-level)
537 (beg (point)) 540 (beg (point))
538 end) 541 end)
539 (prog1 542 (prog1
540 (prin1 value) 543 (prin1 value)
541 (if (eq standard-output t) 544 (let ((str (eval-expression-print-format value)))
542 (let ((str (eval-expression-print-format value))) 545 (if str (princ str)))
543 (if str (princ str))))
544 (setq end (point)) 546 (setq end (point))
545 (when (and (bufferp standard-output) 547 (when (and (bufferp standard-output)
546 (or (not (null print-length)) 548 (or (not (null print-length))
547 (not (null print-level))) 549 (not (null print-level)))
548 (not (string= unabbreviated 550 (not (string= unabbreviated