diff options
| author | Lars Ingebrigtsen | 2016-02-12 16:55:23 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-12 16:55:23 +1100 |
| commit | 0ff58f69651faa1aa36ff45d4012a19938642412 (patch) | |
| tree | a7edf47a4cf94d300d3011aeb50ae0b4de7e38c6 | |
| parent | 210a895757fc89138a7ec21cbf7fc8cb14b3c0b8 (diff) | |
| download | emacs-0ff58f69651faa1aa36ff45d4012a19938642412.tar.gz emacs-0ff58f69651faa1aa36ff45d4012a19938642412.zip | |
Partially revert the defmethod->cl-defmethod change in registry.el
* lisp/gnus/registry.el (initialize-instance): Use defmethod,
since cl-defmethod doesn't work with :after.
(initialize-instance): Ditto, but with :before.
| -rw-r--r-- | lisp/gnus/registry.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 9182920b87f..d89ba48eabb 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el | |||
| @@ -129,7 +129,7 @@ | |||
| 129 | :type hash-table | 129 | :type hash-table |
| 130 | :documentation "The data hashtable."))) | 130 | :documentation "The data hashtable."))) |
| 131 | 131 | ||
| 132 | (cl-defmethod initialize-instance :BEFORE ((this registry-db) slots) | 132 | (defmethod initialize-instance :BEFORE ((this registry-db) slots) |
| 133 | "Check whether a registry object needs to be upgraded." | 133 | "Check whether a registry object needs to be upgraded." |
| 134 | ;; Hardcoded upgrade routines. Version 0.1 to 0.2 requires the | 134 | ;; Hardcoded upgrade routines. Version 0.1 to 0.2 requires the |
| 135 | ;; :max-soft slot to disappear, and the :max-hard slot to be renamed | 135 | ;; :max-soft slot to disappear, and the :max-hard slot to be renamed |
| @@ -146,7 +146,7 @@ | |||
| 146 | (cl-remf slots :max-hard) | 146 | (cl-remf slots :max-hard) |
| 147 | (cl-remf slots :max-soft)))) | 147 | (cl-remf slots :max-soft)))) |
| 148 | 148 | ||
| 149 | (cl-defmethod initialize-instance :AFTER ((this registry-db) slots) | 149 | (defmethod initialize-instance :AFTER ((this registry-db) slots) |
| 150 | "Set value of data slot of THIS after initialization." | 150 | "Set value of data slot of THIS after initialization." |
| 151 | (with-slots (data tracker) this | 151 | (with-slots (data tracker) this |
| 152 | (unless (member :data slots) | 152 | (unless (member :data slots) |