# HG changeset patch # User Steve Losh # Date 1481991668 18000 # Node ID 0baa9f04528392c6b4343ff91de66a71624121f9 # Parent 8d3cdc4c9c2a10316c5d5024435bc49d20ef952d# Parent aef3ee7d2cbe3b2d85f02814000bb7b7733109c2 Merge. diff -r aef3ee7d2cbe -r 0baa9f045283 acknowledgements.markdown --- a/acknowledgements.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/acknowledgements.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -16,25 +16,30 @@ * [chiphogg](https://github.com/chiphogg) * [ciwchris](https://github.com/ciwchris) * [cwarden](https://github.com/cwarden) +* [danderss](https://bitbucket.org/danderss/) * [dmedvinsky](https://github.com/dmedvinsky) * [flatcap](https://github.com/flatcap) * [helixbass](https://bitbucket.org/helixbass) * [hoelzro](https://github.com/hoelzro) +* [inside](https://github.com/inside) +* [jlmuir](https://bitbucket.org/jlmuir/) * [jrib](https://github.com/jrib) * [lheiskan](https://github.com/lheiskan) * [lightningdb](https://github.com/lightningdb) * [manojkumarm](https://github.com/manojkumarm) -* [manojkumarm](https://github.com/manojkumarm) * [markscholtz](https://github.com/markscholtz) * [marlun](https://github.com/marlun) +* [martica](https://github.com/martica) * [mattsacks](https://github.com/mattsacks) * [Mr-Happy](https://github.com/Mr-Happy) * [mrgrubb](https://github.com/mrgrubb) * [NagatoPain](https://github.com/NagatoPain) * [nathanaelkane](https://github.com/nathanaelkane) * [nielsbom](https://github.com/nielsbom) +* [nkalvi](https://github.com/nkalvi) * [nvie](https://github.com/nvie) * [Psycojoker](https://github.com/Psycojoker) +* [rhilenova](https://github.com/rhilenova) * [riceissa](https://github.com/riceissa) * [rodnaph](https://github.com/rodnaph) * [rramsden](https://github.com/rramsden) diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/01.markdown --- a/chapters/01.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/01.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -60,7 +60,7 @@ Read `:help echom`. -Read `:help messages`. +Read `:help :messages`. Add a line to your `~/.vimrc` file that displays a friendly ASCII-art cat (`>^.^<`) whenever you open Vim. diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/11.markdown --- a/chapters/11.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/11.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -40,7 +40,7 @@ When you typed `x` in file `bar` Vim couldn't find a mapping that matched it, so it treated it as two commands: `` (which does nothing on -its own) and `x` (the normal command to delete a single character.) +its own) and `x` (the normal command to delete a single character). Local Leader ------------ diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/15.markdown --- a/chapters/15.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/15.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -144,7 +144,7 @@ ------------- A good way to keep the multiple ways of creating operator-pending mappings -straight is the remember the following two rules: +straight is to remember the following two rules: * If your operator-pending mapping ends with some text visually selected, Vim will operate on that text. diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/16.markdown --- a/chapters/16.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/16.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -161,7 +161,7 @@ Let's look at one more mapping before we move on. Run the following command: :::vim - :onoremap ah :execute "normal! ?^==\\+\r:nohlsearch\rg_vk0" + :onoremap ah :execute "normal! ?^==\\+$\r:nohlsearch\rg_vk0" Try it by putting your cursor in a section's text and typing `cah`. This time Vim will delete not only the heading's text but also the line of equal signs diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/20.markdown --- a/chapters/20.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/20.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -25,7 +25,7 @@ Vim has many different scopes for variables, but we need to learn a little more about Vimscript before we can take advantage of the rest. For now, just -remember that when you see a variable that start with a character and a colon +remember that when you see a variable that starts with a character and a colon that it's describing a scoped variable. Exercises diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/23.markdown --- a/chapters/23.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/23.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -118,7 +118,7 @@ What did we do here? * First we set the `textwidth` globally to `80`. -* The we ran an if statement that checked if `TextwidthIsTooWide()` was truthy. +* Then we ran an if statement that checked if `TextwidthIsTooWide()` was truthy. * This wound up not being the case, so the `if`'s body wasn't executed. Because we never explicitly returned a value, Vim returned `0` from the diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/31.markdown --- a/chapters/31.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/31.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -184,7 +184,7 @@ Read `:help pattern-overview` to see the kinds of things Vim regexes support. Stop reading after the character classes. -Read `:help match`. Try running the `:match Error /\v.../` command a few times +Read `:help :match`. Try running the `:match Error /\v.../` command a few times by hand. Edit your `~/.vimrc` file to add a mapping that will use `match` to highlight diff -r aef3ee7d2cbe -r 0baa9f045283 chapters/42.markdown --- a/chapters/42.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/chapters/42.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -21,7 +21,7 @@ I've been using the word "plugin" to mean "a big ol' hunk of Vimscript that does a bunch of related stuff". Vim has a more specific meaning of "plugin", which -is "a file in `~/.vim/plugins/`". +is "a file in `~/.vim/plugin/`". Most of the time I'll be using the first definition. I'll try to be clear when I mean the second. diff -r aef3ee7d2cbe -r 0baa9f045283 introduction.markdown --- a/introduction.markdown Sun Apr 07 11:33:46 2013 -0700 +++ b/introduction.markdown Sat Dec 17 11:21:08 2016 -0500 @@ -29,12 +29,6 @@ [leanpub]: http://leanpub.org/learnvimscriptthehardway [paper]: http://bit.ly/lvsthw-paperback [hard]: http://bit.ly/lvsthw-hardcover - -The source code to the book is available [on BitBucket][hg] and [on -GitHub][git]. If you find any mistakes or feel you could improve it feel free -to send a pull request, but I'm retaining the copyright on the book, so if -you're not comfortable with that I understand. - [book]: http://learnvimscriptthehardway.stevelosh.com/ [Vim]: http://www.vim.org/ [hg]: http://bitbucket.org/sjl/learnvimscriptthehardway/