Merge branch 'maint'

lisp/org-bibtex.el

@@ -386,7 +386,9 @@ and `org-exclude-tags-from-inheritence'."
 	    (bibtex-beginning-of-entry)
 	    (if (re-search-forward "keywords.*=.*{\\(.*\\)}" nil t)
 		(progn (goto-char (match-end 1)) (insert ", "))
-	      (ignore-errors (bibtex-make-field "keywords" t t)))
+	      (progn (re-search-forward ",\\(\n\\)" nil t) 
+		     (insert "  keywords={},\n"))
+	      (re-search-backward "}," nil t))
 	    (insert (mapconcat #'identity tags ", ")))
 	  (buffer-string))))))