summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-26 22:30:15 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-26 22:30:15 +0200
commit0903d56f5ca69bb1fa0bbb00ed2a3d9c4d06ddb4 (patch)
tree0f6ec0105b1ff84d7e2b17277df56a0a9c2cba93
parent13ebb03e7520c2c34f93444b0146640ca08e7424 (diff)
patch 8.0.1001: setting 'encoding' makes 'printheader' invalidv8.0.1001
Problem: Setting 'encoding' makes 'printheader' invalid. Solution: Do not translate the default value of 'printheader'. (Yasuhiro Matsumoto, closes #2026)
-rw-r--r--src/option.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 61d3579834..90a11bce3a 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2196,7 +2196,9 @@ static struct vimoption options[] =
{"printheader", "pheader", P_STRING|P_VI_DEF|P_GETTEXT,
#ifdef FEAT_PRINTER
(char_u *)&p_header, PV_NONE,
- {(char_u *)N_("%<%f%h%m%=Page %N"), (char_u *)0L}
+ /* untranslated to avoid problems when 'encoding'
+ * is changed */
+ {(char_u *)"%<%f%h%m%=Page %N", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)NULL, (char_u *)0L}
diff --git a/src/version.c b/src/version.c
index e229f41775..f8eb49111e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1001,
+/**/
1000,
/**/
999,