Sync to HEAD

[bpt/emacs.git] / lisp / textmodes / bibtex.el

diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 141d123..82b15cf 100644 (file)
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1656,16 +1656,15 @@ are defined, but only for the head part of the entry
   "Make sure point is outside of a BibTeX entry."
   (let ((orig-point (point)))
     (bibtex-end-of-entry)
-    (when (<= (point) orig-point)
+    (when (< (point) orig-point)
       ;; We moved backward, so we weren't inside an entry to begin with.
       ;; Leave point at the beginning of a line, and preferably
       ;; at the beginning of a paragraph.
       (goto-char orig-point)
       (beginning-of-line 1)
-      (let ((cb (char-before (1- (point)))))
-        (unless (and cb (= ?\n cb))
-          (re-search-forward "^[ \t]*[@\n]" nil 'move)
-          (backward-char 1))))
+      (unless (= ?\n (char-before (1- (point))))
+        (re-search-forward "^[ \t]*[@\n]" nil 'move)
+        (backward-char 1)))
     (skip-chars-forward " \t\n")))
 
 (defun bibtex-beginning-of-first-entry ()
@@ -3891,4 +3890,5 @@ is outside key or BibTeX field."
 
 (provide 'bibtex)
 
+;;; arch-tag: ee2be3af-caad-427f-b42a-d20fad630d04
 ;;; bibtex.el ends here