From 64f17557559e76e7f1790c2a07c4c4742bf8db5e Mon Sep 17 00:00:00 2001 From: contrapunctus Date: Thu, 13 Jan 2022 23:08:12 +0530 Subject: [PATCH] Move cp-parens into init.org, deleting lots of junk --- contrapunctus/cp-parens.el | 226 ------------------------------------- init.org | 53 +++++++++ 2 files changed, 53 insertions(+), 226 deletions(-) delete mode 100644 contrapunctus/cp-parens.el diff --git a/contrapunctus/cp-parens.el b/contrapunctus/cp-parens.el deleted file mode 100644 index 4ab8dc1..0000000 --- a/contrapunctus/cp-parens.el +++ /dev/null @@ -1,226 +0,0 @@ -;; (require 'paredit) - -;; (add-hook 'emacs-lisp-mode-hook 'paredit-mode) -;; (add-hook 'lisp-mode-hook 'paredit-mode) -;; (add-hook 'scheme-mode-hook 'paredit-mode) -;; (add-hook 'inferior-scheme-mode-hook 'paredit-mode) -;; (add-hook 'inferior-lisp-mode-hook 'paredit-mode) -;; (add-hook 'ielm-mode-hook 'paredit-mode) - -;; (global-set-key (kbd "C-x C-p") 'paredit-mode) - -;; (cp-set-keys -;; :keymap paredit-mode-map -;; :bindings -;; `((,(kbd "C-p") paredit-backward-down) -;; (,(kbd "C-n") paredit-forward-up) -;; (,(kbd "C-b") paredit-backward) -;; (,(kbd "C-f") paredit-forward) -;; (,(kbd "C-u") paredit-backward-up) -;; (,(kbd "C-d") paredit-forward-down) - -;; (,(kbd "M-b") backward-char) -;; (,(kbd "M-f") forward-char) -;; (,(kbd "M-p") previous-line) -;; (,(kbd "M-n") next-line) -;; (,(kbd "M-u") paredit-kill-0) -;; (,(kbd "M-d") paredit-forward-delete) - -;; (,(kbd "C-M-b") backward-word) -;; (,(kbd "C-M-f") forward-word) -;; (,(kbd "C-M-u") upcase-word) -;; (,(kbd "C-M-d") paredit-forward-kill-word) -;; (,(kbd "C-M-p") nil) -;; (,(kbd "C-M-n") nil) - -;; (,(kbd "M-w") paredit-copy-as-kill) -;; (,(kbd "C-h") paredit-backward-delete) -;; (,(kbd "C-w") paredit-backward-kill-word))) - -;; (cp-set-keys -;; :keymap comint-mode-map -;; :bindings -;; `((,(kbd "C-d") paredit-forward-down) -;; (,(kbd "C-M-p") comint-previous-input) -;; (,(kbd "C-M-n") comint-next-input))) - -(defun cp/sp-after-colon-p (id action context) - (save-excursion - (forward-char -1) - (looking-at-p ":"))) - -(require 'smartparens) -(require 'smartparens-config) -(smartparens-global-mode) -(add-hook 'paredit-mode-hook 'turn-off-smartparens-mode) -;; (sp-pair "(" ")" :trigger-wrap (kbd "M-(") :actions '(insert wrap autoskip navigate escape)) -(sp-pair "(" ")" :wrap "M-(") -(sp-pair "[" "]" :wrap "M-[") -(sp-pair "\"" "\"" :wrap "M-\"") -;; (global-unset-key (kbd "M-\'")) -;; (sp-pair "\'" "\'" :wrap "M-\'") ;; buggy -(sp-pair "<" ">" :wrap "M-<") -(sp-pair "{" "}" :wrap "M-{") -;; (sp-pair "\\\\*" "\\\\*" :actions '(wrap)) -;; (sp-pair "\\\\*" :wrap) -;; (sp-pair "\\\\/" :wrap) - -;; commented out on 2017-06-06T19:25:13+0530 - -(add-hook 'erc-mode-hook 'smartparens-mode) -;; Disable inserting pair if preceded by : (e.g. in IRC smileys) -(defun cp-point-after-colon-p () - (equal (string (char-before)) ":")) -;; (sp-pair "(" nil :unless '(cp-point-after-colon-p)) - -;;;; sp-backward-kill-word and subword-backward-kill conflict -;; (define-key emacs-lisp-mode-map (kbd "C-p") 'sp-previous-sexp) -;; (define-key emacs-lisp-mode-map (kbd "C-n") 'sp-next-sexp) - -;; 2016-11-12 - trying something different, hopefully more consistent -(defun cp-setup-lisp-keys () - ;; (cp-set-keys - ;; :keymap smartparens-mode-map - ;; :bindings - ;; `((,(kbd "C-M-b") nil) - ;; (,(kbd "C-M-f") nil) - ;; (,(kbd "C-M-u") nil) - ;; (,(kbd "C-M-d") nil) - ;; (,(kbd "C-M-p") nil) - ;; (,(kbd "C-M-n") nil))) - - ;; (cp-set-keys - ;; :keymap 'local - ;; :bindings - ;; `((,(kbd ";") sp-comment) - ;; (,(kbd "C-p") sp-backward-down-sexp) - ;; (,(kbd "C-n") sp-backward-up-sexp) - ;; (,(kbd "C-b") sp-backward-sexp) - ;; (,(kbd "C-f") sp-forward-sexp) - ;; (,(kbd "C-u") sp-up-sexp) - ;; (,(kbd "C-d") sp-down-sexp) - ;; (,(kbd "C-a") sp-beginning-of-sexp) - ;; (,(kbd "C-e") sp-end-of-sexp) - - ;; (,(kbd "C-k") sp-kill-sexp) - ;; (,(kbd "M-w") sp-copy-sexp) - ;; (,(kbd "C-h") sp-backward-delete-char) - ;; (,(kbd "C-w") sp-backward-kill-word) - ;; (,(kbd "M-q") sp-indent-defun) - - ;; (,(kbd "M-b") backward-char) - ;; (,(kbd "M-f") forward-char) - ;; (,(kbd "M-p") previous-line) - ;; (,(kbd "M-n") next-line) - ;; (,(kbd "M-u") cp-kill-line-0) - ;; (,(kbd "M-d") sp-delete-char) - ;; (,(kbd "M-a") beginning-of-line) - ;; (,(kbd "M-e") end-of-line) - - ;; (,(kbd "C-M-b") backward-word) - ;; (,(kbd "C-M-f") forward-word) - ;; (,(kbd "C-M-u") upcase-word) - ;; (,(kbd "C-M-d") sp-kill-word))) - - ;; (cp-set-keys - ;; :keymap comint-mode-map - ;; :bindings - ;; `((,(kbd "C-d") sp-down-sexp) - ;; (,(kbd "C-M-p") comint-previous-input) - ;; (,(kbd "C-M-n") comint-next-input))) - - (cp-set-keys - :keymap 'local - :bindings - `((,(kbd "M-q") sp-indent-defun) - (,(kbd "M-w") contrapunctus-lisp-copy))) - ) - -;; experiment -(defun cp/erc-sp-keys () - (cp-set-keys - :keymap smartparens-mode-map - :unset t - :bindings - `((,(kbd "C-h")) - (,(kbd "C-w"))) - ;; `((,(kbd "C-h") backward-delete-char) - ;; (,(kbd "C-w") backward-kill-word)) - )) - -;; ;; 2016-11-06 - commented out to try a different, hopefully more consistent setup - -(add-hook 'emacs-lisp-mode-hook 'cp-setup-lisp-keys) -(add-hook 'lisp-mode-hook 'cp-setup-lisp-keys) -(add-hook 'scheme-mode-hook 'cp-setup-lisp-keys) -(add-hook 'inferior-scheme-mode-hook 'cp-setup-lisp-keys) -(add-hook 'ielm-mode-hook 'cp-setup-lisp-keys) - -(add-hook 'eval-expression-minibuffer-setup-hook 'smartparens-mode) -(add-hook 'erc-mode 'cp/erc-sp-keys) -;; (add-hook 'eval-expression-minibuffer-setup-hook 'cp-setup-lisp-keys) - -;; ielm -;; (require 'ielm) -;; (define-key ielm-map (kbd "C-p") 'sp-backward-down-sexp) -;; (define-key ielm-map (kbd "C-n") 'sp-backward-up-sexp) -;; (define-key ielm-map (kbd "C-b") 'sp-backward-sexp) -;; (define-key ielm-map (kbd "C-f") 'sp-forward-sexp) -;; (define-key ielm-map (kbd "C-u") 'sp-up-sexp) -;; (define-key ielm-map (kbd "C-d") 'sp-down-sexp) -;; (define-key comint-mode-map (kbd "C-d") 'sp-down-sexp) -;; (define-key ielm-map (kbd "C-a") 'sp-beginning-of-sexp) -;; (define-key ielm-map (kbd "C-e") 'sp-end-of-sexp) - -;; (define-key ielm-map (kbd "C-k") 'sp-kill-sexp) -;; (define-key ielm-map (kbd "M-w") 'sp-copy-sexp) -;; (define-key ielm-map (kbd "C-h") 'sp-backward-delete-char) -;; (define-key ielm-map (kbd "C-w") 'sp-backward-kill-word) - -;; (define-key ielm-map (kbd "M-b") 'backward-char) -;; (define-key ielm-map (kbd "M-f") 'forward-char) -;; (define-key ielm-map (kbd "M-p") 'previous-line) -;; (define-key ielm-map (kbd "M-n") 'next-line) -;; (define-key ielm-map (kbd "M-u") 'cp-kill-line-0) -;; (define-key ielm-map (kbd "C-k") 'sp-kill-sexp) -;; (define-key ielm-map (kbd "M-d") 'sp-delete-char) - -;; (define-key ielm-map (kbd "C-M-b") 'backward-word) -;; (define-key ielm-map (kbd "C-M-f") 'forward-word) -;; (define-key ielm-map (kbd "C-M-u") 'upcase-word) -;; (define-key ielm-map (kbd "C-M-d") 'sp-kill-word) -;; (define-key ielm-map (kbd "C-M-p") nil) -;; (define-key ielm-map (kbd "C-M-n") nil) - -;; (define-key comint-mode-map (kbd "C-M-p") 'comint-previous-input) -;; (define-key comint-mode-map (kbd "C-M-n") 'comint-next-input) - - -;; (define-key scheme-mode-map (kbd "C-p") 'sp-backward-down-sexp) -;; (define-key scheme-mode-map (kbd "C-n") 'paredit-forward-up) -;; (define-key scheme-mode-map (kbd "C-b") 'paredit-backward) -;; (define-key scheme-mode-map (kbd "C-f") 'sp-forward-sexp) -;; (define-key scheme-mode-map (kbd "C-u") 'paredit-backward-up) -;; (define-key scheme-mode-map (kbd "C-d") 'paredit-forward-down) -;; (define-key comint-mode-map (kbd "C-d") 'paredit-forward-down) - -;; (define-key scheme-mode-map (kbd "M-b") 'backward-char) -;; (define-key scheme-mode-map (kbd "M-f") 'forward-char) -;; (define-key scheme-mode-map (kbd "M-p") 'previous-line) -;; (define-key scheme-mode-map (kbd "M-n") 'next-line) -;; ;; (define-key scheme-mode-map (kbd "M-u") 'paredit-kill-0) -;; (define-key scheme-mode-map (kbd "C-k") 'sp-kill-sexp) -;; (define-key scheme-mode-map (kbd "M-d") 'sp-delete-char) - -;; (define-key scheme-mode-map (kbd "C-M-b") 'backward-word) -;; (define-key scheme-mode-map (kbd "C-M-f") 'forward-word) -;; (define-key scheme-mode-map (kbd "C-M-u") 'upcase-word) -;; (define-key scheme-mode-map (kbd "C-M-d") 'sp-kill-word) -;; (define-key scheme-mode-map (kbd "C-M-p") nil) -;; (define-key scheme-mode-map (kbd "C-M-n") nil) -;; (define-key comint-mode-map (kbd "C-M-p") 'comint-previous-input) -;; (define-key comint-mode-map (kbd "C-M-n") 'comint-next-input) - -;; (define-key scheme-mode-map (kbd "M-w") 'paredit-copy-as-kill) -;; (define-key scheme-mode-map (kbd "C-h") 'paredit-backward-delete) -;; (define-key scheme-mode-map (kbd "C-w") 'paredit-backward-kill-word) - -(provide 'cp-parens) diff --git a/init.org b/init.org index ad9ac7e..3265294 100644 --- a/init.org +++ b/init.org @@ -3955,6 +3955,59 @@ pjb suggested a different approach [[http://paste.lisp.org/display/10157][here]] (compile "./makem.sh compile lint test-ert"))) #+END_SRC +*** paredit :disabled: +:PROPERTIES: +:CREATED: 2022-01-13T23:04:41+0530 +:END: + +#+BEGIN_SRC emacs-lisp :load no :tangle no +(require 'paredit) + +(add-hook 'emacs-lisp-mode-hook 'paredit-mode) +(add-hook 'lisp-mode-hook 'paredit-mode) +(add-hook 'scheme-mode-hook 'paredit-mode) +(add-hook 'inferior-scheme-mode-hook 'paredit-mode) +(add-hook 'inferior-lisp-mode-hook 'paredit-mode) +(add-hook 'ielm-mode-hook 'paredit-mode) + +(global-set-key (kbd "C-x C-p") 'paredit-mode) + +(cp-set-keys + :keymap paredit-mode-map + :bindings + `((,(kbd "C-p") paredit-backward-down) + (,(kbd "C-n") paredit-forward-up) + (,(kbd "C-b") paredit-backward) + (,(kbd "C-f") paredit-forward) + (,(kbd "C-u") paredit-backward-up) + (,(kbd "C-d") paredit-forward-down) + + (,(kbd "M-b") backward-char) + (,(kbd "M-f") forward-char) + (,(kbd "M-p") previous-line) + (,(kbd "M-n") next-line) + (,(kbd "M-u") paredit-kill-0) + (,(kbd "M-d") paredit-forward-delete) + + (,(kbd "C-M-b") backward-word) + (,(kbd "C-M-f") forward-word) + (,(kbd "C-M-u") upcase-word) + (,(kbd "C-M-d") paredit-forward-kill-word) + (,(kbd "C-M-p") nil) + (,(kbd "C-M-n") nil) + + (,(kbd "M-w") paredit-copy-as-kill) + (,(kbd "C-h") paredit-backward-delete) + (,(kbd "C-w") paredit-backward-kill-word))) + +(cp-set-keys + :keymap comint-mode-map + :bindings + `((,(kbd "C-d") paredit-forward-down) + (,(kbd "C-M-p") comint-previous-input) + (,(kbd "C-M-n") comint-next-input))) +#+END_SRC + *** smartparens #+BEGIN_SRC emacs-lisp (use-package smartparens