Skip to content

Made concealing configurable #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2015
Merged

Made concealing configurable #104

merged 2 commits into from
Mar 15, 2015

Conversation

naddeoa
Copy link
Contributor

@naddeoa naddeoa commented Feb 6, 2015

No description provided.

Anthony Naddeo added 2 commits February 6, 2015 13:27
Users can now add options to configure whether or not the conceal
feature isused to shorten urls and hide quotes/underscores for
formatting. To disable all concealing:

        let g:notes_coneal_code = 0
        let g:notes_coneal_italics = 0
        let g:notes_coneal_bold = 0
        let g:notes_coneal_url = 0

 This was added because some plugins don't play nicely with concealing.
 In particular, the indentLines plugin is conflicting with coneal on OSX
 (at least).
@xolox xolox merged commit 76e0042 into xolox:master Mar 15, 2015
xolox added a commit that referenced this pull request Mar 15, 2015
I made a few changes while merging this pull request:

1. I changed the logic inside syntax/notes.vim to use the function
   xolox#misc#option#get() with a default option value of true (1). In
   my mind this makes a lot more sense than checking for the existence
   of variables without checking their actual values.

2. I renamed notes_conceal_italics to notes_conceal_italic to be
   consistent with the other options (IMHO).

3. I rewrote the documentation additions because A) doc/notes.txt is
   generated from README.md so the changes by @naddeoa would have gone
   lost and B) because there were typos in the additions
   (s/coneal/conceal/g).

4. The documentation for notes_conceal_code was incorrect because
   the code changes by @naddeoa only apply to the markers for inline
   code fragments, not the markers for multi line code blocks. I kept
   the implementation as is and updated the documentation to match the
   implementation.

See also pull request 104 on GitHub:
  #104
@xolox
Copy link
Owner

xolox commented Mar 15, 2015

Hi Anthony and thanks for the contribution! I've merged your pull request but had to make a few changes while merging:

  1. I changed the logic inside syntax/notes.vim to use the function xolox#misc#option#get() with a default option value of true (1). In my mind this makes a lot more sense than checking for the existence of variables without checking their actual values.
  2. I renamed notes_conceal_italics to notes_conceal_italic to be consistent with the other options (IMHO).
  3. I rewrote the documentation additions because A) doc/notes.txt is generated from README.md so your changes would have gone lost and B) because there were typos in the additions (s/coneal/conceal/g).
  4. The documentation for notes_conceal_code was incorrect because your code changes only apply to the markers for inline code fragments, not the markers for multi line code blocks (I'm guessing you changed your mind about the implementation at some point?). I kept the implementation as is and updated the documentation to match the implementation.

Happy Vimming!

@naddeoa
Copy link
Contributor Author

naddeoa commented Mar 16, 2015

Thanks a lot, and good catches, I need to be more careful before issuing pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants