gentoo auto-resync : 01:09:2023 - 04:12:43

2 files changed, 91 insertions, 14 deletions

diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch b/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
deleted file mode 100644
index 1ae481d6c094..000000000000
--- a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-dev-python/markdown2 and dev-python/markdown install their commands
-as markdown2 and markdown_py, respectively.
-
---- markdown-mode-2.4-orig/markdown-mode.el
-+++ markdown-mode-2.4/markdown-mode.el
-@@ -90,7 +90,7 @@
-   :group 'text
-   :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
- 
--(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc")
-+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown2" "markdown_py")
-                                                     when (executable-find cmd)
-                                                     return (file-name-nondirectory it))))
-                               (or command "markdown"))
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
new file mode 100644
index 000000000000..4d1396dcb12e
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
@@ -0,0 +1,91 @@
+--- a/tests/markdown-test.el
++++ b/tests/markdown-test.el
+@@ -6756,46 +6756,6 @@ x|"
+     (markdown-indent-region (line-beginning-position) (line-end-position) nil)
+     (should (string-equal (buffer-string) " #. abc\n    def\n"))))
+ 
+-(ert-deftest test-markdown-ext/wiki-link-rules ()
+-  "Test wiki link search rules and font lock for missing pages."
+-  (let ((markdown-enable-wiki-links t)
+-        (markdown-wiki-link-fontify-missing t)
+-        (markdown-wiki-link-search-type '(project)))
+-    (progn
+-      (find-file (expand-file-name "wiki/root" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/sub/foo$"
+-                     (markdown-convert-wiki-link-to-filename "foo")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 11 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 14 33 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 36 42 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 45 60 'font-lock-face 'markdown-missing-link-face))
+-        (kill-buffer)))
+-    (progn
+-      (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/wiki/root$"
+-                     (markdown-convert-wiki-link-to-filename "root")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 16 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 19 26 'font-lock-face 'markdown-link-face))
+-        (kill-buffer)))))
+-
+ (ert-deftest test-markdown-ext/wiki-link-keep-match-data ()
+   "Test that markdown-wiki-link-p keeps expected match data.
+ Detail: https://github.com/jrblevin/markdown-mode/pull/590"
+@@ -7185,41 +7145,6 @@ foo(bar=None)
+     (cl-loop for ov in (overlays-in (car bounds) (cdr bounds))
+              thereis (overlay-get ov 'flyspell-overlay))))
+ 
+-(ert-deftest test-markdown-flyspell/check-word-p ()
+-  "Test for `flyspell'."
+-  (skip-unless (executable-find ispell-program-name))
+-  (markdown-test-string "aaa
+-
+-```
+-bbb
+-```
+-
+-ccc
+-
+-`ddd`
+-
+-eee
+-
+-<!-- fff -->
+-
+-@ref9999
+-"
+-    (flyspell-buffer)
+-    (search-forward "aaa")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "bbb") ;; in code block
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ccc")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ddd") ;; in inline code
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "eee")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "fff") ;; in comment
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "@ref") ;; pandoc reference
+-    (should-not (markdown-test-flyspell-incorrect-word-p))))
+-
+ (ert-deftest test-markdown-flyspell/remove-overlay ()
+   "Test non-dictionary word in code block with `flyspell-mode'.
+ Details: https://github.com/jrblevin/markdown-mode/issues/311"