From 47d9c133ee4b62cbe664858201846f51c8180cac Mon Sep 17 00:00:00 2001 From: Alexandre Avanian Date: Thu, 25 Jan 2024 10:59:36 +0800 Subject: [PATCH 1/2] Fix: (--check-pandoc-no-wrap-option) Handle option has been removed Closes #68 --- org-web-tools.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org-web-tools.el b/org-web-tools.el index 0273e76..417d631 100644 --- a/org-web-tools.el +++ b/org-web-tools.el @@ -196,7 +196,8 @@ When SELECTOR is non-nil, the HTML is filtered using (sleep-for org-web-tools-pandoc-sleep-time) (cl-incf checked))) (if (and (zerop (process-exit-status process)) - (not (string-match "--no-wrap is deprecated" (buffer-string)))) + (not (string-match "--no-wrap is deprecated" (buffer-string))) + (not (string-match "--no-wrap has been removed" (buffer-string)))) "--no-wrap" "--wrap=none")))) From 635f8d78b03c600d4b14c00dcf85789af1b03dbd Mon Sep 17 00:00:00 2001 From: Alexandre Avanian Date: Thu, 25 Jan 2024 13:06:54 +0800 Subject: [PATCH 2/2] Change: (--check-pandoc-no-wrap-option) Use regexp --- org-web-tools.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org-web-tools.el b/org-web-tools.el index 417d631..ae77ef2 100644 --- a/org-web-tools.el +++ b/org-web-tools.el @@ -196,8 +196,7 @@ When SELECTOR is non-nil, the HTML is filtered using (sleep-for org-web-tools-pandoc-sleep-time) (cl-incf checked))) (if (and (zerop (process-exit-status process)) - (not (string-match "--no-wrap is deprecated" (buffer-string))) - (not (string-match "--no-wrap has been removed" (buffer-string)))) + (not (string-match-p (rx "--no-wrap " (or "is deprecated" "has been removed")) (buffer-string)))) "--no-wrap" "--wrap=none"))))