]> git.eshelyaron.com Git - emacs.git/log
emacs.git
8 years agoMerge pull request from dudebout/patch-1
John Wiegley [Sat, 6 Feb 2016 20:56:18 +0000 (15:56 -0500)]
Merge pull request from dudebout/patch-1

Upper casing Cs corresponding to Ctrl
GitHub-reference: https://github.com/jwiegley/use-package/issues/316

8 years agoAdd an autoload cookie for `use-package'
John Wiegley [Sat, 6 Feb 2016 19:55:35 +0000 (14:55 -0500)]
Add an autoload cookie for `use-package'

8 years agoUpper casing Cs corresponding to Ctrl
Nicolas Dudebout [Sat, 6 Feb 2016 02:40:34 +0000 (21:40 -0500)]
Upper casing Cs corresponding to Ctrl

A number of Cs corresponding to Ctrl have been lower cased in comments in eb6b81dfe.

8 years agoMerge pull request from thierryvolpiatto/fix_package_install
John Wiegley [Thu, 4 Feb 2016 19:00:36 +0000 (14:00 -0500)]
Merge pull request from thierryvolpiatto/fix_package_install

When :ensure is used install package as a selected package.
GitHub-reference: https://github.com/jwiegley/use-package/issues/314

8 years agoEnsure package-install support a second argument
Thierry Volpiatto [Thu, 4 Feb 2016 10:19:23 +0000 (11:19 +0100)]
Ensure package-install support a second argument

* use-package.el (use-package-ensure-elpa): Do it.

8 years agoWhen :ensure is used install package as a selected package
Thierry Volpiatto [Thu, 4 Feb 2016 09:20:55 +0000 (10:20 +0100)]
When :ensure is used install package as a selected package

Also shutup bytecompiler about package-archive-contents.

* use-package.el (use-package-ensure-elpa): Add package to selected package
by using second arg of package install.

8 years agoMerge pull request from kovrik/fix-pin-performance
John Wiegley [Mon, 25 Jan 2016 17:58:02 +0000 (12:58 -0500)]
Merge pull request from kovrik/fix-pin-performance

Do not package-initialize on each :pin
GitHub-reference: https://github.com/jwiegley/use-package/issues/308

8 years agoMerge pull request from phillord/fix/always-pin-typo
John Wiegley [Thu, 21 Jan 2016 18:33:36 +0000 (13:33 -0500)]
Merge pull request from phillord/fix/always-pin-typo

Fix errant variable name.
GitHub-reference: https://github.com/jwiegley/use-package/issues/312

8 years agoFix errant variable name
Phillip Lord [Thu, 21 Jan 2016 09:06:28 +0000 (09:06 +0000)]
Fix errant variable name

8 years agoMerge pull request from phillord/feature/always-pin
John Wiegley [Wed, 20 Jan 2016 23:55:54 +0000 (18:55 -0500)]
Merge pull request from phillord/feature/always-pin

Add new option `-always-pin'
GitHub-reference: https://github.com/jwiegley/use-package/issues/310

8 years agoAdd new option `-always-pin'
Phillip Lord [Wed, 20 Jan 2016 22:02:26 +0000 (22:02 +0000)]
Add new option `-always-pin'

`use-package-always-pin' allows a default archive (or manual) to be
specified for all use-package statements, unless explicitly overridden.

8 years agoChange condition that checks if package has been initialized
Ivan Goncharov [Tue, 19 Jan 2016 21:49:27 +0000 (10:49 +1300)]
Change condition that checks if package has been initialized

8 years agoDo not package-initialize on each :pin
Ivan Goncharov [Mon, 18 Jan 2016 01:41:27 +0000 (14:41 +1300)]
Do not package-initialize on each :pin

8 years agoMerge pull request from kovrik/issue-299
John Wiegley [Tue, 12 Jan 2016 21:01:19 +0000 (16:01 -0500)]
Merge pull request from kovrik/issue-299

Move :pin out of macro expansion phase
GitHub-reference: https://github.com/jwiegley/use-package/issues/302

8 years agoAdd a missing comma
John Wiegley [Tue, 12 Jan 2016 15:58:06 +0000 (07:58 -0800)]
Add a missing comma

