Fossil SCM
Make Notepad the default editor on Cygwin, just as win32, if no other editor is specified.
Commit
ad32c20f8e28ebcdf6f5a15a989c749e386ec2b3
Parent
ff87296f853a72a…
2 files changed
+1
-1
+6
-2
+1
-1
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -987,11 +987,11 @@ | ||
| 987 | 987 | blob_reset(&b3); |
| 988 | 988 | } |
| 989 | 989 | fossil_print("ok\n"); |
| 990 | 990 | } |
| 991 | 991 | |
| 992 | -#if defined(_WIN32) | |
| 992 | +#if defined(_WIN32) || defined(__CYGWIN__) | |
| 993 | 993 | /* |
| 994 | 994 | ** Convert every \n character in the given blob into \r\n. |
| 995 | 995 | */ |
| 996 | 996 | void blob_add_cr(Blob *p){ |
| 997 | 997 | char *z = p->aData; |
| 998 | 998 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -987,11 +987,11 @@ | |
| 987 | blob_reset(&b3); |
| 988 | } |
| 989 | fossil_print("ok\n"); |
| 990 | } |
| 991 | |
| 992 | #if defined(_WIN32) |
| 993 | /* |
| 994 | ** Convert every \n character in the given blob into \r\n. |
| 995 | */ |
| 996 | void blob_add_cr(Blob *p){ |
| 997 | char *z = p->aData; |
| 998 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -987,11 +987,11 @@ | |
| 987 | blob_reset(&b3); |
| 988 | } |
| 989 | fossil_print("ok\n"); |
| 990 | } |
| 991 | |
| 992 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 993 | /* |
| 994 | ** Convert every \n character in the given blob into \r\n. |
| 995 | */ |
| 996 | void blob_add_cr(Blob *p){ |
| 997 | char *z = p->aData; |
| 998 |
+6
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -623,13 +623,17 @@ | ||
| 623 | 623 | zEditor = fossil_getenv("VISUAL"); |
| 624 | 624 | } |
| 625 | 625 | if( zEditor==0 ){ |
| 626 | 626 | zEditor = fossil_getenv("EDITOR"); |
| 627 | 627 | } |
| 628 | -#ifdef _WIN32 | |
| 628 | +#if defined(_WIN32) || defined(__CYGWIN__) | |
| 629 | 629 | if( zEditor==0 ){ |
| 630 | - zEditor = mprintf("%s\\notepad.exe", fossil_getenv("SystemRoot")); | |
| 630 | + zEditor = mprintf("%s\\notepad.exe", fossil_getenv("SYSTEMROOT")); | |
| 631 | +#if defined(__CYGWIN__) | |
| 632 | + zEditor = fossil_utf8_to_filename(zEditor); | |
| 633 | + blob_add_cr(pPrompt); | |
| 634 | +#endif | |
| 631 | 635 | } |
| 632 | 636 | #endif |
| 633 | 637 | if( zEditor==0 ){ |
| 634 | 638 | blob_append(pPrompt, |
| 635 | 639 | "#\n" |
| 636 | 640 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -623,13 +623,17 @@ | |
| 623 | zEditor = fossil_getenv("VISUAL"); |
| 624 | } |
| 625 | if( zEditor==0 ){ |
| 626 | zEditor = fossil_getenv("EDITOR"); |
| 627 | } |
| 628 | #ifdef _WIN32 |
| 629 | if( zEditor==0 ){ |
| 630 | zEditor = mprintf("%s\\notepad.exe", fossil_getenv("SystemRoot")); |
| 631 | } |
| 632 | #endif |
| 633 | if( zEditor==0 ){ |
| 634 | blob_append(pPrompt, |
| 635 | "#\n" |
| 636 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -623,13 +623,17 @@ | |
| 623 | zEditor = fossil_getenv("VISUAL"); |
| 624 | } |
| 625 | if( zEditor==0 ){ |
| 626 | zEditor = fossil_getenv("EDITOR"); |
| 627 | } |
| 628 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 629 | if( zEditor==0 ){ |
| 630 | zEditor = mprintf("%s\\notepad.exe", fossil_getenv("SYSTEMROOT")); |
| 631 | #if defined(__CYGWIN__) |
| 632 | zEditor = fossil_utf8_to_filename(zEditor); |
| 633 | blob_add_cr(pPrompt); |
| 634 | #endif |
| 635 | } |
| 636 | #endif |
| 637 | if( zEditor==0 ){ |
| 638 | blob_append(pPrompt, |
| 639 | "#\n" |
| 640 |