- moderncv.layout: add missing separator style

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d17540d4ad70abd41bcaace8f2bc5a5cd3dec665..5cfce9bec536679dfa09775526a317805aec291b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2311,6 +2311,10 @@ void Paragraph::latex(BufferParams const & bparams,
        if (body_pos > 0) {
                // the optional argument is kept in curly brackets in
                // case it contains a ']'
+               // This is not strictly needed, but if this is changed it
+               // would be a file format change, and tex2lyx would need
+               // to be adjusted, since it unconditionally removes the
+               // braces when it parses \item.
                os << "[{";
                column += 2;
                basefont = getLabelFont(bparams, outerfont);
@@ -3485,16 +3489,13 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 
 void Paragraph::collectWords()
 {
-       // This is the value that needs to be exposed in the preferences
-       // to resolve bug #6760.
-       static int minlength = 6;
        pos_type n = size();
        for (pos_type pos = 0; pos < n; ++pos) {
                if (isWordSeparator(pos))
                        continue;
                pos_type from = pos;
                locateWord(from, pos, WHOLE_WORD);
-               if (pos - from >= minlength) {
+               if ((pos - from) >= (int)lyxrc.completion_minlength) {
                        docstring word = asString(from, pos, AS_STR_NONE);
                        FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
                        if (cit == d->fontlist_.end())