Merge https://github.com/RafeKettler/cython

b2b337b2 · Robert Bradshaw · b0f8fee3 · 8012e5a4 · b2b337b2
Commit b2b337b2 authored Apr 02, 2011 by Robert Bradshaw
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Tools/cython-mode.el Tools/cython-mode.el +3 -1

No files found.
--- a/Tools/cython-mode.el
+++ b/Tools/cython-mode.el
 ;; Cython mode
-(require 'python-mode)
+;; Load python-mode if available, otherwise use builtin emacs python package
+(when (not(require 'python-mode nil t))
+  (require 'python))
 (add-to-list 'auto-mode-alist '("\\.pyx\\'" . cython-mode))
 (add-to-list 'auto-mode-alist '("\\.pxd\\'" . cython-mode))