(Man-files-regexp): Tighten up the regexp (bug#5686).

2 files changed, 12 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bafe6db6d89..8c5dd5cc0f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * man.el (Man-files-regexp): Tighten up the regexp (bug#5686).
+
 2010-03-03  Chong Yidong  <cyd@stupidchicken.com>
 
         * macros.el (insert-kbd-macro): Look up keyboard macro using the
@@ -27,19 +31,17 @@
 
 2010-03-01  Alan Mackenzie  <acm@muc.de>
 
-        * progmodes/cc-engine.el (c-remove-stale-state-cache): Correct
-        previous patch.
+        * progmodes/cc-engine.el (c-remove-stale-state-cache):
+        Correct previous patch.
 
 2010-03-01  Kenichi Handa  <handa@m17n.org>
 
-        * language/burmese.el (burmese-composable-pattern): Renamed from
+        * language/burmese.el (burmese-composable-pattern): Rename from
         myanmar-composable-pattern.
 
-        * international/characters.el (script-list): Change myanmar to
-        burmese.
-
-        * international/fontset.el (script-representative-chars): Change
-        myanmar to burmese.
+        * international/characters.el (script-list):
+        * international/fontset.el (script-representative-chars):
+        Change myanmar to burmese.
         (otf-script-alist): Likewise.
         (setup-default-fontset): Likewise.  Re-fix :otf spec.
 
diff --git a/lisp/man.el b/lisp/man.el
index d64846a2d4d..8eb5f73e245 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -283,7 +283,8 @@ This regular expression should start with a `^' character.")
   "Regular expression for SYNOPSIS heading (or your equivalent).
 This regexp should not start with a `^' character.")
 
-(defvar Man-files-regexp "FILES"
+(defvar Man-files-regexp "FILES\\>"
+  ;; Add \> so as not to match mount(8)'s FILESYSTEM INDEPENDENT MOUNT OPTIONS.
   "Regular expression for FILES heading (or your equivalent).
 This regexp should not start with a `^' character.")