prefix all my defuns with 'my/'

diff --git a/lisp/my-defuns.el b/lisp/my-defuns.el
index 7f851ba3b3cdbf5286bd4fe6d5b130077ca3218d..c74f8041a7288dcda465b296b5a39acfc63d0146 100644 (file)
--- a/lisp/my-defuns.el
+++ b/lisp/my-defuns.el
@@ -1,19 +1,36 @@
 (require 'cl-lib)
 
-(defun copy-line (arg)
+(defun my/copy-line (arg)
   "Copy lines in the kill ring"
   (interactive "p")
   (kill-ring-save (line-beginning-position)
                   (line-beginning-position (+ 1 arg)))
   (message "%d line%s copied" arg (if (= 1 arg) "" "s")))
 
-(defun frame-initial-frame-p (frame)
+(defun my/generate-frame-title ()
+  (if (buffer-file-name)
+      (concat
+       (file-name-nondirectory (buffer-file-name))
+       (if (buffer-modified-p)
+           " +")
+       " ("
+       (abbreviate-file-name (substring (file-name-directory (buffer-file-name)) 0 -1))
+       ") - Emacs"
+       )
+    (concat
+     "%b"
+     (if (buffer-modified-p)
+         " +")
+     " - Emacs")))
+
+(defun my/frame-initial-frame-p (frame)
+  "Returns true if the given frame is the magic 'initial frame' that always exists in GUI emacs sessions"
   (equal "initial_terminal" (terminal-name frame)))
 
-(defun frame-list-ignoring-initial-frame ()
-  (filtered-frame-list (lambda (frame) (not (frame-initial-frame-p frame)))))
+(defun my/frame-list-ignoring-initial-frame ()
+  (filtered-frame-list (lambda (frame) (not (my/frame-initial-frame-p frame)))))
 
-(defun kill-buffer-safely (buffer)
+(defun my/kill-buffer-safely (buffer)
   "Kill the buffer if it is not special or modified"
   (if (and
        (not (string-match "^ " (buffer-name buffer)))
@@ -23,25 +40,25 @@
         (null (buffer-file-name buffer))))
       (kill-buffer buffer)))
 
-(defun kill-buffers-if-deleting-last-frame (frame)
+(defun my/kill-buffers-if-deleting-last-frame (frame)
   "Kill all buffers when closing the last frame"
-  (when (equal (list frame) (frame-list-ignoring-initial-frame))
+  (when (equal (list frame) (my/frame-list-ignoring-initial-frame))
     (dolist (buffer (buffer-list))
-      (kill-buffer-safely buffer))))
+      (my/kill-buffer-safely buffer))))
 
-(defun kill-buffers-not-in-frame ()
+(defun my/kill-buffers-not-in-frame ()
   "Kill buffers which are not loaded into some frame"
   (interactive)
   (let ((kill-count 0))
     (dolist (buffer (buffer-list))
       (let* ((window (get-buffer-window buffer t))
              (frame (window-frame window)))
-        (if (or (null frame) (not (window-live-p window)) (frame-initial-frame-p frame))
-            (if (kill-buffer-safely buffer)
+        (if (or (null frame) (not (window-live-p window)) (my/frame-initial-frame-p frame))
+            (if (my/kill-buffer-safely buffer)
                 (cl-incf kill-count)))))
     (message "Killed %d buffers" kill-count)))
 
-(defun open-line-above ()
+(defun my/open-line-above ()
   "Open a new line above point with indentation"
   (interactive)
   (beginning-of-line)
@@ -49,14 +66,14 @@
   (forward-line -1)
   (indent-for-tab-command))
 
-(defun open-line-below ()
+(defun my/open-line-below ()
   "Open a new line below point with indentation"
   (interactive)
   (end-of-line)
   (newline)
   (indent-for-tab-command))
 
-(defun scratch-buffer ()
+(defun my/scratch-buffer ()
   "Create a new scratch buffer to work in. (could be *scratch* - *scratchX*)"
   (interactive)
   (let ((n 0)
@@ -71,7 +88,7 @@
     (emacs-lisp-mode)
     ))
 
-(defun toggle-comment-on-line ()
+(defun my/toggle-comment-on-line ()
   "Toggles the comment on for the active region if present or the current line otherwise."
   (interactive)
   (if (and mark-active transient-mark-mode)

diff --git a/lisp/my-gui.el b/lisp/my-gui.el
index 8a2f3a0b8cf4c0bd025513a148c213b010b3d575..9cefd9d9232543045462d1149fba23100731ce3e 100644 (file)
--- a/lisp/my-gui.el
+++ b/lisp/my-gui.el
@@ -20,7 +20,7 @@
 (setq uniquify-strip-common-suffix t)
 (setq uniquify-buffer-name-style 'post-forward)
 
-(add-to-list 'delete-frame-functions #'kill-buffers-if-deleting-last-frame)
+(add-to-list 'delete-frame-functions #'my/kill-buffers-if-deleting-last-frame)
 
 (setq frame-title-format
       '((:eval (if (buffer-file-name)

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 12527d88d2009c70197930fa172e20bea349c755..4af81c490907c56d3449d59ebb7e61437f583ff8 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -13,7 +13,7 @@
 (global-set-key (kbd "C-x f") 'counsel-find-file)
 (global-set-key (kbd "C-c f") 'counsel-git)
 (global-set-key (kbd "C-c g") 'counsel-git-grep)
-(global-set-key (kbd "C-x C-k") 'kill-buffers-not-in-frame)
+(global-set-key (kbd "C-x C-k") 'my/kill-buffers-not-in-frame)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-x C-r") 'ivy-recentf)
 
@@ -30,8 +30,8 @@
 (global-set-key (kbd "M-/") 'hippie-expand)
 (global-set-key (kbd "M-;") 'toggle-comment-on-line)
 (global-set-key (kbd "M-i") 'change-inner)
-(global-set-key (kbd "C-o") 'open-line-above)
-(global-set-key (kbd "M-o") 'open-line-below)
+(global-set-key (kbd "C-o") 'my/open-line-above)
+(global-set-key (kbd "M-o") 'my/open-line-below)
 
 ;; Marking
 (global-set-key (kbd "C-=") 'er/expand-region)
@@ -40,7 +40,7 @@
 
 ;; Killing and deleting
 (global-set-key (kbd "M-y") 'counsel-yank-pop)
-(global-set-key (kbd "M-_") 'copy-line)
+(global-set-key (kbd "M-_") 'my/copy-line)
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 
 ;; Mode switching