From 4cca3784e2fed98b4e07950088049057918344fa Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 15 Aug 2017 09:31:32 -0700 Subject: [PATCH 1/2] Resolve 32/64-bit confusion for Windows editors --- book/01-introduction/sections/first-time-setup.asc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc index 48bd81b05..c72925f29 100644 --- a/book/01-introduction/sections/first-time-setup.asc +++ b/book/01-introduction/sections/first-time-setup.asc @@ -50,14 +50,19 @@ If you want to use a different text editor, such as Emacs, you can do the follow $ git config --global core.editor emacs ---- -While on a Windows system, if you want to use a different text editor, such as Notepad++, you can do the following: +On a Windows system, if you want to use a different text editor, you must specify the full path to its executable file. +This can be different depending on how your editor is packaged. + +In the case of Notepad++, a popular programming editor, the application is always shipped as a 32-bit executable. +If you are on a 32-bit Windows system, or you have a 64-bit editor on a 64-bit system, you'll type something like this: -On a x86 system [source,console] ---- $ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -nosession" ---- -On a x64 system + +If you have a 32-bit editor on a 64-bit system, the program will be installed in `C:\Program Files (x86)`: + [source,console] ---- $ git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession" From 3cb981d5b1ed400c9404a788e85fdd530bbb99ee Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 16 Aug 2017 09:26:58 -0700 Subject: [PATCH 2/2] Slight change of language about Notepad++ --- book/01-introduction/sections/first-time-setup.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc index c72925f29..d648edae2 100644 --- a/book/01-introduction/sections/first-time-setup.asc +++ b/book/01-introduction/sections/first-time-setup.asc @@ -53,7 +53,7 @@ $ git config --global core.editor emacs On a Windows system, if you want to use a different text editor, you must specify the full path to its executable file. This can be different depending on how your editor is packaged. -In the case of Notepad++, a popular programming editor, the application is always shipped as a 32-bit executable. +In the case of Notepad++, a popular programming editor, you are likely to want to use the 32-bit version, since at the time of writing the 64-bit version doesn't support all plug-ins. If you are on a 32-bit Windows system, or you have a 64-bit editor on a 64-bit system, you'll type something like this: [source,console]