##// END OF EJS Templates
fix "--colors=<color>" option in py-python-command-args. otherwise ipython is launched with "-i --colors LightBG" arguments.
Kefu Chai -
Show More
@@ -36,7 +36,7 b''
36 ;; always in ``pylab`` mode with hardcoded light-background colors, you can
36 ;; always in ``pylab`` mode with hardcoded light-background colors, you can
37 ;; use::
37 ;; use::
38 ;;
38 ;;
39 ;; (setq py-python-command-args '("-pylab" "--colors" "LightBG"))
39 ;; (setq py-python-command-args '("--pylab" "--colors=LightBG"))
40 ;;
40 ;;
41 ;;
41 ;;
42 ;; NOTE: This mode is currently somewhat alpha and although I hope that it
42 ;; NOTE: This mode is currently somewhat alpha and although I hope that it
@@ -217,17 +217,18 b' the second for a \'normal\' command, and the third for a multiline command.")'
217 (setq py-shell-input-prompt-1-regexp "^In \\[[0-9]+\\]: *"
217 (setq py-shell-input-prompt-1-regexp "^In \\[[0-9]+\\]: *"
218 py-shell-input-prompt-2-regexp "^ [.][.][.]+: *" )
218 py-shell-input-prompt-2-regexp "^ [.][.][.]+: *" )
219 ;; select a suitable color-scheme
219 ;; select a suitable color-scheme
220 (unless (member "--colors" py-python-command-args)
220 (unless (delq nil
221 (setq py-python-command-args
221 (mapcar (lambda (x) (eq (string-match "^--colors=*" x) 0))
222 (nconc py-python-command-args
222 py-python-command-args))
223 (list "--colors"
223 (push (format "--colors=%s"
224 (cond
224 (cond
225 ((eq frame-background-mode 'dark)
225 ((eq frame-background-mode 'dark)
226 "Linux")
226 "Linux")
227 ((eq frame-background-mode 'light)
227 ((eq frame-background-mode 'light)
228 "LightBG")
228 "LightBG")
229 (t ; default (backg-mode isn't always set by XEmacs)
229 (t ; default (backg-mode isn't always set by XEmacs)
230 "LightBG"))))))
230 "LightBG")))
231 py-python-command-args))
231 (unless (equal ipython-backup-of-py-python-command py-python-command)
232 (unless (equal ipython-backup-of-py-python-command py-python-command)
232 (setq ipython-backup-of-py-python-command py-python-command))
233 (setq ipython-backup-of-py-python-command py-python-command))
233 (setq py-python-command ipython-command))
234 (setq py-python-command ipython-command))
General Comments 0
You need to be logged in to leave comments. Login now