* lisp/textmodes/bibtex.el (bibtex-fill-field-bounds, bibtex-fill-entry):

Avoid open-line which runs post-self-insert-hook.
(bibtex-fill-entry): Remove unused `end' var.

2 files changed, 11 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 460c62ca23e..bc635487254 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,18 @@
+2011-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/bibtex.el (bibtex-fill-field-bounds, bibtex-fill-entry):
+        Avoid open-line which runs post-self-insert-hook.
+        (bibtex-fill-entry): Remove unused `end' var.
+
 2011-05-03  Dirk Ullrich  <dirk.ullrich@googlemail.com>  (tiny change)
 
-        * textmodes/ispell.el (ispell-add-per-file-word-list):
-        Protect against `nil' value of `comment-start' (Bug#8579).
+        * textmodes/ispell.el (ispell-add-per-file-word-list):
+        Protect against `nil' value of `comment-start' (Bug#8579).
 
 2011-05-03  Leo Liu  <sdl.web@gmail.com>
 
         * isearch.el (isearch-yank-pop): New command.
-        (isearch-mode-map): bind it to `M-y'.
+        (isearch-mode-map): Bind it to `M-y'.
         (isearch-forward): Mention it.
 
 2011-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 2d2c0380a4a..e49d7549776 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -4313,8 +4313,7 @@ If optional arg MOVE is non-nil move point to end of field."
       (goto-char (bibtex-start-of-field bounds))
       (forward-char) ; leading comma
       (bibtex-delete-whitespace)
-      (open-line 1)
-      (forward-char)
+      (insert "\n")
       (indent-to-column (+ bibtex-entry-offset
                            bibtex-field-indentation))
       (re-search-forward "[ \t\n]*=" end-field)
@@ -4352,7 +4351,6 @@ column `bibtex-text-indentation' and continuation lines start here, too.
 If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too."
   (interactive "*")
   (let ((pnt (copy-marker (point)))
-        (end (copy-marker (bibtex-end-of-entry)))
         (beg (bibtex-beginning-of-entry)) ; move point
         bounds)
     (bibtex-delete-whitespace)
@@ -4364,8 +4362,7 @@ If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too."
         (forward-char))
     (skip-chars-backward " \t\n")
     (bibtex-delete-whitespace)
-    (open-line 1)
-    (forward-char)
+    (insert "\n")
     (indent-to-column bibtex-entry-offset)
     (goto-char pnt)))