From 9bb25ed3b898cb59f403be1ee9356d4718e3af22 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 10 Feb 2005 06:47:58 +0000 Subject: [PATCH] (eval-expression-print-format): Avoid warning about edebug-active. --- lisp/simple.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 03a91fb4db0..3f3c41422a1 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -902,7 +902,7 @@ display the result of expression evaluation." (eq this-command last-command) (if (boundp 'edebug-active) edebug-active))) (let ((char-string - (if (or (and (boundp 'edebug-active) edebug-active) + (if (or (if (boundp 'edebug-active) edebug-active) (memq this-command '(eval-last-sexp eval-print-last-sexp))) (prin1-char value)))) (if char-string @@ -4674,7 +4674,8 @@ of the differing parts is, by contrast, slightly highlighted." (point-min) 'mouse-face)) (element-common-end - (+ (or element-start nil) common-string-length)) + (and element-start + (+ (or element-start nil) common-string-length))) (maxp (point-max))) (while (and element-start (< element-common-end maxp)) (when (and (get-char-property element-start 'mouse-face) -- 2.39.5