From a6c0c1e996436799d15d91ce5b682bff47c05419 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Tue, 17 Sep 2019 13:55:16 -0700
Subject: [PATCH] Only set the HTML b:ml_commentstring if it isn't already set
The Markdown b:ml_commentstring was being overwritten because the
Markdown plugin includes the HTML plugin.
Also change the Markdown syntax override to include the ghmarkdown
syntax plugin instead of being a symlink to it.
---
vim/ftplugin/html.vim | 7 +++++--
vim/syntax/markdown.vim | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
mode change 120000 => 100644 vim/syntax/markdown.vim
diff --git a/vim/ftplugin/html.vim b/vim/ftplugin/html.vim
index c5c9720..0dbe00d 100644
--- a/vim/ftplugin/html.vim
+++ b/vim/ftplugin/html.vim
@@ -1,2 +1,5 @@
-" Add whitespace to the modeline commentstring
-let b:ml_commentstring = '<!-- %s -->'
+" Only set the b:ml_commentstring if it hasn't already been set
+if !exists("b:ml_commentstring")
+ " Add whitespace to the modeline commentstring
+ let b:ml_commentstring = '<!-- %s -->'
+end
diff --git a/vim/syntax/markdown.vim b/vim/syntax/markdown.vim
deleted file mode 120000
index 76e6d9a..0000000
--- a/vim/syntax/markdown.vim
+++ /dev/null
@@ -1 +0,0 @@
-ghmarkdown.vim
\ No newline at end of file
diff --git a/vim/syntax/markdown.vim b/vim/syntax/markdown.vim
new file mode 100644
index 0000000..a2f3695
--- /dev/null
+++ b/vim/syntax/markdown.vim
@@ -0,0 +1,2 @@
+" This has been replaced by the ghmarkdown syntax
+:runtime! syntax/ghmarkdown.vim
--
GitLab