[geany/geany] 6a132e: CR line endings are used on old Mac OS systems only - make it more explicit in labels

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Tue, 10 Feb 2015 14:57:50 UTC
Commit:      6a132ef3fa4a01f7e05a0b8d673407429e3e6c8a
             https://github.com/geany/geany/commit/6a132ef3fa4a01f7e05a0b8d673407429e3e6c8a

Log Message:
-----------
CR line endings are used on old Mac OS systems only - make it more explicit in labels

Also don't default to CR if OS is neither Windows nor Unix (including OS X).
There's no other GTK backend right now so it doesn't matter much but
still if something else appears, it will most probably not have CR line
endings.


Modified Paths:
--------------
    data/geany.glade
    src/document.h
    src/utils.c

Modified: data/geany.glade
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -7726,7 +7726,7 @@
                                   <object class="GtkRadioMenuItem" id="cr">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Convert and Set to CR (_Mac)</property>
+                                    <property name="label" translatable="yes">Convert and Set to CR (Classic _Mac)</property>
                                     <property name="use_underline">True</property>
                                     <property name="group">crlf</property>
                                     <signal name="activate" handler="on_cr_activate" swapped="no"/>


Modified: src/document.h
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -222,10 +222,8 @@ GeanyDocument *document_find_by_id(guint id);
 
 #if defined(G_OS_WIN32)
 # define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CRLF
-#elif defined(G_OS_UNIX)
-# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF
 #else
-# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CR
+# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF
 #endif
 
 extern GeanyFilePrefs file_prefs;


Modified: src/utils.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -374,7 +374,7 @@ const gchar *utils_get_eol_name(gint eol_mode)
 	switch (eol_mode)
 	{
 		case SC_EOL_CRLF: return _("Win (CRLF)"); break;
-		case SC_EOL_CR: return _("Mac (CR)"); break;
+		case SC_EOL_CR: return _("Classic Mac (CR)"); break;
 		default: return _("Unix (LF)"); break;
 	}
 }



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).