Remove 3rdparty/boost/Makefile.am

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 1c5d4397f495a070eadc152166dc003a520e75d8..4defd94fa610e513ea29948da6f4fa7cf1e03e46 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -258,7 +258,7 @@ public:
         settings are given to the new one.
         This function will handle a multi-paragraph selection.
         */
-       void setParagraphs(Cursor const & cur, docstring const & arg, bool modify = false);
+       void setParagraphs(Cursor const & cur, docstring const & arg, bool merge = false);
        /// Sets parameters for current or selected paragraphs
        void setParagraphs(Cursor const & cur, ParagraphParameters const & p);