diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..0f594dc9c --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2016 Henrik Lissner. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/modules/module-python.el b/modules/module-python.el index cee534f9e..83d34be51 100644 --- a/modules/module-python.el +++ b/modules/module-python.el @@ -5,7 +5,7 @@ :interpreter ("python" . python-mode) :commands python-mode :init - (define-repl! python-mode "py,py3,python") + (define-docset! python-mode "py,py3,python") (add-hook! python-mode '(emr-initialize narf|flycheck-enable-maybe)) (setq-default python-indent-offset 4 @@ -41,8 +41,10 @@ :defines (anaconda-mode-map anaconda-nav-mode-map) :functions (anaconda-mode-running-p) :init - (add-hook! python-mode '(anaconda-mode eldoc-mode)) - (setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/")) + (add-hook! python-mode '(anaconda-mode anaconda-eldoc-mode eldoc-mode)) + (setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/") + anaconda-mode-eldoc-as-single-line t) + :config (map! :map anaconda-mode-map :m "gd" 'anaconda-mode-goto-definitions) (map! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)