diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-29 20:19:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-29 20:19:37 -0700 |
| commit | 45ce222e71d27716193584309090072dd6258179 (patch) | |
| tree | 28a220c10a12b536db49299f5eb66f4e006bf5af /lisp | |
| parent | f146f2e4bdff5e381868ceead0521456e4cb76b7 (diff) | |
| download | emacs-45ce222e71d27716193584309090072dd6258179.tar.gz | |
* lisp/emacs-lisp/eieio.el (eieio-eval-default-p): Move before use.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1a5c0eb92d9..7838b04ea68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-05-30 Glenn Morris <rgm@gnu.org> + * emacs-lisp/eieio.el (eieio-eval-default-p): Move before use. + * minibuffer.el (read-file-name-completion-ignore-case): Move before completion--in-region, for eager macro expansion. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 37b1ec5fa94..541ac32842f 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -851,6 +851,10 @@ See `defclass' for more information." cname )) +(defsubst eieio-eval-default-p (val) + "Whether the default value VAL should be evaluated for use." + (and (consp val) (symbolp (car val)) (fboundp (car val)))) + (defun eieio-perform-slot-validation-for-default (slot spec value skipnil) "For SLOT, signal if SPEC does not match VALUE. If SKIPNIL is non-nil, then if VALUE is nil return t instead." @@ -1554,10 +1558,6 @@ Fills in OBJ's SLOT with its default value." (eieio-default-eval-maybe val)) obj cl 'oref-default)))) -(defsubst eieio-eval-default-p (val) - "Whether the default value VAL should be evaluated for use." - (and (consp val) (symbolp (car val)) (fboundp (car val)))) - (defun eieio-default-eval-maybe (val) "Check VAL, and return what `oref-default' would provide." (cond |