Make shortcuts for master-buffer-X fall back to buffer-X.

Fixes #9842.

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index b7903b61cd74ad01743199eeb6df9a1108bc227c..2aa9be5db21826ad7bd152f8354cb8b6d4537fae 100644 (file)
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -45,14 +45,14 @@ Format 2
 \bind "C-r"                    "buffer-view"
 \bind "C-d"                    "buffer-view dvi"       # 'd' for dvi
 \bind "C-t"                    "buffer-view ps"
-\bind "C-M-r"                  "master-buffer-view"
-\bind "C-M-t"                  "master-buffer-view ps"
-\bind "C-M-d"                  "master-buffer-view dvi"
+\bind "C-M-r"                  "command-alternatives master-buffer-view; buffer-view"
+\bind "C-M-t"                  "command-alternatives master-buffer-view ps; buffer-view ps"
+\bind "C-M-d"                  "command-alternatives master-buffer-view dvi; buffer-view dvi"
 \bind "C-S-R"                  "buffer-update"
 \bind "C-S-D"                  "buffer-update dvi"     # 'd' for dvi
 \bind "C-S-T"                  "buffer-update ps"
-\bind "C-M-S-t"                        "master-buffer-update ps"
-\bind "C-M-S-d"                        "master-buffer-update dvi"
+\bind "C-M-S-t"                        "command-alternatives master-buffer-update ps; buffer-update ps"
+\bind "C-M-S-d"                        "command-alternatives master-buffer-update dvi; buffer-update dvi"
 \bind "C-q"                    "lyx-quit"
 \bind "C-Next"                 "buffer-next"
 \bind "C-Tab"                  "buffer-next"

diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 519033221fa36bcd061e6ce36c8344b660635896..18d086205aee0097c1350dfc765e5ef75fad4382 100644 (file)
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -136,7 +136,7 @@ Format 2
 #  +: "Option-Command-D"             # Show or hide the Dock
 #  -: "Command-Control D"            # Display the definition of the selected word in the Dictionary application
 \bind "C-d"                          "buffer-view dvi" # 'd' for dvi
-\bind "C-M-d"                        "master-buffer-view dvi"
+\bind "C-M-d"                        "command-alternatives master-buffer-view dvi; buffer.view dvi"
 \bind "C-S-D"                        "buffer-update dvi"       # 'd' for dvi
 #  -: "Command-E"                    # Use the selection for a find
 \bind "C-e"                          "font-emph"
@@ -176,7 +176,7 @@ Format 2
 \bind "C-S-S"                        "buffer-write-as"
 #  -: "Command-T"                    # Display the Fonts window
 \bind "C-t"                          "buffer-view pdf"
-\bind "C-M-t"                        "master-buffer-view pdf"
+\bind "C-M-t"                        "command-alternatives master-buffer-view pdf; buffer-view pdf"
 #  -: "Option-Command-T"             # Show or hide a toolbar
 #  -: "Command-U"                    # Underline the selected text or turn underlining on or off
 \bind "C-u"                          "font-underline"
@@ -253,8 +253,8 @@ Format 2
 \bind "C-S-O"                        "font-strikeout"
 \bind "C-S-T"                        "buffer-update pdf" # (pdflatex; was "ps")
 \bind "C-S-R"                        "buffer-update"
-\bind "C-M-S-T"                      "master-buffer-update pdf"
-\bind "C-M-S-D"                      "master-buffer-update dvi"
+\bind "C-M-S-T"                      "command-alternatives master-buffer-update pdf; buffer-update pdf"
+\bind "C-M-S-D"                      "command-alternatives master-buffer-update dvi; buffer-update dvi"
 
 \bind "C-S-E"                        "changes-track" # it's what MS Word uses
 \bind "~S-M-quotedbl"                "quote-insert single"