all: Namespace functions and variables

8 files changed, 41 insertions, 39 deletions

diff --git a/lisp/init-appearance.el b/lisp/init-appearance.el
index 5b10870..e81b208 100644
--- a/lisp/init-appearance.el
+++ b/lisp/init-appearance.el
@@ -30,12 +30,12 @@
 (add-hook 'prog-mode-hook (lambda () (setq-local show-trailing-whitespace t)))
 
 ;; render ansi colors in compilation buffer
-(defun colorize-compilation-buffer ()
+(defun mpolden/colorize-compilation-buffer ()
   (when (eq major-mode 'compilation-mode)
     (ansi-color-apply-on-region compilation-filter-start (point-max))))
 
 (use-package ansi-color
-  :hook ((compilation-filter . colorize-compilation-buffer)))
+  :hook ((compilation-filter . mpolden/colorize-compilation-buffer)))
 
 ;; disable word wrapping
 (setq-default truncate-lines t)
diff --git a/lisp/init-git.el b/lisp/init-git.el
index be48d03..9a39bcd 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -6,7 +6,7 @@
   ;; use gfm-mode as major mode
   (setq git-commit-major-mode 'gfm-mode))
 
-(defun magit-visit-file-other-window (&optional noselect)
+(defun mpolden/magit-visit-file-other-window (&optional noselect)
   "Visit current file in another window."
   (interactive)
   (let ((current-window (selected-window)))
@@ -14,10 +14,10 @@
     (when noselect
       (select-window current-window))))
 
-(defun magit-visit-file-other-window-noselect ()
+(defun mpolden/magit-visit-file-other-window-noselect ()
   "Visit current file in another window, but don't select it."
   (interactive)
-  (magit-visit-file-other-window t))
+  (mpolden/magit-visit-file-other-window t))
 
 (use-package magit
   :ensure t
@@ -32,8 +32,8 @@
          ("C-c b" . magit-blame)
          :map magit-status-mode-map
          ;; make C-o and o behave as in dired
-         ("o" . magit-visit-file-other-window)
-         ("C-o" . magit-visit-file-other-window-noselect)))
+         ("o" . mpolden/magit-visit-file-other-window)
+         ("C-o" . mpolden/magit-visit-file-other-window-noselect)))
 
 (use-package forge
   :ensure t
diff --git a/lisp/init-go.el b/lisp/init-go.el
index af781ae..ae22c9b 100644
--- a/lisp/init-go.el
+++ b/lisp/init-go.el
@@ -1,9 +1,9 @@
-(defun go-mode-buffer-local-variables ()
+(defun mpolden/go-mode-buffer-local-variables ()
   ;; adjust fill-column
   (setq-local fill-column 120))
 
 (use-package go-mode
   :ensure t
-  :hook (go-mode . go-mode-buffer-local-variables))
+  :hook (go-mode . mpolden/go-mode-buffer-local-variables))
 
 (provide 'init-go)
diff --git a/lisp/init-grep.el b/lisp/init-grep.el
index 319919a..c362ec4 100644
--- a/lisp/init-grep.el
+++ b/lisp/init-grep.el
@@ -1,4 +1,4 @@
-(defun grep-visit-buffer-other-window (&optional event noselect)
+(defun mpolden/grep-visit-buffer-other-window (&optional event noselect)
   "Visit grep result in another window."
   (interactive)
   (let ((current-window (selected-window)))
@@ -6,24 +6,24 @@
     (when noselect
       (select-window current-window))))
 
-(defun grep-visit-buffer-other-window-noselect (&optional event)
+(defun mpolden/grep-visit-buffer-other-window-noselect (&optional event)
   "Visit grep result in another window, but don't select it."
   (interactive)
-  (grep-visit-buffer-other-window event t))
+  (mpolden/grep-visit-buffer-other-window event t))
 
-(defun grep-mode-buffer-local-variables ()
+(defun mpolden/grep-mode-buffer-local-variables ()
   ;; wrap lines
   (setq-local truncate-lines nil))
 
 (use-package grep
   :demand t ;; this cannot lazy load as bindings are inside a mode map
 
-  :hook (grep-mode . grep-mode-buffer-local-variables)
+  :hook (grep-mode . mpolden/grep-mode-buffer-local-variables)
 
   :bind (:map grep-mode-map
               ;; make C-o and o behave as in dired
-              ("o" . grep-visit-buffer-other-window)
-              ("C-o" . grep-visit-buffer-other-window-noselect)
+              ("o" . mpolden/grep-visit-buffer-other-window)
+              ("C-o" . mpolden/grep-visit-buffer-other-window-noselect)
               ;; n and p changes line as in ag-mode
               ("n" . compilation-next-error)
               ("p" . compilation-previous-error)))
diff --git a/lisp/init-package.el b/lisp/init-package.el
index d42cd04..bdfa19e 100644
--- a/lisp/init-package.el
+++ b/lisp/init-package.el
@@ -9,7 +9,7 @@
 (when (version< emacs-version "26.3")
   (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))
 
-(defun require-package (package &optional min-version no-refresh)
+(defun mpolden/require-package (package &optional min-version no-refresh)
   "Install given PACKAGE, optionally requiring MIN-VERSION.
 If NO-REFRESH is non-nil, the available package lists will not be
 re-downloaded in order to locate PACKAGE."
@@ -21,17 +21,19 @@ re-downloaded in order to locate PACKAGE."
         (package-refresh-contents)
         (require-package package min-version t)))))
 
-(defun require-packages (packages)
+(defun mpolden/require-packages (packages)
   "Install a list of PACKAGES."
-  (mapcar (lambda (package) (require-package package)) packages))
+  (mapcar (lambda (package) (mpolden/require-package package)) packages))
 
 ;; load given package unless inhibited through inhibited-packages
-(defun maybe-require (package)
-  (unless (member package (bound-and-true-p inhibited-packages))
+(define-obsolete-variable-alias 'inhibited-packages 'mpolden/inhibited-packages)
+
+(defun mpolden/maybe-require (package)
+  (unless (member package (bound-and-true-p mpolden/inhibited-packages))
     (require package)))
 
 ;; install use-package and diminish
-(require-packages '(use-package diminish))
+(mpolden/require-packages '(use-package diminish))
 
 ;; speed up loading of use-package and dependencies
 (eval-when-compile
diff --git a/lisp/init-project.el b/lisp/init-project.el
index 997bc0a..b69e6a9 100644
--- a/lisp/init-project.el
+++ b/lisp/init-project.el
@@ -1,4 +1,4 @@
-(defun project-git-grep ()
+(defun mpolden/project-git-grep ()
   (interactive)
   (let ((search-regexp (grep-read-regexp))
         (dir (project-root (project-current t))))
@@ -10,7 +10,7 @@
   ;; commands to show when switching projects
   (setq project-switch-commands '((?f "Find file" project-find-file)
                                   (?d "Dired" project-dired)
-                                  (?g "Grep" project-git-grep)
+                                  (?g "Grep" mpolden/project-git-grep)
                                   (?m "Magit" magit-status)))
 
   :bind (;; C-x f finds file in project
@@ -18,7 +18,7 @@
          ;; C-c p switches project
          ("C-c p" . project-switch-project)
          ;; C-c g runs git grep in project
-         ("C-c g" . project-git-grep)
+         ("C-c g" . mpolden/project-git-grep)
          ;; C-c m compiles project
          ("C-c m" . project-compile)))
 
diff --git a/lisp/init-python.el b/lisp/init-python.el
index e5223b2..b760a34 100644
--- a/lisp/init-python.el
+++ b/lisp/init-python.el
@@ -1,4 +1,4 @@
-(defun python-mode-buffer-local-variables ()
+(defun mpolden/python-mode-buffer-local-variables ()
   ;; highlight lines longer than 88 characters
   (setq-local fill-column 88)
   ;; use flat index in imenu
@@ -7,7 +7,7 @@
 
 (use-package python
   :commands python-mode
-  :hook (python-mode . python-mode-buffer-local-variables)
+  :hook (python-mode . mpolden/python-mode-buffer-local-variables)
   :config
   ;; prefer flake8 as flymake backend
   (when (executable-find "flake8")
diff --git a/lisp/init-tramp.el b/lisp/init-tramp.el
index 4fe63e0..9aa268b 100644
--- a/lisp/init-tramp.el
+++ b/lisp/init-tramp.el
@@ -1,12 +1,12 @@
-(defun sudo-prefix-p (prefix)
+(defun mpolden/sudo-prefix-p (prefix)
   "Return non-nil if PREFIX is a sudo prefix."
   (member prefix '("/sudo" "/sudo:")))
 
-(defun ssh-prefix-p (prefix)
+(defun mpolden/ssh-prefix-p (prefix)
   "Return non-nil if PREFIX is a ssh prefix."
   (string-equal prefix "/ssh"))
 
-(defun sudo-file-name (filename)
+(defun mpolden/sudo-file-name (filename)
   "Return FILENAME with a sudo prefix.
 
 If FILENAME already has a sudo prefix, do nothing. If FILENAME is
@@ -14,29 +14,29 @@ accessed over SSH, prefix it with \"/sudo:\". Otherwise, assume
 FILENAME is a local path and prefix it with \"/sudo::\"."
   (let* ((splitname (split-string filename ":"))
          (prefix (car splitname)))
-    (if (sudo-prefix-p prefix)
+    (if (mpolden/sudo-prefix-p prefix)
         filename
-      (let* ((ssh (ssh-prefix-p prefix))
+      (let* ((ssh (mpolden/ssh-prefix-p prefix))
              (sudo-prefix (if ssh "/sudo" "/sudo:"))
              (components (if ssh (cdr splitname) splitname)))
         (mapconcat 'identity (cons sudo-prefix components) ":")))))
 
-(defun sudo-find-file (&optional arg)
+(defun mpolden/sudo-find-file (&optional arg)
   "Find file and open it with sudo.
 With a prefix ARG prompt edit currently visited file using sudo."
   (interactive "P")
   (if arg
-      (find-alternate-file (sudo-file-name buffer-file-name))
-    (find-file (sudo-file-name (read-file-name "Find file with sudo: ")))))
+      (find-alternate-file (mpolden/sudo-file-name buffer-file-name))
+    (find-file (mpolden/sudo-file-name (read-file-name "Find file with sudo: ")))))
 
-(defun sudo-current-file ()
+(defun mpolden/sudo-current-file ()
   (interactive)
-  (sudo-find-file t))
+  (mpolden/sudo-find-file t))
 
 (use-package tramp
   :bind
-  (("C-x +" . sudo-find-file)
-   ("C-x !" . sudo-current-file))
+  (("C-x +" . mpolden/sudo-find-file)
+   ("C-x !" . mpolden/sudo-current-file))
 
   :config
   ;; make sudo:remote-host work as expected