[nongnu] elpa/tablist 7cd9360 27/60: Merge branch 'master' into options

[Philip Kaludercic]

branch: elpa/tablist
commit 7cd9360cbc2355961772da97ff391e210b2254db
Merge: c78eccd 7380227
Author: oscar <oscar@qcore>
Commit: oscar <oscar@qcore>

    Merge branch 'master' into options
    
    Conflicts:
        lisp/pdf-info.el
        server/epdfinfo.c
        server/epdfinfo.h
---
 tablist-filter.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tablist-filter.el b/tablist-filter.el
index a401a2b..6a6f058 100644
--- a/tablist-filter.el
+++ b/tablist-filter.el
@@ -22,11 +22,15 @@
 
 ;;
 
+(let (python-mode-hook)
 (require 'semantic/wisent/comp)
-(require 'semantic/wisent/wisent)
+(require 'semantic/wisent/wisent))
 
 ;;; Code:
 
+(defvar wisent-eoi-term)
+(declare-function wisent-parse "semantic/wisent/wisent.el")
+
 (defvar tablist-filter-binary-operator
   '((== . tablist-filter-op-equal)
     (=~ . tablist-filter-op-regexp)
@@ -102,7 +106,7 @@
   (when interactive
     (message "Parser reinitialized."))
   nil)
-    
+
 (defun tablist-filter-wisent-lexer ()
   (cl-destructuring-bind (unary-op binary-op keywords)
       tablist-filter-lexer-regexps