Minor edits

.bashrc

@@ -149,13 +149,6 @@ fi
 
 IFS=$SAVEIFS
 
-# Function for using Emacs as our manpage reader.
-# Use :q to quit out of Emacs and return to the shell.
-macsman() {
-    # emacsclient -nw -e "(man \"$1\")"
-    emacsclient -nw -e "(let ((Man-notify-method 'bully)) (man \"$1\"))"
-}
-
 # navigation
 up () {
   local d=""
@@ -189,7 +182,6 @@ alias vim="nvim"
 alias emacs="emacsclient -c -a 'emacs'" # GUI versions of Emacs
 alias em="/usr/bin/emacs -nw" # Terminal version of Emacs
 alias rem="killall emacs || echo 'Emacs server not running'; /usr/bin/emacs --daemon" # Kill Emacs and restart daemon..
-alias man="macsman" # Use emacs as your manpage reader.
 
 # Changing "ls" to "eza"
 alias ls='eza -al --color=always --group-directories-first' # my preferred listing

.config/emacs/config.el

@@ -720,12 +720,7 @@
     (browse-url
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
-  
+
 (defun dm-search ()
   "Search various search engines."
   (interactive)
@@ -748,7 +743,3 @@
                          ("3" "Three"))))              
       (cadr (assoc (completing-read "Choose: " completions) completions)))))
   (message "You choose `%s'" choice))
-<<<<<<< HEAD
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
-=======
->>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f

.config/emacs/scripts/elpaca-setup.el

@@ -1,7 +1,7 @@
 
 ;;; Code:
 
-(defvar elpaca-installer-version 0.5)
+(defvar elpaca-installer-version 0.7)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))

.config/fish/config.fish

@@ -136,13 +136,6 @@ function org-search -d "send a search string to org-mode"
     printf $output
 end
 
-# Function for using Emacs as our manpage reader.
-# Use :q to quit out of Emacs and return to the shell.
-function macsman
-    # emacsclient -nw -e "(man \"$argv\")"
-    emacsclient -nw -e "(let ((Man-notify-method 'bully)) (man \"$argv\"))"
-end
-
 ### END OF FUNCTIONS ###
 
 
@@ -159,7 +152,6 @@ alias vim='nvim'
 alias emacs="emacsclient -c -a 'emacs'"
 alias em='/usr/bin/emacs -nw'
 alias rem="killall emacs || echo 'Emacs server not running'; /usr/bin/emacs --daemon" # Kill Emacs and restart daemon..
-alias man="macsman" # Use emacs as your manpage reader.
 
 # Changing "ls" to "eza"
 alias ls='eza -al --color=always --group-directories-first' # my preferred listing

.zshrc

@@ -130,13 +130,6 @@ fi
 
 IFS=$SAVEIFS
 
-# Function for using Emacs as our manpage reader.
-# Use :q to quit out of Emacs and return to the shell.
-macsman() {
-    # emacsclient -nw -e "(man \"$1\")"
-    emacsclient -nw -e "(let ((Man-notify-method 'bully)) (man \"$1\"))"
-}
-
 # navigation
 up () {
   local d=""
@@ -163,7 +156,6 @@ alias vim="nvim"
 alias emacs="emacsclient -c -a 'emacs'" # GUI versions of Emacs
 alias em="/usr/bin/emacs -nw" # Terminal version of Emacs
 alias rem="killall emacs || echo 'Emacs server not running'; /usr/bin/emacs --daemon" # Kill Emacs and restart daemon..
-alias man="macsman" # Use emacs as your manpage reader.
 
 # Changing "ls" to "eza"
 alias ls='eza -al --color=always --group-directories-first' # my preferred listing