aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2025-03-29 07:01:49 +0800
committerGitHub <noreply@github.com>2025-03-29 07:01:49 +0800
commitcb31663663b9be92dd9c2fbe06ccea88625b2fca (patch)
tree812b56ede3741de74443099815e5eac4c2ff8988 /src
parentf4ee0ab2f1a15fe3bb88122fa162620e4af74b1d (diff)
downloadrneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.tar.gz
rneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.tar.bz2
rneovim-cb31663663b9be92dd9c2fbe06ccea88625b2fca.zip
vim-patch:9.1.1252: typos in code and docs related to 'diffopt' "inline:" (#33143)
Problem: Typos in code and docs related to 'diffopt' "inline:". (after v9.1.1243) Solution: Fix typos and slightly improve the docs. (zeertzjq) closes: vim/vim#16997 https://github.com/vim/vim/commit/5a307c361cbe9f7ac438a917b905378d87f8f2de
Diffstat (limited to 'src')
-rw-r--r--src/nvim/buffer_defs.h2
-rw-r--r--src/nvim/options.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index be28e08675..f226ce9c42 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -777,7 +777,7 @@ struct diffblock_S {
typedef struct diffline_change_S diffline_change_T;
struct diffline_change_S {
colnr_T dc_start[DB_COUNT]; ///< byte offset of start of range in the line
- colnr_T dc_end[DB_COUNT]; ///< 1 paste byte offset of end of range in line
+ colnr_T dc_end[DB_COUNT]; ///< 1 past byte offset of end of range in line
int dc_start_lnum_off[DB_COUNT]; ///< starting line offset
int dc_end_lnum_off[DB_COUNT]; ///< end line offset
};
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4a11078b80..2f77d0ebb7 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2279,8 +2279,8 @@ local options = {
none Do not perform inline highlighting.
simple Highlight from first different
character to the last one in each
- line. This is the default if nothing
- is set.
+ line. This is the default if no
+ `inline:` value is set.
char Use internal diff to perform a
character-wise diff and highlight the
difference.