X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=878bdc8cb625be27e8fb25a4870e046715a0704c;hb=9e9f207bf1217b245f4e2b73efcd00b8a2c2536b;hp=0291bd47b068031abe33005486d9a52b328da762;hpb=845e4083176a7234403d86ec371a922b24689aee;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 0291bd4..878bdc8 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -265,6 +265,7 @@ value, scrolling continues until there is no more output.
     :ensure t
     :bind (("C-c j ," . goto-last-change)
            ("C-c j ." . goto-last-change-reverse))
+    )
 #+END_SRC
 *** Jumping to bookmarks (visible bookmarks, bm)
 #+BEGIN_SRC emacs-lisp
@@ -344,27 +345,30 @@ value, scrolling continues until there is no more output.
 
 ** Perl
 #+BEGIN_SRC emacs-lisp
-  (require 'cperl-mode)
-  ;; Use c-mode for perl .xs files
-  (add-to-list 'auto-mode-alist '("\\.xs\\'" . c-mode))
-  (add-to-list 'auto-mode-alist '("\\.\\([pP][Llm]\\|al\\)\\'" . cperl-mode))
-  (add-to-list 'interpreter-mode-alist '("perl" . cperl-mode))
-  (add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode))
-  (add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode))
-  (setq cperl-hairy t
-        cperl-indent-level 4
-        cperl-auto-newline nil
-        cperl-auto-newline-after-colon nil
-        cperl-continued-statement-offset 4
-        cperl-brace-offset -1
-        cperl-continued-brace-offset 0
-        cperl-label-offset -4
-        cperl-highlight-variables-indiscriminately t
-        cperl-electric-lbrace-space nil
-        cperl-indent-parens-as-block nil
-        cperl-close-paren-offset -1
-        cperl-tab-always-indent t)
-  ;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
+  (use-package cperl-mode
+    :config
+    (progn
+      ;; Use c-mode for perl .xs files
+      (add-to-list 'auto-mode-alist '("\\.xs\\'" . c-mode))
+      (add-to-list 'auto-mode-alist '("\\.\\([pP][Llm]\\|al\\)\\'" . cperl-mode))
+      (add-to-list 'interpreter-mode-alist '("perl" . cperl-mode))
+      (add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode))
+      (add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode))
+      (setq cperl-hairy t
+            cperl-indent-level 4
+            cperl-auto-newline nil
+            cperl-auto-newline-after-colon nil
+            cperl-continued-statement-offset 4
+            cperl-brace-offset -1
+            cperl-continued-brace-offset 0
+            cperl-label-offset -4
+            cperl-highlight-variables-indiscriminately t
+            cperl-electric-lbrace-space nil
+            cperl-indent-parens-as-block nil
+            cperl-close-paren-offset -1
+            cperl-tab-always-indent t)
+      ;;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
+  ))
 #+END_SRC
 
 ** Helm
@@ -410,7 +414,7 @@ value, scrolling continues until there is no more output.
 #+BEGIN_SRC emacs-lisp
 
   ;;; stolen from https://github.com/malb/emacs.d/blob/master/malb.org
-  (defun malb/helm-swoop-pr2e-fill ()
+  (defun malb/helm-swoop-pre-fill ()
     (thing-at-point 'symbol))
   (setq malb/helm-swoop-ignore-major-mode '(dired-mode
         paradox-menu-mode doc-view-mode pdf-view-mode