summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/python.el1
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71ecb407d32..43cffffcb36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
+
+ python.el: Do not deactivate mark on shell fontification. (Bug#19871)
+
+ * progmodes/python.el (python-shell-font-lock-post-command-hook):
+ Do not deactivate mark on fontification.
+
2015-02-16 Ivan Shmakov <ivan@siamics.net>
* net/eww.el: Fix desktop support. (Bug#19226)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 20266097fed..4420faf3dfc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2360,6 +2360,7 @@ goes wrong and syntax highlighting in the shell gets messed up."
(process-live-p (get-buffer-process (current-buffer))))
(let* ((input (buffer-substring-no-properties
prompt-end (point-max)))
+ (deactivate-mark nil)
(start-pos prompt-end)
(buffer-undo-list t)
(font-lock-buffer-pos nil)