emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master 0731273: Fix last change


From: Eli Zaretskii
Subject: [Emacs-diffs] master 0731273: Fix last change
Date: Sat, 20 Jul 2019 05:34:42 -0400 (EDT)

branch: master
commit 0731273facdab36b34fc4d1c22eb1bcc4b93fadc
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix last change
    
    * etc/NEWS: Call out the change in matching REGEXP.
    
    * lisp/files.el (magic-mode-alist)
    (magic-fallback-mode-alist): Doc fix.  (Bug#36401)
---
 etc/NEWS      | 4 ++++
 lisp/files.el | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 5cbe60c..9b7cfd7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1747,6 +1747,10 @@ immediately.  Type 'M-x so-long-commentary' for full 
documentation.
 
 * Incompatible Lisp Changes in Emacs 27.1
 
+---
+** The REGEXP in 'magic-mode-alist' is now matched case-sensitively.
+Likewise for 'magic-fallback-mode-alist'.
+
 +++
 ** add-hook does not always add to the front or the end any more.
 The replacement of `append` with `depth` implies that the function is not
diff --git a/lisp/files.el b/lisp/files.el
index 34fdc30..89e9a69 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2964,7 +2964,7 @@ associated with that interpreter in 
`interpreter-mode-alist'.")
   "Alist of buffer beginnings vs. corresponding major mode functions.
 Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION).
 After visiting a file, if REGEXP matches the text at the beginning of the
-buffer (respecting case), or calling MATCH-FUNCTION returns non-nil,
+buffer (case-sensitively), or calling MATCH-FUNCTION returns non-nil,
 `normal-mode' will call FUNCTION rather than allowing `auto-mode-alist' to
 decide the buffer's major mode.
 
@@ -2998,7 +2998,7 @@ If FUNCTION is nil, then it is not called.  (That is a 
way of saying
   "Like `magic-mode-alist' but has lower priority than `auto-mode-alist'.
 Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION).
 After visiting a file, if REGEXP matches the text at the beginning of the
-buffer (respecting case), or calling MATCH-FUNCTION returns non-nil,
+buffer (case-sensitively), or calling MATCH-FUNCTION returns non-nil,
 `normal-mode' will call FUNCTION, provided that `magic-mode-alist' and
 `auto-mode-alist' have not specified a mode for this file.
 



reply via email to

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