From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 23 Mar 2016 18:27:22 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39577d07124ee16895b9c6aab7e2c6e7d41cc715;p=emacs.git

Merge from origin/emacs-25

ad250f2 Sync with gnulib
c0165ea Resurrect GNUS-NEWS autogeneration

# Conflicts:
#	etc/GNUS-NEWS
#	lisp/Makefile.in
---

39577d07124ee16895b9c6aab7e2c6e7d41cc715
diff --cc lisp/Makefile.in
index 83714d0f5a7,f33dd011eda..12bb9c7a3ce
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@@ -220,20 -213,19 +220,25 @@@ update-authors
  	$(emacs) -L "$(top_srcdir)/admin" -l authors \
  	  -f batch-update-authors "$(top_srcdir)/etc/AUTHORS" "$(top_srcdir)"
  
+ update-gnus-news:
+ 	$(emacs) -L "$(top_srcdir)/doc/misc" -l gnus-news -f batch-gnus-news \
+ 	  "$(top_srcdir)/doc/misc/gnus-news.texi" \
+ 	  "$(top_srcdir)/etc/GNUS-NEWS"
+ 
 -ETAGS = ../lib-src/etags
 +FORCE:
 +.PHONY: FORCE
 +
 +tagsfiles = $(shell find ${srcdir} -name '*.el')
 +tagsfiles := $(filter-out ${srcdir}/%loaddefs.el,${tagsfiles})
 +tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles})
 +tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles})
 +
 +ETAGS = ../lib-src/etags${EXEEXT}
  
 -lisptagsfiles1 = $(srcdir)/*.el
 -lisptagsfiles2 = $(srcdir)/*/*.el
 -lisptagsfiles3 = $(srcdir)/*/*/*.el
 -lisptagsfiles4 = $(srcdir)/*/*/*/*.el
 +${ETAGS}: FORCE
 +	${MAKE} -C ../lib-src $(notdir $@)
  
 -## The ls | sed | xargs is to stop the command line getting too long
 +## The use of xargs is to stop the command line getting too long
  ## on MS Windows, when the MSYS Bash passes it to a MinGW compiled
  ## etags.  It might be better to use find in a similar way to
  ## compile-main.  But maybe this is not even necessary any more now