From dc39ee30ef67ec7d3d8efc3b9c274f5411cf7aad Mon Sep 17 00:00:00 2001
From: Reed Esau <reed@esau.org>
Date: Thu, 19 Feb 2015 23:49:00 -0700
Subject: [PATCH] Support under curl misspellings for terminal #15

Simplified the global to set the default to

let g:pencil_spell_undercurl = 1

and changed the default value to 1 (undercurl by default)
---
 README.markdown   |  8 ++++----
 colors/pencil.vim | 27 +++++++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/README.markdown b/README.markdown
index f7179a7..7803e21 100644
--- a/README.markdown
+++ b/README.markdown
@@ -79,11 +79,11 @@ contrast.
 
 ### Curled Underline for Spelling Highlights
 
-GUI users may prefer `undercurl` to the default `underline` in
-highlighting misspelled words.
+You can choose between `undercurl` and `underline` in highlighting
+misspelled words.
 
 ```
-let g:pencil_gui_spell_undercurl = 1     " 0=underline (def), 1=undercurl
+let g:pencil_spell_undercurl = 1       " 0=underline, 1=undercurl (def)
 ```
 
 Non-spell underlines remain non-curled.
@@ -168,7 +168,7 @@ Cousine is a good match for Nitti Light.
 
 * [mattly/iterm-colors-pencil][it] - terminal support for mutt, tmux and iTerm
 * [gummesson/term-colors-pencil][tcp] - terminal support for urxvt and termite
-* [mattly/atom-colors-pencil-light][ap] - Atom verson of the pencil color scheme
+* [mattly/atom-colors-pencil-light][ap] - Atom version of the pencil color scheme
 
 [it]: https://github.com/mattly/iterm-colors-pencil
 [tcp]: https://github.com/gummesson/term-colors-pencil
diff --git a/colors/pencil.vim b/colors/pencil.vim
index b42cc20..ff25af6 100644
--- a/colors/pencil.vim
+++ b/colors/pencil.vim
@@ -54,11 +54,10 @@ if ! exists("g:pencil_terminal_italics")
   let g:pencil_terminal_italics = 0
 endif
 
-if ! exists("g:pencil_gui_spell_undercurl")
-  let g:pencil_gui_spell_undercurl = 0
+if ! exists("g:pencil_spell_undercurl")
+  let g:pencil_spell_undercurl = 1
 endif
 
-
 " Colors
 let s:black           = { "gui": "#212121", "cterm": "0"   }
 let s:medium_gray     = { "gui": "#767676", "cterm": "243" }
@@ -140,10 +139,10 @@ else
   let s:code_bg        = s:bg_very_subtle
 endif
 
-if g:pencil_gui_spell_undercurl == 1
-  let s:gui_sp_un      = 'undercurl'
+if g:pencil_spell_undercurl == 1
+  let s:sp_un      = 'undercurl'
 else
-  let s:gui_sp_un      = 'underline'
+  let s:sp_un      = 'underline'
 endif
 
 " shamelessly stolen from hemisu: https://github.com/noahfrederick/vim-hemisu/
@@ -242,15 +241,15 @@ call s:h("DiffText",      {"fg": s:dark_blue})
 call s:h("SignColumn",    {"fg": s:light_green})
 
 if has("gui_running")
-  call s:h("SpellBad",    {"gui": s:gui_sp_un, "sp": s:red})
-  call s:h("SpellCap",    {"gui": s:gui_sp_un, "sp": s:light_green})
-  call s:h("SpellRare",   {"gui": s:gui_sp_un, "sp": s:pink})
-  call s:h("SpellLocal",  {"gui": s:gui_sp_un, "sp": s:dark_green})
+  call s:h("SpellBad",    {"gui": s:sp_un, "sp": s:red})
+  call s:h("SpellCap",    {"gui": s:sp_un, "sp": s:light_green})
+  call s:h("SpellRare",   {"gui": s:sp_un, "sp": s:pink})
+  call s:h("SpellLocal",  {"gui": s:sp_un, "sp": s:dark_green})
 else
-  call s:h("SpellBad",    {"cterm": "underline", "fg": s:red})
-  call s:h("SpellCap",    {"cterm": "underline", "fg": s:light_green})
-  call s:h("SpellRare",   {"cterm": "underline", "fg": s:pink})
-  call s:h("SpellLocal",  {"cterm": "underline", "fg": s:dark_green})
+  call s:h("SpellBad",    {"cterm": s:sp_un, "fg": s:red})
+  call s:h("SpellCap",    {"cterm": s:sp_un, "fg": s:light_green})
+  call s:h("SpellRare",   {"cterm": s:sp_un, "fg": s:pink})
+  call s:h("SpellLocal",  {"cterm": s:sp_un, "fg": s:dark_green})
 endif
 call s:h("Pmenu",         {"fg": s:norm, "bg": s:bg_subtle})
 call s:h("PmenuSel",      {"fg": s:norm, "bg": s:blue})