summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs11
-rw-r--r--.emacs-custom.el2
2 files changed, 6 insertions, 7 deletions
diff --git a/.emacs b/.emacs
index f01f9be..6d7ba70 100644
--- a/.emacs
+++ b/.emacs
@@ -419,11 +419,6 @@
(add-hook 'c-mode-common-hook 'my/c-modes-hook)
-(defun my/python-hook ()
- (setq-local forward-sexp-function nil))
-
-(add-hook 'python-mode-hook 'my/python-hook)
-
(defun my/compilation-notify (buffer results)
(let* ((title (buffer-name buffer))
(status (if (string-equal results "finished\n") "success" "failure"))
@@ -836,6 +831,12 @@
(show-paren-mode t)
(show-paren-predicate t))
+(use-package python
+ :custom
+ (python-fill-docstring-style 'pep-257-nn)
+ (python-forward-sexp-function nil)
+ (python-indent-def-block-scale 1))
+
(use-package shell
:config
(setq shell-font-lock-keywords nil)
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 11bfaf4..2cde161 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -38,8 +38,6 @@
'(menu-bar-mode nil)
'(minibuffer-depth-indicate-mode t)
'(page-break-lines-modes '(fundamental-mode text-mode prog-mode special-mode))
- '(python-fill-docstring-style 'pep-257-nn)
- '(python-shell-interpreter "python3")
'(read-char-by-name-sort 'code)
'(repeat-mode t)
'(scroll-bar-mode nil)