8 years agoAdd a PREDICATE option to bind-key, and :filter to `bind-keys'
John Wiegley [Tue, 12 Jan 2016 06:38:31 +0000 (22:38 -0800)]
Add a PREDICATE option to bind-key, and :filter to `bind-keys'

8 years agoGuard against a case where :load-paths is nil
John Wiegley [Wed, 6 Jan 2016 23:50:43 +0000 (15:50 -0800)]
Guard against a case where :load-paths is nil

8 years agoMove :pin out of macro expansion phase fixes
Ivan Goncharov [Tue, 5 Jan 2016 23:56:54 +0000 (12:56 +1300)]
Move :pin out of macro expansion phase fixes

8 years agoMove :pin out of macro expansion phase
Ivan Goncharov [Tue, 5 Jan 2016 22:15:22 +0000 (11:15 +1300)]
Move :pin out of macro expansion phase

8 years agoUse cl-mapcan rather than apply 'nconc; thanks wasamasa
John Wiegley [Sun, 20 Dec 2015 22:39:33 +0000 (14:39 -0800)]
Use cl-mapcan rather than apply 'nconc; thanks wasamasa

8 years agoMerge pull request from kovrik/byte-compile-ensure-fix
John Wiegley [Thu, 12 Nov 2015 22:39:45 +0000 (17:39 -0500)]
Merge pull request from kovrik/byte-compile-ensure-fix

Install packages when byte-compiling (fix by @npostavs)
GitHub-reference: https://github.com/jwiegley/use-package/issues/285

8 years agoInstall packages when byte-compiling (fix by @npostavs)
Ivan Goncharov [Thu, 12 Nov 2015 22:08:02 +0000 (11:08 +1300)]
Install packages when byte-compiling (fix by @npostavs)

8 years agoApply a fix from npostavs relating to
John Wiegley [Tue, 10 Nov 2015 01:33:05 +0000 (17:33 -0800)]
Apply a fix from npostavs relating to

GitHub-reference: https://github.com/jwiegley/use-package/issues/279

8 years agoMerge pull request from kovrik/master
John Wiegley [Mon, 9 Nov 2015 23:58:21 +0000 (18:58 -0500)]
Merge pull request from kovrik/master

Move :ensure option execution from macro expansion phase to runtime phase
GitHub-reference: https://github.com/jwiegley/use-package/issues/273

8 years agoMerge pull request from phillord/feature/after
John Wiegley [Thu, 5 Nov 2015 13:03:55 +0000 (08:03 -0500)]
Merge pull request from phillord/feature/after

Support for after keyword.
GitHub-reference: https://github.com/jwiegley/use-package/issues/276

8 years agoSupport for after keyword
Phillip Lord [Wed, 4 Nov 2015 22:45:37 +0000 (22:45 +0000)]
Support for after keyword

After provides `eval-after-load' functionality for any number of
features. This helps to avoid deeply nested `use-package' statements.

Closes https://github.com/jwiegley/use-package/issues/274

8 years agoMove :ensure option from macro expansion phase to runtime phase
Ivan Goncharov [Tue, 3 Nov 2015 01:43:51 +0000 (14:43 +1300)]
Move :ensure option from macro expansion phase to runtime phase

8 years agoBump version to 2.1
John Wiegley [Sat, 26 Sep 2015 15:46:37 +0000 (08:46 -0700)]
Bump version to 2.1

9 years agoMerge pull request from waymondo/extend-bind-handler
John Wiegley [Wed, 23 Sep 2015 17:17:03 +0000 (10:17 -0700)]
Merge pull request from waymondo/extend-bind-handler

Pass in symbol of bind macro, for more extensible re-use of same handler
GitHub-reference: https://github.com/jwiegley/use-package/issues/259

9 years agopass in symbol of bind macro, for more extensible re-use of same handler
Justin Talbott [Wed, 23 Sep 2015 15:06:58 +0000 (11:06 -0400)]
pass in symbol of bind macro, for more extensible re-use of same handler

related to https://github.com/jwiegley/use-package/issues/258

9 years agoRevert "Merge pull request from edvorg/master"
John Wiegley [Mon, 7 Sep 2015 03:51:31 +0000 (20:51 -0700)]
Revert "Merge pull request from edvorg/master"

This reverts commit 38b213c6c382f87b7f6e60d0c97d37f2951c2482, reversing
changes made to 7d34df4f5dd26b6d8b0899e6508c9af5dedf2dc4.
GitHub-reference: https://github.com/jwiegley/use-package/issues/247

