From 160902bd18a902410d510db14b8da91effa405b8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 2 Feb 2018 19:54:56 -0500
Subject: [PATCH] Remove doom/toggle-fullsreen; redundant with
 toggle-frame-fullscreen

---
 core/autoload/ui.el                  | 16 ----------------
 modules/private/default/+bindings.el |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/core/autoload/ui.el b/core/autoload/ui.el
index 080ce05fd..984ade45c 100644
--- a/core/autoload/ui.el
+++ b/core/autoload/ui.el
@@ -1,21 +1,5 @@
 ;;; core/autoload/ui.el -*- lexical-binding: t; -*-
 
-;;;###autoload
-(defun doom/toggle-fullscreen ()
-  "Toggle fullscreen for the current frame using non-native fullscreen. If you
-prefer native fullscreen, use `toggle-frame-fullscreen' instead."
-  (interactive)
-  (modify-frame-parameters
-   nil
-   `((maximized
-      . ,(unless (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth))
-           (frame-parameter nil 'fullscreen)))
-     (fullscreen
-      . ,(if (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth))
-             (when (eq (frame-parameter nil 'maximized) 'maximized)
-               'maximized)
-           'fullboth)))))
-
 (defvar doom--line-number-style doom-line-numbers-style)
 ;;;###autoload
 (defun doom/toggle-line-numbers ()
diff --git a/modules/private/default/+bindings.el b/modules/private/default/+bindings.el
index 7714cadfe..4e813f82e 100644
--- a/modules/private/default/+bindings.el
+++ b/modules/private/default/+bindings.el
@@ -28,13 +28,14 @@
       "M-="       #'text-scale-increase
       "M--"       #'text-scale-decrease
 
-      ;; Simple window navigation/manipulation
+      ;; Simple window/frame navigation/manipulation
       "C-`"       #'+popup/toggle
       "C-~"       #'+popup/raise
       "M-t"       #'+workspace/new
       "M-T"       #'+workspace/display
       "M-w"       #'delete-window
       "M-W"       #'delete-frame
+      "C-M-f"     #'toggle-frame-fullscreen
       "M-n"       #'evil-buffer-new
       "M-N"       #'make-frame
       "M-1"       (λ! (+workspace/switch-to 0))
@@ -56,7 +57,6 @@
       :ne "M-c"   #'evil-yank
       :ne "M-q"   (if (daemonp) #'delete-frame #'save-buffers-kill-emacs)
       :ne "M-f"   #'swiper
-      :ne "C-M-f" #'doom/toggle-fullscreen
       :n  "M-s"   #'save-buffer
       :m  "A-j"   #'+default:multi-next-line
       :m  "A-k"   #'+default:multi-previous-line
@@ -287,7 +287,7 @@
           :desc "Flyspell"               :n "s" #'flyspell-mode
           :desc "Flycheck"               :n "f" #'flycheck-mode
           :desc "Line numbers"           :n "l" #'doom/toggle-line-numbers
-          :desc "Fullscreen"             :n "f" #'doom/toggle-fullscreen
+          :desc "Frame fullscreen"       :n "f" #'toggle-frame-fullscreen
           :desc "Indent guides"          :n "i" #'highlight-indentation-mode
           :desc "Indent guides (column)" :n "I" #'highlight-indentation-current-column-mode
           :desc "Impatient mode"         :n "h" #'+impatient-mode/toggle