Merge changes from emacs-23 branch

[gnu-emacs] / lisp / textmodes / bibtex-style.el

diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 6f67d11d78e6138cc95faddab3c2933bb825d504..831d4e8667607fba53af61bc194cea97505a31a3 100644 (file)
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -1,9 +1,9 @@
 ;;; bibtex-style.el --- Major mode for BibTeX Style files
 
-;; Copyright (C) 2005, 2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2011  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: 
+;; Keywords: tex
 
 ;; This file is part of GNU Emacs.
 
@@ -63,8 +63,6 @@
     ("\\<\\(FUNCTION\\|MACRO\\)\\s-+{\\([^}\n]+\\)}"
      (2 font-lock-function-name-face))))
 
-;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.bst\\'") 'bibtex-style-mode))
-
 ;;;###autoload
 (define-derived-mode bibtex-style-mode nil "BibStyle"
   "Major mode for editing BibTeX style files."
@@ -153,5 +151,4 @@
 
 
 (provide 'bibtex-style)
-;; arch-tag: b20ad41a-fd36-466e-8fd2-cc6137f9c55c
 ;;; bibtex-style.el ends here