Cleanup, fix various errors

diff --git a/bindings.el b/bindings.el
index 30c740dfc5c74c5351be084f41f2d5dad24ef377..254ccbc5b3495edee2a533b81491787fa2bfd6af 100644 (file)
--- a/bindings.el
+++ b/bindings.el
@@ -30,7 +30,7 @@
 (global-set-key [?\C-\S-S] 'isearch-forward-regexp)
 (global-set-key [?\C-\S-R] 'isearch-backward-regexp)
 ;; OVERRIDES - ctl-x-map
-(define-key ctl-x-map [\C-b]'buffer-menu)
+(define-key ctl-x-map "\C-b" 'buffer-menu)
 ;; OVERRIDES - esc-map (M-*)
 (define-key esc-map "j" 'backward-join-line)
 (define-key esc-map "o" 'open-line-above)

diff --git a/custom-set-variables.el b/custom-set-variables.el
index 2192bd73146bea3baa4580156af5bfa40001efab..d0ee2efe54a068daaa395cdd9b973c9e73cb4d4c 100644 (file)
--- a/custom-set-variables.el
+++ b/custom-set-variables.el
@@ -4,17 +4,18 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(ledger-reports
-   '(("assets" "%(binary) -f %(ledger-file) bal assets")
-     ("income" "%(binary) -f %(ledger-file) bal income")
-     ("expenses" "%(binary) -f %(ledger-file) bal expenses")
-     ("liabilities" "%(binary) -f %(ledger-file) bal liabilities")
-     ("bal" "%(binary) -f %(ledger-file) bal")
-     ("reg" "%(binary) -f %(ledger-file) reg")
-     ("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
-     ("account" "%(binary) -f %(ledger-file) reg %(account)")))
+        '(("assets" "%(binary) -f %(ledger-file) bal assets")
+                ("income" "%(binary) -f %(ledger-file) bal income")
+                ("expenses" "%(binary) -f %(ledger-file) bal expenses")
+                ("liabilities" "%(binary) -f %(ledger-file) bal liabilities")
+                ("bal" "%(binary) -f %(ledger-file) bal")
+                ("reg" "%(binary) -f %(ledger-file) reg")
+                ("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
+                ("account" "%(binary) -f %(ledger-file) reg %(account)")))
  '(minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
  '(package-selected-packages
-   '(page-break-lines popup-kill-ring auto-package-update s openwith gnuplot-mode magit expand-region company use-package)))
+        '(magit browse-kill-ring use-package page-break-lines openwith gnuplot-mode expand-region company)))
+
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

diff --git a/package-config.el b/package-config.el
index d3b68361a57961bb807845329064cef13bf0e2a0..9ce442d2757a4147217b34637dc60ac958a37d3d 100644 (file)
--- a/package-config.el
+++ b/package-config.el
@@ -3,8 +3,8 @@
 (require 'package)
 (setq package-archives
                        '(("elpa" . "https://elpa.gnu.org/packages/")
-       ("nongnu" . "https://elpa.nongnu.org/nongnu/")
-       ("melpa" . "https://melpa.org/packages/")))
+                               ("nongnu" . "https://elpa.nongnu.org/nongnu/")
+                               ("melpa" . "https://melpa.org/packages/")))
 
 (unless (bound-and-true-p package--initialized)
        (setq package-enable-at-startup nil)
@@ -20,15 +20,6 @@
        (use-package slime)
        (use-package ledger-mode))
 
-(use-package auto-package-update
-       :if (not (daemonp))
-       :custom
-       (auto-package-update-interval 7) ;; in days
-       (auto-package-update-prompt-before-update t)
-       (auto-package-update-delete-old-versions t)
-       :config
-       (auto-package-update-maybe))
-
 (use-package company
        :custom
        (company-idle-delay 0)
@@ -70,8 +61,8 @@
        (message "Loading Magit...")
        :config
        (message "Loaded Magit!")
-       :bind
-       (("C-x g" . magit-status)))
+       :bind (:map ctl-x-map
+                               ("g" . magit-status)))
 
 (use-package openwith
        :config
@@ -139,12 +130,12 @@ Intended for use as an after-save-hook."
                (save-buffer)))
 
 (use-package page-break-lines
-       :init
+       :config
        (global-page-break-lines-mode))
 
-(use-package popup-kill-ring
-       :bind
-       ("M-y" . popup-kill-ring))
+(use-package browse-kill-ring
+       :config
+       (browse-kill-ring-default-keybindings))
 
 (use-package recentf
        :ensure nil