[Emacs-diffs] /srv/bzr/emacs/trunk r105947: * lisp/emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the

[Stefan Monnier]

------------------------------------------------------------
revno: 105947
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9613
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-27 21:20:41 -0400
message:
  * lisp/emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the
  object has more than 4 slots.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-28 00:59:28 +0000
+++ b/lisp/ChangeLog    2011-09-28 01:20:41 +0000
@@ -1,3 +1,8 @@
+2011-09-28  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the
+       object has more than 4 slots (bug#9613).
+
 2011-09-28  Juanma Barranquero  <address@hidden>
 
        * subr.el (with-output-to-temp-buffer):

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2011-09-19 21:14:23 +0000
+++ b/lisp/emacs-lisp/debug.el  2011-09-28 01:20:41 +0000
@@ -869,8 +869,10 @@
                  ,defn
                  ,@(remq '&rest (remq '&optional args))))))
        (if (> (length defn) 5)
+            ;; The mere presence of field 5 is sufficient to make
+            ;; it interactive.
            (push `(interactive ,(aref defn 5)) body))
-       (if (aref defn 4)
+       (if (and (> (length defn) 4) (aref defn 4))
            ;; Use `documentation' here, to get the actual string,
            ;; in case the compiled function has a reference
            ;; to the .elc file.