diff options
Diffstat (limited to 'basics.el')
-rw-r--r-- | basics.el | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/basics.el b/basics.el index 68cdc2a..3905003 100644 --- a/basics.el +++ b/basics.el | |||
@@ -17,7 +17,7 @@ | |||
17 | "Where various Emacs files are placed." | 17 | "Where various Emacs files are placed." |
18 | :makedir) | 18 | :makedir) |
19 | 19 | ||
20 | (defdir sync/ "~/Sync/" | 20 | (defdir sync/ "~/sync/" |
21 | "My Syncthing directory." | 21 | "My Syncthing directory." |
22 | :makedir) | 22 | :makedir) |
23 | 23 | ||
@@ -142,7 +142,7 @@ | |||
142 | 142 | ||
143 | ;; Text editing | 143 | ;; Text editing |
144 | (setq-default fill-column 80 | 144 | (setq-default fill-column 80 |
145 | sentence-end-double-space t | 145 | sentence-end-double-space nil |
146 | tab-width 8 | 146 | tab-width 8 |
147 | tab-always-indent 'complete) | 147 | tab-always-indent 'complete) |
148 | (global-so-long-mode) | 148 | (global-so-long-mode) |
@@ -295,13 +295,27 @@ N spaces." | |||
295 | (interactive "*p") | 295 | (interactive "*p") |
296 | (cycle-spacing (- n))) | 296 | (cycle-spacing (- n))) |
297 | 297 | ||
298 | (defun +comment-dwim (&optional prefix) | ||
299 | "Comments or uncomments current line or region. | ||
300 | When called with PREFIX, start a comment at the end of the | ||
301 | current line." | ||
302 | (interactive "P") | ||
303 | (if prefix | ||
304 | (comment-indent) | ||
305 | (apply #'comment-or-uncomment-region | ||
306 | (if (region-active-p) | ||
307 | (list (region-beginning) | ||
308 | (region-end)) | ||
309 | (list (line-beginning-position) | ||
310 | (line-end-position)))))) | ||
311 | |||
298 | (global-set-key [remap eval-expression] #'pp-eval-expression) | 312 | (global-set-key [remap eval-expression] #'pp-eval-expression) |
299 | (global-set-key (kbd "M-o") #'other-window|switch-buffer) | 313 | (global-set-key (kbd "M-o") #'other-window|switch-buffer) |
300 | (global-set-key (kbd "C-x 0") #'delete-window|bury-buffer) | 314 | (global-set-key [remap delete-window] #'delete-window|bury-buffer) |
301 | (global-set-key (kbd "M-SPC") #'+cycle-spacing) | 315 | (global-set-key [remap cycle-spacing] #'+cycle-spacing) |
302 | (global-set-key (kbd "C-x C-k") #'kill-this-buffer) | 316 | (global-set-key (kbd "C-x C-k") #'kill-this-buffer) |
303 | (global-set-key (kbd "C-/") #'undo-only) | 317 | (global-set-key [remap comment-dwim] #'+comment-dwim) |
304 | (global-set-key (kbd "C-?") #'undo-redo) | 318 | (global-set-key [remap undo] #'undo-only) |
305 | 319 | ||
306 | (global-set-key [f10] #'tmm-menubar) | 320 | (global-set-key [f10] #'tmm-menubar) |
307 | (advice-add 'tmm-add-prompt :after 'minibuffer-hide-completions) | 321 | (advice-add 'tmm-add-prompt :after 'minibuffer-hide-completions) |
@@ -408,7 +422,7 @@ N spaces." | |||
408 | (use-package vertico-directory | 422 | (use-package vertico-directory |
409 | :after vertico | 423 | :after vertico |
410 | :bind (:map vertico-map | 424 | :bind (:map vertico-map |
411 | ("C-DEL" . vertico-directory-delete-word)) | 425 | ("C-<backspace>" . vertico-directory-delete-word)) |
412 | :hook (rfn-shadow-update-overlay-hook . vertico-directory-tidy)) | 426 | :hook (rfn-shadow-update-overlay-hook . vertico-directory-tidy)) |
413 | 427 | ||
414 | (use-package vertico-mouse | 428 | (use-package vertico-mouse |
@@ -531,7 +545,7 @@ N spaces." | |||
531 | (use-package orderless | 545 | (use-package orderless |
532 | :ensure t :demand t | 546 | :ensure t :demand t |
533 | :init | 547 | :init |
534 | (setopt completion-styles '(substring orderless basic) | 548 | (setopt completion-styles '(orderless substring basic) |
535 | completion-category-defaults nil | 549 | completion-category-defaults nil |
536 | completion-category-overrides | 550 | completion-category-overrides |
537 | '((file (styles basic partial-completion orderless))))) | 551 | '((file (styles basic partial-completion orderless))))) |