diff options
| -rw-r--r-- | ravi-init-cpp.el | 24 | ||||
| -rw-r--r-- | ravi-init-dired.el | 5 | ||||
| -rw-r--r-- | ravi-init-files.el | 3 | ||||
| -rw-r--r-- | ravi-init-ido.el | 8 | ||||
| -rw-r--r-- | ravi-init-insertion.el | 3 | ||||
| -rw-r--r-- | ravi-init-marks.el | 2 | ||||
| -rw-r--r-- | ravi-init-mu.el | 2 | ||||
| -rw-r--r-- | ravi-init-navigation.el | 7 | ||||
| -rw-r--r-- | ravi-init-org.el | 2 | ||||
| -rw-r--r-- | ravi-init-repl.el | 2 |
10 files changed, 29 insertions, 29 deletions
diff --git a/ravi-init-cpp.el b/ravi-init-cpp.el index 4ae7910..5fe9e8f 100644 --- a/ravi-init-cpp.el +++ b/ravi-init-cpp.el @@ -98,8 +98,8 @@ :init (progn (use-package doxymacs - :load-path ,(ravi/emacs-file "site-lisp/doxymacs/lisp") - :init + :load-path (lambda () (ravi/emacs-file "site-lisp/doxymacs/lisp")) + :config (progn (doxymacs-mode) (setq doxymacs-file-comment-template @@ -133,6 +133,11 @@ (indent-according-to-mode) (forward-line)) + ) + + :config + (progn + (defun my-c-mode-common-hook () (hs-minor-mode 1) (hs-hide-initial-comment-block) @@ -147,7 +152,7 @@ (doxymacs-mode 1) (doxymacs-font-lock) - ;(define-key c-mode-base-map [return] 'c-context-line-break) + ;(define-key c-mode-base-map [return] 'c-context-line-break) (bind-key "<return>" 'c-context-line-break c-mode-base-map) (unbind-key "M-j" c-mode-base-map) @@ -285,21 +290,12 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named (insert (ravi-license-header)) (insert "\n") (setq end (point)) - (comment-region start end) - ) - ) - ) + (comment-region start end)))) (defun ravi-auto-insert-cpp () (progn (ravi-license-insert) - (doxymacs-insert-file-comment) - ) - ) - ) - - :config - (progn + (doxymacs-insert-file-comment))) (defun ravi/add-space-before-paren-c (&rest ignored) (message "Handler invoked") diff --git a/ravi-init-dired.el b/ravi-init-dired.el index 51cacb8..0c8fab2 100644 --- a/ravi-init-dired.el +++ b/ravi-init-dired.el @@ -90,7 +90,7 @@ Also used for highlighting.") (use-package dired-rainbow - :init + :config (progn (dired-rainbow-define html "#4e9a06" ("htm" "html" "xhtml")) (dired-rainbow-define xml "DarkGreen" ("xml" "xsd" "xsl" "xslt" "wsdl")) @@ -105,7 +105,8 @@ Also used for highlighting.") (dired-rainbow-define executable "#8cc4ff" ("exe" "msi")) (dired-rainbow-define compressed "#ad7fa8" ("zip" "bz2" "tgz" "txz" "gz" "xz" "z" "Z" "jar" "war" "ear" "rar" "sar" "xpi" "apk" "xz" "tar")) (dired-rainbow-define packaged "#e6a8df" ("deb" "rpm")) - (dired-rainbow-define encrypted "LightBlue" ("gpg" "pgp")))) + (dired-rainbow-define encrypted "LightBlue" ("gpg" "pgp"))) + :ensure t) (add-to-list 'dired-guess-shell-alist-user (list (regexp-opt my-dired-media-files-extensions) "vlc")) diff --git a/ravi-init-files.el b/ravi-init-files.el index 96d4dc5..9ac482d 100644 --- a/ravi-init-files.el +++ b/ravi-init-files.el @@ -63,6 +63,9 @@ (progn (setq recentf-save-file (ravi/emacs-file "past/recentf")) (setq recentf-max-saved-items 100) ;; just 20 is too recent + ) + :config + (progn (add-to-list 'recentf-exclude "/COMMIT_EDITMSG$") (add-to-list 'recentf-exclude "/kmail[[:alnum:]]*\\.tmp$") (add-to-list 'recentf-exclude "/elpa/.*/*-autoloads.el$") diff --git a/ravi-init-ido.el b/ravi-init-ido.el index 7aec0ce..93af3e6 100644 --- a/ravi-init-ido.el +++ b/ravi-init-ido.el @@ -75,13 +75,13 @@ :config (progn (use-package ido-hacks - :init + :config (ido-hacks-mode 1) :ensure t ) (use-package flx-ido - :init + :config (progn (use-package flx :ensure t) @@ -94,13 +94,13 @@ (setq ido-create-new-buffer 'always) (use-package ido-ubiquitous - :init + :config (ido-ubiquitous-mode t) :ensure t ) (use-package ido-vertical-mode - :init + :config (ido-vertical-mode 1) :ensure t ) diff --git a/ravi-init-insertion.el b/ravi-init-insertion.el index 8ce47cb..65ff9db 100644 --- a/ravi-init-insertion.el +++ b/ravi-init-insertion.el @@ -34,10 +34,11 @@ `(,(ravi/emacs-file "snippets") yas-installed-snippets-dir) ) - (yas-global-mode 1) ) :config (progn + (yas-global-mode 1) + ;; No dropdowns (setq yas/prompt-functions '(yas/ido-prompt yas/completing-prompt)) diff --git a/ravi-init-marks.el b/ravi-init-marks.el index 4288b6b..803b2cb 100644 --- a/ravi-init-marks.el +++ b/ravi-init-marks.el @@ -69,7 +69,7 @@ This is the same as using \\[set-mark-command] with the prefix argument." (define-key global-map [remap exchange-point-and-mark] 'ravi/exchange-point-and-mark-no-activate) (use-package browse-kill-ring - :init (browse-kill-ring-default-keybindings) + :config (browse-kill-ring-default-keybindings) :ensure t :if (not ravi/use-helm-instead-of-ido) ) diff --git a/ravi-init-mu.el b/ravi-init-mu.el index 66b9631..b123da2 100644 --- a/ravi-init-mu.el +++ b/ravi-init-mu.el @@ -38,7 +38,7 @@ (when ravi/use-mu-for-email (use-package mu4e - :load-path ,(ravi/emacs-file "site-lisp/mu/mu4e") + :load-path (lambda () (ravi/emacs-file "site-lisp/mu/mu4e")) :commands mu4e :init (progn diff --git a/ravi-init-navigation.el b/ravi-init-navigation.el index 9a7da61..5a6054d 100644 --- a/ravi-init-navigation.el +++ b/ravi-init-navigation.el @@ -70,7 +70,6 @@ :config (progn (bind-key "C-=" 'er/expand-region)) - :idle (require 'expand-region) :ensure t ) @@ -80,7 +79,7 @@ ("C->" . mc/mark-next-like-this) ("C-<" . mc/mark-previous-like-this) ("C-c C-<" . mc/mark-all-like-this)) - :init + :config (progn (setq mc/list-file (ravi/emacs-file "past/mc-lists.el")) (bind-key "a" 'mc/mark-all-like-this region-bindings-mode-map) @@ -93,7 +92,7 @@ (use-package fold-this :commands fold-this - :init + :config (progn (bind-key "t" 'fold-this region-bindings-mode-map)) :ensure t @@ -101,7 +100,7 @@ (use-package indirect :commands indirect-region - :init + :config (progn (bind-key "I" 'indirect-region region-bindings-mode-map)) ) diff --git a/ravi-init-org.el b/ravi-init-org.el index e2ed68f..004d2f6 100644 --- a/ravi-init-org.el +++ b/ravi-init-org.el @@ -36,7 +36,7 @@ (use-package htmlize :ensure t) (use-package ox-reveal - :load-path ,(ravi/emacs-file "site-lisp/org-reveal") + :load-path (lambda () (ravi/emacs-file "site-lisp/org-reveal")) ) (setq org-src-fontify-natively t) (setq org-modules (quote (org-bbdb diff --git a/ravi-init-repl.el b/ravi-init-repl.el index c83dad3..8cc343b 100644 --- a/ravi-init-repl.el +++ b/ravi-init-repl.el @@ -35,7 +35,7 @@ (use-package octave-mod :mode ("\\.m\\'" . octave-mode) - :init + :config (progn (defun ravi/octave-shell-switch-to-shell () "Make sure that `inferior-octave-buffer' exists and is displayed." |