From c0b08eb01759d39c1aa3ac731fee22832135c4aa Mon Sep 17 00:00:00 2001 From: Dave Love Date: Fri, 12 Dec 1997 17:10:08 +0000 Subject: [PATCH] Use imenu-case-fold-search. --- lisp/emacs-lisp/lisp-mode.el | 2 ++ lisp/generic.el | 8 ++++++-- lisp/progmodes/ada-mode.el | 1 + lisp/progmodes/c-mode.el | 1 + lisp/progmodes/cc-mode.el | 7 +++++-- lisp/progmodes/cplus-md.el | 1 + lisp/progmodes/dcl-mode.el | 3 ++- lisp/progmodes/f90.el | 1 + lisp/progmodes/octave-mod.el | 3 ++- lisp/progmodes/pascal.el | 1 + lisp/progmodes/perl-mode.el | 1 + lisp/progmodes/scheme.el | 6 ++++-- lisp/progmodes/sh-script.el | 1 + lisp/textmodes/bibtex.el | 1 + lisp/textmodes/texinfo.el | 1 + 15 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f6a09eaba2c..73633e7bfe7 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -212,6 +212,7 @@ if that value is non-nil." (setq major-mode 'emacs-lisp-mode) (setq mode-name "Emacs-Lisp") (lisp-mode-variables nil) + (setq imenu-case-fold-search nil) (run-hooks 'emacs-lisp-mode-hook)) (defvar lisp-mode-map () @@ -242,6 +243,7 @@ if that value is non-nil." (setq major-mode 'lisp-mode) (setq mode-name "Lisp") (lisp-mode-variables t) + (setq imenu-case-fold-search t) (set-syntax-table lisp-mode-syntax-table) (run-hooks 'lisp-mode-hook)) diff --git a/lisp/generic.el b/lisp/generic.el index b10d8c1fa36..3b7b1b92b62 100644 --- a/lisp/generic.el +++ b/lisp/generic.el @@ -115,7 +115,10 @@ ;; ACorreir@pervasive-sw.com (Alfred Correira) ;;; Change log: -;; $Log: generic-mode.el,v $ +;; $Log: generic.el,v $ +;; Revision 1.1 1997/06/15 07:01:26 rms +;; Initial revision +;; ;; Revision 1.6 1996/11/01 17:27:47 peter ;; Changed the function generic-function-name to return a string instead ;; of a symbol. Generic-mode now uses this for the mode's name @@ -542,7 +545,8 @@ Some generic modes are defined in generic-extras.el" ;; Support for [KEYWORD] constructs found in INF, INI and Samba files (defun generic-bracket-support () (setq imenu-generic-expression - '((nil "^\\[\\(.*\\)\\]" 1)))) + '((nil "^\\[\\(.*\\)\\]" 1)) + imenu-case-fold-search t)) ;; This generic mode is always defined (define-generic-mode 'default-generic-mode (list ?#) nil nil nil nil) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 32a373a6f36..c248227190b 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -596,6 +596,7 @@ If you use ada-xref.el: (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression ada-imenu-generic-expression) + (setq imenu-case-fold-search t) (if (ada-xemacs) nil ; XEmacs uses properties (make-local-variable 'font-lock-defaults) diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el index f3364457e18..5a19a42e134 100644 --- a/lisp/progmodes/c-mode.el +++ b/lisp/progmodes/c-mode.el @@ -363,6 +363,7 @@ if that value is non-nil." (setq parse-sexp-ignore-comments t) (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression c-imenu-generic-expression) + (setq imenu-case-fold-search nil) (run-hooks 'c-mode-hook)) (defun c-outline-level () diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 08ea7103f2d..39dee286ec4 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -158,7 +158,8 @@ Key bindings: c-class-key c-C-class-key c-baseclass-key nil c-comment-start-regexp c-C++-comment-start-regexp - imenu-generic-expression cc-imenu-c-generic-expression) + imenu-generic-expression cc-imenu-c-generic-expression + imenu-case-fold-search nil) (run-hooks 'c-mode-common-hook) (run-hooks 'c-mode-hook) (c-update-modeline)) @@ -197,7 +198,8 @@ Key bindings: c-class-key c-C++-class-key c-access-key c-C++-access-key c-recognize-knr-p nil - imenu-generic-expression cc-imenu-c++-generic-expression) + imenu-generic-expression cc-imenu-c++-generic-expression + imenu-case-fold-search nil) (run-hooks 'c-mode-common-hook) (run-hooks 'c++-mode-hook) (c-update-modeline)) @@ -282,6 +284,7 @@ Key bindings: c-access-key c-Java-access-key ;defun-prompt-regexp c-Java-defun-prompt-regexp imenu-generic-expression cc-imenu-java-generic-expression + imenu-case-fold-search nil ) (c-set-style "java") (run-hooks 'c-mode-common-hook) diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el index 42e2346a48d..dbbe19125c1 100644 --- a/lisp/progmodes/cplus-md.el +++ b/lisp/progmodes/cplus-md.el @@ -340,6 +340,7 @@ no args if that value is non-nil." (set (make-local-variable 'parse-sexp-ignore-comments) t) (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression c++-imenu-generic-expression) + (setq imenu-case-fold-search nil) (run-hooks 'c++-mode-hook) (if c++-electric-colon (define-key c++-mode-map ":" 'electric-c++-terminator))) diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 2ac2cdea8b8..7a6e2691093 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -542,7 +542,8 @@ $ (setq comment-start-skip "\\$[ \t]*![ \t]*") (if (boundp 'imenu-generic-expression) - (setq imenu-generic-expression dcl-imenu-generic-expression)) + (progn (setq imenu-generic-expression dcl-imenu-generic-expression) + (setq imenu-case-fold-search t))) (setq imenu-create-index-function 'dcl-imenu-create-index-function) (make-local-variable 'dcl-comment-line-regexp) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 8debddda1fa..85d0901dabd 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -877,6 +877,7 @@ with no args, if that value is non-nil." (setq font-lock-defaults '(f90-font-lock-keywords nil t)) ;; Tell imenu how to handle f90. + (setq imenu-case-fold-search t) (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression f90-imenu-generic-expression)) (run-hooks 'f90-mode-hook) diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 8f5ff1d18be..c5d0d789ee7 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -515,7 +515,8 @@ including a reproducible test case and send the message." (setq font-lock-defaults '(octave-font-lock-keywords nil nil)) (make-local-variable 'imenu-generic-expression) - (setq imenu-generic-expression octave-mode-imenu-generic-expression) + (setq imenu-generic-expression octave-mode-imenu-generic-expression + imenu-case-fold-search nil) (octave-add-octave-menu) (octave-initialize-completions) diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 2b313ee8e35..d2ef2d2b283 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -371,6 +371,7 @@ no args, if that value is non-nil." ;; Imenu support (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression pascal-imenu-generic-expression) + (setq imenu-case-fold-search t) (run-hooks 'pascal-mode-hook)) diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index 122c6ecc1cf..42eecbde7c8 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -331,6 +331,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'." ;; Tell imenu how to handle Perl. (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression perl-imenu-generic-expression) + (setq imenu-case-fold-search nil) (run-hooks 'perl-mode-hook)) ;; This is used by indent-for-comment diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 094a6f45da7..ed393a96d6f 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -152,7 +152,8 @@ (set lisp-indent-function 'scheme-indent-function) (setq mode-line-process '("" scheme-mode-line-process)) (make-local-variable 'imenu-generic-expression) - (setq imenu-generic-expression scheme-imenu-generic-expression)) + (setq imenu-generic-expression scheme-imenu-generic-expression) + (setq imenu-case-fold-search t)) (defvar scheme-mode-line-process "") @@ -281,7 +282,8 @@ if that value is non-nil and inserts the value of (run-hooks 'scheme-mode-hook) (run-hooks 'dsssl-mode-hook) (scheme-mode-variables) - (setq imenu-generic-expression dsssl-imenu-generic-expression)) + (setq imenu-generic-expression dsssl-imenu-generic-expression) + (setq imenu-case-fold-search nil)) ;; Extra syntax for DSSSL. This isn't separated from Scheme, but ;; shouldn't cause much trouble in scheme-mode. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 4898a16ac94..6ac56cdb8c7 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -829,6 +829,7 @@ Calls the value of `sh-set-shell-hook' if set." sh-shell-variables nil sh-shell-variables-initialized nil imenu-generic-expression (sh-feature sh-imenu-generic-expression) + imenu-case-fold-search nil shell (sh-feature sh-variables)) (set-syntax-table (sh-feature sh-mode-syntax-table)) (while shell diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 93176bb9a89..e462b8c27e3 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -2530,6 +2530,7 @@ non-nil. (bibtex-beginning-of-entry))) (setq imenu-generic-expression (list (list nil bibtex-reference-head bibtex-key-in-head))) + (setq imenu-case-fold-search t) (run-hooks 'bibtex-mode-hook)) (defun bibtex-submit-bug-report () diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 73b06600aeb..95d102e4741 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -515,6 +515,7 @@ value of texinfo-mode-hook." (setq words-include-escapes t) (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression texinfo-imenu-generic-expression) + (setq imenu-case-fold-search nil) (make-local-variable 'font-lock-defaults) (setq font-lock-defaults '(texinfo-font-lock-keywords t)) (make-local-variable 'outline-regexp) -- 2.39.2