From e35ecd83967b4f59246656bb284e8beacb614629 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Fri, 31 Oct 2008 17:58:22 +0100 Subject: [PATCH] merge scrolltip-enable-opt.patch into Scrolltip.patch B.W. --- Patch: !CursorLine6.diff Patch: !Scrolltip.patch Patch: !handle_hardlink.patch Patch: !remove_zero_sized_files.patch Patch: -scrolltip-enable-opt.patch --- CursorLine6.diff | 2 +- Scrolltip.patch | 6 +++--- handle_hardlink.patch | 6 +++--- remove_zero_sized_files.patch | 2 +- scrolltip-enable-opt.patch | 31 ------------------------------- series | 1 - 6 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 scrolltip-enable-opt.patch diff --git a/CursorLine6.diff b/CursorLine6.diff index dbb8f76..506a178 100644 --- a/CursorLine6.diff +++ b/CursorLine6.diff @@ -177,7 +177,7 @@ diff --quilt old/source/preferences.c new/source/preferences.c - &PrefData.honorSymlinks, NULL, False} + &PrefData.honorSymlinks, NULL, False}, + {"showCursorline", "ShowCursorline", PREF_BOOLEAN, "True", -+ &PrefData.showCursorline, NULL, True}, ++ &PrefData.showCursorline, NULL, True}, }; static XrmOptionDescRec OpTable[] = { diff --git a/Scrolltip.patch b/Scrolltip.patch index 1fc139b..3c49953 100644 --- a/Scrolltip.patch +++ b/Scrolltip.patch @@ -519,9 +519,9 @@ diff --quilt old/source/preferences.c new/source/preferences.c @@ -1098,6 +1099,8 @@ static PrefDescripRec PrefDescrip[] = { &PrefData.honorSymlinks, NULL, False}, {"showCursorline", "ShowCursorline", PREF_BOOLEAN, "True", - &PrefData.showCursorline, NULL, True}, -+// {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", -+// &PrefData.showScrolltip, NULL, False}, + &PrefData.showCursorline, NULL, True}, ++ {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", ++ &PrefData.showScrolltip, NULL, False}, }; static XrmOptionDescRec OpTable[] = { diff --git a/handle_hardlink.patch b/handle_hardlink.patch index ec571dc..f5081f0 100644 --- a/handle_hardlink.patch +++ b/handle_hardlink.patch @@ -323,9 +323,9 @@ diff --quilt old/source/preferences.c new/source/preferences.c /* Temporary storage for preferences strings which are discarded after being @@ -1169,6 +1177,8 @@ static PrefDescripRec PrefDescrip[] = { - &PrefData.showCursorline, NULL, True}, - // {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", - // &PrefData.showScrolltip, NULL, False}, + &PrefData.showCursorline, NULL, True}, + {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", + &PrefData.showScrolltip, NULL, False}, + {"hardlinkMode", "HardlinkMode", PREF_ENUM, "Ignore", + &PrefData.hardlinkMode, HardlinkModes, True}, }; diff --git a/remove_zero_sized_files.patch b/remove_zero_sized_files.patch index eff2a92..a831b12 100644 --- a/remove_zero_sized_files.patch +++ b/remove_zero_sized_files.patch @@ -194,7 +194,7 @@ diff --quilt old/source/preferences.c new/source/preferences.c /* Temporary storage for preferences strings which are discarded after being @@ -1179,6 +1187,8 @@ static PrefDescripRec PrefDescrip[] = { - // &PrefData.showScrolltip, NULL, False}, + &PrefData.showScrolltip, NULL, False}, {"hardlinkMode", "HardlinkMode", PREF_ENUM, "Ignore", &PrefData.hardlinkMode, HardlinkModes, True}, + {"zeroSizedMode", "ZeroSizedMode", PREF_ENUM, "Never", diff --git a/scrolltip-enable-opt.patch b/scrolltip-enable-opt.patch deleted file mode 100644 index fbd0cda..0000000 --- a/scrolltip-enable-opt.patch +++ /dev/null @@ -1,31 +0,0 @@ -Subject: scrolltips, disable it again - ---- - - source/preferences.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --quilt old/source/preferences.c new/source/preferences.c ---- old/source/preferences.c -+++ new/source/preferences.c -@@ -1200,8 +1200,8 @@ static PrefDescripRec PrefDescrip[] = { - &PrefData.honorSymlinks, NULL, False}, - {"showCursorline", "ShowCursorline", PREF_BOOLEAN, "True", - &PrefData.showCursorline, NULL, True}, --// {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", --// &PrefData.showScrolltip, NULL, False}, -+ {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True", -+ &PrefData.showScrolltip, NULL, False}, - {"hardlinkMode", "HardlinkMode", PREF_ENUM, "Ignore", - &PrefData.hardlinkMode, HardlinkModes, True}, - {"zeroSizedMode", "ZeroSizedMode", PREF_ENUM, "Never", -@@ -2427,8 +2427,7 @@ Boolean GetPrefShowCursorline(void) - - Boolean GetPrefShowScrolltip(void) - { -- //return PrefData.showScrolltip; -- return True; -+ return PrefData.showScrolltip; - } - - void SetPrefHardlinkMode(int mode) diff --git a/series b/series index 0462c4d..7921954 100644 --- a/series +++ b/series @@ -104,7 +104,6 @@ fix_hide_hscrollbar.patch dont-resize-window.patch sh-bg-newline.diff GlobalSymTable.patch -scrolltip-enable-opt.patch calltipsID.diff fix-calltip-not-found-tip.patch textDisp-cursor-position.patch -- 2.11.4.GIT