mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(bibtex-field-list): Use functionp.

Browse source 
(bibtex-make-field): Check that INIT is a string. Use functionp.
This commit is contained in:
Roland Winkler 2007-04-15 16:05:19 +00:00
parent a762d463bc
commit cbc0b7831f
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2007-04-15 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-field-list): Use functionp.
(bibtex-make-field): Check that INIT is a string. Use functionp.
2007-04-14 Glenn Morris <rgm@gnu.org>
* complete.el (PC-goto-end): New buffer-local variable.

18
lisp/textmodes/bibtex.el
View file

@ -2831,7 +2831,7 @@ and `bibtex-user-optional-fields'."
(push (list "key"
"Used for reference key creation if author and editor fields are missing"
(if (or (stringp bibtex-include-OPTkey)
(fboundp bibtex-include-OPTkey))
(functionp bibtex-include-OPTkey))
bibtex-include-OPTkey))
optional))
(if (member-ignore-case entry-type bibtex-include-OPTcrossref)
@ -3029,7 +3029,7 @@ If MOVE is non-nil, move point past the present field before making
the new field. If INTERACTIVE is non-nil, move point to the end of
the new field. Otherwise move point past the new field.
MOVE and INTERACTIVE are t when called interactively.
INIT is surrounded by delimiters, unless NODELIM is non-nil."
INIT is surrounded by field delimiters, unless NODELIM is non-nil."
(interactive
(list (let ((completion-ignore-case t)
(field-list (bibtex-field-list
@ -3059,14 +3059,12 @@ INIT is surrounded by delimiters, unless NODELIM is non-nil."
(indent-to-column (+ bibtex-entry-offset
bibtex-text-indentation)))
(let ((init (nth 2 field)))
(insert (if nodelim
""
(bibtex-field-left-delimiter))
(cond ((stringp init) init)
((fboundp init) (funcall init))
(t ""))
(if nodelim
""
(if (not init) (setq init "")
(if (functionp init) (setq init (funcall init)))
(unless (stringp init) (error "`%s' is not a string" init)))
;; NODELIM is required by `bibtex-insert-kill'
(if nodelim (insert init)
(insert (bibtex-field-left-delimiter) init
(bibtex-field-right-delimiter))))
(when interactive
;; (bibtex-find-text nil nil bibtex-help-message)