X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/77ab81d0545e980c57c0a35510ade29a9e43b4cd..83d208a5dd293caae48beb9d36dd45529375631a:/lisp/textmodes/reftex-auc.el diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 4f3cc69d58..ce69a64f4c 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,12 +1,9 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org -;; Version: 4.31 -;; Package: reftex ;; This file is part of GNU Emacs. @@ -28,21 +25,21 @@ ;;; Code: (eval-when-compile (require 'cl)) -(provide 'reftex-auc) + (require 'reftex) -;;; - -(declare-function TeX-argument-insert "ext:tex" (name optional &optional prefix)) -(declare-function TeX-argument-prompt "ext:tex" (optional prompt default &optional complete)) -(declare-function multi-prompt "ext:multi-prompt" - (separator - unique prompt table - &optional mp-predicate require-match initial history)) -(declare-function LaTeX-add-index-entries "ext:tex" (&rest entries) t) + +(declare-function TeX-argument-prompt "ext:tex" + (optional prompt default &optional complete)) +(declare-function TeX-argument-insert "ext:tex" + (name optional &optional prefix)) (declare-function LaTeX-add-labels "ext:tex" (&rest entries) t) +(declare-function LaTeX-add-index-entries "ext:tex" (&rest entries) t) (declare-function LaTeX-bibitem-list "ext:tex" () t) (declare-function LaTeX-index-entry-list "ext:tex" () t) (declare-function LaTeX-label-list "ext:tex" () t) +(declare-function multi-prompt "ext:multi-prompt" + (separator unique prompt table &optional + mp-predicate require-match initial history)) (defun reftex-plug-flag (which) ;; Tell if a certain flag is set in reftex-plug-into-AUCTeX @@ -77,14 +74,15 @@ What is being used depends upon `reftex-plug-into-AUCTeX'." (let (items) (cond ((and (not definition) (reftex-plug-flag 3)) - (setq items (list (or (reftex-citation t) "")))) + (setq items (or (reftex-citation t) (list "")))) (t (setq prompt (concat (if optional "(Optional) " "") (if prompt prompt "Add key") " (default none): ")) (setq items (multi-prompt "," t prompt (LaTeX-bibitem-list))))) (apply 'LaTeX-add-bibitems items) - (TeX-argument-insert (mapconcat 'identity items ",") optional))) + (TeX-argument-insert (mapconcat 'identity items reftex-cite-key-separator) + optional))) (defun reftex-arg-index-tag (optional &optional prompt &rest args) @@ -224,5 +222,6 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See (defun reftex-notice-new-section () (reftex-notice-new 1 'force)) -;; arch-tag: 4a798e68-3405-421c-a09b-0269aac64ab4 +(provide 'reftex-auc) + ;;; reftex-auc.el ends here