X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Femacs.bind;h=bfd42b448c369c512b4e56407d4b6cdcf14f8588;hb=41b39ff835b39fc647190ebf02aca83e89ec8bea;hp=4b3a081f9759fc00bf7718597f74a8fa75fe6cfa;hpb=b170e5890e5994c4182ea7503991fa19c74e7464;p=lyx.git

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index 4b3a081f97..bfd42b448c 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,31 +25,35 @@
 #
 # Happy tuning!
 
+Format 2
+
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
 \bind "C-b"			"char-backward"
 #bind "C-c"			"------" // used as users prefix
-\bind "C-d"			"delete-forward"
+\bind "C-d"			"char-delete-forward"
 \bind "C-e"			"line-end"
 \bind "C-f"			"char-forward"
 \bind "C-g"			"cancel"
 
 # help in emacs
-\bind "C-h"                    "hyphenation-point-insert"
-\bind "C-i"                    "hfill-insert"
-\bind "C-j"                    "break-paragraph"
+\bind "C-h"                    "specialchar-insert hyphenation"
+\bind "C-M-minus"		"specialchar-insert nobreakdash"
+\bind "C-i"                    "space-insert hfill"
+\bind "C-j"                    "paragraph-break"
 \bind "C-k"                    "line-delete-forward"
 \bind "C-l"                    "screen-recenter"
 \bind "C-m"                    "mark-toggle"
 \bind "C-n"                    "down"
-\bind "C-o"                    "next-inset-toggle"
+\bind "C-o"                    "inset-toggle"
 \bind "C-p"                    "up"
 
 # this is "quoted-insert" a total different meaning from "quote-insert"
 \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"
 
@@ -101,8 +105,15 @@
 #\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 "S-F7"                   "thesaurus-entry"
+\bind "S-F8"                   "dialog-show spellchecker"
+\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
@@ -133,14 +144,20 @@
 #bind "F10"                    "------"
 
 \bind "M-x"			"command-execute"
+\bind "C-M-o"			"dialog-show toc"
 
+\bind "M-equal"			"buffer-zoom-in"
+\bind "M-plus"			"buffer-zoom-in"
+\bind "M-minus"			"buffer-zoom-out"
 
 #
 # 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"
@@ -208,14 +225,17 @@
 \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 "C-Return"		"break-line"
-\bind "C-S-L"			"ligature-break-insert"
-\bind "C-space"			"space-insert protected"
-\bind "C-M-space"			"space-insert normal"
-\bind "S-C-space"			"space-insert thin"
-\bind "C-period"		"end-of-sentence-period-insert"
-\bind "M-period"		"dots-insert"
+\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 math-space ; space-insert protected"
+\bind "nobreakspace"		"space-insert protected"
+\bind "C-M-space"		"space-insert normal"
+\bind "S-C-space"		"space-insert thin"
+\bind "M-~S-slash"		"specialchar-insert slash"
+\bind "C-period"		"specialchar-insert end-of-sentence"
+\bind "M-period"		"specialchar-insert dots"
 \bind "M-w"			"copy"
 \bind "Escape"			"meta-prefix"
 
@@ -234,8 +254,9 @@
 \bind "S-KP_Next"               "screen-down-select"
 \bind "S-C-KP_Home"             "buffer-begin-select"
 \bind "S-C-KP_End"              "buffer-end-select"
-\bind "S-C-KP_Prior"            "buffer-begin-select"
-\bind "S-C-KP_Next"             "buffer-end-select"
+\bind "S-C-KP_Prior"            "buffer-move-previous"
+\bind "S-C-KP_Next"             "buffer-move-next"
+\bind "M-h"                     "inset-select-all"
 \bind "C-KP_Insert"             "copy"
 \bind "S-KP_Insert"             "paste"
 \bind "S-KP_Delete"             "cut"