[nesc/f20: 5/5] Merge branch 'master' into f20

[Christopher Meng]

commit f224b22a77387448bc2e8da844c85d65125c947d
Merge: 32bfabe 683b8aa
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 2 23:45:02 2014 +0800

    Merge branch 'master' into f20
    
    Conflicts:
    	nesc.spec

 nesc.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --cc nesc.spec
index ceb66bd,8b92033..2d0fa59
--- a/nesc.spec
+++ b/nesc.spec
@@@ -72,8 -74,8 +74,8 @@@ package to use %{pkgname} with GNU Emac
  
  %build
  autoreconf -fiv
- %configure
+ %configure --enable-m4_pattern_allow
 -%make_build
 +make %{?_smp_mflags}
  
  %if 0%{?fedora}
  %{_emacs_bytecompile} tools/editor-modes/emacs/*.el