From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 5 Feb 2015 19:44:26 +0000 (-0500)
Subject: Merge branch 'dynamic-docstrings' into trunk
X-Git-Tag: emacs-25.0.90~2008^2~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f06902840eff62e83858a40b4e139b61d254107a;p=emacs.git

Merge branch 'dynamic-docstrings' into trunk
---

f06902840eff62e83858a40b4e139b61d254107a
diff --cc lisp/ChangeLog
index 92026c7c10e,ce70d49a030..a1e43e14c7b
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,15 -1,34 +1,44 @@@
 +2015-02-05  Kelly Dean <kelly@prtime.org>
 +
 +	* help-mode.el (help-xref-interned): Pass BUFFER and FRAME to
 +	`describe-variable'.
 +
 +	* help-fns.el (describe-function-or-variable): New function.
 +
 +	* help.el (help-map): Bind `describe-function-or-variable' to o.
 +	(help-for-help-internal): Document o key.
 +
  2015-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
  
+ 	* emacs-lisp/eieio-compat.el (eieio--defmethod): Use new
+ 	special (:documentation ...) feature.
+ 	* emacs-lisp/eieio-core.el (eieio-make-class-predicate)
+ 	(eieio-make-child-predicate): Same.
+ 	(eieio-copy-parents-into-subclass): Remove unused arg.
+ 	(eieio-defclass-internal): Adjust call accordingly and remove redundant
+ 	`pname' var.
+ 	(eieio--slot-name-index): Remove unused arg `obj' and adjust all
+ 	callers accordingly.
+ 
+ 	* emacs-lisp/cconv.el (cconv--convert-function):
+ 	Add `docstring' argument.
+ 	(cconv-convert): Use it to handle the new (:documentation ...) form.
+ 	(cconv-analyze-form): Handle the new (:documentation ...) form.
+ 
+ 	* emacs-lisp/bytecomp.el:
+ 	(byte-compile-initial-macro-environment): Use macroexp-progn.
+ 	(byte-compile-cl-warn): Don't silence use of cl-macroexpand-all.
+ 	(byte-compile-file-form-defvar-function): Rename from
+ 	byte-compile-file-form-define-abbrev-table.
+ 	(defvaralias, byte-compile-file-form-custom-declare-variable): Use it.
+ 	(byte-compile): Use byte-compile-top-level rather than
+ 	byte-compile-lambda so we can compile non-values.
+ 	(byte-compile-form): Add warnings for failed uses of lexical vars via
+ 	quoted symbols.
+ 	(byte-compile-unfold-bcf): Improve message for failed inlining.
+ 	(byte-compile-make-closure): Handle new format of internal-make-closure
+ 	for dynamically-generated docstrings.
+ 
  	* delsel.el: Deprecate the `kill' option.  Use lexical-binding.
  	(open-line): Delete like all other commands, instead of killing.
  	(delete-active-region): Don't define any return any value.