From: Nikolaj Schumacher <git@nschum.de>
Date: Wed, 6 Jan 2010 19:04:41 +0000 (+0100)
Subject: Added compatibility for CEDET in Emacs 23.2.
X-Git-Tag: 0.5~21
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/company-mode.git/commitdiff_plain/b2c434d62c9c7bcc408ddde51e3532d8b9d74013

Added compatibility for CEDET in Emacs 23.2.
---

diff --git a/company-semantic.el b/company-semantic.el
index 36a50d7..3fd7226 100644
--- a/company-semantic.el
+++ b/company-semantic.el
@@ -18,7 +18,8 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (require 'company)
-(require 'semantic-ia)
+(or (require 'semantic-ia nil t)
+    (require 'semantic/ia))
 (eval-when-compile (require 'cl))
 
 (defcustom company-semantic-metadata-function 'company-semantic-summary-and-doc
diff --git a/company.el b/company.el
index 714ac30..0e5b9a8 100644
--- a/company.el
+++ b/company.el
@@ -65,6 +65,8 @@
 ;;
 ;;; Change Log:
 ;;
+;;    Added compatibility for CEDET in Emacs 23.2.
+;;
 ;; 2009-05-07 (0.4.3)
 ;;    Added `company-other-backend'.
 ;;    Idle completion no longer interrupts multi-key command input.