X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/99a33b77e15b9a075024701d060d912b2fd87caf..732fd4c7e11debd61c97eaaba3038d61e6ec7024:/lisp/emacs-lisp/eieio-datadebug.el

diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el
index 60510e1816..0a51ecfa20 100644
--- a/lisp/emacs-lisp/eieio-datadebug.el
+++ b/lisp/emacs-lisp/eieio-datadebug.el
@@ -1,6 +1,6 @@
 ;;; eieio-datadebug.el --- EIEIO extensions to the data debugger.
 
-;; Copyright (C) 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: OO, lisp
@@ -58,9 +58,9 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
 	(end nil)
 	(str (object-print object))
 	(tip (format "Object %s\nClass: %S\nParent(s): %S\n%d slots"
-		     (object-name-string object)
-		     (object-class object)
-		     (class-parents (object-class object))
+		     (eieio-object-name-string object)
+		     (eieio-object-class object)
+		     (eieio-class-parents (eieio-object-class object))
 		     (length (object-slots object))
 		     ))
 	)
@@ -80,39 +80,39 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
 ;; Each object should have an opportunity to show stuff about itself.
 
 (defmethod data-debug/eieio-insert-slots ((obj eieio-default-superclass)
-						prefix)
+					  prefix)
   "Insert the slots of OBJ into the current DDEBUG buffer."
-  (data-debug-insert-thing (object-name-string obj)
-				prefix
-				"Name: ")
-  (let* ((cl (object-class obj))
-	 (cv (class-v cl)))
-    (data-debug-insert-thing (class-constructor cl)
-				  prefix
-				  "Class: ")
-    ;; Loop over all the public slots
-    (let ((publa (aref cv class-public-a))
-	  (publd (aref cv class-public-d))
-	  )
-      (while publa
-	(if (slot-boundp obj (car publa))
-	    (let ((i (class-slot-initarg cl (car publa)))
-		  (v (eieio-oref obj (car publa))))
-	      (data-debug-insert-thing
-	       v prefix (concat
-			 (if i (symbol-name i)
-			   (symbol-name (car publa)))
-			 " ")))
-	  ;; Unbound case
-	  (let ((i (class-slot-initarg cl (car publa))))
-	    (data-debug-insert-custom
-	     "#unbound" prefix
-	     (concat (if i (symbol-name i)
-		       (symbol-name (car publa)))
-		     " ")
-	     'font-lock-keyword-face))
-	  )
-	(setq publa (cdr publa) publd (cdr publd))))))
+  (let ((inhibit-read-only t))
+    (data-debug-insert-thing (eieio-object-name-string obj)
+			     prefix
+			     "Name: ")
+    (let* ((cl (eieio-object-class obj))
+	   (cv (class-v cl)))
+      (data-debug-insert-thing (class-constructor cl)
+			       prefix
+			       "Class: ")
+      ;; Loop over all the public slots
+      (let ((publa (eieio--class-public-a cv))
+	    )
+	(while publa
+	  (if (slot-boundp obj (car publa))
+	      (let* ((i (class-slot-initarg cl (car publa)))
+		     (v (eieio-oref obj (car publa))))
+		(data-debug-insert-thing
+		 v prefix (concat
+			   (if i (symbol-name i)
+			     (symbol-name (car publa)))
+			   " ")))
+	    ;; Unbound case
+	    (let ((i (class-slot-initarg cl (car publa))))
+	      (data-debug-insert-custom
+	       "#unbound" prefix
+	       (concat (if i (symbol-name i)
+			 (symbol-name (car publa)))
+		       " ")
+	       'font-lock-keyword-face))
+	    )
+	  (setq publa (cdr publa)))))))
 
 ;;; Augment the Data debug thing display list.
 (data-debug-add-specialized-thing (lambda (thing) (object-p thing))
@@ -124,7 +124,7 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
 ;;
 (defmethod data-debug-show ((obj eieio-default-superclass))
   "Run ddebug against any EIEIO object OBJ."
-  (data-debug-new-buffer (format "*%s DDEBUG*" (object-name obj)))
+  (data-debug-new-buffer (format "*%s DDEBUG*" (eieio-object-name obj)))
   (data-debug-insert-object-slots obj "]"))
 
 ;;; DEBUG FUNCTIONS
@@ -132,7 +132,7 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
 (defun eieio-debug-methodinvoke (method class)
   "Show the method invocation order for METHOD with CLASS object."
   (interactive "aMethod: \nXClass Expression: ")
-  (let* ((eieio-pre-method-execution-hooks
+  (let* ((eieio-pre-method-execution-functions
 	  (lambda (l) (throw 'moose l) ))
 	 (data
 	  (catch 'moose (eieio-generic-call