From f2badf30beb5fd8a758574cddd3a2f7cc7159080 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 27 Aug 2013 13:07:22 +0100 Subject: Emacs: Fix control key issue on OSX --- emacs/init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index 337d663..0a22073 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -476,9 +476,9 @@ Values: `desktop', `server', `laptop'") (set-keyboard-coding-system nil) (setq mac-option-modifier 'meta mac-right-option-modifier 'left - mac-control-modifier 'control + mac-control-modifier 'super mac-right-control-modifier 'left - mac-command-modifier 'super + mac-command-modifier 'control mac-right-command-modifier 'left mac-function-modifier 'hyper)) -- cgit 1.4.1 From 9719bca673b354a1dbd495afb55c5dec74482a51 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 27 Aug 2013 13:08:22 +0100 Subject: Emacs: unbind unhelpful s-n key --- emacs/init.el | 6 ------ 1 file changed, 6 deletions(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index 0a22073..e07ef0b 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -498,13 +498,7 @@ Values: `desktop', `server', `laptop'") (bind-key "C-c i" #'ucs-insert) -(unbind-key "s-h") (unbind-key "s-n") -(unbind-key "s-p") -(unbind-key "s-w") -(unbind-key "s-m") - -(bind-key "s-x" (define-prefix-command 'super-x-map)) (set-register ?e `(file . ,*init-file*)) -- cgit 1.4.1 From 6e26c674b93629c3d1cfeb79d6c6f2268510a420 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 27 Aug 2013 13:09:35 +0100 Subject: Emacs: add extra keybinding for projectile-find-file --- emacs/init.el | 2 ++ 1 file changed, 2 insertions(+) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index e07ef0b..dd73f19 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -500,6 +500,8 @@ Values: `desktop', `server', `laptop'") (unbind-key "s-n") +(bind-key "s-x" (define-prefix-command 'super-x-map)) + (set-register ?e `(file . ,*init-file*)) ;; Enable narrowing functions C-x n -- cgit 1.4.1 From 17147f0bb602a34f7b1cb669718813339fa21400 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 28 Aug 2013 09:00:11 +0100 Subject: Emacs: Switch control and command on OSX --- emacs/init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index dd73f19..b70f90b 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -476,9 +476,9 @@ Values: `desktop', `server', `laptop'") (set-keyboard-coding-system nil) (setq mac-option-modifier 'meta mac-right-option-modifier 'left - mac-control-modifier 'super + mac-control-modifier 'control mac-right-control-modifier 'left - mac-command-modifier 'control + mac-command-modifier 'super mac-right-command-modifier 'left mac-function-modifier 'hyper)) -- cgit 1.4.1 From 07522b7ea7a158949cb24ecce2ebcf3084fe5b67 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 28 Aug 2013 16:33:18 +0100 Subject: Emacs: Unbind more unhelpful Mac keybindings --- emacs/init.el | 3 +++ 1 file changed, 3 insertions(+) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index b70f90b..b959702 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -498,7 +498,10 @@ Values: `desktop', `server', `laptop'") (bind-key "C-c i" #'ucs-insert) +(unbind-key "s-h") (unbind-key "s-n") +(unbind-key "s-p") +(unbind-key "s-w") (bind-key "s-x" (define-prefix-command 'super-x-map)) -- cgit 1.4.1 From c12b575f04d653d12edfc9188a70f709607a30c3 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 9 Sep 2013 13:46:37 +0100 Subject: Emacs: set company completion to only happen after inserting text --- emacs/init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index b959702..620c5b3 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -311,7 +311,8 @@ Values: `desktop', `server', `laptop'") :bind (("C-" . company-complete)) :init (progn (add-hook 'prog-mode-hook #'company-mode) - (setq company-idle-delay .3))) + (setq company-idle-delay .3 + company-begin-commands '(self-insert-command)))) ;;;; Dates & Times -- cgit 1.4.1 From ff9984e5698068e56a38cd3193231adc8d296e37 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 9 Sep 2013 13:49:21 +0100 Subject: Emacs: rebind M-/ to hippie-expand --- emacs/init.el | 1 + 1 file changed, 1 insertion(+) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index 620c5b3..191545c 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -498,6 +498,7 @@ Values: `desktop', `server', `laptop'") (unbind-key "C-x C-c") (bind-key "C-c i" #'ucs-insert) +(bind-key "M-/" #'hippie-expand) (unbind-key "s-h") (unbind-key "s-n") -- cgit 1.4.1 From 8be7aa09302953dd74aff58b6a9ca141efa8b693 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 9 Sep 2013 14:13:28 +0100 Subject: Emacs: Remove configuration for nxhtml mode --- emacs/init.el | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'emacs') diff --git a/emacs/init.el b/emacs/init.el index 191545c..c26f3e2 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1140,20 +1140,6 @@ Works with: arglist-cont-nonempty, arglist-close." :ensure t :mode (("\\.j2\\'" . jinja2-mode))) -(use-package nxhtml-mode - :defer t - :if (eq env/system-type 'laptop) - :load-path "nxhtml" - :config (progn - (when (and (equal emacs-major-version 24) - (> emacs-minor-version 1)) - (setq mumamo-per-buffer-local-vars - (delq 'buffer-file-name mumamo-per-buffer-local-vars))) - (setq mumamo-chunk-coloring 4 - nxhtml-skip-welcome t - nxhtml-autoload-web nil) - (nxhtml-menu-mode -1))) - (use-package php-mode :mode ("\\.php\\'" . php-mode) :config (progn -- cgit 1.4.1