[Emacs-diffs] trunk r113166: bibtex-mode: Update imenu-support when dialect changes

[Roland Winkler]

------------------------------------------------------------
revno: 113166
revision-id: address@hidden
parent: address@hidden
committer: Roland Winkler <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-25 21:15:44 +1200
message:
  bibtex-mode: Update imenu-support when dialect changes
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/textmodes/bibtex.el       bibtex.el-20091113204419-o5vbwnq5f7feedwu-227

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-25 01:04:06 +0000
+++ b/lisp/ChangeLog    2013-06-25 09:15:44 +0000
@@ -1,3 +1,8 @@
+2013-06-25  Rüdiger Sonderfeld  <address@hidden>
+
+       * lisp/textmodes/bibtex.el (bibtex-mode, bibtex-set-dialect):
+       Update imenu-support when dialect changes.
+
 2013-06-25  Leo Liu  <address@hidden>
 
        * ido.el (ido-read-internal): Allow forward slash on windows.

=== modified file 'lisp/textmodes/bibtex.el'
--- a/lisp/textmodes/bibtex.el  2013-04-13 20:45:03 +0000
+++ b/lisp/textmodes/bibtex.el  2013-06-25 09:15:44 +0000
@@ -3400,9 +3400,6 @@
   (set (make-local-variable 'syntax-propertize-function)
        (syntax-propertize-via-font-lock
         bibtex-font-lock-syntactic-keywords))
-  (setq imenu-generic-expression
-        (list (list nil bibtex-entry-head bibtex-key-in-head))
-        imenu-case-fold-search t)
   ;; Allow `bibtex-dialect' as a file-local variable.
   (add-hook 'hack-local-variables-hook 'bibtex-set-dialect nil t))
 
@@ -3479,7 +3476,10 @@
              (concat "^[ address@hidden \t]*\\(?:"
                      (regexp-opt
                       (append '("String" "Preamble")
-                              (mapcar 'car bibtex-entry-alist))) "\\)"))))
+                              (mapcar 'car bibtex-entry-alist))) "\\)"))
+    (setq imenu-generic-expression
+          (list (list nil bibtex-entry-head bibtex-key-in-head))
+          imenu-case-fold-search t)))
 
 ;; Entry commands and menus for BibTeX dialects
 ;; We do not use `easy-menu-define' here because this gets confused