diff options
| author | Joakim Verona | 2015-01-27 20:38:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-27 20:38:56 +0100 |
| commit | 2a9de013720d8505369b42c7c110116ec822281f (patch) | |
| tree | be63a5b56d96c1b943311be2419064f5a2f387eb /lisp/progmodes/python.el | |
| parent | d464b0ee300a1919f4398195974396e3e3d66d57 (diff) | |
| parent | bd7a1e1564d04d7ea9c7f6587ffcf02ef8975512 (diff) | |
| download | emacs-2a9de013720d8505369b42c7c110116ec822281f.tar.gz emacs-2a9de013720d8505369b42c7c110116ec822281f.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d298f96bc81..13ff439bef2 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3816,7 +3816,9 @@ The skeleton will be bound to python-skeleton-NAME." | |||
| 3816 | ;;; Code check | 3816 | ;;; Code check |
| 3817 | 3817 | ||
| 3818 | (defcustom python-check-command | 3818 | (defcustom python-check-command |
| 3819 | "pyflakes" | 3819 | (or (executable-find "pyflakes") |
| 3820 | (executable-find "epylint") | ||
| 3821 | "install pyflakes, pylint or something else") | ||
| 3820 | "Command used to check a Python file." | 3822 | "Command used to check a Python file." |
| 3821 | :type 'string | 3823 | :type 'string |
| 3822 | :group 'python) | 3824 | :group 'python) |
| @@ -3827,7 +3829,7 @@ The skeleton will be bound to python-skeleton-NAME." | |||
| 3827 | :type 'string | 3829 | :type 'string |
| 3828 | :group 'python) | 3830 | :group 'python) |
| 3829 | 3831 | ||
| 3830 | (defvar python-check-custom-command nil | 3832 | (defvar-local python-check-custom-command nil |
| 3831 | "Internal use.") | 3833 | "Internal use.") |
| 3832 | 3834 | ||
| 3833 | (defun python-check (command) | 3835 | (defun python-check (command) |