Further fixes to writing of object names

Pursuant to 1ef6d2b0e6

* lisp/emacs-lisp/eieio.el (object-write): Only write the name in the
  comment when the comment's also present. Newline should only be
  printed if the name is.

diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 9276fab0c39effb86af2353fa84fdf74d4b13dca..d0d2ff5145cf7c599621bdf2d58c8c87ee03b7be 100644 (file)
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -868,7 +868,7 @@ This writes out the vector version of this object.  Complex and recursive
 object are discouraged from being written.
   If optional COMMENT is non-nil, include comments when outputting
 this object."
-  (when eieio-print-object-name
+  (when (and comment eieio-print-object-name)
     (princ ";; Object ")
     (princ (eieio-object-name-string this))
     (princ "\n"))
@@ -887,8 +887,8 @@ this object."
     (princ (symbol-name (eieio--class-constructor (eieio-object-class this))))
     (when eieio-print-object-name
       (princ " ")
-      (prin1 (eieio-object-name-string this)))
-    (princ "\n")
+      (prin1 (eieio-object-name-string this))
+      (princ "\n"))
     ;; Loop over all the public slots
     (let ((slots (eieio--class-slots cv))
          (eieio-print-depth (1+ eieio-print-depth)))