Commit 7f6b0c1e authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

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.
parent 18c83aed
Pipeline #2056 failed with stage
in 26 minutes and 54 seconds
......@@ -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")))
)
......
......@@ -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))
......
......@@ -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")
)
......
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment