Applied, thanks.
- Carsten
On Jun 3, 2010, at 3:10 PM, Bernt Hansen wrote:
* contrib/lisp/org-special-blocks.el (org-special-blocks-make-
special-cookies):
Emacs 22 doesn't have string-match-p
* lisp/org-freemind.el (org-freemind-write-mm-buffer):
(org-freemind-get-node-style):
Emacs 22 doesn't have string-match-p
* lisp/org-html.el (org-html-make-link):
Use new org-string-match-p for compatibility
---
Updated patch using org-string-match-p
This is available at git://git.norang.ca/org-mode.git emacs22
-Bernt
contrib/lisp/org-special-blocks.el | 2 +-
lisp/org-freemind.el | 4 ++--
lisp/org-html.el | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/lisp/org-special-blocks.el b/contrib/lisp/org-
special-blocks.el
index af50b30..d97cff3 100644
--- a/contrib/lisp/org-special-blocks.el
+++ b/contrib/lisp/org-special-blocks.el
@@ -51,7 +51,7 @@ seen. This is run after a few special cases are
taken care of."
(when (or htmlp latexp)
(goto-char (point-min))
(while (re-search-forward "^#\\+\\(begin\\|end\\)_\\(.*\\)$" nil
t)
- (unless (string-match-p org-special-blocks-ignore-regexp
(match-string 2))
+ (unless (org-string-match-p org-special-blocks-ignore-regexp
(match-string 2))
(replace-match
(if (equal (downcase (match-string 1)) "begin")
(concat "ORG-" (match-string 2) "-START")
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index 9aabbea..538b404 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -552,7 +552,7 @@ Otherwise give an error say the file exists."
(defun org-freemind-write-mm-buffer (org-buffer mm-buffer node-at-
line)
(with-current-buffer org-buffer
(dolist (node-style org-freemind-node-styles)
- (when (string-match-p (car node-style) buffer-file-name)
+ (when (org-string-match-p (car node-style) buffer-file-name)
(setq org-freemind-node-style (cadr node-style))))
;;(message "org-freemind-node-style =%s" org-freemind-node-style)
(save-match-data
@@ -725,7 +725,7 @@ Otherwise give an error say the file exists."
(dolist (style-list org-freemind-node-style)
(let ((node-regexp (car style-list)))
(message "node-regexp=%s node-name=%s" node-regexp node-name)
- (when (string-match-p node-regexp node-name)
+ (when (org-string-match-p node-regexp node-name)
;;(setq node-style (org-freemind-do-apply-node-style style-
list))
(setq node-style (cadr style-list))
(when node-style
diff --git a/lisp/org-html.el b/lisp/org-html.el
index f7dd1b3..d18350d 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -641,7 +641,7 @@ MAY-INLINE-P allows inlining it as an image."
(let
((str (org-export-html-format-href thefile)))
(if (and type (not (string= "file" type))
- (string-match "^//" str))
+ (org-string-match-p "^//" str))
(concat type ":" str)
str)))
--
1.7.1.240.g225c
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
