From: Rafe Kettler <rafe.kettler@gmail.com>
Date: Fri, 25 Mar 2011 15:15:07 +0000 (-0400)
Subject: cython-mode now works with python-mode and the builtin python package
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8012e5a4c1af11d5885c2cc14bd4da682b1fa654;p=cython.git

cython-mode now works with python-mode and the builtin python package
---

diff --git a/Tools/cython-mode.el b/Tools/cython-mode.el
index 53487da1..66a2d5e3 100644
--- a/Tools/cython-mode.el
+++ b/Tools/cython-mode.el
@@ -1,6 +1,8 @@
 ;; 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))