Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.


(agc)

$NetBSD: patch-aa,v 1.1.2.2 2010/07/04 07:30:12 agc Exp $

--- aclocal.m4.orig	2010-06-28 20:31:17.000000000 +0000
+++ aclocal.m4
@@ -116,7 +116,7 @@ AC_DEFUN(AC_PATH_EMACS,
   case "${flavor}" in
   XEmacs)
     EMACS_FLAVOR=xemacs;;
-  Emacs\ 2[[123]]\.*)
+  Emacs\ 2[[1234]]\.*)
     EMACS_FLAVOR=emacs;;
   *)
     EMACS_FLAVOR=unsupported;;