;;
;; Copyright (C) 2009 Nikolaj Schumacher
;;
-;; This file is part of company 0.2.1.
+;; This file is part of company 0.4.3.
;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License
:type '(choice (const :tag "off" nil)
(const :tag "on" t)))
-(defvar company-etags-symbol-regexp
- "\\_<[A-Za-z_][A-Za-z_0-9]*\\_>")
-
(defvar company-etags-modes '(c-mode objc-mode c++-mode java-mode jde-mode
pascal-mode perl-mode python-mode))
(make-variable-buffer-local 'company-etags-buffer-table)
(defun company-etags-find-table ()
- (let ((dir (if buffer-file-name
- (file-name-directory buffer-file-name)
- (expand-file-name default-directory)))
- file)
- (while (not (or file (equal dir "/")))
- (unless (file-exists-p (setq file (expand-file-name "TAGS" dir)))
- (setq file nil
- dir (file-name-directory (directory-file-name dir)))))
+ (let ((file (company-locate-dominating-file (or buffer-file-name
+ default-directory)
+ "TAGS")))
(when file
- (list file))))
+ (list (expand-file-name file)))))
(defun company-etags-buffer-table ()
(or (and company-etags-use-main-table-list tags-table-list)
(not (company-in-string-or-comment))
(require 'etags nil t)
(company-etags-buffer-table)
- (or (company-grab company-etags-symbol-regexp) "")))
+ (or (company-grab-symbol) 'stop)))
('candidates (let ((tags-table-list (company-etags-buffer-table))
(completion-ignore-case nil))
- (and (fboundp 'tags-completion-table)
+ (and (or tags-file-name tags-table-list)
+ (fboundp 'tags-completion-table)
+ tags-table-list
(all-completions arg (tags-completion-table)))))
('location (let ((tags-table-list (company-etags-buffer-table)))
(when (fboundp 'find-tag-noselect)
(cons buffer (with-current-buffer buffer (point)))))))
('sorted t)))
-(add-to-list 'company-backends 'company-etags)
-
(provide 'company-etags)
;;; company-etags.el ends here
-
-