add python setup

diff --git a/python/init_python.el b/python/init_python.el
index 86f8d11..d45a25a 100644 (file)
--- a/python/init_python.el
+++ b/python/init_python.el
@@ -4,6 +4,7 @@
 ;(require 'python-mode)
 ;(provide 'python)
 ;(provide 'python21)
+(require 'python)
 
 ;; pymacs
 (autoload 'pymacs-apply "pymacs")

diff --git a/setup/10python.el b/setup/10python.el
new file mode 100644 (file)
index 0000000..5dc5b36
--- /dev/null
+++ b/setup/10python.el
@@ -0,0 +1,8 @@
+(let ((dir (concat (file-name-directory
+                    (directory-file-name
+                     (file-name-directory
+                      (or load-file-name
+                          (when (boundp 'bytecomp-filename) bytecomp-filename)
+                          buffer-file-name))))
+                   "python/")))
+  (load (concat dir "setup.el")))

diff --git a/setup/egrep.el b/setup/egrep.el
index b515def..97cb96d 100644 (file)
--- a/setup/egrep.el
+++ b/setup/egrep.el
@@ -1,2 +1,8 @@
-(add-to-list 'load-path "~/.emacs.d/emacs-egrep")
+(add-to-list 'load-path (concat (file-name-directory
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                "emacs-egrep"))
 (require 'egrep)

diff --git a/setup/magit.el b/setup/magit.el
index b88f553..8becc0d 100644 (file)
--- a/setup/magit.el
+++ b/setup/magit.el
@@ -1,4 +1,10 @@
-(add-to-list 'load-path "~/.emacs.d/magit")
+(add-to-list 'load-path (concat (file-name-directory
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                "emacs-egrep"))
 (require 'magit)
 (require 'cl)
 

diff --git a/setup/mmm-mode.el b/setup/mmm-mode.el
index 520cfeb..35a8d27 100644 (file)
--- a/setup/mmm-mode.el
+++ b/setup/mmm-mode.el
@@ -1,9 +1,8 @@
 (add-to-list 'load-path (concat (file-name-directory
-                                                                (directory-file-name 
-                                                                 (file-name-directory (or load-file-name
-                                                                                                                  (when (boundp 'bytecomp-filename) bytecomp-filename)
-                                                                                                                  buffer-file-name))))
-                                                               (file-name-as-directory "mmm-mode-0.4.8")))
-                                               
-
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                (file-name-as-directory "mmm-mode-0.4.8")))
 (require 'mmm-mode)

diff --git a/setup/xquery.el b/setup/xquery.el
deleted file mode 100644 (file)
index ae8a283..0000000
--- a/setup/xquery.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(require 'xquery-mode)
-
-(add-to-list 'auto-mode-alist '("\\.[Xx][Qq][Uu][Ee][Rr][Yy]\\'" . xquery-mode))
-
-(defvar dbxml-shell-filename "dbxml")
-
-(defun dbxml ()
-  (interactive)
-  (pop-to-buffer (make-comint "DB-Xml" dbxml-shell-filename))
-  (set-buffer-process-coding-system "utf-8" "utf-8"))