[Emacs-diffs] /srv/bzr/emacs/trunk r111666: * lisp/subr.el (internal--called-interactively-p--get-frame): Avoid filling

[Stefan Monnier]

------------------------------------------------------------
revno: 111666
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13366
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-02-03 10:28:47 -0500
message:
  * lisp/subr.el (internal--called-interactively-p--get-frame): Avoid filling
  current-load-list.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-02 08:41:02 +0000
+++ b/lisp/ChangeLog    2013-02-03 15:28:47 +0000
@@ -1,3 +1,8 @@
+2013-02-03  Stefan Monnier  <address@hidden>
+
+       * subr.el (internal--called-interactively-p--get-frame): Avoid filling
+       current-load-list (bug#13366).
+
 2013-02-02  Christopher Schmidt  <address@hidden>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist):

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2013-01-13 01:23:48 +0000
+++ b/lisp/subr.el      2013-02-03 15:28:47 +0000
@@ -3976,12 +3976,14 @@
   ;; "static" variables.
   (let ((sym (make-symbol "base-index")))
     `(progn
-       (defvar ,sym
+       (defvar ,sym)
+       (unless (boundp ',sym)
          (let ((i 1))
+           (message "Computing base-index")
            (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t)
                            (indirect-function 'called-interactively-p)))
              (setq i (1+ i)))
-           i))
+           (setq ,sym i)))
        ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p)
        ;;   (error "called-interactively-p: %s is out-of-sync!" ,sym))
        (backtrace-frame (+ ,sym ,n)))))