[Emacs-diffs] Changes to emacs/lisp/simple.el

[Richard M . Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.689 emacs/lisp/simple.el:1.690
*** emacs/lisp/simple.el:1.689  Wed Feb  9 15:50:41 2005
--- emacs/lisp/simple.el        Thu Feb 10 06:47:58 2005
***************
*** 902,908 ****
                 (eq this-command last-command)
                 (if (boundp 'edebug-active) edebug-active)))
        (let ((char-string
!              (if (or (and (boundp 'edebug-active) edebug-active)
                       (memq this-command '(eval-last-sexp 
eval-print-last-sexp)))
                   (prin1-char value))))
          (if char-string
--- 902,908 ----
                 (eq this-command last-command)
                 (if (boundp 'edebug-active) edebug-active)))
        (let ((char-string
!              (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,4680 ****
                               (point-min)
                               'mouse-face))
               (element-common-end
!               (+ (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)
--- 4674,4681 ----
                               (point-min)
                               'mouse-face))
               (element-common-end
!               (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)