contrib: adapt to deprecation of org-remove-(angle-brackets,double-quotes)

4 files changed, 6 insertions, 6 deletions

diff --git a/contrib/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
index 84a9582..84c2dfd 100644
--- a/contrib/lisp/org-mairix.el
+++ b/contrib/lisp/org-mairix.el
@@ -94,7 +94,7 @@ correctly, you should not need to change this.
           (if org-mairix-threaded-links "t:")
           (if org-mairix-augmented-links "a:")
           "@@"
-          (org-remove-angle-brackets message-id)))
+          (org-unbracket-string "<" ">" message-id)))
 
 (defun org-store-mairix-link-props (&rest plist)
   "Take a property list describing a mail, and add mairix link
diff --git a/contrib/lisp/org-mew.el b/contrib/lisp/org-mew.el
index f4c845c..2c2bdcc 100644
--- a/contrib/lisp/org-mew.el
+++ b/contrib/lisp/org-mew.el
@@ -170,7 +170,7 @@ with \"t\" key."
 	       desc link)
 	  (org-store-link-props :type "mew" :from from :to to :date date
 				:subject subject :message-id message-id)
-	  (setq message-id (org-remove-angle-brackets message-id))
+	  (setq message-id (org-unbracket-string "<" ">" message-id))
 	  (setq desc (org-email-link-description))
 	  (setq link (concat "mew:" folder-name "#" message-id))
 	  (org-add-link-props :link link :description desc)
@@ -280,12 +280,12 @@ the subject and the group number to extract.  You can get rid of
 	(setq subject (mew-header-get-value "Subject:"))
 	(setq message-id (mew-header-get-value "Message-Id:"))
 	(setq references (mew-header-get-value "References:")))
-      (setq id-list (mapcar (lambda (id) (org-remove-angle-brackets id))
+      (setq id-list (mapcar (lambda (id) (org-unbracket-string "<" ">" id))
 			    (mew-idstr-to-id-list references)))
       (if last-reference-only
 	  (setq id-list (last id-list))
 	(if message-id
-	    (setq id-list (cons (org-remove-angle-brackets message-id)
+	    (setq id-list (cons (org-unbracket-string "<" ">" message-id)
 				id-list))))
       (when (and by-subject (stringp subject))
 	(catch 'matched
diff --git a/contrib/lisp/org-vm.el b/contrib/lisp/org-vm.el
index f55d7f8..070d2f8 100644
--- a/contrib/lisp/org-vm.el
+++ b/contrib/lisp/org-vm.el
@@ -86,7 +86,7 @@
                      (string-match (concat "^" (regexp-quote vm-folder-directory))
                                    folder))
                 (setq folder (replace-match "" t t folder)))))
-        (setq message-id (org-remove-angle-brackets message-id))
+        (setq message-id (org-unbracket-string "<" ">" message-id))
 	(org-store-link-props :type link-type :from from :to to :subject subject
 			      :message-id message-id :date date)
 	(setq desc (org-email-link-description))
diff --git a/contrib/lisp/org-wl.el b/contrib/lisp/org-wl.el
index e4d7306..01eee13 100644
--- a/contrib/lisp/org-wl.el
+++ b/contrib/lisp/org-wl.el
@@ -191,7 +191,7 @@ ENTITY is a message entity."
 		 (message-id
 		  (org-wl-message-field 'message-id wl-message-entity))
 		 (message-id-no-brackets
-		  (org-remove-angle-brackets message-id))
+		  (org-unbracket-string "<" ">" message-id))
 		 (from (org-wl-message-field 'from wl-message-entity))
 		 (to (org-wl-message-field 'to wl-message-entity))
 		 (xref (org-wl-message-field 'xref wl-message-entity))