Mercurial > emacs
diff lisp/progmodes/cfengine.el @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Jan 2007 06:16:11 +0000 |
| parents | a1a25ac6c88a e3694f1cb928 |
| children | f55f9811f5d7 |
line wrap: on
line diff
--- a/lisp/progmodes/cfengine.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/progmodes/cfengine.el Fri Jan 26 06:16:11 2007 +0000 @@ -1,6 +1,6 @@ ;;; cfengine.el --- mode for editing Cfengine files -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> @@ -89,7 +89,7 @@ ;; In the main syntax-table, backslash is marked as a punctuation, because ;; of its use in DOS-style directory separators. Here we try to recognize ;; the cases where backslash is used as an escape inside strings. - '(("\\(\\(?:\\\\\\)+\\)\"" . "\\"))) + '(("\\(\\(?:\\\\\\)+\\)\"" 1 "\\"))) (defvar cfengine-imenu-expression `((nil ,(concat "^[ \t]*" (eval-when-compile