aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-12 16:45:57 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-12 16:45:57 +1200
commitf3c2ffa6ba2bf9949d5de8d37b4426c22885ad91 (patch)
tree1105d914a5bd2d1b39519afe2386e1c1f4b16a60
parentee516369f3ce613ad3160afa96fe0bfa8dd1aedc (diff)
parentd9a69da56341fb9ba54b36efa91fdc113f0ca372 (diff)
downloadvim-redact-pass-f3c2ffa6ba2bf9949d5de8d37b4426c22885ad91.tar.gz
vim-redact-pass-f3c2ffa6ba2bf9949d5de8d37b4426c22885ad91.zip
Merge branch 'release/v1.3.0'v1.3.0
* release/v1.3.0: Remove unneeded variable scoping Switch to two-spacing
-rw-r--r--README.md2
-rw-r--r--VERSION2
-rw-r--r--doc/redact_pass.txt6
-rw-r--r--plugin/redact_pass.vim4
4 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index eeee26b..d0b4fdb 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ whenever you `pass edit`:
License
-------
-Copyright (c) [Tom Ryder][1]. Distributed under the same terms as Vim itself.
+Copyright (c) [Tom Ryder][1]. Distributed under the same terms as Vim itself.
See `:help license`.
[1]: https://sanctum.geek.nz/
diff --git a/VERSION b/VERSION
index 26aaba0..f0bb29e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git a/doc/redact_pass.txt b/doc/redact_pass.txt
index f2e6fff..03e30f5 100644
--- a/doc/redact_pass.txt
+++ b/doc/redact_pass.txt
@@ -15,13 +15,13 @@ printed whenever you `pass edit`:
REQUIREMENTS *redact_pass-requirements*
-This plugin is only available if 'compatible' is not set. It also requires the
-|+autocmd| feature.
+This plugin is only available if 'compatible' is not set. It also requires
+the |+autocmd| feature.
IMPLEMENTATION *redact_pass-implementation*
The options are disabled globally rather than attempting to set them local to
-the buffer only, which was the flawed approach of previous versions. This is
+the buffer only, which was the flawed approach of previous versions. This is
mostly because of the 'viminfo' option; it's global, and there's no meaningful
way to exclude information from the sensitive buffer from appearing in it.
diff --git a/plugin/redact_pass.vim b/plugin/redact_pass.vim
index a3d67e8..47c422d 100644
--- a/plugin/redact_pass.vim
+++ b/plugin/redact_pass.vim
@@ -8,13 +8,13 @@
" Author: Tom Ryder <tom@sanctum.geek.nz>
" License: Same as Vim itself
"
-if exists('g:loaded_redact_pass') || &compatible
+if exists('loaded_redact_pass') || &compatible
finish
endif
if !has('autocmd') || v:version < 600
finish
endif
-let g:loaded_redact_pass = 1
+let loaded_redact_pass = 1
" Check whether we should set redacting options or not
function! s:CheckArgsRedact()