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

Convert line endings for file templates.

Browse Source 
Fix line endings when using file header template in a file template
(oops).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5388 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-11-09 18:14:33 +00:00
parent 025e391dba
commit f3c199807d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,10 @@
Save build commands for filetype None (patch by Lex, thanks).
Make filetypes_get_conf_extension() return "common" for filetype
None.
* src/templates.c:
Convert line endings for file templates.
Fix line endings when using file header template in a file template
(oops).
2010-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

11
src/templates.c
View File

@ -84,16 +84,12 @@ static void read_template(const gchar *name, gint id)
TEMPLATES_READ_FILE(fname, &templates[id]);
/* FIXME: we should replace the line ends on insertion with doc pref, not on loading */
{
GString *tmp = g_string_new(templates[id]);
const gchar *eol_str = (file_prefs.default_eol_character == SC_EOL_CR) ? "\r" : "\r\n";
/* first convert data to LF only */
utils_string_replace_all(tmp, "\r\n", "\n");
utils_string_replace_all(tmp, "\r", "\n");
/* now convert to desired line endings */
utils_string_replace_all(tmp, "\n", eol_str);
/* Convert to default line endings e.g. for file header use in a file template.
* When inserting separately we replace line endings with the document setting. */
utils_ensure_same_eol_characters(tmp, file_prefs.default_eol_character);
setptr(templates[id], tmp->str);
g_string_free(tmp, FALSE);
}
@ -264,6 +260,7 @@ static gchar *get_template_from_file(const gchar *locale_fname, const gchar *doc
gchar *file_header;
template = g_string_new(content);
utils_ensure_same_eol_characters(template, file_prefs.default_eol_character);
file_header = get_template_fileheader(ft);
templates_replace_valist(template,