# HG changeset patch # User Glenn Morris # Date 1221532909 0 # Node ID 5ac5a5adc0280600253f60282a8a1ce691c8ecbe # Parent ef3ca5fcb75166a8703f19c2c271135002ae19c7 (makefile-match-function-end): Move point. (Bug#983) diff -r ef3ca5fcb751 -r 5ac5a5adc028 lisp/progmodes/make-mode.el --- a/lisp/progmodes/make-mode.el Tue Sep 16 02:07:05 2008 +0000 +++ b/lisp/progmodes/make-mode.el Tue Sep 16 02:41:49 2008 +0000 @@ -1,7 +1,7 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Thomas Neumann ;; Eric S. Raymond @@ -1761,11 +1761,12 @@ "To be called as an anchored matcher by font-lock. The anchor must have matched the opening parens in the first group." (let ((s (match-string-no-properties 1))) - (setq s (cond ((string= s "(") "\\(.*?\\)[ \t]*)") - ((string= s "{") "\\(.*?\\)[ \t]*}") - ((string= s "((") "\\(.*?\\)[ \t]*))") - ((string= s "{{") "\\(.*?\\)[ \t]*}}"))) - (if s (looking-at s)))) + ;; FIXME forward-sexp or somesuch would be better? + (if (setq s (cond ((string= s "(") ")") + ((string= s "{") "}") + ((string= s "((") "))") + ((string= s "{{") "}}"))) + (re-search-forward (concat "\\(.*\\)[ \t]*" s) (line-end-position) t)))) (defun makefile-match-dependency (bound) "Search for `makefile-dependency-regex' up to BOUND.