From: Stefan Monnier Date: Thu, 26 Mar 2015 17:32:45 +0000 (-0400) Subject: * lisp/emacs-lisp/cl|eieio: Minor tweaks X-Git-Tag: emacs-25.0.90~2564^2~64 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fd527eb00a0ec1d8d7cf916204c3be3e79e27da;p=emacs.git * lisp/emacs-lisp/cl|eieio: Minor tweaks * lisp/emacs-lisp/cl-macs.el (cl-dolist, cl-dotimes): Silence byte-compiler. * lisp/emacs-lisp/eieio.el (defclass): Change internal name so as to make sure only EIEIO files should have "eieio--" prefixes in their .elc. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 37ac1c5f3c8..294bcfe7fb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-26 Stefan Monnier + + * emacs-lisp/eieio.el (defclass): Change internal name so as to make + sure only EIEIO files should have "eieio--" prefixes in their .elc. + + * emacs-lisp/cl-macs.el (cl-dolist, cl-dotimes): Silence byte-compiler. + 2015-03-26 Boruch Baum (tiny change) * bookmark.el (bookmark-show-all-annotations): Sort them (bug#20177). diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 5d55a1d4579..f8ddc00c3bf 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1752,7 +1752,7 @@ An implicit nil block is established around the loop. (declare (debug ((symbolp form &optional form) cl-declarations body)) (indent 1)) (let ((loop `(dolist ,spec ,@body))) - (if (advice-member-p #'cl--wrap-in-nil-block 'dolist) + (if (advice-member-p 'cl--wrap-in-nil-block 'dolist) loop `(cl-block nil ,loop)))) ;;;###autoload @@ -1765,7 +1765,7 @@ nil. \(fn (VAR COUNT [RESULT]) BODY...)" (declare (debug cl-dolist) (indent 1)) (let ((loop `(dotimes ,spec ,@body))) - (if (advice-member-p #'cl--wrap-in-nil-block 'dotimes) + (if (advice-member-p 'cl--wrap-in-nil-block 'dotimes) loop `(cl-block nil ,loop)))) (defvar cl--tagbody-alist nil) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 27725148ff6..bca53c0c892 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -130,7 +130,7 @@ and reference them using the function `class-option'." (error "Method invocation order %s is not allowed" io))) (let ((testsym1 (intern (concat (symbol-name name) "-p"))) - (testsym2 (intern (format "eieio--childp--%s" name))) + (testsym2 (intern (format "%s--eieio-childp" name))) (accessors ())) ;; Collect the accessors we need to define.