equal
deleted
inserted
replaced
2711 (call-interactively 'vc-root-diff nil) )) |
2711 (call-interactively 'vc-root-diff nil) )) |
2712 |
2712 |
2713 (global-set-key (kbd "C-x v D") 'my-vc-root-diff) |
2713 (global-set-key (kbd "C-x v D") 'my-vc-root-diff) |
2714 |
2714 |
2715 (setq vc-hg-diff-switches (list "-U" "7")) |
2715 (setq vc-hg-diff-switches (list "-U" "7")) |
2716 (setq vc-git-diff-switches (list "-U7")) |
2716 ;; More context (7 lines) and better rename detection (30% similarity). |
|
2717 (setq vc-git-diff-switches (list "-U7" "-M3")) |
2717 |
2718 |
2718 (setq vc-git-print-log-follow t) |
2719 (setq vc-git-print-log-follow t) |
2719 |
2720 |
2720 (when window-system |
2721 (when window-system |
2721 (setq |
2722 (setq |
3182 "My Python extentions in Emacs." |
3183 "My Python extentions in Emacs." |
3183 :group 'python) |
3184 :group 'python) |
3184 |
3185 |
3185 (defvar my-python/pylint-command "pylint" |
3186 (defvar my-python/pylint-command "pylint" |
3186 "Command to run pylint executable.") |
3187 "Command to run pylint executable.") |
3187 (defvar my-python/pylint-args "-f parseable" |
3188 (defvar my-python/pylint-args "-f parseable --disable=C0301,C0325" |
3188 "Arguments to pass to pylint executable.") |
3189 "Arguments to pass to pylint executable.") |
3189 |
3190 |
3190 (defvar my-python/pep8-command "pep8" |
3191 (defvar my-python/pep8-command "pep8" |
3191 "Command to run pep8 executable.") |
3192 "Command to run pep8 executable.") |
3192 (defvar my-python/pep8-args "" |
3193 (defvar my-python/pep8-args "" |
3207 (pep8 . (my-python/pep8-command my-python/pep8-args)) |
3208 (pep8 . (my-python/pep8-command my-python/pep8-args)) |
3208 (pyflakes . (my-python/pyflakes-command my-python/pyflakes-args)) |
3209 (pyflakes . (my-python/pyflakes-command my-python/pyflakes-args)) |
3209 (pyflakes3 . (my-python/pyflakes3-command my-python/pyflakes3-args))) |
3210 (pyflakes3 . (my-python/pyflakes3-command my-python/pyflakes3-args))) |
3210 "Known Python source code checkers.") |
3211 "Known Python source code checkers.") |
3211 |
3212 |
3212 (defcustom my-python/default-checker 'pyflakes |
3213 (defcustom my-python/default-checker |
|
3214 (cond |
|
3215 ((eq system-type 'cygwin) 'pylint) |
|
3216 (t 'pyflakes)) |
3213 "Default Python source code checker. See `my-python/checker-alist' for full alist." |
3217 "Default Python source code checker. See `my-python/checker-alist' for full alist." |
3214 :group 'my-python |
3218 :group 'my-python |
3215 :type (cons 'choice (mapcar (lambda (e) (cons 'const e)) my-python/checker-alist))) |
3219 :type (cons 'choice (mapcar (lambda (e) (cons 'const e)) my-python/checker-alist))) |
3216 |
3220 |
3217 (defvar my-python/check-history nil) |
3221 (defvar my-python/check-history nil) |