reorder backends; fix org mode reftex integration

diff --git a/.emacs b/.emacs
index 2783d01725b0470c5bce49277f02be0b0b6610a0..a685cb6435dc592ee0c69af1051e9ff1618ea9e2 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -48,6 +48,9 @@
  '(vc-delete-logbuf-window nil)
  '(vc-follow-symlinks t))
 
+;; use git before SVN; use CVS earlier, because I have CVS
+;; repositories inside of git directories
+(setq vc-handled-backends (quote (CVS Git RCS SVN SCCS Bzr Hg Mtn Arch)))
 
 ;; switch back to the old primary selection method
 (setq x-select-enable-clipboard nil)
@@ -505,19 +508,26 @@ Argument DESCRIPTION MIME description."
  (global-set-key "\M-o" cm-map)
 
 (defun my-org-mode-setup ()
- (when (and (buffer-file-name)
-            (file-exists-p (buffer-file-name)))
   (load-library "reftex")
   (and (buffer-file-name)
-        (file-exists-p (buffer-file-name))
-        (reftex-parse-all))
-   (reftex-set-cite-format
-     '((?b . "[[bib::%l]]")
-       (?n . "[[note::%l]]"))))
-   (define-key org-mode-map "\C-c\C-g" 'reftex-citation)
-)
+       (file-exists-p (buffer-file-name))
+       (progn
+         (reftex-parse-all)
+         (reftex-set-cite-format
+          '((?b . "[[bib::%l][%l-bib]]")
+            (?n . "[[note::%l][%l-notes]]")
+            (?h . "** %t\n:PROPERTIES:\n:Custom_ID: %l\n:END:\n[[papers:%l][%l-paper]]")))
+         ))
+  (define-key org-mode-map (kbd "C-c )") 'reftex-citation)
+  (define-key org-mode-map (kbd "C-c (") 'org-mode-reftex-search)
+  )
 (add-hook 'org-mode-hook 'my-org-mode-setup)
 
+(defun org-mode-reftex-search ()
+  (interactive)
+  (org-open-link-from-string (format "[[notes:%s]]" (reftex-citation t))))
+
+
 (setq-default org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/")
 (setq-default org-directory "/home/don/org-mode/")
 (setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")