# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1085844810 0
# Node ID fcd2e17daffaa1c8c957543ed7b4d61313823963
# Parent  af9432138635c25b8a7ce3240a59669ca54d4b0d
(prin1-char): Catch errors from `string'.
(eval-last-sexp-print-value): Print char equivalent regardless
of standard-output value.

diff -r af9432138635 -r fcd2e17daffa lisp/emacs-lisp/lisp-mode.el
--- a/lisp/emacs-lisp/lisp-mode.el	Sat May 29 15:23:42 2004 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Sat May 29 15:33:30 2004 +0000
@@ -470,7 +470,10 @@
 	  (cond
 	   ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
 	   ((eq c 127) "\\C-?")
-	   (t (string c)))))))
+	   (t
+	    (condition-case nil
+		(string c)
+	      (error nil))))))))
 
 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
   "Evaluate sexp before point; print value in minibuffer.
@@ -538,9 +541,8 @@
 	end)
     (prog1
 	(prin1 value)
-      (if (eq standard-output t)
-          (let ((str (eval-expression-print-format value)))
-            (if str (princ str))))
+      (let ((str (eval-expression-print-format value)))
+	(if str (princ str)))
       (setq end (point))
       (when (and (bufferp standard-output)
 		 (or (not (null print-length))