aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-05-23 20:45:50 -0700
committerGlenn Morris2013-05-23 20:45:50 -0700
commitb8e57bf420cdbde4a4e87f420f2e8e90b16c5d13 (patch)
treea237bc5acae0ab51a7fad6d431ef35a25035faef
parentdb785726ccd9d3788c5c0ae70c59ea67d3a64447 (diff)
downloademacs-b8e57bf420cdbde4a4e87f420f2e8e90b16c5d13.tar.gz
emacs-b8e57bf420cdbde4a4e87f420f2e8e90b16c5d13.zip
Silence sym-comp compilation
* obsolete/sym-comp.el: No need to load hipper-exp when compiling. (he-search-string, he-tried-table, he-expand-list) (he-init-string, he-string-member, he-substitute-string) (he-reset-string): Declare.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/obsolete/sym-comp.el8
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee17699eb40..6a094692240 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12013-05-24 Glenn Morris <rgm@gnu.org> 12013-05-24 Glenn Morris <rgm@gnu.org>
2 2
3 * obsolete/sym-comp.el: No need to load hipper-exp when compiling.
4 (he-search-string, he-tried-table, he-expand-list)
5 (he-init-string, he-string-member, he-substitute-string)
6 (he-reset-string): Declare.
7
3 * obsolete/options.el (list-options): Use custom-variable-p, 8 * obsolete/options.el (list-options): Use custom-variable-p,
4 rather than obsolete alias. 9 rather than obsolete alias.
5 10
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index 85d427a3317..4641ca68544 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -148,7 +148,13 @@ to be set buffer-locally. Variables `symbol-completion-symbol-function',
148 (completion-in-region (- (point) (length pattern)) (point) 148 (completion-in-region (- (point) (length pattern)) (point)
149 completions predicate))) 149 completions predicate)))
150 150
151(eval-when-compile (require 'hippie-exp)) 151(defvar he-search-string)
152(defvar he-tried-table)
153(defvar he-expand-list)
154(declare-function he-init-string "hippie-exp" (beg end))
155(declare-function he-string-member "hippie-exp" (str lst &optional trans-case))
156(declare-function he-substitute-string "hippie-exp" (str &optional trans-case))
157(declare-function he-reset-string "hippie-exp" ())
152 158
153;;;###autoload 159;;;###autoload
154(defun symbol-completion-try-complete (old) 160(defun symbol-completion-try-complete (old)