--- a/.emacs-my	Thu Jan 26 20:54:44 2017 +0200
+++ b/.emacs-my	Thu Jan 26 21:09:42 2017 +0200
@@ -1145,11 +1145,6 @@
   (setq-local company-backends '((company-dabbrev company-files)))
   (company-mode 1))
 
-(defun my/company-code-setup ()
-  (setq-local company-dabbrev-code-other-buffers 'code)
-  (setq-local company-backends '((company-capf company-dabbrev-code company-files)))
-  (company-mode 1))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "bookmark")
 
@@ -1481,6 +1476,9 @@
      '(rst-level-6face ((t (:background "yellow"))) t)
      ) ) )
 
+(when (featurep 'company)
+  (add-hook 'rst-mode-hook #'my/company-text-setup))
+
 ;; (add-hook 'rst-mode-hook #'abbrev-mode)
 ;; (remove-hook 'rst-mode-hook #'abbrev-mode)
 
@@ -2363,8 +2361,13 @@
 (mapc (lambda (mode) (add-hook (my-mode2hook mode) #'hs-minor-mode))
       '(c-mode c++-mode java-mode js-mode lisp-mode emacs-lisp-mode))
 
+(defun my/company-prog-mode-setup ()
+  (setq-local company-dabbrev-code-other-buffers 'code)
+  (setq-local company-backends '((company-capf company-dabbrev-code company-files)))
+  (company-mode 1))
+
 (when (featurep 'company)
-  (add-hook 'prog-mode-hook #'my/company-code-setup))
+  (add-hook 'prog-mode-hook #'my/company-prog-mode-setup))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "diff, patch, ediff, emerge")