From a7cbf216123b2aafb0e7e177cd83603db5d66e60 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 4 Sep 2020 01:53:29 -0400 Subject: [PATCH] misc cleanup --- init.el | 74 +++++++++++++++++++----------------------------- misc-disabled.el | 4 +++ 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/init.el b/init.el index 5f1bbd5..85c7fb2 100644 --- a/init.el +++ b/init.el @@ -46,15 +46,15 @@ (garbage-collect)) t) ;; 2019-6-26, 1.26s - ;;; to profile init: - ;;; uncomment the following block +;; ; to profile init: +;; ; uncomment the following block ;; (require 'benchmark-init) ;; (add-hook 'after-init-hook 'benchmark-init/deactivate) - ;;; Then run: - ;;; emacs -f benchmark-init/show-durations-tabulated - ;;; emacs -f benchmark-init/show-durations-tree - ;;; to catch things post-init - ;;; emacs -f benchmark-init/deactivate +;; ; Then run: +;; ; emacs -f benchmark-init/show-durations-tabulated +;; ; emacs -f benchmark-init/show-durations-tree +;; ; to catch things post-init +;; ; emacs -f benchmark-init/deactivate ;; these need to be done before the hook in order to satisfy the byte compiler or batch mode @@ -554,12 +554,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer." ;; lowest bound of functionality is actually about 15 input events ;; (setq auto-save-interval ...) -;;; bookmark settings -;; save bookmarks whenever they are changed instead of just when emacs quits -(setq bookmark-save-flag 1) -;; increase bookmark context size for better functionality -(setq bookmark-search-size 2000) - ;;; c-like settings ;; change last thing from gnu. ;; notably this avoids brace indent after if, and 4 space indent @@ -1167,7 +1161,17 @@ and Ian Kelling as the name" mode-require-final-newline t require-final-newline t auto-revert-verbose nil - auto-revert-remote-files t) + auto-revert-remote-files t + ;; save bookmarks whenever they are changed instead of just when emacs quits + bookmark-save-flag 1 + ;; increase bookmark context size for better functionality + bookmark-search-size 2000 + ;; https://www.emacswiki.org/emacs/FillParagraph + ;; make list items start paragraphs. + paragraph-start "\f\\|[ \t]*$\\|[ \t]*[-+*] " + sh-basic-offset 2 + vc-follow-symlinks t + ) (ivy-mode 1) (add-hook 'text-mode-hook (lambda () (auto-fill-mode t))) @@ -1177,18 +1181,6 @@ and Ian Kelling as the name" ;; easier to read with just spaces as separator (quote (setf (nth 2 ido-decorations) " "))) - -;; https://www.emacswiki.org/emacs/FillParagraph -;; make list items start paragraphs. -(setq paragraph-start "\f\\|[ \t]*$\\|[ \t]*[-+*] ") - -(setq sh-basic-offset 2) -(setq vc-follow-symlinks t) - -;; give us a shell to start instead of scratch -;;(setq initial-buffer-choice (lambda () (new-shell))) - - ;; Seed the random-number generator (random t) @@ -1435,10 +1427,10 @@ Go to the next directory based on where the cursor is." ;; make window title be the buffer name (setq frame-title-format "%b") - ; ----------------------------- - ; fixing up the mode line - ; modified from mastering emacs blog - ; ---------------------------- +;; ----------------------------- +;; fixing up the mode line +;; modified from mastering emacs blog +;; ---------------------------- (defvar mode-line-cleaner-alist `((auto-complete-mode . "") @@ -1484,8 +1476,8 @@ Go to the next directory based on where the cursor is." ; (add-hook 'after-change-major-mode-hook 'clean-mode-line) - ;;; alias the new `flymake-report-status-slim' to - ;;; `flymake-report-status' +;; alias the new `flymake-report-status-slim' to +;; `flymake-report-status' (defalias 'flymake-report-status 'flymake-report-status-slim) (defun flymake-report-status-slim (e-w &optional status) "Show \"slim\" flymake status in mode line." @@ -2280,7 +2272,7 @@ modes like org-mode which have their own yank function." (lambda () (define-key org-mode-map (kbd "") nil))) ;;;;; esc - ; todo, test out if this can be used +;; todo, test out if this can be used ;;;;; return - new line ;; todo, this doesn't set the keybind for the help minibuffer @@ -2411,10 +2403,7 @@ modes like org-mode which have their own yank function." (add-hook 'comint-mode-hook (lambda () (define-key comint-mode-map (kbd "C-q") 'comint-insert-previous-argument))) -;;;;; M-q org-archive-to-archive-sibling - -(global-set-key (kbd "M-q") 'org-archive-to-archive-sibling) - +;;;;; M-q ?? unused ;;;;; C-M-q quoted-insert (global-set-key (kbd "C-M-q") 'quoted-insert) @@ -2454,9 +2443,7 @@ modes like org-mode which have their own yank function." (global-set-key (kbd "C-e") 'copy-line) -;;;;; M-e org-clock-in-last - -(global-set-key (kbd "M-e") 'org-clock-in-last) +;;;;; M-e ?? unused ;;;;; C-r isearch-backward @@ -2465,10 +2452,7 @@ modes like org-mode which have their own yank function." (lambda () (define-key comint-mode-map (kbd "C-r") 'comint-history-isearch-backward-regexp))) -;;;;; M-r org-clock-out - -(global-set-key (kbd "M-r") 'org-clock-out) - +;;;;; M-r ?? unused ;;;;; C-a copy buffer (defun copy-all () @@ -2652,7 +2636,6 @@ modes like org-mode which have their own yank function." ;;;;; M-c - delete-other-windows -;; todo, consider binding/using org-capture (define-key global-map "\M-c" 'delete-other-windows) ;;;;; C-M-c - copy-to-register @@ -3283,4 +3266,5 @@ modes like org-mode which have their own yank function." ;; Local Variables: ;; eval: (outline-minor-mode) +;; outline-regexp: "\\( *\\);;;\\{1,8\\} " ;; End: diff --git a/misc-disabled.el b/misc-disabled.el index 90b63d4..59a8851 100644 --- a/misc-disabled.el +++ b/misc-disabled.el @@ -389,3 +389,7 @@ (global-set-key (kbd "") 'mark-defun) (global-set-key (kbd "") 'ibuffer) (global-set-key (kbd "") 'delete-horizontal-space) + + +;; give us a shell to start instead of scratch +;;(setq initial-buffer-choice (lambda () (new-shell))) -- 2.30.2