diff options
| author | Glenn Morris | 2013-09-19 16:11:48 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-09-19 16:11:48 -0400 |
| commit | 9a0289a2e92c6737ef3e866b466b237435fe45d3 (patch) | |
| tree | b38667744cdf51bf4822abedca8a495a3c156fa6 | |
| parent | e189e54eea9d4317c484e534cfbce0bcfb4046ce (diff) | |
| download | emacs-9a0289a2e92c6737ef3e866b466b237435fe45d3.tar.gz emacs-9a0289a2e92c6737ef3e866b466b237435fe45d3.zip | |
* lisp/emacs-lisp/eieio.el (class-parent): Undo previous change.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00354.html
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a557359db95..52d3c015687 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-19 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/eieio.el (class-parent): Undo previous change. | ||
| 4 | |||
| 1 | 2013-09-19 Michael Albinus <michael.albinus@gmx.de> | 5 | 2013-09-19 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp-sh.el (tramp-get-remote-id): Do not raise an error. | 7 | * net/tramp-sh.el (tramp-get-remote-id): Do not raise an error. |
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index e7ec547af9b..46381ede9d1 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el | |||
| @@ -322,10 +322,7 @@ The CLOS function `class-direct-subclasses' is aliased to this function." | |||
| 322 | (defmacro eieio-class-parent (class) | 322 | (defmacro eieio-class-parent (class) |
| 323 | "Return first parent class to CLASS. (overload of variable)." | 323 | "Return first parent class to CLASS. (overload of variable)." |
| 324 | `(car (eieio-class-parents ,class))) | 324 | `(car (eieio-class-parents ,class))) |
| 325 | 325 | (define-obsolete-function-alias 'class-parent 'eieio-class-parent "24.4") | |
| 326 | (defmacro class-parent (class) | ||
| 327 | (declare (obsolete eieio-class-parent "24.4")) | ||
| 328 | '(eieio-class-parent class)) | ||
| 329 | 326 | ||
| 330 | (defun same-class-p (obj class) "Return t if OBJ is of class-type CLASS." | 327 | (defun same-class-p (obj class) "Return t if OBJ is of class-type CLASS." |
| 331 | (eieio--check-type class-p class) | 328 | (eieio--check-type class-p class) |