equal
deleted
inserted
replaced
1123 (defun my/company-filter-out-numbers (lst) |
1123 (defun my/company-filter-out-numbers (lst) |
1124 (cl-remove-if (lambda (str) (string-match-p "^[0-9]" str)) lst)) |
1124 (cl-remove-if (lambda (str) (string-match-p "^[0-9]" str)) lst)) |
1125 |
1125 |
1126 (when (featurep 'company) |
1126 (when (featurep 'company) |
1127 (push #'my/company-filter-out-numbers company-transformers)) |
1127 (push #'my/company-filter-out-numbers company-transformers)) |
|
1128 |
|
1129 (defun company-executable (command &optional arg &rest ignored) |
|
1130 "Company completion for executable in PATH." |
|
1131 (interactive (list 'interactive)) |
|
1132 (cl-case command |
|
1133 (interactive (company-begin-backend 'company-executable)) |
|
1134 (prefix (thing-at-point 'filename)) |
|
1135 (candidates (locate-file-completion-table exec-path exec-suffixes (thing-at-point 'filename) 'identity t)))) |
|
1136 |
|
1137 (defun my/company-text-setup () |
|
1138 (setq-local company-backends '((company-dabbrev company-files))) |
|
1139 (company-mode 1)) |
|
1140 |
|
1141 (defun my/company-code-setup () |
|
1142 (setq-local company-dabbrev-code-other-buffers 'code) |
|
1143 (setq-local company-backends '((company-capf company-dabbrev-code company-files))) |
|
1144 (company-mode 1)) |
1128 |
1145 |
1129 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1146 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1130 (message "bookmark") |
1147 (message "bookmark") |
1131 |
1148 |
1132 ;; (require 'autobm) |
1149 ;; (require 'autobm) |
2337 (append my-devel-mode-hook-list my-text-mode-hook-list)) |
2354 (append my-devel-mode-hook-list my-text-mode-hook-list)) |
2338 |
2355 |
2339 (mapc (lambda (mode) (add-hook (my-mode2hook mode) #'hs-minor-mode)) |
2356 (mapc (lambda (mode) (add-hook (my-mode2hook mode) #'hs-minor-mode)) |
2340 '(c-mode c++-mode java-mode js-mode lisp-mode emacs-lisp-mode)) |
2357 '(c-mode c++-mode java-mode js-mode lisp-mode emacs-lisp-mode)) |
2341 |
2358 |
|
2359 (when (featurep 'company) |
|
2360 (add-hook 'prog-mode-hook #'my/company-code-setup)) |
|
2361 |
2342 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2362 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2343 (message "diff, patch, ediff, emerge") |
2363 (message "diff, patch, ediff, emerge") |
2344 |
2364 |
2345 (eval-when 'compile (require 'ediff)) |
2365 (eval-when 'compile (require 'ediff)) |
2346 |
2366 |
2700 |
2720 |
2701 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2721 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2702 (message "makefile, make") |
2722 (message "makefile, make") |
2703 |
2723 |
2704 (add-to-list 'auto-mode-alist '("\\(Makefile\\|Makefile\\..+\\)\\'" . makefile-gmake-mode) t) |
2724 (add-to-list 'auto-mode-alist '("\\(Makefile\\|Makefile\\..+\\)\\'" . makefile-gmake-mode) t) |
|
2725 |
|
2726 (defun my/makefile-setup () |
|
2727 (add-hook 'completion-at-point-functions 'comint-filename-completion nil t)) |
|
2728 |
|
2729 (add-hook 'makefile-mode-hook #'my/makefile-setup) |
|
2730 |
|
2731 (defun my/makefile-company-setup () |
|
2732 "Limit search for symbols to Makefiles." |
|
2733 (setq-local company-dabbrev-code-other-buffers t) |
|
2734 (setq-local company-backends '((company-capf company-dabbrev-code company-files company-executable))) |
|
2735 (company-mode 1)) |
|
2736 |
|
2737 (when (featurep 'company) |
|
2738 (add-hook 'makefile-mode-hook #'my/makefile-company-setup)) |
2705 |
2739 |
2706 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2740 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2707 (message "asm, assembler") |
2741 (message "asm, assembler") |
2708 |
2742 |
2709 ;; (setq-default asm-comment-char 59) |
2743 ;; (setq-default asm-comment-char 59) |
3371 (setq sh-basic-offset 2) |
3405 (setq sh-basic-offset 2) |
3372 |
3406 |
3373 (add-to-list 'auto-mode-alist '("\\.cygport\\'" . shell-script-mode)) |
3407 (add-to-list 'auto-mode-alist '("\\.cygport\\'" . shell-script-mode)) |
3374 |
3408 |
3375 (defun my/sh-company-setup () |
3409 (defun my/sh-company-setup () |
3376 (make-local-variable 'company-backends) |
3410 (setq-local company-backends '((company-capf company-files company-dabbrev-code))) |
3377 (setq company-backends '((company-capf company-files company-dabbrev-code))) |
3411 (setq-local company-dabbrev-code-other-buffers t) |
3378 (make-local-variable 'company-dabbrev-code-other-buffers) |
|
3379 (setq company-dabbrev-code-other-buffers t) |
|
3380 (company-mode 1)) |
3412 (company-mode 1)) |
3381 |
3413 |
3382 (when (featurep 'company) |
3414 (when (featurep 'company) |
3383 (add-hook 'sh-mode-hook #'my/sh-company-setup)) |
3415 (add-hook 'sh-mode-hook #'my/sh-company-setup)) |
3384 |
3416 |