X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Femacs.bind;h=60f849b67d4b720f3c7c44f7c7bb9a349b399898;hb=433de6f4618ef866a6f63579da861ed24b0f37e9;hp=d552c15fca10fdfdd56d0f2d6be5088dcc71c674;hpb=e5b25ce78ecc35653f0fd79258ed3d253a132dab;p=lyx.git

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index d552c15fca..60f849b67d 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,7 +25,7 @@
 #
 # Happy tuning!
 
-Format 1
+Format 4
 
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
@@ -40,19 +40,23 @@ 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"
 \bind "C-n"                    "down"
 \bind "C-o"                    "inset-toggle"
+
+# facemenu-menu in emacs
+\bind "M-o"                    "inset-settings"
 \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"
 
@@ -72,8 +76,8 @@ Format 1
 \bind "C-~S-slash"             "undo"
 \bind "C-~S-underscore"        "undo"
 
-\bind "~S-M-quotedbl"		"quote-insert single"
-\bind "~S-C-quotedbl"		"self-insert \""
+\bind "~S-M-quotedbl"		"quote-insert inner"
+\bind "~S-C-quotedbl"		"quote-insert outer auto plain"
 
 \bind "C-x a"                  "buffer-auto-save"
 #\bind "C-x b"                 "buffer-previous"
@@ -104,8 +108,15 @@ 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 "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
@@ -146,8 +157,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; tabular-feature move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"			"tabular-feature move-column-right"
+\bind "M-Left"			"tabular-feature move-column-left"
 \bind "C-Right"			"word-right"
 \bind "C-Left"			"word-left"
 \bind "C-Up"			"paragraph-up"
@@ -215,11 +228,13 @@ 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 "M-S-Right"		"depth-increment"
+\bind "M-S-Left"		"depth-decrement"
 \bind "C-S-L"			"specialchar-insert ligature-break"
-\bind "C-space"			"space-insert protected"
+\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"
@@ -228,6 +243,10 @@ Format 1
 \bind "M-period"		"specialchar-insert dots"
 \bind "M-w"			"copy"
 \bind "Escape"			"meta-prefix"
+\bind "M-u"			"word-upcase partial"
+\bind "M-l"			"word-lowcase partial"
+# This conflicts with the character menu.
+#bind "M-c"			"word-capitalize partial"
 
 # Numeric keypad (if Shift+KP_XXX does not switch the NumLock state)
 \bind "S-KP_Right"              "char-right-select"
@@ -244,8 +263,10 @@ Format 1
 \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 "C-x h"			"command-sequence buffer-begin ; buffer-end-select"   # select all
+\bind "M-h"                     "inset-select-all"
 \bind "C-KP_Insert"             "copy"
 \bind "S-KP_Insert"             "paste"
 \bind "S-KP_Delete"             "cut"
@@ -258,3 +279,9 @@ Format 1
 \bind_file latinkeys.bind
 \bind_file cyrkeys.bind
 \bind_file greekkeys.bind
+
+# the following bindings have to be adapted w.r.t. menus.bind
+\bind "M-c Down"		"word-lowcase partial"
+\bind "M-c Up"			"word-upcase partial"
+\bind "M-c Right"		"word-capitalize partial"
+