equal
deleted
inserted
replaced
1143 |
1143 |
1144 (defun my/company-text-setup () |
1144 (defun my/company-text-setup () |
1145 (setq-local company-backends '((company-dabbrev company-files))) |
1145 (setq-local company-backends '((company-dabbrev company-files))) |
1146 (company-mode 1)) |
1146 (company-mode 1)) |
1147 |
1147 |
1148 (defun my/company-code-setup () |
|
1149 (setq-local company-dabbrev-code-other-buffers 'code) |
|
1150 (setq-local company-backends '((company-capf company-dabbrev-code company-files))) |
|
1151 (company-mode 1)) |
|
1152 |
|
1153 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1148 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1154 (message "bookmark") |
1149 (message "bookmark") |
1155 |
1150 |
1156 ;; (require 'autobm) |
1151 ;; (require 'autobm) |
1157 (global-set-key (kbd "C-x r m") 'autobm) |
1152 (global-set-key (kbd "C-x r m") 'autobm) |
1478 '(rst-level-3-face ((t (:background "yellow"))) t) |
1473 '(rst-level-3-face ((t (:background "yellow"))) t) |
1479 '(rst-level-4-face ((t (:background "yellow"))) t) |
1474 '(rst-level-4-face ((t (:background "yellow"))) t) |
1480 '(rst-level-5-face ((t (:background "yellow"))) t) |
1475 '(rst-level-5-face ((t (:background "yellow"))) t) |
1481 '(rst-level-6face ((t (:background "yellow"))) t) |
1476 '(rst-level-6face ((t (:background "yellow"))) t) |
1482 ) ) ) |
1477 ) ) ) |
|
1478 |
|
1479 (when (featurep 'company) |
|
1480 (add-hook 'rst-mode-hook #'my/company-text-setup)) |
1483 |
1481 |
1484 ;; (add-hook 'rst-mode-hook #'abbrev-mode) |
1482 ;; (add-hook 'rst-mode-hook #'abbrev-mode) |
1485 ;; (remove-hook 'rst-mode-hook #'abbrev-mode) |
1483 ;; (remove-hook 'rst-mode-hook #'abbrev-mode) |
1486 |
1484 |
1487 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1485 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2361 (append my-devel-mode-hook-list my-text-mode-hook-list)) |
2359 (append my-devel-mode-hook-list my-text-mode-hook-list)) |
2362 |
2360 |
2363 (mapc (lambda (mode) (add-hook (my-mode2hook mode) #'hs-minor-mode)) |
2361 (mapc (lambda (mode) (add-hook (my-mode2hook mode) #'hs-minor-mode)) |
2364 '(c-mode c++-mode java-mode js-mode lisp-mode emacs-lisp-mode)) |
2362 '(c-mode c++-mode java-mode js-mode lisp-mode emacs-lisp-mode)) |
2365 |
2363 |
|
2364 (defun my/company-prog-mode-setup () |
|
2365 (setq-local company-dabbrev-code-other-buffers 'code) |
|
2366 (setq-local company-backends '((company-capf company-dabbrev-code company-files))) |
|
2367 (company-mode 1)) |
|
2368 |
2366 (when (featurep 'company) |
2369 (when (featurep 'company) |
2367 (add-hook 'prog-mode-hook #'my/company-code-setup)) |
2370 (add-hook 'prog-mode-hook #'my/company-prog-mode-setup)) |
2368 |
2371 |
2369 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2372 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2370 (message "diff, patch, ediff, emerge") |
2373 (message "diff, patch, ediff, emerge") |
2371 |
2374 |
2372 (eval-when 'compile (require 'ediff)) |
2375 (eval-when 'compile (require 'ediff)) |