Use cl-print-object instead of object-print throughout cedet

* lisp/cedet/semantic/db-find.el (semanticdb-find-log-activity):
Ditto.

* lisp/cedet/semantic/analyze/debug.el
(semantic-analyzer-debug-insert-include-summary): Ditto.

* lisp/cedet/semantic/bovine/c.el (semantic-c-describe-environment)
(semantic-c-describe-environment)
(semantic-c-describe-environment): Ditto.

* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-fileless-include-describe): Ditto.
(semantic-decoration-all-include-summary): Ditto.

* lisp/cedet/srecode/insert.el
(srecode-insert-variable-secondname-handler): Use cl-print-object
instead of object-print.

diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index d78d850723f9714250f0751bed11d64b0f0558cf..8ad9c22216f29356310990d2344f568f81142fbe 100644 (file)
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -408,16 +408,16 @@ or implementing a version specific to ")
        (princ (substitute-command-keys
                "\n\nThis file's project include search is handled by the EDE object:\n"))
        (princ "  Buffer Target:  ")
-       (princ (object-print edeobj))
+       (princ (cl-print-object edeobj))
        (princ "\n")
        (when (not (eq edeobj edeproj))
          (princ "  Buffer Project: ")
-         (princ (object-print edeproj))
+         (princ (cl-print-object edeproj))
          (princ "\n"))
        (when edeproj
          (let ((loc (ede-get-locator-object edeproj)))
            (princ "  Backup Locator: ")
-           (princ (object-print loc))
+           (princ (cl-print-object loc))
            (princ "\n")))
        )
 

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 5f0ea168e25ff8eab0feb757ee291815bf1efea5..06c77c79285c2b9cea7a9b1e8c1e40ce03cf7fd6 100644 (file)
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -2183,7 +2183,7 @@ actually in their parent which is not accessible.")
                      (list ede-object))))
          (dolist (O objs)
            (princ "    EDE : ")
-           (princ (object-print O))
+           (princ (cl-print-object O))
            (let ((ipath (ede-system-include-path O)))
              (if (not ipath)
                  (princ "\n     with NO specified system include path.\n")
@@ -2221,7 +2221,7 @@ actually in their parent which is not accessible.")
          (princ "    in table: ")
          (let ((fto (semanticdb-file-table-object file)))
            (if fto
-               (princ (object-print fto))
+               (princ (cl-print-object fto))
              (princ "No Table")))
          (princ "\n")
          ))
@@ -2251,7 +2251,7 @@ actually in their parent which is not accessible.")
        (princ "\n  Project symbol map:\n")
        (when (and (boundp 'ede-object) ede-object)
          (princ "      Your project symbol map is also derived from the EDE object:\n      ")
-         (princ (object-print ede-object)))
+         (princ (cl-print-object ede-object)))
        (princ "\n\n")
        (if (obarrayp semantic-lex-spp-project-macro-symbol-obarray)
            (let ((macros nil))

diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index c89ae1392dd7207492f639c0c6d3bb6d5e6cfb0a..50b1afbf81e1597e4a20e111977bf3ea90835be3 100644 (file)
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1085,7 +1085,7 @@ Returns result."
   "Log that TABLE has been searched and RESULT was found."
   (when semanticdb-find-log-flag
     (with-current-buffer semanticdb-find-log-buffer-name
-      (insert "Table: " (object-print table)
+      (insert "Table: " (cl-print-object table)
              " Result: " (int-to-string (length result)) " tags"
              "\n")
       )

diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 4412a4c18acccfff22f6f500c16597c9bdd7be84..eaf2425c53f559493f9fce40dda43816c60d5d7e 100644 (file)
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -595,7 +595,7 @@ on disk, but a database table of tags has been associated with it.
 This means that the include will still be used to find tags for
 searches, but you cannot visit this include.\n\n")
       (princ "This Header is now represented by the following database table:\n\n  ")
-      (princ (object-print table))
+      (princ (cl-print-object table))
       )))
 
 (defun semantic-decoration-fileless-include-menu (event)
@@ -749,17 +749,17 @@ Argument EVENT describes the event that caused this function to be called."
        (princ (substitute-command-keys
                "  This file's project include search is handled by the EDE object:\n"))
        (princ "    Buffer Target:  ")
-       (princ (object-print ede-object))
+       (princ (cl-print-object ede-object))
        (princ "\n")
        (when (not (eq ede-object ede-object-project))
          (princ "    Buffer Project: ")
-         (princ (object-print ede-object-project))
+         (princ (cl-print-object ede-object-project))
          (princ "\n")
          )
        (when ede-object-project
          (let ((loc (ede-get-locator-object ede-object-project)))
            (princ "    Backup in-project Locator: ")
-           (princ (object-print loc))
+           (princ (cl-print-object loc))
            (princ "\n")))
        (let ((syspath (ede-system-include-path ede-object-project)))
          (if (not syspath)

diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index a7445ea401ae88c8ccb217d16e507d7296c6639c..2c3b996dd7b6c9af23cefd84fc8abc395cfaee49 100644 (file)
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -464,7 +464,7 @@ If SECONDNAME is nil, return VALUE."
          (srecode-insert-report-error
           dictionary
           "Variable inserter %s: second argument `%s' is not a function"
-          (object-print sti) secondname)))
+          (c-print-object sti) secondname)))
     value))
 
 (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-variable)