# -: "Option-Shift-Command-V" # Apply the style of the surrounding text to the inserted object (Paste and Match Style)
# -: "Control-Command-V" # Apply formatting settings to the selected object (Paste Ruler Command)
\bind "C-M-v" "primary-selection-paste"
-# ?: "Command-W" # Close the frontmost window
-\bind "C-w" "buffer-close" # should be "window-close"
-# +: "Shift-Command-W" # Close a file and its associated windows
-\bind "C-S-w" "buffer-close"
+# +: "Command-W" # Close the frontmost window - modern applications map this to close tab or window if it's the last one
+\bind "C-w" "buffer-close"
+# +: "Shift-Command-W" # Close a file and its associated windows - modern applications map this close window
+\bind "C-S-w" "window-close"
# +: "Option-Command-W" # Close all windows in the application without quitting it
\bind "C-A-w" "buffer-close-all"
# +: "Command-X" # Remove the selection and store in the Clipboard
#bind "F1" "help" # Not yet implemented!
#bind "C-F1" "help-context" # Not yet implemented!
-\bind "F2" "buffer-write"
+\bind "F2" "buffer-write force"
\bind "C-F4" "buffer-close"
\bind "C-A-Up" "scroll line up"
\bind "C-A-Down" "scroll line down"
#\bind "F9" "meta-prefix"
\bind "C-M-F" "ui-toggle fullscreen"
+\bind "C-A-F" "forward-search"
# Include menu and math bindings