diff --git a/init.el b/init.el index e77220e..9d502fc 100644 --- a/init.el +++ b/init.el @@ -1,5 +1,5 @@ ;;; init.el --- tastytea's Emacs init file. -;; Time-stamp: <2019-04-10T12:29:27+00:00> +;; Time-stamp: <2019-04-10T12:42:14+00:00> ;;; Commentary: ;; I am using this file with Emacs 26, but most of it will probably work with @@ -146,18 +146,32 @@ ;;;;;;;;;;;;;;;;;;;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (use-package bind-key + :init + (defun my/delete-word (arg) + "Delete characters forward until encountering the end of a word. +With argument, do this that many times." + (interactive "p") + (if (use-region-p) + (delete-region (region-beginning) (region-end)) + (delete-region (point) (progn (forward-word arg) (point))))) + + (defun my/backward-delete-word (arg) + "Delete characters backward until encountering the end of a word. +With argument, do this that many times." + (interactive "p") + (my/delete-word (- arg))) :config (bind-keys - ;; ;; Scroll in other window. - ;; ("S-" . scroll-other-window-down) - ;; ("S-" . scroll-other-window) ;; Switch window - ("C-" . other-window) + ("C-" . other-window) ;; Reduce whitespace around cursor to 0 or 1, according to context. - ("C-S-" . fixup-whitespace) + ("C-S-" . fixup-whitespace) ;; Scroll without moving the cursor. - ("M-" . scroll-up-line) - ("M-" . scroll-down-line))) + ("M-" . scroll-up-line) + ("M-" . scroll-down-line) + ;; Delete words without storing them in the kill buffer. + ("C-" . my/delete-word) + ("C-" . my/backward-delete-word))) ;;;;;;;;;;;;;;;;;;;; Programming / general ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Online documentation mode. @@ -221,6 +235,8 @@ (projectile-switch-project-action 'neotree-projectile-action) :config (projectile-mode +1) + ;; Mark variables as safe. This prevents prompts when using .dir-locals.el. + (put 'projectile-project-configure-cmd 'safe-local-variable #'stringp) :bind ("C-c p" . 'projectile-command-map) (:map projectile-command-map diff --git a/server/server b/server/server index 8664682..1d4a0ba 100644 --- a/server/server +++ b/server/server @@ -1,2 +1,2 @@ -127.0.0.1:51313 4508 +127.0.0.1:51313 25228 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh \ No newline at end of file