9 years agoerror handling for use-package
Edward Knyshov [Sun, 30 Aug 2015 08:23:49 +0000 (11:23 +0300)]
error handling for use-package

GitHub-reference: https://github.com/jwiegley/use-package/issues/246

9 years agoMerge pull request from matklad/master
John Wiegley [Tue, 18 Aug 2015 05:57:59 +0000 (22:57 -0700)]
Merge pull request from matklad/master

fix quotation error
GitHub-reference: https://github.com/jwiegley/use-package/issues/245

9 years agofix quotation error
Aleksey Kladov [Mon, 17 Aug 2015 20:41:28 +0000 (23:41 +0300)]
fix quotation error

9 years agoMerge pull request from npostavs/string-packages
John Wiegley [Fri, 14 Aug 2015 20:53:14 +0000 (13:53 -0700)]
Merge pull request from npostavs/string-packages

Re-add support for string package names
GitHub-reference: https://github.com/jwiegley/use-package/issues/225

9 years agoRe-add support for string package names
Noam Postavsky [Wed, 17 Jun 2015 17:33:09 +0000 (13:33 -0400)]
Re-add support for string package names

e.g. (use-package "isearch") rather than (use-package isearch)

9 years agoMerge pull request from nickalcock/master
John Wiegley [Sat, 1 Aug 2015 06:30:30 +0000 (23:30 -0700)]
Merge pull request from nickalcock/master

