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

Apply from François Cami and Guillaume Duviol to improve replacement of tabs by spaces (thank you).

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1603 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-06-09 12:11:18 +00:00
parent c005b92e70
commit fbd6af9919
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-09 Enrico Tröger <enrico.troeger@uvena.de>
* THANKS, src/document.c:
Apply from François Cami and Guillaume Duviol to improve replacement
of tabs by spaces (thank you).
2007-06-08 Frank Lanitz <frank@frank.uvena.de> 2007-06-08 Frank Lanitz <frank@frank.uvena.de>
* THANKS, src/about.c: Added new translator Adrovane Marques Kade. * THANKS, src/about.c: Added new translator Adrovane Marques Kade.

1
THANKS
View File

@ -30,6 +30,7 @@ Anh Phạm <cs(dot)phamtuananh(at)gmail(dot)com> - various patches
Guillaume Hoffmann <guillaumh(at)gmail(dot)com> - Haskell filetype patch Guillaume Hoffmann <guillaumh(at)gmail(dot)com> - Haskell filetype patch
Peter Strand <peter(at)zarquon(dot)se> - Haskell CTags patch Peter Strand <peter(at)zarquon(dot)se> - Haskell CTags patch
Dave Moore <wrex006(at)gmail(dot)com> - code navigation patch Dave Moore <wrex006(at)gmail(dot)com> - code navigation patch
François Cami <francois.cami(at)free(dot)fr>, Guillaume Duviol - tab replacement patch
Translators: Translators:
---------------------------------- ----------------------------------

17
src/document.c
View File

@ -1800,7 +1800,7 @@ void document_print(gint idx)
void document_replace_tabs(gint idx) void document_replace_tabs(gint idx)
{ {
gint search_pos; gint search_pos, pos_in_line, current_tab_true_length;
gint tab_len; gint tab_len;
gchar *tab_str; gchar *tab_str;
struct TextToFind ttf; struct TextToFind ttf;
@ -1811,22 +1811,25 @@ void document_replace_tabs(gint idx)
tab_len = sci_get_tab_width(doc_list[idx].sci); tab_len = sci_get_tab_width(doc_list[idx].sci);
ttf.chrg.cpMin = 0; ttf.chrg.cpMin = 0;
ttf.chrg.cpMax = sci_get_length(doc_list[idx].sci); ttf.chrg.cpMax = sci_get_length(doc_list[idx].sci);
ttf.lpstrText = (gchar*)"\t"; ttf.lpstrText = (gchar*) "\t";
tab_str = g_strnfill(tab_len, ' ');
while (TRUE) while (TRUE)
{ {
search_pos = sci_find_text(doc_list[idx].sci, SCFIND_MATCHCASE, &ttf); search_pos = sci_find_text(doc_list[idx].sci, SCFIND_MATCHCASE, &ttf);
if (search_pos == -1) break; if (search_pos == -1)
break;
pos_in_line = sci_get_col_from_position(doc_list[idx].sci,search_pos);
current_tab_true_length = tab_len - (pos_in_line % tab_len);
tab_str = g_strnfill(current_tab_true_length, ' ');
sci_target_start(doc_list[idx].sci, search_pos); sci_target_start(doc_list[idx].sci, search_pos);
sci_target_end(doc_list[idx].sci, search_pos + 1); sci_target_end(doc_list[idx].sci, search_pos + 1);
sci_target_replace(doc_list[idx].sci, tab_str, FALSE); sci_target_replace(doc_list[idx].sci, tab_str, FALSE);
ttf.chrg.cpMin = search_pos + tab_len - 1; // next search starts after replacement ttf.chrg.cpMin = search_pos + current_tab_true_length - 1; // next search starts after replacement
ttf.chrg.cpMax += tab_len - 1; // update end of range now text has changed ttf.chrg.cpMax += current_tab_true_length - 1; // update end of range now text has changed
g_free(tab_str);
} }
sci_end_undo_action(doc_list[idx].sci); sci_end_undo_action(doc_list[idx].sci);
g_free(tab_str);
} }