f312c182921… — Fossil SCM

M src/default.css

+1 -1

		--- src/default.css
		+++ src/default.css
		@@ -1231,11 +1231,11 @@
1231	1231	}
1232	1232	.accordion_closed > .accordion_btn_plus {
1233	1233	display: inline-block;
1234	1234	}
1235	1235	.accordion_panel {
1236		- overflow: hidden;
	1236	+ overflow-y: clip;
1237	1237	transition: max-height 0.25s ease-out;
1238	1238	}
1239	1239	.error {
1240	1240	color: darkred;
1241	1241	background: yellow;
1242	1242

	--- src/default.css
	+++ src/default.css
	@@ -1231,11 +1231,11 @@
1231	}
1232	.accordion_closed > .accordion_btn_plus {
1233	display: inline-block;
1234	}
1235	.accordion_panel {
1236	overflow: hidden;
1237	transition: max-height 0.25s ease-out;
1238	}
1239	.error {
1240	color: darkred;
1241	background: yellow;
1242

	--- src/default.css
	+++ src/default.css
	@@ -1231,11 +1231,11 @@
1231	}
1232	.accordion_closed > .accordion_btn_plus {
1233	display: inline-block;
1234	}
1235	.accordion_panel {
1236	overflow-y: clip;
1237	transition: max-height 0.25s ease-out;
1238	}
1239	.error {
1240	color: darkred;
1241	background: yellow;
1242

M src/delta.c

+2 -2

		--- src/delta.c
		+++ src/delta.c
		@@ -572,12 +572,12 @@
572	572	int lenSrc, /* Length of the source file */
573	573	const char zDelta, / Delta to apply to the pattern */
574	574	int lenDelta, /* Length of the delta */
575	575	char zOut / Write the output into this preallocated buffer */
576	576	){
577		- unsigned int limit;
578		- unsigned int total = 0;
	577	+ sqlite3_uint64 limit;
	578	+ sqlite3_uint64 total = 0;
579	579	#ifdef FOSSIL_ENABLE_DELTA_CKSUM_TEST
580	580	char *zOrigOut = zOut;
581	581	#endif
582	582
583	583	limit = getInt(&zDelta, &lenDelta);
584	584

	--- src/delta.c
	+++ src/delta.c
	@@ -572,12 +572,12 @@
572	int lenSrc, /* Length of the source file */
573	const char zDelta, / Delta to apply to the pattern */
574	int lenDelta, /* Length of the delta */
575	char zOut / Write the output into this preallocated buffer */
576	){
577	unsigned int limit;
578	unsigned int total = 0;
579	#ifdef FOSSIL_ENABLE_DELTA_CKSUM_TEST
580	char *zOrigOut = zOut;
581	#endif
582
583	limit = getInt(&zDelta, &lenDelta);
584

	--- src/delta.c
	+++ src/delta.c
	@@ -572,12 +572,12 @@
572	int lenSrc, /* Length of the source file */
573	const char zDelta, / Delta to apply to the pattern */
574	int lenDelta, /* Length of the delta */
575	char zOut / Write the output into this preallocated buffer */
576	){
577	sqlite3_uint64 limit;
578	sqlite3_uint64 total = 0;
579	#ifdef FOSSIL_ENABLE_DELTA_CKSUM_TEST
580	char *zOrigOut = zOut;
581	#endif
582
583	limit = getInt(&zDelta, &lenDelta);
584

M src/util.c

+6 -3

		--- src/util.c
		+++ src/util.c
		@@ -671,20 +671,23 @@
671	671	** (1) The value of the --editor command-line argument
672	672	** (2) The local "editor" setting
673	673	** (3) The global "editor" setting
674	674	** (4) The VISUAL environment variable
675	675	** (5) The EDITOR environment variable
676		-** (6) Any of the following programs that are available:
677		-** notepad, nano, pico, jove, edit, vi, vim, ed,
	676	+** (6) Any of several common editors that might be available, such as:
	677	+** notepad, nano, pico, jove, edit, vi, vim, ed
678	678	**
679	679	** The search only occurs once, the first time this routine is called.
680	680	** Second and subsequent invocations always return the same value.
681	681	*/
682	682	const char *fossil_text_editor(void){
683	683	static const char *zEditor = 0;
684	684	const char *azStdEd[] = {
685		- "notepad", "nano", "pico", "jove", "edit", "vi", "vim", "ed"
	685	+#ifdef _WIN32
	686	+ "notepad",
	687	+#endif
	688	+ "nano", "pico", "jove", "edit", "vi", "vim", "ed"
686	689	};
687	690	int i = 0;
688	691	if( zEditor==0 ){
689	692	zEditor = find_option("editor",0,1);
690	693	}
691	694

	--- src/util.c
	+++ src/util.c
	@@ -671,20 +671,23 @@
671	** (1) The value of the --editor command-line argument
672	** (2) The local "editor" setting
673	** (3) The global "editor" setting
674	** (4) The VISUAL environment variable
675	** (5) The EDITOR environment variable
676	** (6) Any of the following programs that are available:
677	** notepad, nano, pico, jove, edit, vi, vim, ed,
678	**
679	** The search only occurs once, the first time this routine is called.
680	** Second and subsequent invocations always return the same value.
681	*/
682	const char *fossil_text_editor(void){
683	static const char *zEditor = 0;
684	const char *azStdEd[] = {
685	"notepad", "nano", "pico", "jove", "edit", "vi", "vim", "ed"



686	};
687	int i = 0;
688	if( zEditor==0 ){
689	zEditor = find_option("editor",0,1);
690	}
691

	--- src/util.c
	+++ src/util.c
	@@ -671,20 +671,23 @@
671	** (1) The value of the --editor command-line argument
672	** (2) The local "editor" setting
673	** (3) The global "editor" setting
674	** (4) The VISUAL environment variable
675	** (5) The EDITOR environment variable
676	** (6) Any of several common editors that might be available, such as:
677	** notepad, nano, pico, jove, edit, vi, vim, ed
678	**
679	** The search only occurs once, the first time this routine is called.
680	** Second and subsequent invocations always return the same value.
681	*/
682	const char *fossil_text_editor(void){
683	static const char *zEditor = 0;
684	const char *azStdEd[] = {
685	#ifdef _WIN32
686	"notepad",
687	#endif
688	"nano", "pico", "jove", "edit", "vi", "vim", "ed"
689	};
690	int i = 0;
691	if( zEditor==0 ){
692	zEditor = find_option("editor",0,1);
693	}
694

Fossil SCM