Merge pull request #60 from rmariano/develop

v0.14-RC

Author: rmariano

.vimrc

@@ -155,7 +155,7 @@ endfunction
 
 function! ToggleLangCheck()
     if !&spell
-        setlocal spell spelllang=en_gb
+        setlocal spell spelllang=en_us
         set statusline=%!SetCustomStatusLine('[spell]')
     else
         setlocal nospell
@@ -168,12 +168,25 @@ function! FormatXML()
     echom "Formatting XML file"
     execute ":silent %!xmllint --format --recover - 2>/dev/null"
 endfunction
-"" End function definitions
+
+function! CopyContentToClipboard()
+    if executable("clip.exe")
+        execute ":silent '<,'>w !clip.exe"
+    elseif executable("xclip")
+        execute ":silent '<,'>w !xclip"
+    elseif executable("pbcopy")
+        execute ":silent '<,'>w !pbcopy"
+    endif
+endfunction
+"" End of function definitions
 
 "" Mark the limit of <text-width>
 nnoremap <leader>j :call TogglePageLimit()<CR>
 nnoremap ;t :call SearchDevTags()<CR>
 
+"" Copy selected content (visual model) to clipboard
+vnoremap <C-C> :call CopyContentToClipboard()<CR>
+
 set statusline=%!SetCustomStatusLine('')
 map <F2> :call ToggleLangCheck()<CR>
 set pastetoggle=<F4>
@@ -189,11 +202,6 @@ nnoremap <leader>e :set number!<CR>
 """ Configurations per file type
 autocmd FileType xml map <F3> :call FormatXML()<CR>
 
-augroup yaml_ft
-  au!
-  autocmd FileType yaml setlocal shiftwidth=2 tabstop=2
-augroup END
-
 "" Set filetypy=cython according to the extension
 augroup cython_ft
     au!

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 - 2021 Mariano Anaya
+Copyright (c) 2013 - 2022 Mariano Anaya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.rst

@@ -11,7 +11,7 @@ a particular configuration for improved productivity.
 The goal is to develop a good configuration for the Vim editor, tailored
 for Python development.
 
-It does not change the behaviour of VIM, since this configuration only
+It does not change the behavior of VIM, since this configuration only
 adds comfortable shortcuts, and settings that are recommended for
 software development (coding good practices).
 
@@ -67,7 +67,7 @@ files for this project (not the extra packages, though).
 
 Features
 --------
-The leader key (``<leader>``) can be customised, but it's mapped to ``-`` by
+The leader key (``<leader>``) can be customized, but it's mapped to ``-`` by
 default.
 
 * ``<leader>`` + ``j``: Toggle the margin at the column number set by ``textwidth``.
@@ -96,7 +96,9 @@ default.
 
 * ``<leader>`` +  ``nh`` as a shortcut for ``:nohlsearch`` (No highlight).
 
-* A colour scheme I like.
+* A color scheme I like.
+
+* Customizations for certain file types: Python, YAML, XML, and more to come over time.
 
 * A status line with useful information (file name with path, modification
   flag, file type, column, lines, and position (in %).
@@ -128,28 +130,30 @@ default.
   * ``<C-j>``: for moving between splits (instead of ``<C-W><C-j>``).
     Same for ``h``, ``k``, or ``l`` respectively.
 
+* `Ctrl` + `C`: Copy selected content to clipboard.
+
 * Other features
 
   * ``scrolloff=10``: offset of 10 lines when scrolling
   * Performance improvements
   * Silent bells
   * Set hidden buffers
 
-Colour scheme
--------------
+Color scheme
+------------
 
-The colour scheme requires the terminal to support 256 colours. Most of the
+The color scheme requires the terminal to support 256 colors. Most of the
 terminals already support this, but some terminal multiplexers like ``tmux``
 might require to be run as: ``tmux -2`` in order to support this.
 
 In addition, just the command-line classic Vim version is supported, so no
-support for ``Gvim`` or graphical versions is included for the colour scheme,
+support for ``Gvim`` or graphical versions is included for the color scheme,
 although pull requests are welcomed.
 
 Captures
 ^^^^^^^^
 
-Here are some examples of how the colour scheme looks like.
+Here are some examples of how the color scheme looks like.
 
 .. image:: https://rmariano.github.io/itarch/vim-capture1.png
    :target: https://rmariano.github.io/itarch/vim-capture1.png
@@ -185,7 +189,7 @@ Dependencies
 ------------
 
 * Vim 8+
-* Linux (Other platforms are supported on a best-effort basis).
+* Linux, OSX (Other platforms are supported on a best-effort basis).
 
 
 External plug-ins

after/ftplugin/yaml.vim

@@ -0,0 +1,9 @@
+"" YAML configuration
+
+"" Comment (c) / uncomment (u) lines
+noremap  <leader>c :s/^/#/g<CR>:let @/ = ""<CR>
+vnoremap <leader>c :s/^/#/g<CR>:let @/ = ""<CR>
+noremap  <leader>u :s/^#//g<CR>:let @/ = ""<CR>
+vnoremap <leader>u :s/^#//g<CR>:let @/ = ""<CR>
+
+setlocal shiftwidth=2 tabstop=2

syntax/python.vim

@@ -3,9 +3,9 @@
 " Current Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
 " Previous Maintainer:  Neil Schemenauer <nas at python dot ca>
 " URL:                  https://github.com/hdima/python-syntax
-" Last Change:          2015-11-01
+" Last Change:          2021-12-03
 " Filenames:            *.py
-" Version:              3.6.0
+" Version:              3.10.0
 "
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
@@ -157,6 +157,8 @@ syn keyword pythonStatement     global assert
 syn keyword pythonStatement     lambda
 syn keyword pythonStatement     with
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
+syn keyword pythonStatement     match
+syn keyword pythonStatement     case
 syn keyword pythonRepeat        for while
 syn keyword pythonConditional   if elif else
 " The standard pyrex.vim unconditionally removes the pythonInclude group, so
@@ -493,7 +495,6 @@ endif
 
 syn keyword pythonConvention    self
 syn keyword pythonConvention    cls
-syn keyword pythonConvention    __dict__
 
 
 if s:Enabled("g:python_slow_sync")