emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111024: By default, ignore case when


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111024: By default, ignore case when testing inhibit-local-variables (bug#10610)
Date: Wed, 28 Nov 2012 20:13:33 -0500
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111024
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-28 20:13:33 -0500
message:
  By default, ignore case when testing inhibit-local-variables (bug#10610)
  
  * lisp/files.el (inhibit-local-variables-ignore-case): New.
  (inhibit-local-variables-p): Use inhibit-local-variables-ignore-case.
  Doc fix.
  (inhibit-local-variables-regexps, inhibit-local-variables-suffixes):
  Doc fixes.
modified:
  lisp/ChangeLog
  lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-28 04:51:13 +0000
+++ b/lisp/ChangeLog    2012-11-29 01:13:33 +0000
@@ -1,3 +1,11 @@
+2012-11-29  Glenn Morris  <address@hidden>
+
+       * files.el (inhibit-local-variables-ignore-case): New.  (Bug#10610)
+       (inhibit-local-variables-p): Use inhibit-local-variables-ignore-case.
+       Doc fix.
+       (inhibit-local-variables-regexps, inhibit-local-variables-suffixes):
+       Doc fixes.
+
 2012-11-28  Jay Belanger  <address@hidden>
 
        * calc/calc-forms.el (calc-date-notation): Fix regexp

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-11-21 04:47:55 +0000
+++ b/lisp/files.el     2012-11-29 01:13:33 +0000
@@ -2502,25 +2502,31 @@
 specifications, but are not really, or they may be containers for
 member files with their own local variable sections, which are
 not appropriate for the containing file.
-See also `inhibit-local-variables-suffixes'.")
+The function `inhibit-local-variables-p' uses this.")
 
 (define-obsolete-variable-alias 'inhibit-first-line-modes-suffixes
   'inhibit-local-variables-suffixes "24.1")
 
 (defvar inhibit-local-variables-suffixes nil
   "List of regexps matching suffixes to remove from file names.
-When checking `inhibit-local-variables-regexps', we first discard
-from the end of the file name anything that matches one of these regexps.")
-
-;; TODO explicitly add case-fold-search t?
+The function `inhibit-local-variables-p' uses this: when checking
+a file name, it first discards from the end of the name anything that
+matches one of these regexps.")
+
+;; Can't think of any situation in which you'd want this to be nil...
+(defvar inhibit-local-variables-ignore-case t
+  "Non-nil means `inhibit-local-variables-p' ignores case.")
+
 (defun inhibit-local-variables-p ()
   "Return non-nil if file local variables should be ignored.
 This checks the file (or buffer) name against `inhibit-local-variables-regexps'
-and `inhibit-local-variables-suffixes'."
+and `inhibit-local-variables-suffixes'.  If
+`inhibit-local-variables-ignore-case' is non-nil, this ignores case."
   (let ((temp inhibit-local-variables-regexps)
        (name (if buffer-file-name
                  (file-name-sans-versions buffer-file-name)
-               (buffer-name))))
+               (buffer-name)))
+       (case-fold-search inhibit-local-variables-ignore-case))
     (while (let ((sufs inhibit-local-variables-suffixes))
             (while (and sufs (not (string-match (car sufs) name)))
               (setq sufs (cdr sufs)))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]