From 7f6b0c1ee93663892c6220b982f7bc3275dcaa85 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 14 Jun 2019 16:57:35 +0200 Subject: [PATCH] Fix previous object-print/cl-print-object changes * lisp/cedet/srecode/insert.el (srecode-insert-variable-secondname-handler): * lisp/cedet/semantic/decorate/include.el (semantic-decoration-fileless-include-describe): (semantic-decoration-all-include-summary): * lisp/cedet/semantic/db-find.el (semanticdb-find-log-activity): * lisp/cedet/semantic/bovine/c.el (semantic-c-describe-environment): * lisp/cedet/semantic/analyze/debug.el (semantic-analyzer-debug-insert-include-summary): Fix previous object-print/cl-print-object changes that were nonsensical. --- lisp/cedet/semantic/analyze/debug.el | 6 +++--- lisp/cedet/semantic/bovine/c.el | 6 +++--- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/decorate/include.el | 8 ++++---- lisp/cedet/srecode/insert.el | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el index f54f6d4250a..1bb97ce9b83 100644 --- a/lisp/cedet/semantic/analyze/debug.el +++ b/lisp/cedet/semantic/analyze/debug.el @@ -409,16 +409,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 (cl-print-object edeobj)) + (princ (cl-prin1-to-string edeobj)) (princ "\n") (when (not (eq edeobj edeproj)) (princ " Buffer Project: ") - (princ (cl-print-object edeproj)) + (princ (cl-prin1-to-string edeproj)) (princ "\n")) (when edeproj (let ((loc (ede-get-locator-object edeproj))) (princ " Backup Locator: ") - (princ (cl-print-object loc)) + (princ (cl-prin1-to-string loc)) (princ "\n"))) ) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 06c77c79285..b05082c60ef 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.") (list ede-object)))) (dolist (O objs) (princ " EDE : ") - (princ (cl-print-object O)) + (princ 0) (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 (cl-print-object fto)) + (princ (cl-prin1-to-string 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 (cl-print-object ede-object))) + (princ (cl-prin1-to-string 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 fd6951b59df..084085e656a 100644 --- 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: " (cl-print-object table) + (insert "Table: " (cl-prin1-to-string 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 a8f3f2a87d1..8a356fc2932 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. 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 (cl-print-object table)) + (princ (cl-prin1-to-string 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 (cl-print-object ede-object)) + (princ (cl-prin1-to-string ede-object)) (princ "\n") (when (not (eq ede-object ede-object-project)) (princ " Buffer Project: ") - (princ (cl-print-object ede-object-project)) + (princ (cl-prin1-to-string ede-object-project)) (princ "\n") ) (when ede-object-project (let ((loc (ede-get-locator-object ede-object-project))) (princ " Backup in-project Locator: ") - (princ (cl-print-object loc)) + (princ (cl-prin1-to-string 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 53518cd20dd..5eb2edd067f 100644 --- 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" - (cl-print-object sti) secondname))) + (cl-prin1-to-string sti) secondname))) value)) (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-variable) -- 2.39.5