aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-07-20 15:28:50 -0300
committerFabián Ezequiel Gallina2014-07-20 15:28:50 -0300
commitf72d7fa132538ed66048797759a9d59f99c5b8a3 (patch)
treef609fe7ae2c9098a8301666df738ce8d63c943b3 /lisp
parentb06a0dff84b2ec6b32e5740c17d595f6874e884f (diff)
downloademacs-f72d7fa132538ed66048797759a9d59f99c5b8a3.tar.gz
emacs-f72d7fa132538ed66048797759a9d59f99c5b8a3.zip
* lisp/progmodes/python.el (python-mode): Don't set
mode-require-final-newline. Fixes: debbugs:17990
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el2
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 100d57f3893..9c41c6f7ade 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12014-07-20 Fabián Ezequiel Gallina <fgallina@gnu.org> 12014-07-20 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 2
3 * progmodes/python.el (python-mode): Don't set
4 mode-require-final-newline. (Bug#17990)
5
62014-07-20 Fabián Ezequiel Gallina <fgallina@gnu.org>
7
3 Make python.el work with IPython automatically. (Bug#15510) 8 Make python.el work with IPython automatically. (Bug#15510)
4 * progmodes/python.el: 9 * progmodes/python.el:
5 (python-shell-completion-setup-code): New value supporting iPython. 10 (python-shell-completion-setup-code): New value supporting iPython.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 229874d3d51..f4ff03e2405 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4023,8 +4023,6 @@ returned as is."
4023 ,(lambda (_arg) 4023 ,(lambda (_arg)
4024 (python-nav-end-of-defun)) nil)) 4024 (python-nav-end-of-defun)) nil))
4025 4025
4026 (set (make-local-variable 'mode-require-final-newline) t)
4027
4028 (set (make-local-variable 'outline-regexp) 4026 (set (make-local-variable 'outline-regexp)
4029 (python-rx (* space) block-start)) 4027 (python-rx (* space) block-start))
4030 (set (make-local-variable 'outline-heading-end-regexp) ":[^\n]*\n") 4028 (set (make-local-variable 'outline-heading-end-regexp) ":[^\n]*\n")