From: Georg Baum <baum@lyx.org>
Date: Tue, 4 Feb 2014 21:22:54 +0000 (+0100)
Subject: Add more paste lfun doc from bug #8749.
X-Git-Tag: 2.1.0rc1~260
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c616c7e73fa7db533e6fa72aca94a69579bfa1eb;p=features.git

Add more paste lfun doc from bug #8749.
---

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 2413a239ca..a214cfe7bc 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1222,7 +1222,8 @@ void LyXAction::init()
 		{ LFUN_PASTE, "paste", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_CLIPBOARD_PASTE
- * \li Action: Pastes text from the active clipboard. Pastes plain text if plain text is
+ * \li Action: Pastes text from the active clipboard (retains formatting if the
+               clipboard contains formatted text). Pastes plain text if plain text is
                on the clipboard, but tries to interpret it in special ways for certain
                insets, e.g. converting csv data to rows and colums if tha paste happens
                in a tabular inset.
@@ -1256,8 +1257,11 @@ void LyXAction::init()
 		{ LFUN_SELECTION_PASTE, "selection-paste", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_CLIPBOARD_PASTE_SIMPLE
- * \li Action: Pastes simple unformatted text from the active clipboard even
-               if formatted LyX content is in the clipboard.
+ * \li Action: Pastes plain text from the active clipboard even if formatted
+               LyX content is in the clipboard. Pastes plain text if plain text
+               is on the clipboard, without trying to interpret it in special
+               ways for certain insets, e.g. converting csv data to rows and
+               colums if the paste happens in a tabular inset.
  * \li Syntax: clipboard-paste-simple [<ARG>]
  * \li Params: <ARG>: "paragraph" will cause pasting as one paragraph, i.e. "Join lines".
  * \endvar