Commit 7e358994 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

:on_erase): Copy tagtable->match into a local variable and use it. This

* src/filebuffer.cc (FileBuffer::on_erase): Copy tagtable->match
into a local variable and use it.  This fixes a compilation error
with the Intel C++ compiler caused by the creation of a temporary
inside the statement expression of g_return_if_fail().

svn path=/trunk/; revision=597
parent 466b50df
2007-01-06 Daniel Elstner <daniel.kitta@gmail.com>
* src/filebuffer.cc (FileBuffer::on_erase): Copy tagtable->match
into a local variable and use it. This fixes a compilation error
with the Intel C++ compiler caused by the creation of a temporary
inside the statement expression of g_return_if_fail().
2007-01-06 Daniel Elstner <daniel.kitta@gmail.com>
* src/globalstrings.h (glade_aboutdialog_filename): Remove
......
......@@ -629,11 +629,11 @@ void FileBuffer::on_erase(const FileBuffer::iterator& rbegin, const FileBuffer::
signal_preview_line_changed.queue();
}
const Glib::RefPtr<RegexxerTags> tagtable = RegexxerTags::instance();
const Glib::RefPtr<const Gtk::TextTag> tag_match = RegexxerTags::instance()->match;
if (!rbegin.starts_line() && rbegin.has_tag(tagtable->match))
if (!rbegin.starts_line() && rbegin.has_tag(tag_match))
{
g_return_if_fail(!rbegin.ends_tag(tagtable->match)); // just to be sure...
g_return_if_fail(!rbegin.ends_tag(tag_match)); // just to be sure...
int backward_chars = 0;
int match_length = -1;
......@@ -653,7 +653,7 @@ void FileBuffer::on_erase(const FileBuffer::iterator& rbegin, const FileBuffer::
match_length = std::max(match_length, match_data->length);
}
}
while (match_length < 0 && !pos.starts_line() && !pos.toggles_tag(tagtable->match));
while (match_length < 0 && !pos.starts_line() && !pos.toggles_tag(tag_match));
if (match_length > backward_chars)
remove_match_at_iter(pos);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment