From: rearman Date: Fri, 11 Nov 2022 22:01:15 +0000 (-0500) Subject: Separated out editing-defuns.el X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=226fbd69e51700c1b97abf19f1426826adb4388a;p=emacsinit.git Separated out editing-defuns.el --- diff --git a/editing-defuns.el b/editing-defuns.el new file mode 100644 index 0000000..5e6e66e --- /dev/null +++ b/editing-defuns.el @@ -0,0 +1,46 @@ +;; -*- lexical-binding: t; -*- +(defun open-line-below () + "Creates a new empty line below the current line." + (interactive) + (end-of-line) + (newline) + (indent-for-tab-command)) + +(defun open-line-above () + "Creates a new empty line above the current line. +Can't go prev line first, edge case of beginning of buffer." + (interactive) + (beginning-of-line) + (newline) + (previous-line) + (indent-for-tab-command)) + +(defun kill-bword-or-region () + "Kill region if active, otherwise kill back one word." + (interactive) + (if (region-active-p) + (call-interactively 'kill-region) + (call-interactively 'backward-kill-word))) + +(defun backward-kill-line () + "Kill back to beginning of line from point." + (interactive) + (kill-line 0)) + +(defun backward-join-line () + "A wrapper for join-line to make it go in the right direction." + (interactive) + (join-line 0)) + +(defun new-empty-buffer () + "Create a new empty buffer. Stolen from Xah." + (interactive) + (let ((newbuf (generate-new-buffer "untitled"))) + (switch-to-buffer newbuf) + (setq buffer-offer-save t) + newbuf)) + +(defun edit-init () + "Bring up init.el for editing." + (interactive) + (find-file shared-system-init)) diff --git a/init.el b/init.el index e39d24e..efa4068 100644 --- a/init.el +++ b/init.el @@ -3,11 +3,13 @@ (if (eq system-type 'windows-nt) (progn (defvar shared-system-init (expand-file-name "init.el" user-emacs-directory)) (defvar work-eqns (expand-file-name "work-eqs.el" user-emacs-directory)) + (defvar editing-defuns (expand-file-name "editing-defuns.el" user-emacs-directory)) (add-to-list 'default-frame-alist '(background-color . "#cae0a6")) (setq delete-by-moving-to-trash t)) nil) (load-file work-eqns) +(load-file editing-defuns) ;; PACKAGES ;; NEW STRAIGHT.EL CONFIG @@ -35,10 +37,6 @@ :config (global-company-mode t)) -;;(use-package aggressive-indent -;; :straight t -;; :hook lisp-interaction-mode emacs-lisp-mode lisp-mode scheme-mode) - (use-package expand-region :straight t :bind (("C-=" . er/expand-region))) @@ -96,53 +94,6 @@ read-buffer-completion-ignore-case t cursor-type 'bar) -;; DEFUNS -(defun open-line-below () - "Creates a new empty line below the current line." - (interactive) - (end-of-line) - (newline) - (indent-for-tab-command)) - -(defun open-line-above () - "Creates a new empty line above the current line. -Can't go prev line first, edge case of beginning of buffer." - (interactive) - (beginning-of-line) - (newline) - (previous-line) - (indent-for-tab-command)) - -(defun kill-bword-or-region () - "Kill region if active, otherwise kill back one word." - (interactive) - (if (region-active-p) - (call-interactively 'kill-region) - (call-interactively 'backward-kill-word))) - -(defun backward-kill-line () - "Kill back to beginning of line from point." - (interactive) - (kill-line 0)) - -(defun backward-join-line () - "A wrapper for join-line to make it go in the right direction." - (interactive) - (join-line 0)) - -(defun new-empty-buffer () - "Create a new empty buffer. Stolen from Xah." - (interactive) - (let ((newbuf (generate-new-buffer "untitled"))) - (switch-to-buffer newbuf) - (setq buffer-offer-save t) - newbuf)) - -(defun edit-init () - "Bring up init.el for editing." - (interactive) - (find-file shared-system-init)) - ;; PUTS AND PUSHES (put 'upcase-region 'disabled nil) (put 'downcase-region 'disabled nil)