summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-02-13 22:36:01 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2009-02-13 22:36:01 +0100
commit29ff1446003593472769bb6ea846b23f66eec56c (patch)
treef60cf49170f0258babb20ecff8d14cdf0af2f417
parent9524d5ea965ff9125c140cce168f11a18eda43a9 (diff)
downloadorg-mode-29ff1446003593472769bb6ea846b23f66eec56c.tar.gz
Fix compatibility issues with org-choose.el
Patch by Tom Breton.
-rw-r--r--contrib/ChangeLog3
-rw-r--r--contrib/lisp/org-choose.el7
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1e1aae2..e04c08c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -2,6 +2,9 @@
* lisp/org-choose.el (org-choose-get-fn-map-group): Require
`org-agenda'.
+ (cl): Require `cl' at runtime.
+ (org-choose-filter-one): Use `org-split-string' for consistency
+ accross Emacs version.
2009-02-12 Carsten Dominik <carsten.dominik@gmail.com>
diff --git a/contrib/lisp/org-choose.el b/contrib/lisp/org-choose.el
index baa8584..9e07f79 100644
--- a/contrib/lisp/org-choose.el
+++ b/contrib/lisp/org-choose.el
@@ -63,8 +63,9 @@
;;;_ , Requires
(require 'org)
-(eval-when-compile
- (require 'cl))
+;(eval-when-compile
+; (require 'cl))
+(require 'cl)
;;;_. Body
;;;_ , The variables
@@ -109,7 +110,7 @@ Each entry is an `org-choose-mark-data.'" )
;;Split it
(arglist
(let
- ((arglist-x (split-string args ",")))
+ ((arglist-x (org-split-string args ",")))
;;When string starts with "," `split-string' doesn't
;;make a first arg, so in that case make one
;;manually.