X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Femacs.bind;h=0a92d74bb2d2fafaba0c98d0043a0952ca2c99d9;hb=bc6214b63bf9c1b4680c8b4ed9a08c3328878940;hp=f738872a844723fc2a70c14a573d3c8ee7480833;hpb=c876a2e7c720a8dc4bc92ff4a437b769f327e904;p=lyx.git

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index f738872a84..0a92d74bb2 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,11 +25,13 @@
 #
 # Happy tuning!
 
+Format 4
+
 \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"
@@ -38,19 +40,20 @@
 \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"                    "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"
 
@@ -70,8 +73,8 @@
 \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"
@@ -102,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
@@ -134,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; 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"
@@ -209,18 +225,25 @@
 \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"
-\bind "C-S-slash"		"specialchar-insert slash"
+\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"
+\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"
@@ -237,8 +260,10 @@
 \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"
@@ -251,3 +276,9 @@
 \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"
+