diff options
| author | Richard M. Stallman <[email protected]> | 2005-02-10 06:47:58 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2005-02-10 06:47:58 +0000 |
| commit | 9bb25ed3b898cb59f403be1ee9356d4718e3af22 (patch) | |
| tree | fa9be20dd001ed133e588805863a8423ab2185b6 /lisp/simple.el | |
| parent | a4bdcdf3788ae972a2a7c701f97bd2c2865491fc (diff) | |
(eval-expression-print-format): Avoid warning about edebug-active.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 03a91fb4db..3f3c41422a 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) |