summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-06-22 05:16:38 +0200
committerBram Moolenaar <Bram@vim.org>2010-06-22 05:16:38 +0200
commit370df58df9bba97fd5dd6f00595b2f41efda8383 (patch)
tree21706b1cbe3258a7fbfc4e5aa7f4947d6d45253a /runtime
parent883f5d08e48e0e8b6d7bcade0cc48a36fc41931e (diff)
downloadvim-git-370df58df9bba97fd5dd6f00595b2f41efda8383.tar.gz
Couple of small fixes for conceal feature. (Dominique Pelle)
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/syntax.txt6
-rw-r--r--runtime/doc/todo.txt5
2 files changed, 5 insertions, 6 deletions
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b1176a057..418b64ca2 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3135,8 +3135,10 @@ These arguments can be used for all three commands:
conceal *conceal* *:syn-conceal*
When the "conceal" argument is given, the item is marked as concealable.
-Whether or not it is actually concealed depends on the setting on the
-'conceallevel' option.
+Whether or not it is actually concealed depends on the value of the
+'conceallevel' option. If 'modifiable' option is on, concealable items
+in the current line are always displayed unconcealed to be able to edit
+the line.
concealends *:syn-concealends*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 240545770..06be30b89 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1088,11 +1088,8 @@ Vim 7.3:
- using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu.
Use register_shell_extension()? (George Reilly, 2010 May 26)
Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
-- Patch for conceal feature and 'foldcolumn'. (Dominique Pelle, 2010 Jun 10,
- second patch)
- Also patch from Vince, 2010 Jun 15. And another June 16.
+- Patch for conceal from Vince, 2010 Jun 15. And another June 16.
However: more generic patch on the way.
-- patch for conceal feature and 'modifiable'. (Dominique Pelle, 2010 Jun 9)
- undofile: keep markers where the file was written/read, so that it's easy to
go back to a saved version of the file: ":earlier 1f" (f for file)?
Also add ":earlier 1d" (d for day).