mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
(eval-last-sexp-1): Use eval-last-sexp-print-value.
This commit is contained in:
parent
a8c78057ff
commit
606f5e7543
@ -512,27 +512,30 @@ With argument, print output into current buffer."
|
||||
expr
|
||||
'args)))))
|
||||
expr)))))))
|
||||
(let ((unabbreviated (let ((print-length nil) (print-level nil))
|
||||
(prin1-to-string value)))
|
||||
(print-length eval-expression-print-length)
|
||||
(print-level eval-expression-print-level)
|
||||
(char-string (prin1-char value))
|
||||
(beg (point))
|
||||
end)
|
||||
(prog1
|
||||
(prin1 value)
|
||||
(if (and (eq standard-output t) char-string)
|
||||
(princ (concat " = " char-string)))
|
||||
(setq end (point))
|
||||
(when (and (bufferp standard-output)
|
||||
(or (not (null print-length))
|
||||
(not (null print-level)))
|
||||
(not (string= unabbreviated
|
||||
(buffer-substring-no-properties beg end))))
|
||||
(last-sexp-setup-props beg end value
|
||||
unabbreviated
|
||||
(buffer-substring-no-properties beg end))
|
||||
))))))
|
||||
(eval-last-sexp-print-value value))))
|
||||
|
||||
(defun eval-last-sexp-print-value (value)
|
||||
(let ((unabbreviated (let ((print-length nil) (print-level nil))
|
||||
(prin1-to-string value)))
|
||||
(print-length eval-expression-print-length)
|
||||
(print-level eval-expression-print-level)
|
||||
(char-string (prin1-char value))
|
||||
(beg (point))
|
||||
end)
|
||||
(prog1
|
||||
(prin1 value)
|
||||
(if (and (eq standard-output t) char-string)
|
||||
(princ (concat " = " char-string)))
|
||||
(setq end (point))
|
||||
(when (and (bufferp standard-output)
|
||||
(or (not (null print-length))
|
||||
(not (null print-level)))
|
||||
(not (string= unabbreviated
|
||||
(buffer-substring-no-properties beg end))))
|
||||
(last-sexp-setup-props beg end value
|
||||
unabbreviated
|
||||
(buffer-substring-no-properties beg end))
|
||||
))))
|
||||
|
||||
|
||||
(defun eval-last-sexp (eval-last-sexp-arg-internal)
|
||||
|
Loading…
Reference in New Issue
Block a user