aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-13 15:58:32 +0200
committerLars Ingebrigtsen2019-06-13 15:58:32 +0200
commite6e4a05087431c90b96636325ca7d2eac00c95c8 (patch)
tree7456e45b753d3dfb3a43574a1699a43f3be3002e
parent67b261d2dad9b07f3fd62f873c892981af8a0742 (diff)
downloademacs-e6e4a05087431c90b96636325ca7d2eac00c95c8.tar.gz
emacs-e6e4a05087431c90b96636325ca7d2eac00c95c8.zip
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.
-rw-r--r--lisp/cedet/semantic/analyze/debug.el6
-rw-r--r--lisp/cedet/semantic/bovine/c.el6
-rw-r--r--lisp/cedet/semantic/db-find.el2
-rw-r--r--lisp/cedet/semantic/decorate/include.el8
-rw-r--r--lisp/cedet/srecode/insert.el2
5 files changed, 12 insertions, 12 deletions
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index d78d850723f..8ad9c22216f 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -408,16 +408,16 @@ or implementing a version specific to ")
408 (princ (substitute-command-keys 408 (princ (substitute-command-keys
409 "\n\nThis file's project include search is handled by the EDE object:\n")) 409 "\n\nThis file's project include search is handled by the EDE object:\n"))
410 (princ " Buffer Target: ") 410 (princ " Buffer Target: ")
411 (princ (object-print edeobj)) 411 (princ (cl-print-object edeobj))
412 (princ "\n") 412 (princ "\n")
413 (when (not (eq edeobj edeproj)) 413 (when (not (eq edeobj edeproj))
414 (princ " Buffer Project: ") 414 (princ " Buffer Project: ")
415 (princ (object-print edeproj)) 415 (princ (cl-print-object edeproj))
416 (princ "\n")) 416 (princ "\n"))
417 (when edeproj 417 (when edeproj
418 (let ((loc (ede-get-locator-object edeproj))) 418 (let ((loc (ede-get-locator-object edeproj)))
419 (princ " Backup Locator: ") 419 (princ " Backup Locator: ")
420 (princ (object-print loc)) 420 (princ (cl-print-object loc))
421 (princ "\n"))) 421 (princ "\n")))
422 ) 422 )
423 423
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 5f0ea168e25..06c77c79285 100644
--- 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.")
2183 (list ede-object)))) 2183 (list ede-object))))
2184 (dolist (O objs) 2184 (dolist (O objs)
2185 (princ " EDE : ") 2185 (princ " EDE : ")
2186 (princ (object-print O)) 2186 (princ (cl-print-object O))
2187 (let ((ipath (ede-system-include-path O))) 2187 (let ((ipath (ede-system-include-path O)))
2188 (if (not ipath) 2188 (if (not ipath)
2189 (princ "\n with NO specified system include path.\n") 2189 (princ "\n with NO specified system include path.\n")
@@ -2221,7 +2221,7 @@ actually in their parent which is not accessible.")
2221 (princ " in table: ") 2221 (princ " in table: ")
2222 (let ((fto (semanticdb-file-table-object file))) 2222 (let ((fto (semanticdb-file-table-object file)))
2223 (if fto 2223 (if fto
2224 (princ (object-print fto)) 2224 (princ (cl-print-object fto))
2225 (princ "No Table"))) 2225 (princ "No Table")))
2226 (princ "\n") 2226 (princ "\n")
2227 )) 2227 ))
@@ -2251,7 +2251,7 @@ actually in their parent which is not accessible.")
2251 (princ "\n Project symbol map:\n") 2251 (princ "\n Project symbol map:\n")
2252 (when (and (boundp 'ede-object) ede-object) 2252 (when (and (boundp 'ede-object) ede-object)
2253 (princ " Your project symbol map is also derived from the EDE object:\n ") 2253 (princ " Your project symbol map is also derived from the EDE object:\n ")
2254 (princ (object-print ede-object))) 2254 (princ (cl-print-object ede-object)))
2255 (princ "\n\n") 2255 (princ "\n\n")
2256 (if (obarrayp semantic-lex-spp-project-macro-symbol-obarray) 2256 (if (obarrayp semantic-lex-spp-project-macro-symbol-obarray)
2257 (let ((macros nil)) 2257 (let ((macros nil))
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index c89ae1392dd..50b1afbf81e 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1085,7 +1085,7 @@ Returns result."
1085 "Log that TABLE has been searched and RESULT was found." 1085 "Log that TABLE has been searched and RESULT was found."
1086 (when semanticdb-find-log-flag 1086 (when semanticdb-find-log-flag
1087 (with-current-buffer semanticdb-find-log-buffer-name 1087 (with-current-buffer semanticdb-find-log-buffer-name
1088 (insert "Table: " (object-print table) 1088 (insert "Table: " (cl-print-object table)
1089 " Result: " (int-to-string (length result)) " tags" 1089 " Result: " (int-to-string (length result)) " tags"
1090 "\n") 1090 "\n")
1091 ) 1091 )
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 4412a4c18ac..eaf2425c53f 100644
--- 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.
595This means that the include will still be used to find tags for 595This means that the include will still be used to find tags for
596searches, but you cannot visit this include.\n\n") 596searches, but you cannot visit this include.\n\n")
597 (princ "This Header is now represented by the following database table:\n\n ") 597 (princ "This Header is now represented by the following database table:\n\n ")
598 (princ (object-print table)) 598 (princ (cl-print-object table))
599 ))) 599 )))
600 600
601(defun semantic-decoration-fileless-include-menu (event) 601(defun semantic-decoration-fileless-include-menu (event)
@@ -749,17 +749,17 @@ Argument EVENT describes the event that caused this function to be called."
749 (princ (substitute-command-keys 749 (princ (substitute-command-keys
750 " This file's project include search is handled by the EDE object:\n")) 750 " This file's project include search is handled by the EDE object:\n"))
751 (princ " Buffer Target: ") 751 (princ " Buffer Target: ")
752 (princ (object-print ede-object)) 752 (princ (cl-print-object ede-object))
753 (princ "\n") 753 (princ "\n")
754 (when (not (eq ede-object ede-object-project)) 754 (when (not (eq ede-object ede-object-project))
755 (princ " Buffer Project: ") 755 (princ " Buffer Project: ")
756 (princ (object-print ede-object-project)) 756 (princ (cl-print-object ede-object-project))
757 (princ "\n") 757 (princ "\n")
758 ) 758 )
759 (when ede-object-project 759 (when ede-object-project
760 (let ((loc (ede-get-locator-object ede-object-project))) 760 (let ((loc (ede-get-locator-object ede-object-project)))
761 (princ " Backup in-project Locator: ") 761 (princ " Backup in-project Locator: ")
762 (princ (object-print loc)) 762 (princ (cl-print-object loc))
763 (princ "\n"))) 763 (princ "\n")))
764 (let ((syspath (ede-system-include-path ede-object-project))) 764 (let ((syspath (ede-system-include-path ede-object-project)))
765 (if (not syspath) 765 (if (not syspath)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index a7445ea401a..2c3b996dd7b 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -464,7 +464,7 @@ If SECONDNAME is nil, return VALUE."
464 (srecode-insert-report-error 464 (srecode-insert-report-error
465 dictionary 465 dictionary
466 "Variable inserter %s: second argument `%s' is not a function" 466 "Variable inserter %s: second argument `%s' is not a function"
467 (object-print sti) secondname))) 467 (c-print-object sti) secondname)))
468 value)) 468 value))
469 469
470(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-variable) 470(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-variable)