[Emacs-diffs] Changes to emacs/lisp/textmodes/bibtex.el

[Richard M . Stallman]

Index: emacs/lisp/textmodes/bibtex.el
diff -c emacs/lisp/textmodes/bibtex.el:1.86 emacs/lisp/textmodes/bibtex.el:1.87
*** emacs/lisp/textmodes/bibtex.el:1.86 Sun Oct 31 22:25:33 2004
--- emacs/lisp/textmodes/bibtex.el      Mon Nov  1 07:35:47 2004
***************
*** 3007,3018 ****
            (message (nth 1 comment))
          (message "No comment available")))))
  
! (defun bibtex-make-field (field &optional called-by-yank)
    "Make a field named FIELD in current BibTeX entry.
  FIELD is either a string or a list of the form
  \(FIELD-NAME COMMENT-STRING INIT ALTERNATIVE-FLAG) as in
  `bibtex-entry-field-alist'.
! If CALLED-BY-YANK is non-nil, don't insert delimiters."
    (interactive
     (list (let ((completion-ignore-case t)
                 (field-list (bibtex-field-list
--- 3007,3019 ----
            (message (nth 1 comment))
          (message "No comment available")))))
  
! (defun bibtex-make-field (field &optional called-by-yank interactive)
    "Make a field named FIELD in current BibTeX entry.
  FIELD is either a string or a list of the form
  \(FIELD-NAME COMMENT-STRING INIT ALTERNATIVE-FLAG) as in
  `bibtex-entry-field-alist'.
! If CALLED-BY-YANK is non-nil, don't insert delimiters.
! In that case, or when called interactively, also don't do (WHAT?)."
    (interactive
     (list (let ((completion-ignore-case t)
                 (field-list (bibtex-field-list
***************
*** 3021,3030 ****
                                (bibtex-type-in-head)))))
             (completing-read "BibTeX field name: "
                              (append (car field-list) (cdr field-list))
!                             nil nil nil bibtex-field-history))))
    (unless (consp field)
      (setq field (list field)))
!   (if (or (interactive-p) called-by-yank)
        (let (bibtex-help-message)
          (bibtex-find-text nil t t)
          (if (looking-at "[}\"]")
--- 3022,3032 ----
                                (bibtex-type-in-head)))))
             (completing-read "BibTeX field name: "
                              (append (car field-list) (cdr field-list))
!                             nil nil nil bibtex-field-history))
!        t))
    (unless (consp field)
      (setq field (list field)))
!   (if (or interactive called-by-yank)
        (let (bibtex-help-message)
          (bibtex-find-text nil t t)
          (if (looking-at "[}\"]")
***************
*** 3047,3053 ****
            ((fboundp init)
             (insert (funcall init)))))
    (unless called-by-yank (insert (bibtex-field-right-delimiter)))
!   (when (interactive-p)
      (forward-char -1)
      (bibtex-print-help-message)))
  
--- 3049,3055 ----
            ((fboundp init)
             (insert (funcall init)))))
    (unless called-by-yank (insert (bibtex-field-right-delimiter)))
!   (when interactivw
      (forward-char -1)
      (bibtex-print-help-message)))
  
***************
*** 3610,3619 ****
  
  (defun bibtex-find-text (arg &optional as-if-interactive no-error)
    "Go to end of text of current field; with ARG, go to beginning."
!   (interactive "P")
    (bibtex-inside-field)
!   (let ((bounds (bibtex-enclosing-field (or (interactive-p)
!                                             as-if-interactive))))
      (if bounds
          (progn (if arg
                     (progn (goto-char (bibtex-start-of-text-in-field bounds))
--- 3612,3620 ----
  
  (defun bibtex-find-text (arg &optional as-if-interactive no-error)
    "Go to end of text of current field; with ARG, go to beginning."
!   (interactive "P\np")
    (bibtex-inside-field)
!   (let ((bounds (bibtex-enclosing-field as-if-interactive)))
      (if bounds
          (progn (if arg
                     (progn (goto-char (bibtex-start-of-text-in-field bounds))