HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When using editor_get_eol_char_* functions with an invalid editor object, return the appropriate value according to the eol character preference (just in case).

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2999 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-09-25 18:29:11 +00:00
parent a032d6a660
commit f701893ef7
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,10 @@
src/tools.c: src/tools.c:
Unify the API in editor.c, all public functions now take a Unify the API in editor.c, all public functions now take a
GeanyEditor* object. GeanyEditor* object.
* src/editor.c:
When using editor_get_eol_char_* functions with an invalid editor
object, return the appropriate value according to the eol character
preference (just in case).
2008-09-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-09-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

24
src/editor.c
View File

@ -3445,10 +3445,12 @@ void editor_insert_color(GeanyEditor *editor, const gchar *colour)
const gchar *editor_get_eol_char_name(GeanyEditor *editor) const gchar *editor_get_eol_char_name(GeanyEditor *editor)
{ {
if (editor == NULL) gint mode = file_prefs.default_eol_character;
return "";
switch (sci_get_eol_mode(editor->sci)) if (editor != NULL)
mode = sci_get_eol_mode(editor->sci);
switch (mode)
{ {
case SC_EOL_CRLF: return _("Win (CRLF)"); break; case SC_EOL_CRLF: return _("Win (CRLF)"); break;
case SC_EOL_CR: return _("Mac (CR)"); break; case SC_EOL_CR: return _("Mac (CR)"); break;
@ -3460,10 +3462,12 @@ const gchar *editor_get_eol_char_name(GeanyEditor *editor)
/* returns the end-of-line character(s) length of the specified editor */ /* returns the end-of-line character(s) length of the specified editor */
gint editor_get_eol_char_len(GeanyEditor *editor) gint editor_get_eol_char_len(GeanyEditor *editor)
{ {
if (editor == NULL) gint mode = file_prefs.default_eol_character;
return 0;
switch (sci_get_eol_mode(editor->sci)) if (editor != NULL)
mode = sci_get_eol_mode(editor->sci);
switch (mode)
{ {
case SC_EOL_CRLF: return 2; break; case SC_EOL_CRLF: return 2; break;
default: return 1; break; default: return 1; break;
@ -3474,10 +3478,12 @@ gint editor_get_eol_char_len(GeanyEditor *editor)
/* returns the end-of-line character(s) of the specified editor */ /* returns the end-of-line character(s) of the specified editor */
const gchar *editor_get_eol_char(GeanyEditor *editor) const gchar *editor_get_eol_char(GeanyEditor *editor)
{ {
if (editor == NULL) gint mode = file_prefs.default_eol_character;
return "";
switch (sci_get_eol_mode(editor->sci)) if (editor != NULL)
mode = sci_get_eol_mode(editor->sci);
switch (mode)
{ {
case SC_EOL_CRLF: return "\r\n"; break; case SC_EOL_CRLF: return "\r\n"; break;
case SC_EOL_CR: return "\r"; break; case SC_EOL_CR: return "\r"; break;