From: rearman Date: Mon, 29 Jul 2024 18:01:28 +0000 (-0400) Subject: Attempt to make emacs use tabs X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=c3a6d724b2d1094192feb15da911ca8681e76500;p=emacsinit.git Attempt to make emacs use tabs --- diff --git a/init.el b/init.el index 8e81966..ea4fd86 100644 --- a/init.el +++ b/init.el @@ -17,24 +17,24 @@ (require 're-bindings) (add-hook 'after-init-hook - (lambda () - (require 're-logic-defuns) - (require 're-repl-defuns) - (require 're-math-defuns) - (require 're-electronics-defuns) - (require 're-plc-defuns) - (require 're-refrigeration-defuns) - (require 're-skeletons) - (require 're-org) - (require 're-org-defuns))) + (lambda () + (require 're-logic-defuns) + (require 're-repl-defuns) + (require 're-math-defuns) + (require 're-electronics-defuns) + (require 're-plc-defuns) + (require 're-refrigeration-defuns) + (require 're-skeletons) + (require 're-org) + (require 're-org-defuns))) (add-hook 'c-mode-hook (lambda () (require 're-c-style))) ;; Damper bespokeniŋs (setq-default indicate-empty-lines t - fill-column 80 - cursor-type 'bar - cursor-in-non-selected-windows 'hollow) + fill-column 80 + cursor-type 'bar + cursor-in-non-selected-windows 'hollow) (blink-cursor-mode -1) (column-number-mode t) @@ -66,9 +66,9 @@ dired-hide-details-hide-symlink-targets nil) (add-hook 'dired-mode-hook - (lambda () - (dired-hide-details-mode t) - (keymap-set dired-mode-map "RET" #'dired-find-alternate-file))) + (lambda () + (dired-hide-details-mode t) + (keymap-set dired-mode-map "RET" #'dired-find-alternate-file))) ;; Bookmarks (setq bookmark-save-flag 1) @@ -92,23 +92,32 @@ ;; Pretty-Printiŋ (setq prettify-symbols-alist '(("lambda" . 955) - ("delta" . 120517) - ("epsilon" . 120518) - ("->" . 8594) - ("<=" . 8804) - (">=" . 8805))) + ("delta" . 120517) + ("epsilon" . 120518) + ("->" . 8594) + ("<=" . 8804) + (">=" . 8805))) (global-prettify-symbols-mode t) -(setq-default indent-tabs-mode nil) +(setq-default indent-tabs-mode 'only + tab-width 8) +(defvaralias 'c-basic-offset 'tab-width) +(defvaralias 'cperl-indent-level 'tab-width) + +(advice-add 'indent-to :around + (lambda (orig-fun column &rest args) + (when (eq indent-tabs-mode 'only) + (setq column (* tab-width (round column tab-width)))) + (apply orig-fun column args))) ;; Clamp-matchiŋ (setq show-paren-delay 0 show-paren-style 'expression) (set-face-attribute 'show-paren-match nil - :foreground 'unspecified - :background 'unspecified - :underline t) + :foreground 'unspecified + :background 'unspecified + :underline t) ;; Help (setq apropos-do-all t) diff --git a/re/re-editing-defuns.el b/re/re-editing-defuns.el index df74552..c57c614 100644 --- a/re/re-editing-defuns.el +++ b/re/re-editing-defuns.el @@ -7,19 +7,19 @@ "Renames the current buffer and the file it is visiting." (interactive) (let ((name (buffer-name)) - (filename (buffer-file-name))) + (filename (buffer-file-name))) (if (not (and filename (file-exists-p filename))) - (error "Buffer '%s' is not visiting a file!" name) + (error "Buffer '%s' is not visiting a file!" name) (let ((new-name (read-file-name "New name: " filename))) - (if (get-buffer new-name) - (error "A buffer named '%s' already exists!" new-name) - (rename-file filename new-name 1) - (rename-buffer new-name) - (set-visited-file-name new-name) - (set-buffer-modified-p nil) - (message "File '%s' successfully renamed to '%s'" - name - (file-name-nondirectory new-name))))))) + (if (get-buffer new-name) + (error "A buffer named '%s' already exists!" new-name) + (rename-file filename new-name 1) + (rename-buffer new-name) + (set-visited-file-name new-name) + (set-buffer-modified-p nil) + (message "File '%s' successfully renamed to '%s'" + name + (file-name-nondirectory new-name))))))) (defun re/scratch-only () "Bring up the scratch buffer as the only visible buffer." @@ -46,11 +46,11 @@ "Change all groups of blank lines to 1 blank line." (interactive) (save-excursion (mark-whole-buffer) - (replace-regexp "^\n+" - "\n" - nil - (region-beginning) - (region-end)))) + (replace-regexp "^\n+" + "\n" + nil + (region-beginning) + (region-end)))) (defun re/comment-dwim () "Comment region if active, otherwise comment line. @@ -59,7 +59,7 @@ Stolen from https://depp.brause.cc/dotemacs" (if (use-region-p) (comment-or-uncomment-region (region-beginning) (region-end)) (comment-or-uncomment-region (line-beginning-position) - (line-end-position)))) + (line-end-position)))) (defun re/kill-bword-or-region () "Kill region if active, otherwise kill back one word." @@ -76,15 +76,15 @@ If in org-mode, call `org-beginning-of-line' first." (interactive "^") (let ((oldpos (point))) (if (equal major-mode 'org-mode) - (org-beginning-of-line) + (org-beginning-of-line) (progn - (beginning-of-visual-line 1) - (skip-syntax-forward " " (line-end-position)) - (backward-prefix-chars))) + (beginning-of-visual-line 1) + (skip-syntax-forward " " (line-end-position)) + (backward-prefix-chars))) (and (= oldpos (point)) - (let ((newpos (point))) - (back-to-indentation) - (and (= newpos (point)) (beginning-of-line)))))) + (let ((newpos (point))) + (back-to-indentation) + (and (= newpos (point)) (beginning-of-line)))))) (defun re/smart-end-of-line () "Move point to the end of the visual line. If point was already at that position, call `move-end-of-line'. @@ -92,7 +92,7 @@ If in org-mode, call `org-end-of-line' first." (interactive "^") (let ((oldpos (point))) (if (equal major-mode 'org-mode) - (org-end-of-line) + (org-end-of-line) (end-of-visual-line 1)) (and (= oldpos (point)) (move-end-of-line nil)))) @@ -113,7 +113,7 @@ If in org-mode, call `org-end-of-line' first." (interactive) (when (use-region-p) (add-to-history 'search-ring - (buffer-substring (region-beginning) (region-end))) + (buffer-substring (region-beginning) (region-end))) (deactivate-mark)) (call-interactively 'isearch-forward)) @@ -121,9 +121,14 @@ If in org-mode, call `org-end-of-line' first." (interactive) (when (use-region-p) (add-to-history 'search-ring - (buffer-substring (region-beginning) (region-end))) + (buffer-substring (region-beginning) (region-end))) (deactivate-mark)) (call-interactively 'isearch-backward)) +(defun Tab (width) + "Give me a function analagous to the Acme `Tab' command" + (interactive) + (setq-local tab-width width)) + (provide 're-editing-defuns) ;;; re-editing-defuns.el ends here