aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-14 16:57:35 +0200
committerLars Ingebrigtsen2019-06-14 16:57:35 +0200
commit7f6b0c1ee93663892c6220b982f7bc3275dcaa85 (patch)
treebb34afa6ad813be5dc4a6c31402579e8e9cb9d3a
parent18c83aedd91023a677153abeafe561eddb430146 (diff)
downloademacs-7f6b0c1ee93663892c6220b982f7bc3275dcaa85.tar.gz
emacs-7f6b0c1ee93663892c6220b982f7bc3275dcaa85.zip
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.
-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 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 ")
409 (princ (substitute-command-keys 409 (princ (substitute-command-keys
410 "\n\nThis file's project include search is handled by the EDE object:\n")) 410 "\n\nThis file's project include search is handled by the EDE object:\n"))
411 (princ " Buffer Target: ") 411 (princ " Buffer Target: ")
412 (princ (cl-print-object edeobj)) 412 (princ (cl-prin1-to-string edeobj))
413 (princ "\n") 413 (princ "\n")
414 (when (not (eq edeobj edeproj)) 414 (when (not (eq edeobj edeproj))
415 (princ " Buffer Project: ") 415 (princ " Buffer Project: ")
416 (princ (cl-print-object edeproj)) 416 (princ (cl-prin1-to-string edeproj))
417 (princ "\n")) 417 (princ "\n"))
418 (when edeproj 418 (when edeproj
419 (let ((loc (ede-get-locator-object edeproj))) 419 (let ((loc (ede-get-locator-object edeproj)))
420 (princ " Backup Locator: ") 420 (princ " Backup Locator: ")
421 (princ (cl-print-object loc)) 421 (princ (cl-prin1-to-string loc))
422 (princ "\n"))) 422 (princ "\n")))
423 ) 423 )
424 424
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.")
2183 (list ede-object)))) 2183 (list ede-object))))
2184 (dolist (O objs) 2184 (dolist (O objs)
2185 (princ " EDE : ") 2185 (princ " EDE : ")
2186 (princ (cl-print-object O)) 2186 (princ 0)
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 (cl-print-object fto)) 2224 (princ (cl-prin1-to-string 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 (cl-print-object ede-object))) 2254 (princ (cl-prin1-to-string 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 fd6951b59df..084085e656a 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: " (cl-print-object table) 1088 (insert "Table: " (cl-prin1-to-string 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 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.
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 (cl-print-object table)) 598 (princ (cl-prin1-to-string 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 (cl-print-object ede-object)) 752 (princ (cl-prin1-to-string 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 (cl-print-object ede-object-project)) 756 (princ (cl-prin1-to-string 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 (cl-print-object loc)) 762 (princ (cl-prin1-to-string 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 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."
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 (cl-print-object sti) secondname))) 467 (cl-prin1-to-string 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)