* textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be

greedy to find the closing bracket in \*[...] and similar
expressions.  This is a first rough fix -- many additional
refinements are necessary to make this nroff mode really usable with
groff.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da4ba5df39b9ff4cb18495aaff534b23c4699f54..df85f19b2a28bc26eb9354b4282d965a6a82217d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-03  Werner Lemberg  <wl@gnu.org>
+
+       * textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be
+       greedy to find the closing bracket in \*[...] and similar
+       expressions.  This is a first rough fix -- many additional
+       refinements are necessary to make nroff mode really usable with
+       groff.
+
 2006-02-03  Jens Petersen  <petersen@redhat.com>  (tiny change)
 
        * international/mule-cmds.el (set-locale-environment): Add

diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 7fd2db1deb66df04bd888c11dfb83aabb09bac92..ababc041099a88f4a8d92adc8bc07ca465e23ae5 100644 (file)
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -1,7 +1,7 @@
 ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source
 
 ;; Copyright (C) 1985, 1986, 1994, 1995, 1997, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
@@ -86,14 +86,14 @@
    ;; variants).  This won't currently do groff's \A'foo' and
    ;; the like properly.  One might expect it to highlight an escape's
    ;; arguments in common cases, like \f.
-   (concat "\\\\"                     ; backslash
-         "\\("                        ; followed by various possibilities
-         (mapconcat 'identity
-                    '("[f*n]*\\[.+]"  ; some groff extensions
-                      "(.."           ; two chars after (
-                      "[^(\"]"        ; single char escape
-                      ) "\\|")
-         "\\)")
+   (concat "\\\\"                    ; backslash
+        "\\("                        ; followed by various possibilities
+        (mapconcat 'identity
+                   '("[f*n]*\\[.+?]" ; some groff extensions
+                     "(.."           ; two chars after (
+                     "[^(\"]"        ; single char escape
+                     ) "\\|")
+        "\\)")
    )
   "Font-lock highlighting control in `nroff-mode'."
   :group 'nroff