Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

fix "--colors=<color>" option in py-python-command-args. #766

Closed
wants to merge 1 commit into from

1 participant

Kefu Chai
Kefu Chai

fix "--colors=" option in py-python-command-args. otherwise ipython fails to launch with "-i --colors LightBG" arguments.

Kefu Chai tchaikov fix "--colors=<color>" option in py-python-command-args. otherwise ip…
…ython fails to launch with "-i --colors LightBG" arguments.
1ce6212
Kefu Chai

thanks, i will be reusing PR #764 for this fix.

Kefu Chai tchaikov closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 6, 2011
  1. Kefu Chai

    fix "--colors=<color>" option in py-python-command-args. otherwise ip…

    tchaikov authored
    …ython fails to launch with "-i --colors LightBG" arguments.
This page is out of date. Refresh to see the latest.
Showing with 13 additions and 12 deletions.
  1. +13 −12 docs/emacs/ipython.el
25 docs/emacs/ipython.el
View
@@ -36,7 +36,7 @@
;; always in ``pylab`` mode with hardcoded light-background colors, you can
;; use::
;;
-;; (setq py-python-command-args '("-pylab" "--colors" "LightBG"))
+;; (setq py-python-command-args '("-pylab" "--colors=LightBG"))
;;
;;
;; NOTE: This mode is currently somewhat alpha and although I hope that it
@@ -217,17 +217,18 @@ the second for a 'normal' command, and the third for a multiline command.")
(setq py-shell-input-prompt-1-regexp "^In \\[[0-9]+\\]: *"
py-shell-input-prompt-2-regexp "^ [.][.][.]+: *" )
;; select a suitable color-scheme
- (unless (member "--colors" py-python-command-args)
- (setq py-python-command-args
- (nconc py-python-command-args
- (list "--colors"
- (cond
- ((eq frame-background-mode 'dark)
- "Linux")
- ((eq frame-background-mode 'light)
- "LightBG")
- (t ; default (backg-mode isn't always set by XEmacs)
- "LightBG"))))))
+ (unless (delq nil
+ (mapcar (lambda (x) (eq (string-match "^--colors=*" x) 0))
+ py-python-command-args))
+ (push (format "--colors=%s"
+ (cond
+ ((eq frame-background-mode 'dark)
+ "Linux")
+ ((eq frame-background-mode 'light)
+ "LightBG")
+ (t ; default (backg-mode isn't always set by XEmacs)
+ "LightBG")))
+ py-python-command-args))
(unless (equal ipython-backup-of-py-python-command py-python-command)
(setq ipython-backup-of-py-python-command py-python-command))
(setq py-python-command ipython-command))
Something went wrong with that request. Please try again.