Mercurial > emacs
changeset 77281:372e6a7ea660
(bibtex-include-OPTkey, bibtex-user-optional-fields)
(bibtex-entry-field-alist): Fix defcustom.
| author | Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> |
|---|---|
| date | Tue, 17 Apr 2007 03:24:26 +0000 |
| parents | 128de1e556af |
| children | 8cdcedfdee6b |
| files | lisp/textmodes/bibtex.el |
| diffstat | 1 files changed, 31 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/bibtex.el Tue Apr 17 02:41:18 2007 +0000 +++ b/lisp/textmodes/bibtex.el Tue Apr 17 03:24:26 2007 +0000 @@ -86,7 +86,7 @@ :group 'bibtex :type '(choice (const :tag "None" nil) (string :tag "Initial text") - (function :tag "Initialize Function" :value fun) + (function :tag "Initialize Function") (const :tag "Default" t))) (put 'bibtex-include-OPTkey 'risky-local-variable t) @@ -98,11 +98,8 @@ :group 'bibtex :type '(repeat (group (string :tag "Field") (string :tag "Comment") - (option (group :inline t - :extra-offset -4 - (choice :tag "Init" :value "" - string - function)))))) + (option (choice :tag "Init" + (const nil) string function))))) (put 'bibtex-user-optional-fields 'risky-local-variable t) (defcustom bibtex-entry-format @@ -454,45 +451,34 @@ field is an alternative. ALTERNATIVE-FLAG may be t only in the REQUIRED or CROSSREF-REQUIRED lists." :group 'bibtex - :type '(repeat (list (string :tag "Entry name") - (list (repeat :tag "required" - (group (string :tag "Field") - (string :tag "Comment") - (option (choice :tag "Init" :value nil - (const nil) - (string :tag "string") - (function :tag "function"))) - (option (choice (const nil) - (const :tag "Alternative" t))))) - (repeat :tag "optional" - (group (string :tag "Field") - (string :tag "Comment") - (option (choice :tag "Init" :value nil - (const nil) - (string :tag "string") - (function :tag "function"))) - (option (choice (const nil) - (const :tag "Alternative" t)))))) - (option - (list :tag "Crossref" - (repeat :tag "required" - (group (string :tag "Field") - (string :tag "Comment") - (option (choice :tag "Init" :value nil - (const nil) - (string :tag "string") - (function :tag "function"))) - (option (choice (const nil) - (const :tag "Alternative" t))))) - (repeat :tag "optional" - (group (string :tag "Field") - (string :tag "Comment") - (option (choice :tag "Init" :value nil - (const nil) - (string :tag "string") - (function :tag "function"))) - (option (choice (const nil) - (const :tag "Alternative" t)))))))))) + :type '(repeat (group (string :tag "Entry name") + (group (repeat :tag "Required fields" + (group (string :tag "Field") + (string :tag "Comment") + (option (choice :tag "Init" :value nil + (const nil) string function)) + (option (choice :tag "Alternative" + (const :tag "No" nil) + (const :tag "Yes" t))))) + (repeat :tag "Optional fields" + (group (string :tag "Field") + (string :tag "Comment") + (option (choice :tag "Init" :value nil + (const nil) string function))))) + (option :extra-offset -4 + (group (repeat :tag "Crossref: required fields" + (group (string :tag "Field") + (string :tag "Comment") + (option (choice :tag "Init" :value nil + (const nil) string function)) + (option (choice :tag "Alternative" + (const :tag "No" nil) + (const :tag "Yes" t))))) + (repeat :tag "Crossref: optional fields" + (group (string :tag "Field") + (string :tag "Comment") + (option (choice :tag "Init" :value nil + (const nil) string function))))))))) (put 'bibtex-entry-field-alist 'risky-local-variable t) (defcustom bibtex-comment-start "@Comment"