branch: elpa/markdown-mode commit f579bcc561b44aed0e1c564158fccc5eeaf73db2 Merge: 360abf5ff5 6fc5904257 Author: Joe Reinhart <joseph.reinh...@gmail.com> Commit: Joe Reinhart <joseph.reinh...@gmail.com>
Merge branch 'master' of github.com:jrblevin/markdown-mode into jayemar/toggle-hiding-of-wiki-links --- CHANGES.md | 3 +++ README.md | 2 +- markdown-mode.el | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1a5c2326ad..d3f62d0890 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,7 @@ # Markdown Mode 2.8 +*Under development* + * **Breaking changes:** - GNU Emacs 28.1 or later is required. @@ -9,6 +11,7 @@ * Improvements: - Support drag and drop features on Windows and multiple files' drag and drop + - Added cmark and cmark-gfm to the markdown command list. # Markdown Mode 2.7 diff --git a/README.md b/README.md index 66da025db7..cfb62cf0fe 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ a complete list of keybindings is available using <kbd>C-h m</kbd> _Note:_ To use all of the features of `markdown-mode`, you'll need to install the Emacs package itself and also have a local Markdown -processor installed (e.g., Markdown.pl, MultiMarkdown, or Pandoc). +processor installed (e.g., Markdown.pl, MultiMarkdown, Pandoc, or CommonMark). The external processor is not required for editing, but will be used for rendering HTML for preview and export. After installing the Emacs package, be sure to configure `markdown-command` to point diff --git a/markdown-mode.el b/markdown-mode.el index ba220d63a2..765ef7b499 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -108,7 +108,7 @@ Any changes to the output buffer made by this hook will be saved.") :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" "markdown_py" "cmark" "cmark-gfm") when (executable-find cmd) return (file-name-nondirectory it)))) (or command "markdown"))