aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorVincent Belaïche2017-09-15 23:52:24 +0200
committerVincent Belaïche2017-09-15 23:52:24 +0200
commit767b3a7429d94d1565256565fda2060c95ca4f73 (patch)
tree51ea759d20769230bd57fd6a93f0c98d261063b0 /lisp/progmodes/python.el
parentd1458d0f40f481e0ac55a55e7567d6e51438b583 (diff)
parent9785d3513741c598ae53aecafacbb9bca3e53e48 (diff)
downloademacs-767b3a7429d94d1565256565fda2060c95ca4f73.tar.gz
emacs-767b3a7429d94d1565256565fda2060c95ca4f73.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 444167f536e..f3513ced4bb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -23,7 +23,7 @@
23;; General Public License for more details. 23;; General Public License for more details.
24 24
25;; You should have received a copy of the GNU General Public License 25;; You should have received a copy of the GNU General Public License
26;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 26;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
27 27
28;;; Commentary: 28;;; Commentary:
29 29
@@ -80,7 +80,7 @@
80 80
81;; Using the "console" subcommand to start IPython in server-client 81;; Using the "console" subcommand to start IPython in server-client
82;; mode is known to fail intermittently due a bug on IPython itself 82;; mode is known to fail intermittently due a bug on IPython itself
83;; (see URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18052#27'). 83;; (see URL `https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18052#27').
84;; There seems to be a race condition in the IPython server (A.K.A 84;; There seems to be a race condition in the IPython server (A.K.A
85;; kernel) when code is sent while it is still initializing, sometimes 85;; kernel) when code is sent while it is still initializing, sometimes
86;; causing the shell to get stalled. With that said, if an IPython 86;; causing the shell to get stalled. With that said, if an IPython
@@ -97,7 +97,7 @@
97 97
98;; Missing or delayed output used to happen due to differences between 98;; Missing or delayed output used to happen due to differences between
99;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7. 99;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7.
100;; See URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304'). To 100;; See URL `https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304'). To
101;; avoid this, the `python-shell-unbuffered' defaults to non-nil and 101;; avoid this, the `python-shell-unbuffered' defaults to non-nil and
102;; controls whether `python-shell-calculate-process-environment' 102;; controls whether `python-shell-calculate-process-environment'
103;; should set the "PYTHONUNBUFFERED" environment variable on startup: 103;; should set the "PYTHONUNBUFFERED" environment variable on startup: