Fix the crux-like changes (#995)

README.md

@@ -265,7 +265,7 @@ Keybinding         | Description
 <kbd>C-+</kbd>     | Increase font size(`text-scale-increase`).
 <kbd>C--</kbd>     | Decrease font size(`text-scale-decrease`).
 <kbd>C-x O</kbd>   | Go back to previous window (the inverse of `other-window` (`C-x o`)).
-<kbd>C-^</kbd>     | Join two lines into one(`prelude-top-join-line`).
+<kbd>C-^</kbd>     | Join two lines into one(`crux-top-join-line`).
 <kbd>C-x p</kbd>   | Start `proced` (manage processes from Emacs; works only in Linux).
 <kbd>C-x m</kbd>   | Start `eshell`.
 <kbd>C-x M-m</kbd> | Start your default shell.
@@ -432,7 +432,7 @@ Keybinding         | Description
 <kbd>jj</kbd>      | Jump to the beginning of a word(`avy-goto-word-1`)
 <kbd>jk</kbd>      | Jump to a character(`avy-goto-char`)
 <kbd>jl</kbd>      | Jump to the beginning of a line(`avy-goto-line`)
-<kbd>JJ</kbd>      | Jump back to previous buffer(`prelude-switch-to-previous-buffer`)
+<kbd>JJ</kbd>      | Jump back to previous buffer(`crux-switch-to-previous-buffer`)
 <kbd>uu</kbd>      | View edits as a tree(`undo-tree-visualize`)
 <kbd>xx</kbd>      | Executed extended command(`execute-extended-command`)
 <kbd>yy</kbd>      | Browse the kill ring(`browse-kill-ring`)

core/prelude-custom.el

@@ -70,7 +70,7 @@ Will only occur if `prelude-whitespace' is also enabled."
 Prelude recommends you only put personal customizations in the
 personal folder.  This variable allows you to specify a specific
 folder as the one that should be visited when running
-`prelude-find-user-init-file'.  This can be easily set to the desired buffer
+`crux-find-user-init-file'.  This can be easily set to the desired buffer
 in lisp by putting `(setq prelude-user-init-file load-file-name)'
 in the desired elisp file."
   :type 'string
@@ -99,7 +99,7 @@ Only modes that don't derive from `prog-mode' should be listed here."
   :group 'prelude)
 
 (defcustom prelude-shell (getenv "SHELL")
-  "The default shell to run with `prelude-visit-term-buffer'"
+  "The default shell to run with `crux-visit-term-buffer'"
   :type 'string
   :group 'prelude)
 

core/prelude-global-keybindings.el

@@ -45,8 +45,7 @@
                                 (other-window -1))) ;; back one
 
 ;; Indentation help
-(global-set-key (kbd "C-^") 'prelude-top-join-line)
+(global-set-key (kbd "C-^") 'crux-top-join-line)
-
 ;; Start proced in a similar manner to dired
 (unless (eq system-type 'darwin)
     (global-set-key (kbd "C-x p") 'proced))
@@ -86,7 +85,7 @@
                                         (kill-line 0)
                                         (indent-according-to-mode)))
 
-(global-set-key [remap kill-whole-line] 'prelude-kill-whole-line)
+(global-set-key [remap kill-whole-line] 'crux-kill-whole-line)
 
 ;; Activate occur easily inside isearch
 (define-key isearch-mode-map (kbd "C-o") 'isearch-occur)

core/prelude-mode.el

@@ -88,31 +88,31 @@
   (easy-menu-add-item nil '("Tools")
                       '("Prelude"
                         ("Files"
-                         ["Open with..." prelude-open-with]
+                         ["Open with..." crux-open-with]
-                         ["Delete file and buffer" prelude-delete-file-and-buffer]
+                         ["Delete file and buffer" crux-delete-file-and-buffer]
-                         ["Rename buffer and file" prelude-rename-buffer-and-file])
+                         ["Rename buffer and file" crux-rename-buffer-and-file])
 
                         ("Buffers"
-                         ["Clean up buffer or region" prelude-cleanup-buffer-or-region]
+                         ["Clean up buffer or region" crux-cleanup-buffer-or-region]
-                         ["Kill other buffers" prelude-kill-other-buffers])
+                         ["Kill other buffers" crux-kill-other-buffers])
 
                         ("Editing"
                          ["Insert empty line" prelude-insert-empty-line]
                          ["Move line up" prelude-move-line-up]
                          ["Move line down" prelude-move-line-down]
                          ["Duplicate line or region" prelude-duplicate-current-line-or-region]
-                         ["Indent rigidly and copy to clipboard" prelude-indent-rigidly-and-copy-to-clipboard]
+                         ["Indent rigidly and copy to clipboard" crux-indent-rigidly-and-copy-to-clipboard]
-                         ["Insert date" prelude-insert-date]
+                         ["Insert date" crux-insert-date]
-                         ["Eval and replace" prelude-eval-and-replace]
+                         ["Eval and replace" crux-eval-and-replace]
                          )
 
                         ("Windows"
-                         ["Swap windows" prelude-swap-windows])
+                         ["Swap windows" crux-swap-windows])
 
                         ("General"
-                         ["Visit term buffer" prelude-visit-term-buffer]
+                         ["Visit term buffer" crux-visit-term-buffer]
                          ["Search in Google" prelude-google]
-                         ["View URL" prelude-view-url]))
+                         ["View URL" crux-view-url]))
                       "Search Files (Grep)...")
 
   (easy-menu-add-item nil '("Tools") '("--") "Search Files (Grep)..."))

modules/prelude-programming.el

@@ -60,7 +60,7 @@ This functions should be added to the hooks of major modes for programming."
 ;; smart curly braces
 (sp-pair "{" nil :post-handlers
          '(((lambda (&rest _ignored)
-              (prelude-smart-open-line-above)) "RET")))
+              (crux-smart-open-line-above)) "RET")))
 
 ;; enlist a more liberal guru
 (setq guru-warn-only t)