Support :bind (:map '(...)).
GitHub-reference: https://github.com/jwiegley/use-package/issues/235

9 years agoSupport :bind (:map '(...))
Nick Alcock [Thu, 30 Jul 2015 22:42:59 +0000 (23:42 +0100)]
Support :bind (:map '(...))

We transform it into (:map foo (...) (...)) in the normalizer, and
no longer warn about unknown sorts of arg.

9 years agoMerge pull request from thomasf/master
John Wiegley [Mon, 22 Jun 2015 17:44:34 +0000 (12:44 -0500)]
Merge pull request from thomasf/master

Refresh package.el archives if package is missing.
GitHub-reference: https://github.com/jwiegley/use-package/issues/210

9 years agoMerge pull request from killdash9/keymap
John Wiegley [Fri, 12 Jun 2015 02:03:34 +0000 (21:03 -0500)]
Merge pull request from killdash9/keymap

bind-keymap fixes.
GitHub-reference: https://github.com/jwiegley/use-package/issues/199

9 years agoMerge pull request from syl20bnr/fix_hook_injection
John Wiegley [Wed, 10 Jun 2015 23:12:32 +0000 (18:12 -0500)]
Merge pull request from syl20bnr/fix_hook_injection

Fix calls to run-hooks for :init and :config injected hooks
GitHub-reference: https://github.com/jwiegley/use-package/issues/213

9 years agoFix calls to run-hooks for :init and :config injected hooks
Sylvain Benner [Wed, 20 May 2015 01:07:30 +0000 (21:07 -0400)]
Fix calls to run-hooks for :init and :config injected hooks

9 years agoRefresh package.el archives if package is missing
Thomas Frössman [Fri, 8 May 2015 10:19:35 +0000 (12:19 +0200)]
Refresh package.el archives if package is missing

9 years agobind-keymap fixes
Russell Black [Sun, 12 Apr 2015 00:08:58 +0000 (18:08 -0600)]
bind-keymap fixes

Override argument no longer ignored.  Not adding keymap to list of
commands. `eval' no longer appears to be necessary, using direct
invocation of bind-key*.

9 years agoKeymap bindings must be interactive
John Wiegley [Wed, 25 Mar 2015 23:14:49 +0000 (18:14 -0500)]
Keymap bindings must be interactive

9 years agoFailed to require a package is just a message
John Wiegley [Wed, 25 Mar 2015 03:30:48 +0000 (22:30 -0500)]
Failed to require a package is just a message

9 years agoMinor fix to :diminish
John Wiegley [Wed, 25 Mar 2015 02:59:10 +0000 (21:59 -0500)]
Minor fix to :diminish

9 years agoFix a bug in the :delight support
John Wiegley [Mon, 23 Mar 2015 05:38:51 +0000 (00:38 -0500)]
Fix a bug in the :delight support

9 years agoAdd :delight support, thanks to darkfeline on GitHub
John Wiegley [Sun, 22 Mar 2015 04:35:58 +0000 (23:35 -0500)]
Add :delight support, thanks to darkfeline on GitHub

Fixes https://github.com/jwiegley/use-package/issues/189

9 years agoAdd new customization use-package-always-ensure
John Wiegley [Sat, 21 Mar 2015 09:19:33 +0000 (04:19 -0500)]
Add new customization use-package-always-ensure

Fixes https://github.com/jwiegley/use-package/issues/27

9 years agounbind-key now removes key from personal-keybindings
John Wiegley [Sat, 21 Mar 2015 09:13:02 +0000 (04:13 -0500)]
unbind-key now removes key from personal-keybindings

Fixes https://github.com/jwiegley/use-package/issues/74

9 years agoFix file headers
John Wiegley [Sat, 21 Mar 2015 08:57:09 +0000 (03:57 -0500)]
Fix file headers

9 years agoAdd autoload stanzas to bind-key
John Wiegley [Sat, 21 Mar 2015 08:50:51 +0000 (03:50 -0500)]
Add autoload stanzas to bind-key

Fixes https://github.com/jwiegley/use-package/issues/33

9 years agoCorrection to an eval-after-load expansion
John Wiegley [Sat, 21 Mar 2015 08:49:08 +0000 (03:49 -0500)]
Correction to an eval-after-load expansion

9 years agoChange use-package to use bind-keys and bind-keys*
John Wiegley [Sat, 21 Mar 2015 08:46:26 +0000 (03:46 -0500)]
Change use-package to use bind-keys and bind-keys*

Fixes https://github.com/jwiegley/use-package/issues/129

9 years agoChange bind-key* behavior to mimic bind-keys*
John Wiegley [Sat, 21 Mar 2015 08:31:59 +0000 (03:31 -0500)]
Change bind-key* behavior to mimic bind-keys*

Fixes https://github.com/jwiegley/use-package/issues/148

9 years agoWhitespace cleanups
John Wiegley [Sat, 21 Mar 2015 08:30:52 +0000 (03:30 -0500)]
Whitespace cleanups

9 years agoAllow :map in bind-keys to accept multiple maps
John Wiegley [Sat, 21 Mar 2015 08:30:04 +0000 (03:30 -0500)]
Allow :map in bind-keys to accept multiple maps

Fixes https://github.com/jwiegley/use-package/issues/129

9 years ago:pin should return `t'
John Wiegley [Sat, 21 Mar 2015 08:12:32 +0000 (03:12 -0500)]
:pin should return `t'

9 years agoModular support appears to be working
John Wiegley [Sat, 21 Mar 2015 07:57:18 +0000 (02:57 -0500)]
Modular support appears to be working

9 years agoBegan work on modular handling of keywords
John Wiegley [Fri, 20 Mar 2015 03:26:53 +0000 (22:26 -0500)]
Began work on modular handling of keywords

9 years agoRename use-package-with-elapsed-timer at an internal name
John Wiegley [Thu, 19 Mar 2015 23:48:14 +0000 (18:48 -0500)]
Rename use-package-with-elapsed-timer at an internal name

See https://github.com/jwiegley/use-package/issues/185

9 years agoRemove code I did not intend to commit
John Wiegley [Thu, 19 Mar 2015 23:47:15 +0000 (18:47 -0500)]
Remove code I did not intend to commit

9 years agoMerge pull request from npostavs/macroexp-progn
John Wiegley [Thu, 19 Mar 2015 23:46:37 +0000 (18:46 -0500)]
Merge pull request from npostavs/macroexp-progn

use-package-progn: replace with macroexp-progn
GitHub-reference: https://github.com/jwiegley/use-package/issues/186

9 years agoFix some docstrings
John Wiegley [Thu, 19 Mar 2015 23:45:30 +0000 (18:45 -0500)]
Fix some docstrings

9 years agouse-package-progn: replace with macroexp-progn
Noam Postavsky [Thu, 19 Mar 2015 21:40:41 +0000 (17:40 -0400)]
use-package-progn: replace with macroexp-progn

9 years agoMerge pull request from npostavs/name-keymap
John Wiegley [Thu, 19 Mar 2015 19:20:09 +0000 (14:20 -0500)]
Merge pull request from npostavs/name-keymap

get-binding-description: return keymap symbol
GitHub-reference: https://github.com/jwiegley/use-package/issues/184

9 years agoget-binding-description: return keymap symbol
Noam Postavsky [Thu, 19 Mar 2015 15:25:18 +0000 (11:25 -0400)]
get-binding-description: return keymap symbol

instead of "#<keymap>".

9 years agoUse push instead of add-to-list
John Wiegley [Thu, 19 Mar 2015 09:42:22 +0000 (04:42 -0500)]
Use push instead of add-to-list

9 years agoRemove a hack that is not needed anymore
John Wiegley [Thu, 19 Mar 2015 09:39:07 +0000 (04:39 -0500)]
Remove a hack that is not needed anymore

9 years agomacroexpand nested uses of use-package in :init and :config
John Wiegley [Thu, 19 Mar 2015 01:56:45 +0000 (20:56 -0500)]
macroexpand nested uses of use-package in :init and :config

9 years agoWrap the :preface in an eval-and-compile block
John Wiegley [Thu, 19 Mar 2015 01:53:55 +0000 (20:53 -0500)]
Wrap the :preface in an eval-and-compile block

9 years agoRemove a use of macroexpand
John Wiegley [Wed, 18 Mar 2015 10:46:25 +0000 (05:46 -0500)]
Remove a use of macroexpand

9 years agoMake a warning more specific
John Wiegley [Wed, 18 Mar 2015 08:25:21 +0000 (03:25 -0500)]
Make a warning more specific

9 years agoMore work to silence the byte-compiler
John Wiegley [Wed, 18 Mar 2015 08:10:36 +0000 (03:10 -0500)]
More work to silence the byte-compiler

9 years agoOther minor improvements for byte-compiling
John Wiegley [Tue, 17 Mar 2015 16:50:25 +0000 (11:50 -0500)]
Other minor improvements for byte-compiling

9 years agoSeveral minor improvements and fixes
John Wiegley [Tue, 17 Mar 2015 16:42:04 +0000 (11:42 -0500)]
Several minor improvements and fixes

9 years agoChange some code for consistency's sake
John Wiegley [Tue, 17 Mar 2015 15:21:34 +0000 (10:21 -0500)]
Change some code for consistency's sake

9 years agoMerge pull request from killdash9/keymap
John Wiegley [Tue, 17 Mar 2015 15:20:48 +0000 (10:20 -0500)]
Merge pull request from killdash9/keymap

minor fixes to get bind-keymap working in 2.0
GitHub-reference: https://github.com/jwiegley/use-package/issues/176

9 years agominor fixes to get bind-keymap working in 2.0
Russell Black [Tue, 17 Mar 2015 04:55:48 +0000 (22:55 -0600)]
minor fixes to get bind-keymap working in 2.0

9 years agoAlways return t on a successful init-time load
John Wiegley [Tue, 17 Mar 2015 03:12:52 +0000 (22:12 -0500)]
Always return t on a successful init-time load

Fixes https://github.com/jwiegley/use-package/issues/174

9 years agoAdd to the load-path before the :preface
John Wiegley [Mon, 16 Mar 2015 17:19:14 +0000 (12:19 -0500)]
Add to the load-path before the :preface

Fixes https://github.com/jwiegley/use-package/issues/172

9 years agoMore fixes related to byte-compilation
John Wiegley [Mon, 16 Mar 2015 16:58:37 +0000 (11:58 -0500)]
More fixes related to byte-compilation

9 years agoA few changes for byte-compilation
John Wiegley [Mon, 16 Mar 2015 16:50:32 +0000 (11:50 -0500)]
A few changes for byte-compilation

9 years ago:defer now accepts an optional number of seconds
John Wiegley [Mon, 16 Mar 2015 15:46:25 +0000 (10:46 -0500)]
:defer now accepts an optional number of seconds

9 years agoPermit minimal expansion of macro bodies, and other fixes
John Wiegley [Mon, 16 Mar 2015 15:39:37 +0000 (10:39 -0500)]
Permit minimal expansion of macro bodies, and other fixes

9 years agoCollapse some whitespace
John Wiegley [Mon, 16 Mar 2015 08:25:21 +0000 (03:25 -0500)]
Collapse some whitespace

9 years agoAllow vectors to be passed to :bind again
John Wiegley [Mon, 16 Mar 2015 08:19:28 +0000 (03:19 -0500)]
Allow vectors to be passed to :bind again

Fixes https://github.com/jwiegley/use-package/issues/166

9 years agoAdd code to workaround an inefficiency with eval-after-load
John Wiegley [Mon, 16 Mar 2015 07:54:43 +0000 (02:54 -0500)]
Add code to workaround an inefficiency with eval-after-load

This is currently disabled, as it leads to strange byte-compilation
errors that need to be tracked down.

9 years agoOutput Compiling message only if verbose is enabled
John Wiegley [Mon, 16 Mar 2015 07:48:55 +0000 (02:48 -0500)]
Output Compiling message only if verbose is enabled

9 years agoAllow :pin to accept a symbol
John Wiegley [Mon, 16 Mar 2015 07:48:13 +0000 (02:48 -0500)]
Allow :pin to accept a symbol

9 years agoRelax a path normalization check
John Wiegley [Mon, 16 Mar 2015 02:23:40 +0000 (21:23 -0500)]
Relax a path normalization check

9 years agoCorrect an erroneous symbol reference
John Wiegley [Mon, 16 Mar 2015 02:21:11 +0000 (21:21 -0500)]
Correct an erroneous symbol reference

9 years agoUpdate docstring for :disabled
John Wiegley [Mon, 16 Mar 2015 01:39:19 +0000 (20:39 -0500)]
Update docstring for :disabled

9 years agoMerge pull request from npostavs/eval-after-name
John Wiegley [Mon, 16 Mar 2015 00:07:16 +0000 (20:07 -0400)]
Merge pull request from npostavs/eval-after-name

use--package: eval-after-load name
GitHub-reference: https://github.com/jwiegley/use-package/issues/168

9 years agoUndo an erroneous change
John Wiegley [Mon, 16 Mar 2015 00:07:03 +0000 (19:07 -0500)]
Undo an erroneous change

9 years agoAdd -hook to the injected hooks
John Wiegley [Sun, 15 Mar 2015 23:49:08 +0000 (18:49 -0500)]
Add -hook to the injected hooks

Fixes https://github.com/jwiegley/use-package/issues/161

9 years agoRestore an earlier fix to
John Wiegley [Sun, 15 Mar 2015 23:45:41 +0000 (18:45 -0500)]
Restore an earlier fix to

Fixes https://github.com/jwiegley/use-package/issues/167
GitHub-reference: https://github.com/jwiegley/use-package/issues/53

9 years agoBREAKING CHANGE: Remove :idle and :idle-priority
John Wiegley [Sun, 15 Mar 2015 23:07:37 +0000 (18:07 -0500)]
BREAKING CHANGE: Remove :idle and :idle-priority

I am removing this feature for now because it can result in a nasty
inconsistency.  Consider the following definition:

  (use-package vkill
    :commands vkill
    :idle (some-important-configuration-here)
    :bind ("C-x L" . vkill-and-helm-occur)
    :init
    (defun vkill-and-helm-occur ()
      (interactive)
      (vkill)
      (call-interactively #'helm-occur))

    :config
    (setq vkill-show-all-processes t))

If I load my Emacs and wait until the idle timer fires, then this is the
sequence of events:

    :init :idle <load> :config

But if I load Emacs and immediately type C-x L without waiting for the
idle timer to fire, this is the sequence of events:

    :init <load> :config :idle

It's possible that the user could use `featurep` in their idle to test
for this case, but that's a subtlety I'd rather avoid.

What I would consider is this: `:idle [N]` is a keyword that simply
implies `:defer`, with an option number of N to specify a second count.
After that many seconds, if the package has not yet been loaded by
autoloading, it will be loaded via the idle timer.

This approach has the benefit of complete consistency for both the idle
and the autoloaded cases.  Although, the fact that it implies `:defer`
means we don't have to consider what it means to add `:idle` behavior to
a demand-loaded configuration.

9 years agouse--package: eval-after-load name
Noam Postavsky [Sun, 15 Mar 2015 19:14:04 +0000 (15:14 -0400)]
use--package: eval-after-load name

instead of name-string. This prevents triggering by config file names
that have the same name as the package.

Reprise of c6d79d2cb40bd141f62eaca6dca47fb2e8e6943f