LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR -> LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23605 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 02ff8b2a56bbb1c8f654bbb5f2e2d41fd20ce8e2..99db2f16dc0d8a3af6a13e3fb65b36efbac37448 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -43,6 +43,10 @@ Some of the LyX functions have changed names:
   LFUN_FLEX_INSERT, "flex-insert". It now handles beside charstyles, also 
   custom insets and XML short element insets.
 
+- The function LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar"
+  has been renamed to LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE,
+  "cursor-follows-scrollbar-toggle".
+
 The following new LyX functions have been introduced:
 
 - LFUN_SPECIALCHAR_INSERT, "specialchar-insert" (see above).

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 2516b5adb6cb245ad647020f1c7be2660a3ede46..3deb55bb892c9f92afd74f5fdbbd614479e24aae 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1527,14 +1527,14 @@ void LyXAction::init()
  */
                { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer, System },
 /*!
- * \var lyx::kb_action lyx::LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR
+ * \var lyx::kb_action lyx::LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE
  * \li Action: Determine whether keep cursor inside the editing window regardless
                the scrollbar movement.
  * \li Syntax: toggle-cursor-follows-scrollbar
  * \li Origin: ARRae, 2 Dec 1997
  * \endvar
  */
-               { LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly, System },
+               { LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, "cursor-follows-scrollbar-toggle", ReadOnly, System },
 /*!
  * \var lyx::kb_action lyx::LFUN_SET_COLOR
  * \li Action: Set the given LyX color to the color defined by the X11 name given.

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 138865d87c1f017ca657514d86d5a311044f8ce6..920ffa84bd136b22c8860b1d0fb0633a2ae6207d 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -607,7 +607,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_DIALOG_DISCONNECT_INSET:
        case LFUN_BUFFER_CHILD_OPEN:
        case LFUN_UI_TOGGLE:
-       case LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR:
+       case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE:
        case LFUN_KEYMAP_OFF:
        case LFUN_KEYMAP_PRIMARY:
        case LFUN_KEYMAP_SECONDARY:
@@ -1324,7 +1324,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
                }
 
-               case LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR:
+               case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE:
                        BOOST_ASSERT(lyx_view_);
                        lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
                        break;

diff --git a/src/lfuns.h b/src/lfuns.h
index 22aa481774b4ba013a13281434f84c20fba20d2a..011c9e22de10c396f0f89be7e8d92b07c001550b 100644 (file)
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -231,7 +231,7 @@ enum kb_action {
        LFUN_BUFFER_EXPORT,             // Lgb 97-07-29
        // 165
        LFUN_LABEL_GOTO,                // Ale 970806
-       LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, // ARRae 971202
+       LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, // ARRae 971202
        LFUN_BUFFER_CHKTEX,             // Asger 971030
        LFUN_HYPERLINK_INSERT,          // CFO-G 971121
        LFUN_WORD_FIND_FORWARD,         // Etienne 980216