From f8efeee0e1033ca45885210c44a5f72c47d2d6a6 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 17 Jun 2019 21:40:05 +0200 Subject: [PATCH] Work around warning from macroexpanding obsolete method * lisp/emacs-lisp/eieio.el (object-print): Move method definition to before generic definition because the generic definition obsoletes the method, which will then output a warning from when macroexpanding. --- lisp/emacs-lisp/eieio.el | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 504133c1e77..3169541e5bf 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -827,15 +827,6 @@ first and modify the returned object.") ;; No cleanup... yet. nil) -(cl-defgeneric object-print (this &rest _strings) - "Pretty printer for object THIS. - -It is sometimes useful to put a summary of the object into the -default # string when using EIEIO browsing tools. -Implement this method to customize the summary." - (declare (obsolete cl-print-object "26.1")) - (format "%S" this)) - (cl-defmethod object-print ((this eieio-default-superclass) &rest strings) "Pretty printer for object THIS. Call function `object-name' with STRINGS. The default method for printing object THIS is to use the @@ -850,6 +841,14 @@ When passing in extra strings from child classes, always remember to prepend a space." (eieio-object-name this (apply #'concat strings))) +(cl-defgeneric object-print (this &rest _strings) + "Pretty printer for object THIS. + +It is sometimes useful to put a summary of the object into the +default # string when using EIEIO browsing tools. +Implement this method to customize the summary." + (declare (obsolete cl-print-object "26.1")) + (format "%S" this)) (with-suppressed-warnings ((obsolete object-print)) (cl-defmethod cl-print-object ((object eieio-default-superclass) stream) @@ -859,6 +858,7 @@ to prepend a space." ;; out-of-tree. (princ (object-print object) stream))) + (defvar eieio-print-depth 0 "The current indentation depth while printing. Ignored if `eieio-print-indentation' is nil.") -- 2.39.2