# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1108018078 0
# Node ID bfdc246541279b4122f639e03c361f4ae3d7f353
# Parent  dfc2b4718048f333eb2e9fdf65f6fdf5de43a051
(eval-expression-print-format): Avoid warning about edebug-active.

diff -r dfc2b4718048 -r bfdc24654127 lisp/simple.el
--- a/lisp/simple.el	Thu Feb 10 06:46:42 2005 +0000
+++ b/lisp/simple.el	Thu Feb 10 06:47:58 2005 +0000
@@ -902,7 +902,7 @@
                (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 @@
 			       (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)