[Emacs-diffs] Changes to emacs/lisp/imenu.el

[Stefan Monnier]

Index: emacs/lisp/imenu.el
diff -c emacs/lisp/imenu.el:1.92 emacs/lisp/imenu.el:1.93
*** emacs/lisp/imenu.el:1.92    Tue Aug 20 16:34:33 2002
--- emacs/lisp/imenu.el Tue May  6 11:16:27 2003
***************
*** 745,753 ****
    "Defines whether `imenu--generic-function' should fold case when matching.
  
  This variable should be set (only) by initialization code
! for modes which use `imenu--generic-function'.  If it is not set, that
! function will use the current value of `case-fold-search' to match
! patterns.")
  ;;;###autoload
  (make-variable-buffer-local 'imenu-case-fold-search)
  
--- 745,752 ----
    "Defines whether `imenu--generic-function' should fold case when matching.
  
  This variable should be set (only) by initialization code
! for modes which use `imenu--generic-function'.  If it is not set, but
! `font-lock-defaults' is set, then font-lock's setting is used.")
  ;;;###autoload
  (make-variable-buffer-local 'imenu-case-fold-search)
  
***************
*** 779,785 ****
  
    (let ((index-alist (list 'dummy))
        prev-pos beg
!         (case-fold-search imenu-case-fold-search)
          (old-table (syntax-table))
          (table (copy-syntax-table (syntax-table)))
          (slist imenu-syntax-alist))
--- 778,787 ----
  
    (let ((index-alist (list 'dummy))
        prev-pos beg
!         (case-fold-search (if (or (local-variable-p 'imenu-case-fold-search)
!                                 (not (local-variable-p 'font-lock-defaults)))
!                             imenu-case-fold-search
!                           (nth 2 font-lock-defaults)))
          (old-table (syntax-table))
          (table (copy-syntax-table (syntax-table)))
          (slist imenu-syntax-alist))