Merge remote-tracking branch 'origin/master' into pr-830

diff --cc doc/misc/use-package.texi
index 2b868564372011ff8f7f87d54150f1389bc08563,573baac89aa383560f70f35af8565a0c843bc199..a11416a470c664a9212a8ec752a41910882debcf
--- 1/doc/misc/use-package.texi
--- 2/doc/misc/use-package.texi
+++ b/doc/misc/use-package.texi
@@@ -73,27 -73,27 +73,27 @@@ Installatio
  
  Keywords
  
- * @code{after}::
- * @code{bind-keymap}, @code{bind-keymap*}: @code{bind-keymap} @code{bind-keymap*}. 
- * @code{bind}, @code{bind*}: @code{bind} @code{bind*}. 
- * @code{commands}::
- * @code{preface}, @code{init}, @code{config}: @code{preface} @code{init} @code{config}. 
- * @code{custom}::
- * @code{custom-face}::
- * @code{defer}, @code{demand}: @code{defer} @code{demand}. 
- * @code{defines}, @code{functions}: @code{defines} @code{functions}. 
- * @code{diminish}, @code{delight}: @code{diminish} @code{delight}. 
- * @code{disabled}::
- * @code{ensure}, @code{pin}: @code{ensure} @code{pin}. 
- * @code{hook}::
- * @code{if}, @code{when}, @code{unless}: @code{if} @code{when} @code{unless}. 
- * @code{load-path}::
- * @code{mode}, @code{interpreter}: @code{mode} @code{interpreter}. 
- * @code{magic}, @code{magic-fallback}: @code{magic} @code{magic-fallback}. 
- * @code{no-require}::
- * @code{requires}::
- 
- @code{:bind}, @code{:bind*}
 -* @code{after}:: @code{:after}. 
 -* @code{bind-keymap} @code{bind-keymap*}:: @code{:bind-keymap}, @code{:bind-keymap*}. 
 -* @code{bind} @code{bind*}:: @code{:bind}, @code{:bind*}. 
 -* @code{commands}:: @code{:commands}. 
 -* @code{preface} @code{init} @code{config}:: @code{:preface}, @code{:init}, @code{:config}. 
 -* @code{custom}:: @code{:custom}. 
 -* @code{custom-face}:: @code{:custom-face}. 
 -* @code{defer} @code{demand}:: @code{:defer}, @code{:demand}. 
 -* @code{defines} @code{functions}:: @code{:defines}, @code{:functions}. 
 -* @code{diminish} @code{delight}:: @code{:diminish}, @code{:delight}. 
 -* @code{disabled}:: @code{:disabled}. 
 -* @code{ensure} @code{pin}:: @code{:ensure}, @code{:pin}. 
 -* @code{hook}:: @code{:hook}. 
 -* @code{if} @code{when} @code{unless}:: @code{:if}, @code{:when}, @code{:unless}. 
++* @code{after}:: @code{:after}.
++* @code{bind-keymap} @code{bind-keymap*}:: @code{:bind-keymap}, @code{:bind-keymap*}.
++* @code{bind} @code{bind*}:: @code{:bind}, @code{:bind*}.
++* @code{commands}:: @code{:commands}.
++* @code{preface} @code{init} @code{config}:: @code{:preface}, @code{:init}, @code{:config}.
++* @code{custom}:: @code{:custom}.
++* @code{custom-face}:: @code{:custom-face}.
++* @code{defer} @code{demand}:: @code{:defer}, @code{:demand}.
++* @code{defines} @code{functions}:: @code{:defines}, @code{:functions}.
++* @code{diminish} @code{delight}:: @code{:diminish}, @code{:delight}.
++* @code{disabled}:: @code{:disabled}.
++* @code{ensure} @code{pin}:: @code{:ensure}, @code{:pin}.
++* @code{hook}:: @code{:hook}.
++* @code{if} @code{when} @code{unless}:: @code{:if}, @code{:when}, @code{:unless}.
+ * @code{load-path}:: @code{:load-path}.
 -* @code{mode} @code{interpreter}:: @code{:mode}, @code{:interpreter}. 
 -* @code{magic} @code{magic-fallback}:: @code{:magic}, @code{:magic-fallback}. 
++* @code{mode} @code{interpreter}:: @code{:mode}, @code{:interpreter}.
++* @code{magic} @code{magic-fallback}:: @code{:magic}, @code{:magic-fallback}.
+ * @code{no-require}:: @code{:no-require}.
 -* @code{requires}:: @code{:requires}. 
