From: Bernt Hansen <bernt@norang.ca>
To: emacs-orgmode@gnu.org
Cc: Bernt Hansen <bernt@norang.ca>
Subject: [PATCH] Emacs 22 support - use org-string-match-p
Date: Thu, 3 Jun 2010 09:10:57 -0400 [thread overview]
Message-ID: <1275570657-14876-1-git-send-email-bernt@norang.ca> (raw)
In-Reply-To: <87d3w8mhaa.fsf@gollum.intra.norang.ca>
* 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
next prev parent reply other threads:[~2010-06-03 13:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 23:10 [PATCH] Emacs 22 support Bernt Hansen
2010-06-01 23:43 ` Štěpán Němec
2010-06-02 3:03 ` Bernt Hansen
2010-06-02 11:47 ` Bernt Hansen
2010-06-03 8:32 ` Carsten Dominik
2010-06-03 12:28 ` Bernt Hansen
2010-06-03 13:10 ` Bernt Hansen [this message]
2010-06-03 22:07 ` [PATCH] Emacs 22 support - use org-string-match-p Štěpán Němec
2010-06-03 22:09 ` Bernt Hansen
2010-06-03 22:29 ` Štěpán Němec
2010-06-04 4:42 ` Carsten Dominik
2010-06-04 19:03 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275570657-14876-1-git-send-email-bernt@norang.ca \
--to=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).