1 files changed, 21 insertions, 10 deletions

@@ -1694,16 +1694,17 @@ successive invocations."
   ;; I don't use paredit-splice-sexp much, and it stomps on isearch.
   (:unbind "M-s")
   
-  (defun setup-paredit-mode ()
+  (defun paredit@setup ()
     "Correct weirdnesses and set up paredit mode."
-    (paredit-mode +1)
-    (let ((map lisp-mode-shared-map))
-      (define-key map (kbd "DEL") #'paredit-backward-delete)
-      (define-key map (kbd "C-M-;") #'comment-or-uncomment-sexp)))
+    (:with-map lisp-mode-shared-map
+      (:bind "DEL" paredit-backward-delete
+             "C-M-;" comment-or-uncomment-sexp
+             "C-<backspace>" paredit-backward-kill-word))
+    (paredit-mode +1))
   
   (dolist (mode lispy-modes)
     (add-hook (intern (concat (symbol-name mode) "-hook"))
-              #'setup-paredit-mode))
+              #'paredit@setup))
   
   (require 'eldoc)
   (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
@@ -1807,19 +1808,29 @@ successive invocations."
   ;; MARK) is /not/ an apostrophe.  Making it curly is a typographical
   ;; consideration, not an input consideration.  (I suppose you could make the
   ;; argument that all of these are typographical considerations, but .. bleh.)
-  (:bind "'" self-insert-command
-         "`" self-insert-command)
+  (define-typo-cycle typo-cycle-apostrophe
+    "Cycle through apostrophe-like graphemes.
+If used with a numeric prefix argument N, N apostrophes will be inserted."
+    ("'" "′" "″" "’"))
+
+  (define-typo-cycle typo-cycle-backtick
+    "Cycle through backtick and left single quotation mark.
+If used with a numeric prefix argument N, N backticks will be inserted."
+    ("`" "‘"))
+
+  (:bind "'" typo-cycle-apostrophe
+         "`" typo-cycle-backtick)
 
   ;; Enable C-c 8 map in all buffers
   (typo-global-mode +1)
   
   (add-hook 'text-mode-hook
             (defun text-mode@typo-unless ()
-              ;; I use this /instead/ of the provided
+              "Start `typo-mode' UNLESS the buffer matches a predicate."
+              ;; I implement this instead of using
               ;; `typo-disable-electricity-functions' because the latter checks
               ;; on every pertinent keypress.  I know I want /no/ typo-ing in
               ;; these certain buffers, so I won't even turn on the mode.
-              "Start `typo-mode' UNLESS the buffer matches a predicate."
               (unless (or ; predicates here
                        (string-match-p "COMMIT_EDITMSG"
                                        (or (buffer-name) "")))