branch: externals/ebdb
commit 89467fc6c741acce9dd36e8ddc24be6a65be4194
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Don't wrap cl-print-object in eval-when-compile
* ebdb.el (cl-print-object): Probably unnecessary, and the compiler
didn't like it.
---
ebdb.el | 67 ++++++++++++++++++++++++++++++-----------------------------------
1 file changed, 31 insertions(+), 36 deletions(-)
diff --git a/ebdb.el b/ebdb.el
index 9c89fdc..48bfc4f 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -821,13 +821,12 @@ simple or complex name class."
(t
(ebdb-parse 'ebdb-field-name-simple input slots)))))
-(eval-when-compile
- (when (fboundp 'cl-print-object)
- (cl-defmethod cl-print-object ((name ebdb-field-name) stream)
- (princ (format "#<%S %s>"
- (eieio-object-class-name name)
- (ebdb-string name))
- stream))))
+(when (fboundp 'cl-print-object)
+ (cl-defmethod cl-print-object ((name ebdb-field-name) stream)
+ (princ (format "#<%S %s>"
+ (eieio-object-class-name name)
+ (ebdb-string name))
+ stream)))
(defclass ebdb-field-name-simple (ebdb-field-name)
((name
@@ -1201,13 +1200,12 @@ first one."
(and (eq l-p 'normal)
(eq r-p 'defunct)))))))
-(eval-when-compile
- (when (fboundp 'cl-print-object)
- (cl-defmethod cl-print-object ((mail ebdb-field-mail) stream)
- (princ (format "#<%S %s>"
- (eieio-object-class-name mail)
- (slot-value mail 'mail))
- stream))))
+(when (fboundp 'cl-print-object)
+ (cl-defmethod cl-print-object ((mail ebdb-field-mail) stream)
+ (princ (format "#<%S %s>"
+ (eieio-object-class-name mail)
+ (slot-value mail 'mail))
+ stream)))
;;; Address fields
@@ -1460,13 +1458,12 @@ first one."
(plist-put slots :number acc))
(cl-call-next-method class string slots)))
-(eval-when-compile
- (when (fboundp 'cl-print-object)
- (cl-defmethod cl-print-object ((phone ebdb-field-phone) stream)
- (princ (format "#<%S %s>"
- (eieio-object-class-name phone)
- (ebdb-string phone))
- stream))))
+(when (fboundp 'cl-print-object)
+ (cl-defmethod cl-print-object ((phone ebdb-field-phone) stream)
+ (princ (format "#<%S %s>"
+ (eieio-object-class-name phone)
+ (ebdb-string phone))
+ stream)))
;;; Notes field
@@ -2086,13 +2083,12 @@ only return fields that are suitable for user editing.")
"Provide a base method that does nothing."
nil)
-(eval-when-compile
- (when (fboundp 'cl-print-object)
- (cl-defmethod cl-print-object ((record ebdb-record) stream)
- (princ (format "#<%S %s>"
- (eieio-object-class-name record)
- (ebdb-string record))
- stream))))
+(when (fboundp 'cl-print-object)
+ (cl-defmethod cl-print-object ((record ebdb-record) stream)
+ (princ (format "#<%S %s>"
+ (eieio-object-class-name record)
+ (ebdb-string record))
+ stream)))
;; The following functions are here because they need to come after
;; `ebdb-record' has been defined.
@@ -3238,14 +3234,13 @@ the persistent save, or allow them to propagate."
:documentation "A `ebdb-db' subclass that saves records
directly in its persistence file.")
-(eval-when-compile
- (when (fboundp 'cl-print-object)
- (cl-defmethod cl-print-object ((db ebdb-db) stream)
- (princ (format "#<%S %s %d records>"
- (eieio-object-class-name db)
- (slot-value db 'file)
- (length (slot-value db 'records)))
- stream))))
+(when (fboundp 'cl-print-object)
+ (cl-defmethod cl-print-object ((db ebdb-db) stream)
+ (princ (format "#<%S %s %d records>"
+ (eieio-object-class-name db)
+ (slot-value db 'file)
+ (length (slot-value db 'records)))
+ stream)))
;; `ebdb-db-file' doesn't need a `ebdb-db-load' method. Its records
;; are stored in its persistence file, directly in the :records slot,