++* @code{requires}:: @code{:requires}.
+ 
+ @code{bind}, @code{bind*}
  
  * Binding to local keymaps::
  
@@@ -290,25 -267,25 +267,25 @@@ used for speed (reason 3), it can stil
  @chapter Keywords
  
  @menu
- * @code{after}::
- * @code{bind-keymap}, @code{bind-keymap*}: @code{bind-keymap} @code{bind-keymap*}. 
- * @code{bind}, @code{bind*}: @code{bind} @code{bind*}. 
- * @code{commands}::
- * @code{preface}, @code{init}, @code{config}: @code{preface} @code{init} @code{config}. 
- * @code{custom}::
- * @code{custom-face}::
- * @code{defer}, @code{demand}: @code{defer} @code{demand}. 
- * @code{defines}, @code{functions}: @code{defines} @code{functions}. 
- * @code{diminish}, @code{delight}: @code{diminish} @code{delight}. 
- * @code{disabled}::
- * @code{ensure}, @code{pin}: @code{ensure} @code{pin}. 
- * @code{hook}::
- * @code{if}, @code{when}, @code{unless}: @code{if} @code{when} @code{unless}. 
- * @code{load-path}::
- * @code{mode}, @code{interpreter}: @code{mode} @code{interpreter}. 
- * @code{magic}, @code{magic-fallback}: @code{magic} @code{magic-fallback}. 
- * @code{no-require}::
- * @code{requires}::
 -* @code{after}:: @code{after}. 
 -* @code{bind-keymap} @code{bind-keymap*}:: @code{:bind-keymap}, @code{:bind-keymap*}. 
++* @code{after}:: @code{after}.
++* @code{bind-keymap} @code{bind-keymap*}:: @code{:bind-keymap}, @code{:bind-keymap*}.
+ * @code{bind} @code{bind*}:: @code{bind} @code{:bind*}.
 -* @code{commands}:: @code{:commands}. 
 -* @code{preface} @code{init} @code{config}:: @code{:preface}, @code{:init}, @code{:config}. 
 -* @code{custom}:: @code{:custom}. 
 -* @code{custom-face}:: @code{:custom-face}. 
 -* @code{defer} @code{demand}:: @code{:defer}, @code{:demand}. 
 -* @code{defines} @code{functions}:: @code{:defines}, @code{:functions}. 
 -* @code{diminish} @code{delight}:: @code{:diminish}, @code{:delight}. 
 -* @code{disabled}:: @code{:disabled}. 
 -* @code{ensure} @code{pin}:: @code{:ensure}, @code{:pin}. 
 -* @code{hook}:: @code{:hook}. 
 -* @code{if} @code{when} @code{unless}:: @code{:if}, @code{:when}, @code{:unless}. 
 -* @code{load-path}:: @code{:load-path}. 
 -* @code{mode} @code{interpreter}:: @code{:mode}, @code{:interpreter}. 
 -* @code{magic} @code{magic-fallback}:: @code{:magic}, @code{:magic-fallback}. 
 -* @code{no-require}:: @code{:no-require}. 
 -* @code{requires}:: @code{:requires}. 
++* @code{commands}:: @code{:commands}.
++* @code{preface} @code{init} @code{config}:: @code{:preface}, @code{:init}, @code{:config}.
++* @code{custom}:: @code{:custom}.
++* @code{custom-face}:: @code{:custom-face}.
++* @code{defer} @code{demand}:: @code{:defer}, @code{:demand}.
++* @code{defines} @code{functions}:: @code{:defines}, @code{:functions}.
++* @code{diminish} @code{delight}:: @code{:diminish}, @code{:delight}.
++* @code{disabled}:: @code{:disabled}.
++* @code{ensure} @code{pin}:: @code{:ensure}, @code{:pin}.
++* @code{hook}:: @code{:hook}.
++* @code{if} @code{when} @code{unless}:: @code{:if}, @code{:when}, @code{:unless}.
++* @code{load-path}:: @code{:load-path}.
++* @code{mode} @code{interpreter}:: @code{:mode}, @code{:interpreter}.
++* @code{magic} @code{magic-fallback}:: @code{:magic}, @code{:magic-fallback}.
++* @code{no-require}:: @code{:no-require}.
++* @code{requires}:: @code{:requires}.
  @end menu
  
  @node @code{after}

diff --cc lisp/use-package/bind-chord.el
Simple merge

diff --cc lisp/use-package/bind-key.el
Simple merge

diff --cc lisp/use-package/use-package-bind-key.el
Simple merge

diff --cc test/lisp/use-package/use-package-tests.el
Simple merge