Improve fullscreen capabilities ( http://bugzilla.lyx.org/show_bug.cgi?id=4146 ).

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 83c182a99c66245abfa574b51dd3e5f986fab5e6..5e00debe35e6b763ff033408f898024180e7c9e3 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -79,7 +79,6 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/FileFilterList.h"
 #include "support/FileName.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
@@ -1754,31 +1753,33 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
        // find macros in included files
        Impl::PositionScopeBufferMap::const_iterator it
        = greatest_below(d->position_to_children, pos);
-       if (it != d->position_to_children.end()) {
-               while (true) {
-                       // do we know something better (i.e. later) already?
-                       if (it->first < bestPos )               
-                               break;
+       if (it == d->position_to_children.end())
+               // no children before
+               return bestData;
 
-                       // scope ends behind pos?
-                       if (pos < it->second.first) {
-                               // look for macro in external file
-                               d->macro_lock = true;
-                               MacroData const * data
-                               = it->second.second->getMacro(name, false);
-                               d->macro_lock = false;
-                               if (data) {
-                                       bestPos = it->first;
-                                       bestData = data;                               
-                                       break;
-                               }
-                       }
-                       
-                       // try previous file if there is one
-                       if (it == d->position_to_children.begin())
+       while (true) {
+               // do we know something better (i.e. later) already?
+               if (it->first < bestPos )
+                       break;
+
+               // scope ends behind pos?
+               if (pos < it->second.first) {
+                       // look for macro in external file
+                       d->macro_lock = true;
+                       MacroData const * data
+                       = it->second.second->getMacro(name, false);
+                       d->macro_lock = false;
+                       if (data) {
+                               bestPos = it->first;
+                               bestData = data;
                                break;
-                       --it;
+                       }
                }
+
+               // try previous file if there is one
+               if (it == d->position_to_children.begin())
+                       break;
+               --it;
        }
                
        // return the best macro we have found
@@ -1899,7 +1900,7 @@ void Buffer::updateEnvironmentMacros(DocIterator & it,
                                if (!child)
                                        continue;                               
 
-                               // register it, but only when it is
+                               // register its position, but only when it is
                                // included first in the buffer
                                if (d->children_positions.find(child)
                                    == d->children_positions.end())