X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Femacs.bind;h=09fe78361406cee3432bf75d51e362c553259b42;hb=00802019771bd1b9779d3b39899089abfc38201f;hp=b124ef3defef56e5c519551eedb6e13c152542ad;hpb=e70b3ff726dfc03989e03488cea6513a4fc9f0d1;p=lyx.git

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index b124ef3def..09fe783614 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,7 +25,7 @@
 #
 # Happy tuning!
 
-Format 1
+Format 2
 
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
@@ -40,7 +40,7 @@ Format 1
 \bind "C-h"                    "specialchar-insert hyphenation"
 \bind "C-M-minus"		"specialchar-insert nobreakdash"
 \bind "C-i"                    "space-insert hfill"
-\bind "C-j"                    "break-paragraph"
+\bind "C-j"                    "paragraph-break"
 \bind "C-k"                    "line-delete-forward"
 \bind "C-l"                    "screen-recenter"
 \bind "C-m"                    "mark-toggle"
@@ -52,7 +52,8 @@ Format 1
 \bind "C-q"                    "self-insert \""
 #bind "C-r"                    "------"
 \bind "C-s"                    "dialog-show findreplace"
-\bind "M-~S-percent"		"dialog-show findreplace"
+\bind "C-S-s"                  "dialog-show findreplaceadv"
+\bind "M-~S-percent"           "dialog-show findreplaceadv"
 
 \bind "C-t"                    "chars-transpose"
 
@@ -79,7 +80,7 @@ Format 1
 #\bind "C-x b"                 "buffer-previous"
 \bind "C-x d"                  "buffer-new"
 \bind "C-x g"                  "buffer-view ps"
-\bind "C-x k"                  "view-close"
+\bind "C-x k"                  "buffer-close"
 \bind "C-x p"                  "buffer-view dvi"
 \bind "C-x r"                  "buffer-update dvi"
 # Should have been "buffer-write-some"
@@ -104,8 +105,13 @@ Format 1
 #\bind "C-x C-r"                "buffer-update dvi"
 \bind "C-x C-s"                "buffer-write"
 \bind "C-x C-t"                "buffer-update dvi"
-\bind "C-Next"		       "buffer-next"
-\bind "C-Prior"		       "buffer-previous"
+\bind "C-Next"                 "buffer-next"
+\bind "C-Prior"                "buffer-previous"
+\bind "C-x 0"                  "view-close"
+
+# Window commands
+\bind "C-x 5 2"                "window-new"
+\bind "C-x 5 0"                "window-close"
 
 
 # this is "upcase-region" in emacs
@@ -146,8 +152,10 @@ Format 1
 # Motion group
 #
 
-\bind "M-Up"			"paragraph-move-up"
-\bind "M-Down"			"paragraph-move-down"
+\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
+\bind "M-Right"			"inset-modify tabular move-column-right"
+\bind "M-Left"			"inset-modify tabular move-column-left"
 \bind "C-Right"			"word-right"
 \bind "C-Left"			"word-left"
 \bind "C-Up"			"paragraph-up"
@@ -215,11 +223,11 @@ Format 1
 \bind "C-Delete"		"word-delete-forward"
 \bind "M-d"			"word-delete-forward"
 \bind "C-BackSpace"		"word-delete-backward"
-\bind "M-Return"		"break-paragraph inverse"
+\bind "M-Return"		"paragraph-break inverse"
 \bind "C-Return"		"newline-insert newline"
 \bind "C-S-Return"		"newline-insert linebreak"
 \bind "C-S-L"			"specialchar-insert ligature-break"
-\bind "C-space"			"command-alternatives space-insert protected ; math-space"
+\bind "C-space"			"command-alternatives math-space ; space-insert protected"
 \bind "nobreakspace"		"space-insert protected"
 \bind "C-M-space"		"space-insert normal"
 \bind "S-C-space"		"space-insert thin"