diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fdf12be0a1c..693d2d769ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-02-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * subr.el (internal--called-interactively-p--get-frame): Avoid filling + current-load-list (bug#13366). + 2013-02-02 Christopher Schmidt <christopher@ch.ristopher.com> * progmodes/compile.el (compilation-error-regexp-alist-alist): diff --git a/lisp/subr.el b/lisp/subr.el index e1ab5298409..82bbc022646 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3976,12 +3976,14 @@ the number of frames to skip (minus 1).") ;; "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))))) |