Commit 5f101f9e55bf

Vincent Demeester <vincent@sbr.pm>
2019-02-02 13:42:21
Rename vde-* functions to vde/*
A bit better namespaced 👼 Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 926b064
lisp/setup-buffers.el
@@ -89,23 +89,23 @@
   (setq ibuffer-show-empty-filter-groups nil))
 
 (use-package ibuffer                    ; Buffer management
-  :bind (("C-x C-b" . vde-ibuffer-open)
+  :bind (("C-x C-b" . vde/ibuffer-open)
          ([remap list-buffers] . ibuffer)
          :map ibuffer-mode-map
-         ("q" . vde-pop-window-configuration)) 
+         ("q" . vde/pop-window-configuration)) 
   :config
   (setq
    ibuffer-expert t              ; Do not prompt when on kill buffers operations
    ibuffer-filter-group-name-face 'font-lock-doc-face)
 
-  (defun vde-ibuffer-open ()
+  (defun vde/ibuffer-open ()
     "Save window configuration and call `ibuffer'."
     (interactive)
     (vde-save-wins-then-call 'ibuffer))
 
   ;; Use a single full frame for ibuffer
   (with-eval-after-load 'ibuffer
-    (fullframe ibuffer vde-pop-window-configuration))
+    (fullframe ibuffer vde/pop-window-configuration))
   
   ;; Use human readable Size column instead of original one
   (define-ibuffer-column size-h
lisp/setup-dired.el
@@ -5,16 +5,16 @@
 
 (use-package dired
   :defer t
-  :bind (("<C-return>" . vde-open-in-external-app)
-         ("C-c f g"    . vde-dired-get-size)
+  :bind (("<C-return>" . vde/open-in-external-app)
+         ("C-c f g"    . vde/dired-get-size)
          ("C-c f f"    . find-name-dired))
   :bind (:map dired-mode-map
-              ("M-p"         . vde-dired-up)
-              ("^"           . vde-dired-up)
-              ("<backspace>" . vde-dired-up)
-              ("M-n"         . vde-dired-down)
+              ("M-p"         . vde/dired-up)
+              ("^"           . vde/dired-up)
+              ("<backspace>" . vde/dired-up)
+              ("M-n"         . vde/dired-down)
               ("RET"         . find-file-reuse-dir-buffer)
-              ("!"           . vde-sudired)
+              ("!"           . vde/sudired)
               ("<prior>"     . beginend-dired-mode-goto-beginning)
               ("<next>"      . beginend-dired-mode-goto-end))
 
@@ -33,17 +33,17 @@
   ;; Handle long file names
   (add-hook 'dired-mode-hook #'toggle-truncate-lines)
 
-  (defun vde-dired-up ()
+  (defun vde/dired-up ()
     "Go to previous directory."
     (interactive)
     (find-alternate-file ".."))
 
-  (defun vde-dired-down ()
+  (defun vde/dired-down ()
     "Enter directory."
     (interactive)
     (dired-find-alternate-file))
 
-  (defun vde-open-in-external-app ()
+  (defun vde/open-in-external-app ()
     "Open the file(s) at point with an external application."
     (interactive)
     (let* ((file-list
@@ -62,7 +62,7 @@
           (find-alternate-file file)
         (find-file file))))
 
-  (defun vde-sudired ()
+  (defun vde/sudired ()
     "Open directory with sudo in Dired."
     (interactive)
     (require 'tramp)
@@ -71,7 +71,7 @@
           (user-error "Already in sudo")
         (dired (concat "/sudo::" dir)))))
 
-  (defun vde-dired-get-size ()
+  (defun vde/dired-get-size ()
     "Quick and easy way to get file size in Dired."
     (interactive)
     (let ((files (dired-get-marked-files)))
lisp/setup-files.el
@@ -57,7 +57,7 @@
   :mode "\\.to?ml\\'")
 
 ;;;###autoload
-(defun vde-delete-this-file ()
+(defun vde/delete-this-file ()
   "Delete the current file, and kill the buffer."
   (interactive)
   (or (buffer-file-name) (error "No file is currently being edited"))
@@ -67,7 +67,7 @@
     (kill-this-buffer)))
 
 ;;;###autoload
-(defun vde-rename-this-file-and-buffer (new-name)
+(defun vde/rename-this-file-and-buffer (new-name)
   "Renames both current buffer and file it's visiting to NEW-NAME."
   (interactive "sNew name: ")
   (let ((name (buffer-name))
@@ -82,31 +82,31 @@
         (rename-buffer new-name)
         (set-visited-file-name new-name)))))
 
-(bind-key "C-c f D" #'vde-delete-this-file)
-(bind-key "C-c f R" #'vde-rename-this-file-and-buffer)
+(bind-key "C-c f D" #'vde/delete-this-file)
+(bind-key "C-c f R" #'vde/rename-this-file-and-buffer)
 
 ;; Additional bindings for built-ins
 (bind-key "C-c f v d" #'add-dir-local-variable)
 (bind-key "C-c f v l" #'add-file-local-variable)
 (bind-key "C-c f v p" #'add-file-local-variable-prop-line)
 
-(defun vde-reload-dir-locals-for-current-buffer ()
+(defun vde/reload-dir-locals-for-current-buffer ()
   "Reload dir locals for the current buffer."
   (interactive)
   (let ((enable-local-variables :all))
     (hack-dir-local-variables-non-file-buffer)))
 
-(defun vde-reload-dir-locals-for-all-buffers-in-this-directory ()
+(defun vde/reload-dir-locals-for-all-buffers-in-this-directory ()
   "Reload dir-locals for all buffers in current buffer's `default-directory'."
   (interactive)
   (let ((dir default-directory))
     (dolist (buffer (buffer-list))
       (with-current-buffer buffer
         (when (equal default-directory dir))
-        (vde-reload-dir-locals-for-current-buffer)))))
+        (vde/reload-dir-locals-for-current-buffer)))))
 
-(bind-key "C-c f v r" #'vde-reload-dir-locals-for-current-buffer)
-(bind-key "C-c f v r" #'vde-reload-dir-locals-for-all-buffers-in-this-directory)
+(bind-key "C-c f v r" #'vde/reload-dir-locals-for-current-buffer)
+(bind-key "C-c f v r" #'vde/reload-dir-locals-for-all-buffers-in-this-directory)
 
 (provide 'setup-files)
 
lisp/setup-shells.el
@@ -4,29 +4,29 @@
 ;;; -*- lexical-binding: t; -*-
 
 (use-package shell                 ; Specialized comint.el for running the shell
-  :bind (("<f1>"      . vde-shell-open)
+  :bind (("<f1>"      . vde/shell-open)
          (:map shell-mode-map
                ("<tab>" . completion-at-point)))
   :config
-  (defun vde-shell-open ()
+  (defun vde/shell-open ()
     "Save window configuration and call `shell'."
     (interactive)
-    (vde-save-wins-then-call 'shell))
+    (vde/save-wins-then-call 'shell))
 
   ;; Use a single full frame for shell
   (with-eval-after-load 'shell
-    (fullframe shell vde-pop-window-configuration))
+    (fullframe shell vde/pop-window-configuration))
 
-  (bind-key "C-c C-q" #'vde-pop-window-configuration shell-mode-map)
+  (bind-key "C-c C-q" #'vde/pop-window-configuration shell-mode-map)
   
   (unbind-key "C-c C-l" shell-mode-map)
   (bind-key "C-c C-l" #'counsel-shell-history shell-mode-map)
 
-  (defun vde-comint-delchar-or-eof-or-kill-buffer (arg)
+  (defun vde/comint-delchar-or-eof-or-kill-buffer (arg)
     "Restore window configuration if process is dead, otherwise delete ARG."
     (interactive "p")
     (if (null (get-buffer-process (current-buffer)))
-        (vde-pop-window-configuration)
+        (vde/pop-window-configuration)
       (comint-delchar-or-maybe-eof arg)))
   
   (setq
@@ -36,7 +36,7 @@
    shell-file-name "bash")
   (add-hook 'shell-mode-hook
             (lambda ()
-              (bind-key "C-d" #'vde-comint-delchar-or-eof-or-kill-buffer
+              (bind-key "C-d" #'vde/comint-delchar-or-eof-or-kill-buffer
                         shell-mode-map)))
   )
 
@@ -127,7 +127,7 @@ The EShell is renamed to match that directory to make multiple windows easier."
 (use-package em-prompt                  ; EShell command prompts
   :defer 2
   :config
-  (defun vde-eshell-quit-or-delete-char (arg)
+  (defun vde/eshell-quit-or-delete-char (arg)
     "Use C-d to either delete forward char or exit EShell."
     (interactive "p")
     (if (and (eolp) (looking-back eshell-prompt-regexp nil nil))
@@ -140,7 +140,7 @@ The EShell is renamed to match that directory to make multiple windows easier."
   (add-hook 'eshell-mode-hook
             (lambda ()
               (bind-key "C-d"
-                        #'vde-eshell-quit-or-delete-char eshell-mode-map))))
+                        #'vde/eshell-quit-or-delete-char eshell-mode-map))))
 
 (use-package esh-mode                   ; EShell UI customizations
   :ensure eshell
lisp/setup-windows.el
@@ -16,7 +16,7 @@
  ("M-S-<right>" . enlarge-window-horizontally))
 
 ;;;###autoload
-(defun vde-window-split-toggle ()
+(defun vde/window-split-toggle ()
   "Toggle between horizontal and vertical split with two windows."
   (interactive)
   (if (> (length (window-list)) 2)
@@ -30,14 +30,14 @@
         (other-window 1)
         (switch-to-buffer (other-buffer))))))
 
-(bind-key "C-c w t" #'vde-window-split-toggle)
+(bind-key "C-c w t" #'vde/window-split-toggle)
 
-(defvar vde-saved-window-configuration nil)
+(defvar vde/saved-window-configuration nil)
 
-(defun vde-save-wins-then-call (func &optional args)
+(defun vde/save-wins-then-call (func &optional args)
   "Save current window configuration, then call FUNC optionally with ARGS."
   (interactive)
-  (push (current-window-configuration) vde-saved-window-configuration)
+  (push (current-window-configuration) vde/saved-window-configuration)
   (cond
    ;; We have arguments for the function
    ((bound-and-true-p args) (funcall func args))
@@ -46,18 +46,18 @@
    ;; The function does not expect arguments
    (t (funcall func))))
 
-(defun vde-restore-window-configuration (config)
+(defun vde/restore-window-configuration (config)
   "Kill current buffer and restore the window configuration in CONFIG."
   (interactive)
   (kill-this-buffer)
   (set-window-configuration config))
 
-(defun vde-pop-window-configuration ()
+(defun vde/pop-window-configuration ()
   "Restore the previous window configuration and clear current window."
   (interactive)
-  (let ((config (pop vde-saved-window-configuration)))
+  (let ((config (pop vde/saved-window-configuration)))
     (if config
-        (vde-restore-window-configuration config)
+        (vde/restore-window-configuration config)
       (if (> (length (window-list)) 1)
           (delete-window)
         (bury-buffer)))))
init.el
@@ -103,19 +103,19 @@
   (exec-path-from-shell-initialize))
 
 ;; Set separate custom file for the customize interface
-(defconst vde-custom-file (locate-user-emacs-file "custom.el")
+(defconst vde/custom-file (locate-user-emacs-file "custom.el")
   "File used to store settings from Customization UI.")
 
 (use-package cus-edit                   ; Set up custom.el
   :defer t
   :config
   (setq
-   custom-file vde-custom-file
+   custom-file vde/custom-file
    custom-buffer-done-kill nil          ; Kill when existing
    custom-buffer-verbose-help nil       ; Remove redundant help text
    custom-unlispify-tag-names nil       ; Show me the real variable name
    custom-unlispify-menu-entries nil)
-  :init (load vde-custom-file 'no-error 'no-message))
+  :init (load vde/custom-file 'no-error 'no-message))
 
 (use-package no-littering               ; Keep .emacs.d clean
   :config