monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 22c9eed33bebf72991c46c36193ec180f91eb7b1
Author: Tassilo Horn <[email protected]>
Date: Mon Feb 18 14:56:11 2013 +0000
* tex.el (require): Require crm.
* multi-prompt.el (multi-prompt-key-value): Don't require crm here
because it has already been required in tex.el.
---
ChangeLog | 7 +++++++
multi-prompt.el | 1 -
tex.el | 9 +++++++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1cd198c..0aacfc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-18 Tassilo Horn <[email protected]>
+
+ * tex.el (require): Require crm.
+
+ * multi-prompt.el (multi-prompt-key-value): Don't require crm here
+ because it has already been required in tex.el.
+
2013-02-16 Mos� Giordano <[email protected]>
* style/biblatex.el ("biblatex"): Add hooks for loaded packages.
diff --git a/multi-prompt.el b/multi-prompt.el
index 159380f..20edffa 100644
--- a/multi-prompt.el
+++ b/multi-prompt.el
@@ -200,7 +200,6 @@ other arguments: PREDICATE, REQUIRE-MATCH, INITIAL-INPUT,
HIST,
DEF, and INHERIT-INPUT-METHOD.
The return value is the string as entered in the minibuffer."
- (require 'crm)
(let* ((minibuffer-completion-table #'multi-prompt-key-value-collection-fn)
(minibuffer-completion-predicate predicate)
(minibuffer-completion-confirm
diff --git a/tex.el b/tex.el
index 2ac5e3e..dc2db52 100644
--- a/tex.el
+++ b/tex.el
@@ -669,6 +669,15 @@ overlays."
(+ (/ (- outer-priority inner-priority) 2) inner-priority))
(t TeX-overlay-priority-step)))) )
+;; require crm here, because we often do
+;;
+;; (let ((crm-separator ","))
+;; (TeX-completing-read-multiple ...))
+;;
+;; which results in a void-variable error if crm hasn't been loaded before.
+(unless (require 'crm nil t)
+ (error "AUCTeX requires crm.el which is included in Emacs and
+edit-utils >= 2.32 for XEmacs."))
(if (fboundp 'completing-read-multiple)
(defalias 'TeX-completing-read-multiple 'completing-read-multiple)
