          ("C-c o"   . rotate-frame)
          ("C-c C-\\" . transpose-frame))) ; toggles between horz/vert splits
 
-;; http://www.whattheemacsd.com/
-(defun delete-current-buffer-file ()
+(defun modi/delete-current-buffer-file ()
   "Deletes file connected to current buffer and kills buffer."
   (interactive)
-  (let ((filename (buffer-file-name))
-        (buffer (current-buffer))
-        (name (buffer-name)))
-    (if (not (and filename (file-exists-p filename)))
-        (ido-kill-buffer)
-      (when (yes-or-no-p "Are you sure you want to delete this file? ")
-        (delete-file filename)
-        (kill-buffer buffer)
-        (message "File `%s' successfully deleted." filename)))))
+  (let ((filename (buffer-file-name)))
+    (when (and filename
+               (file-exists-p filename)
+               (yes-or-no-p "Are you sure you want to delete this file? "))
+      (delete-file filename)
+      (message "File `%s' successfully deleted." filename))
+    (kill-buffer (current-buffer))))
 
 ;; http://www.whattheemacsd.com/
 (defun rename-current-buffer-file ()

(defvar modi/toggle-one-window--window-configuration nil
  "Variable to store the window configuration before `modi/toggle-one-window'
function was called.")
(defun modi/toggle-one-window (&optional force-one-window)
  "Toggles the frame state between deleting all windows other than
the current window and the windows state prior to that.

`winner' is required for this function."
  (interactive "P")
  (if (or (null (one-window-p))
          force-one-window)

    (kill-buffer (current-buffer))))

(defun modi/quit-and-kill-window ()
  "Quit window and kill instead of burying the buffer in it."
  (interactive)
  (quit-window :kill))

