2 files changed, 43 insertions, 0 deletions
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch b/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch
new file mode 100644
index 000000000000..99ed3d2149b7
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch
@@ -0,0 +1,13 @@
+dev-python/markdown2 installs its command as markdown2
+
+--- markdown-mode-2.5/markdown-mode.el
++++ markdown-mode-2.5/markdown-mode.el
+@@ -94,7 +94,7 @@
+   :group 'text
+   :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
+ 
+-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown_py")
++(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.5-test.patch b/app-emacs/markdown-mode/files/markdown-mode-2.5-test.patch
new file mode 100644
index 000000000000..0bd1e8b7f667
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.5-test.patch
@@ -0,0 +1,30 @@
+This test seems to expect interactive input, therefore disable.
+
+--- markdown-mode-2.5/tests/markdown-test.el
++++ markdown-mode-2.5/tests/markdown-test.el
+@@ -6643,25 +6643,6 @@
+             (should (string= (markdown-wiki-link-link) "Zettel Markdown")))
+         (kill-buffer)))))
+ 
+-(ert-deftest test-markdown-ext/wiki-link-search-under-project ()
+-  "Test that searching link under project root."
+-  (let ((markdown-enable-wiki-links t)
+-        (markdown-link-space-sub-char " ")
+-        (markdown-wiki-link-search-type '(project))
+-        (expected (expand-file-name "wiki/pr590/Guide/Zettel Markdown/math.md"
+-                                    markdown-test-dir)))
+-    (progn
+-      (find-file (expand-file-name "wiki/pr590/Guide/Plugin/Link.md" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            (re-search-forward "math")
+-            (goto-char (match-beginning 0))
+-            (markdown-wiki-link-p) ;; create match-data
+-            (let ((link (markdown-convert-wiki-link-to-filename (markdown-wiki-link-link))))
+-              (should (string= (expand-file-name link) expected))))
+-        (kill-buffer)))))
+-
+ (ert-deftest test-markdown-ext/wiki-link-major-mode ()
+   "Test major-mode of linked page."
+   (let ((markdown-enable-wiki-links t)