summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-12 13:02:59 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-12 18:37:51 +0200
commit436302c1a293a629a7560fa0b2327316369ac1f8 (patch)
tree3f9e7ce5ec2e442b810f39fdef24277fc3fc18d1
parent32340d03899f1daa8b8a63bf2bed2ec0f6de7705 (diff)
downloadorg-mode-436302c1a293a629a7560fa0b2327316369ac1f8.tar.gz
Fix XEmacs compatibility
-rw-r--r--lisp/org-beamer.el9
-rw-r--r--lisp/org-freemind.el1
-rw-r--r--lisp/org.el2
3 files changed, 7 insertions, 5 deletions
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 064fb59..5900f9b 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -353,10 +353,11 @@ this function dynamically."
(define-minor-mode org-beamer-mode
"Special support for editing Org-mode files made to export to beamer."
nil " Bm" nil)
-(font-lock-add-keywords
- 'org-mode
- '((":\\(B_[a-z]+\\|BMCOL\\):" 1 'org-beamer-tag prepend))
- 'prepent)
+(when (fboundp 'font-lock-add-keywords)
+ (font-lock-add-keywords
+ 'org-mode
+ '((":\\(B_[a-z]+\\|BMCOL\\):" 1 'org-beamer-tag prepend))
+ 'prepent))
(defun org-beamer-place-default-actions-for-lists ()
"Find default overlay specifications in items, and move them.
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index ee39441..1b30dd5 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -81,6 +81,7 @@
(require 'xml)
(require 'org)
+(require 'rx)
(require 'org-exp)
(eval-when-compile (require 'cl))
diff --git a/lisp/org.el b/lisp/org.el
index 7c57edf..416cd09 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16297,7 +16297,7 @@ This command does many different things, depending on context:
(fboundp org-finish-function))
(funcall org-finish-function))
((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
- ((or (looking-at (org-re org-property-start-re))
+ ((or (looking-at org-property-start-re)
(org-at-property-p))
(call-interactively 'org-property-action))
((org-on-target-p) (call-interactively 'org-update-radio-target-regexp))