commit 0b60d7657a2d9e5f9a233032643b0f3ce55420ee (HEAD, refs/remotes/origin/master) Author: Noam Postavsky Date: Tue Mar 21 20:40:52 2017 -0400 * test/lisp/emacs-lisp/lisp-mode-tests.el (indent-subsexp): Test for Bug#26187 diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index 2801f23df6..8e3f2e185c 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -77,6 +77,10 @@ noindent\" 3 (search-backward "d2") (up-list -1) (indent-sexp) + (should (equal (buffer-string) correct)) + (backward-sexp) + (end-of-line) + (indent-sexp) (should (equal (buffer-string) correct))))) (ert-deftest indent-sexp-in-string () commit bcb6c7b7cd954fc653fe54c20aa4a5d8dd97d76d Author: Graham Dobbins Date: Sun Mar 19 21:06:18 2017 -0400 * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Fix null endpos case Copyright-paperwork-exempt: yes diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index eb07c18b03..d6293c0304 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1083,7 +1083,8 @@ ENDPOS is encountered." (init-depth (car state)) (next-depth init-depth) (last-depth init-depth) - (last-syntax-point (point))) + (last-syntax-point (point)) + (real-endpos endpos)) (unless endpos ;; Get error now if we don't have a complete sexp after point. (save-excursion (forward-sexp 1) @@ -1116,6 +1117,8 @@ ENDPOS is encountered." last-depth (- last-depth next-depth) next-depth init-depth)) (forward-line 1) + (when (and (not real-endpos) (<= next-depth init-depth)) + (goto-char endpos)) (when (< (point) endpos) (let ((depth-delta (- next-depth last-depth))) (cond ((< depth-delta 0) commit 3bb5af3a32dd131926fb9cbb5c8db5cd5d97d91c Author: Paul Eggert Date: Tue Mar 21 13:53:47 2017 -0700 Improve configure --with-pop etc. diagnostics * configure.ac: Improve diagnostics re --with-pop and --with-mailutils (Bug#26102). diff --git a/configure.ac b/configure.ac index fad7fb0104..9937a6cce9 100644 --- a/configure.ac +++ b/configure.ac @@ -234,14 +234,16 @@ AC_DEFUN([OPTION_DEFAULT_ON], [dnl # connections. Encrypted connections should be the default. OPTION_DEFAULT_OFF([mailutils], - [rely on GNU Mailutils being installed; this makes the options - --without-pop through --with-mailhost irrelevant]) + [rely on GNU Mailutils, so that the --without-pop through --with-mailhost + options are irrelevant]) if test "$with_mailutils" = no; then with_mailutils= fi AC_SUBST([with_mailutils]) -OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail]) +OPTION_DEFAULT_ON([pop], + [don't support POP mail retrieval with movemail (--without-pop or + --with-mailutils is recommended, as movemail POP is insecure)]) if test "$with_pop" = yes; then AC_DEFINE(MAIL_USE_POP) fi @@ -5482,31 +5484,25 @@ fi AC_OUTPUT if test ! "$with_mailutils"; then + if test "$with_pop" = yes; then + AC_MSG_WARN([This configuration installs a 'movemail' program +that retrieves POP3 email via only insecure channels. +To omit insecure POP3, you can use '$0 --without-pop'.]) + fi + case $opsys in cygwin | mingw32) # Don't suggest GNU Mailutils, as it hasn't been ported. - if test "$with_pop" = yes; then - emacs_fix_movemail="use '$0 --without-pop'" - else - emacs_fix_movemail= - fi;; + ;; *) emacs_fix_movemail="use '$0 --with-mailutils'" case `(movemail --version) 2>/dev/null` in *Mailutils*) ;; *) emacs_fix_movemail="install GNU Mailutils and $emacs_fix_movemail";; - esac;; + esac + AC_MSG_NOTICE([You might want to $emacs_fix_movemail.]);; esac - - if test "$with_pop" = yes; then - AC_MSG_WARN([This configuration installs a 'movemail' program -that retrieves POP3 email via only insecure channels. -To fix this you can $emacs_fix_movemail.]) - elif test "$emacs_fix_movemail"; then - AC_MSG_NOTICE([This configuration installs a 'movemail' program that cannot -retrieve POP3 email. You might want to $emacs_fix_movemail.]) - fi fi test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) commit 650defd4e74ad00dd16e61c1fc5b4f497821c3d2 Author: Eli Zaretskii Date: Tue Mar 21 21:04:56 2017 +0200 Revert "Make --without-pop the default." This reverts commit 9319de675e395517f9a7b50cae1a3aad9cd0abc2. diff --git a/INSTALL b/INSTALL index 9b6c04f079..a99f107804 100644 --- a/INSTALL +++ b/INSTALL @@ -265,14 +265,17 @@ uses the GNU Mailutils 'movemail' program to retrieve mail. Otherwise the Emacs build procedure builds and installs an auxiliary 'movemail' program, a limited and insecure substitute that Emacs can use when Mailutils is not installed; when this happens, there are several -configure options such as --with-mail-unlink that provide fine-grained +configure options such as --without-pop that provide fine-grained control over Emacs 'movemail' construction. The Emacs mail reader RMAIL is configured to be able to read mail from a POP3 server by default. Versions of the POP protocol older than POP3 are not supported. While POP3 support is typically enabled, whether Emacs actually uses POP3 is controlled by individual users; -see the Rmail chapter of the Emacs manual. +see the Rmail chapter of the Emacs manual. Unless you configure +--with-mailutils, it is a good idea to configure --without-pop so that +users are less likely to inadvertently read email via insecure +channels. For image support you may have to download, build, and install the appropriate image support libraries for image types other than XBM and diff --git a/configure.ac b/configure.ac index 648000e0c4..fad7fb0104 100644 --- a/configure.ac +++ b/configure.ac @@ -229,17 +229,19 @@ AC_DEFUN([OPTION_DEFAULT_ON], [dnl m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=$with_features])dnl ])dnl +# FIXME: The default options '--without-mailutils --with-pop' result +# in a movemail implementation that supports only unencrypted POP3 +# connections. Encrypted connections should be the default. + OPTION_DEFAULT_OFF([mailutils], - [rely on GNU Mailutils being installed, so that --with-pop through - --with-mailhost are irrelevant]) + [rely on GNU Mailutils being installed; this makes the options + --without-pop through --with-mailhost irrelevant]) if test "$with_mailutils" = no; then with_mailutils= fi AC_SUBST([with_mailutils]) -OPTION_DEFAULT_OFF([pop], - [support POP mail retrieval with movemail (not recommended, as its - email retrieval is unencrypted)]) +OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail]) if test "$with_pop" = yes; then AC_DEFINE(MAIL_USE_POP) fi @@ -5479,11 +5481,15 @@ fi AC_OUTPUT -if test ! "$with_mailutils" && test "$with_pop" = yes; then +if test ! "$with_mailutils"; then case $opsys in cygwin | mingw32) # Don't suggest GNU Mailutils, as it hasn't been ported. - emacs_fix_movemail="use '$0' (without '--with-pop')";; + if test "$with_pop" = yes; then + emacs_fix_movemail="use '$0 --without-pop'" + else + emacs_fix_movemail= + fi;; *) emacs_fix_movemail="use '$0 --with-mailutils'" case `(movemail --version) 2>/dev/null` in @@ -5493,9 +5499,14 @@ if test ! "$with_mailutils" && test "$with_pop" = yes; then esac;; esac - AC_MSG_WARN([This configuration installs a 'movemail' program -that retrieves POP3 email via only unencrypted channels. -To avoid the problem you can $emacs_fix_movemail.]) + if test "$with_pop" = yes; then + AC_MSG_WARN([This configuration installs a 'movemail' program +that retrieves POP3 email via only insecure channels. +To fix this you can $emacs_fix_movemail.]) + elif test "$emacs_fix_movemail"; then + AC_MSG_NOTICE([This configuration installs a 'movemail' program that cannot +retrieve POP3 email. You might want to $emacs_fix_movemail.]) + fi fi test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) diff --git a/etc/NEWS b/etc/NEWS index bf50d1a3ee..cd98f53399 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -32,15 +32,9 @@ version 2.6.6 or later. ** The new option 'configure --with-mailutils' causes Emacs to rely on GNU Mailutils 'movemail' to retrieve email. By default, the Emacs -build procedure continues to build and install a limited 'movemail' -substitute. Although --with-mailutils is recommended, it is not yet -the default due to backward-compatibility concerns. - -** The option 'configure --without-pop' is now the default. -(This option's setting matters only if --with-mailutils is not used.) -Using --with-pop (the previous default) preserves the historical -behavior where Emacs 'movemail' retrieves network email only via -unencrypted channels. +build procedure continues to build and install a limited and insecure +'movemail' substitute. Although --with-mailutils is recommended, it +is not yet the default due to backward-compatibility concerns. ** The new option 'configure --enable-gcc-warnings=warn-only' causes GCC to issue warnings without stopping the build. This behavior is commit 8a58133ee63c630f5095429065fc3d8446592e4e Author: Paul Eggert Date: Tue Mar 21 11:14:15 2017 -0700 Don’t remove dependency files when configuring Problem reported by Tom Tromey in: http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00533.html * configure.ac: Don’t remove */*.o and */deps/* when --enable-autodepend is in effect. diff --git a/configure.ac b/configure.ac index 83071e619b..648000e0c4 100644 --- a/configure.ac +++ b/configure.ac @@ -5473,7 +5473,6 @@ AC_MSG_ERROR(['etc/refcards/emacsver.tex' could not be made.]) if test $AUTO_DEPEND = yes; then for dir in $AUTODEPEND_PARENTS; do - rm -f $dir/*.o $dir/deps/* AS_MKDIR_P([$dir/deps]) done fi commit 9319de675e395517f9a7b50cae1a3aad9cd0abc2 Author: Paul Eggert Date: Tue Mar 21 10:20:05 2017 -0700 Make --without-pop the default. Suggested by Angelo Graziosi in: http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00431.html * configure.ac: Change the default from --with-pop to --without-pop. Adjust diagnostics to match. diff --git a/INSTALL b/INSTALL index a99f107804..9b6c04f079 100644 --- a/INSTALL +++ b/INSTALL @@ -265,17 +265,14 @@ uses the GNU Mailutils 'movemail' program to retrieve mail. Otherwise the Emacs build procedure builds and installs an auxiliary 'movemail' program, a limited and insecure substitute that Emacs can use when Mailutils is not installed; when this happens, there are several -configure options such as --without-pop that provide fine-grained +configure options such as --with-mail-unlink that provide fine-grained control over Emacs 'movemail' construction. The Emacs mail reader RMAIL is configured to be able to read mail from a POP3 server by default. Versions of the POP protocol older than POP3 are not supported. While POP3 support is typically enabled, whether Emacs actually uses POP3 is controlled by individual users; -see the Rmail chapter of the Emacs manual. Unless you configure ---with-mailutils, it is a good idea to configure --without-pop so that -users are less likely to inadvertently read email via insecure -channels. +see the Rmail chapter of the Emacs manual. For image support you may have to download, build, and install the appropriate image support libraries for image types other than XBM and diff --git a/configure.ac b/configure.ac index 833aaa5eb2..83071e619b 100644 --- a/configure.ac +++ b/configure.ac @@ -229,19 +229,17 @@ AC_DEFUN([OPTION_DEFAULT_ON], [dnl m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=$with_features])dnl ])dnl -# FIXME: The default options '--without-mailutils --with-pop' result -# in a movemail implementation that supports only unencrypted POP3 -# connections. Encrypted connections should be the default. - OPTION_DEFAULT_OFF([mailutils], - [rely on GNU Mailutils being installed; this makes the options - --without-pop through --with-mailhost irrelevant]) + [rely on GNU Mailutils being installed, so that --with-pop through + --with-mailhost are irrelevant]) if test "$with_mailutils" = no; then with_mailutils= fi AC_SUBST([with_mailutils]) -OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail]) +OPTION_DEFAULT_OFF([pop], + [support POP mail retrieval with movemail (not recommended, as its + email retrieval is unencrypted)]) if test "$with_pop" = yes; then AC_DEFINE(MAIL_USE_POP) fi @@ -5482,15 +5480,11 @@ fi AC_OUTPUT -if test ! "$with_mailutils"; then +if test ! "$with_mailutils" && test "$with_pop" = yes; then case $opsys in cygwin | mingw32) # Don't suggest GNU Mailutils, as it hasn't been ported. - if test "$with_pop" = yes; then - emacs_fix_movemail="use '$0 --without-pop'" - else - emacs_fix_movemail= - fi;; + emacs_fix_movemail="use '$0' (without '--with-pop')";; *) emacs_fix_movemail="use '$0 --with-mailutils'" case `(movemail --version) 2>/dev/null` in @@ -5500,14 +5494,9 @@ if test ! "$with_mailutils"; then esac;; esac - if test "$with_pop" = yes; then - AC_MSG_WARN([This configuration installs a 'movemail' program -that retrieves POP3 email via only insecure channels. -To fix this you can $emacs_fix_movemail.]) - elif test "$emacs_fix_movemail"; then - AC_MSG_NOTICE([This configuration installs a 'movemail' program that cannot -retrieve POP3 email. You might want to $emacs_fix_movemail.]) - fi + AC_MSG_WARN([This configuration installs a 'movemail' program +that retrieves POP3 email via only unencrypted channels. +To avoid the problem you can $emacs_fix_movemail.]) fi test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) diff --git a/etc/NEWS b/etc/NEWS index cd98f53399..bf50d1a3ee 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -32,9 +32,15 @@ version 2.6.6 or later. ** The new option 'configure --with-mailutils' causes Emacs to rely on GNU Mailutils 'movemail' to retrieve email. By default, the Emacs -build procedure continues to build and install a limited and insecure -'movemail' substitute. Although --with-mailutils is recommended, it -is not yet the default due to backward-compatibility concerns. +build procedure continues to build and install a limited 'movemail' +substitute. Although --with-mailutils is recommended, it is not yet +the default due to backward-compatibility concerns. + +** The option 'configure --without-pop' is now the default. +(This option's setting matters only if --with-mailutils is not used.) +Using --with-pop (the previous default) preserves the historical +behavior where Emacs 'movemail' retrieves network email only via +unencrypted channels. ** The new option 'configure --enable-gcc-warnings=warn-only' causes GCC to issue warnings without stopping the build. This behavior is commit bf8cf95d7d13ebc5d351cc2a8048f6695ab9faca Author: Paul Eggert Date: Tue Mar 21 09:59:10 2017 -0700 Streamline dependency-file generation * configure.ac (AUTODEPEND_PARENTS): New var. mkdir the dependency directories here, to simplify ‘make’. Remove dependency files just before outputting Makefiles, so that they are preserved if ‘configure’ exits early due to some other problem. * lib/Makefile.in, lwlib/Makefile.in, oldXMenu/Makefile.in: * src/Makefile.in: Adjust deps strategies to be similar, as follows: (MKDEPDIR): Remove. All uses removed. This cuts down on the number of processes spun off by ‘make’. (clean mostlyclean): Remove $(DEPDIR) contents, not $(DEPDIR) itself. (distclean): Remove $(DEPDIR) itself. * lwlib/Makefile.in (all): Move to front, so that depdir includes do not alter default action. diff --git a/configure.ac b/configure.ac index 48fcb3f33a..833aaa5eb2 100644 --- a/configure.ac +++ b/configure.ac @@ -1730,6 +1730,7 @@ dnl AC_C_BIGENDIAN is done by gnulib. dnl check for Make feature AUTO_DEPEND=no +AUTODEPEND_PARENTS='lib src' dnl check if we have GCC and autodepend is on. if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then AC_MSG_CHECKING([whether gcc understands -MMD -MF]) @@ -1742,9 +1743,6 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then AC_MSG_RESULT([$ac_enable_autodepend]) if test $ac_enable_autodepend = yes; then AUTO_DEPEND=yes - for depdir in */deps; do - test ! -d "$depdir" || rm -fr "$depdir"/../*.o "$depdir" || exit - done fi fi AC_SUBST(AUTO_DEPEND) @@ -5016,8 +5014,10 @@ if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then LIBXMENU= elif test "$USE_X_TOOLKIT" = none; then LIBXMENU='$(oldXMenudir)/libXMenu11.a' + AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS oldXMenu" else LIBXMENU='$(lwlibdir)/liblw.a' + AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS lwlib" fi AC_SUBST(LIBXMENU) @@ -5473,6 +5473,13 @@ ${MAKE-make} -s MAKEFILE_NAME=do-not-make-Makefile etc-emacsver || \ AC_MSG_ERROR(['etc/refcards/emacsver.tex' could not be made.]) ]) +if test $AUTO_DEPEND = yes; then + for dir in $AUTODEPEND_PARENTS; do + rm -f $dir/*.o $dir/deps/* + AS_MKDIR_P([$dir/deps]) + done +fi + AC_OUTPUT if test ! "$with_mailutils"; then diff --git a/lib/Makefile.in b/lib/Makefile.in index 4e51ac6b02..832704f3a8 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -65,16 +65,12 @@ ifneq ($(SYSTEM_TYPE),windows-nt) libgnu_a_SOURCES += openat-die.c save-cwd.c endif -# Dependencies. When !AUTO_DEPEND, don't bother with a dependencies file, -# as the default dependencies are often adequate. DEPDIR = deps ifeq ($(AUTO_DEPEND),yes) DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP - MKDEPDIR = $(MKDIR_P) $(DEPDIR) -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) else DEPFLAGS = - MKDEPDIR = : endif .PRECIOUS: ../config.status Makefile @@ -90,10 +86,8 @@ libegnu_a_OBJECTS = $(patsubst %.o,e-%.o,$(libgnu_a_OBJECTS)) $(libegnu_a_OBJECTS) $(libgnu_a_OBJECTS): $(BUILT_SOURCES) .c.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< e-%.o: %.c - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -Demacs -o $@ $< all: libgnu.a $(if $(HYBRID_MALLOC),libegnu.a) @@ -118,10 +112,10 @@ TAGS: $(ETAGS) $(tagsfiles) .PHONY: $(ETAGS) tags clean mostlyclean: - rm -f *.[ao] \#* - -rm -rf $(DEPDIR) + rm -f *.[ao] \#* $(DEPDIR)/* distclean: clean rm -f Makefile $(BUILT_SOURCES) + rm -fr $(DEPDIR) bootstrap-clean: distclean rm -f TAGS maintainer-clean: bootstrap-clean diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index d6a8f50ce7..ee7a2040e8 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -22,6 +22,9 @@ # This was taken from the output of Imake using Lucid's Imakefile. # and set up to be configured by ../configure. +all: liblw.a +.PHONY: all + srcdir=@srcdir@ # MinGW CPPFLAGS may use this. abs_top_srcdir=@abs_top_srcdir@ @@ -71,15 +74,14 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEPDIR = deps AUTO_DEPEND = @AUTO_DEPEND@ - +DEPDIR = deps ifeq ($(AUTO_DEPEND),yes) -DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP -MKDEPDIR = ${MKDIR_P} ${DEPDIR} + DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP + -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) else -DEPFLAGS = -MKDEPDIR = : + DEPFLAGS = + include $(srcdir)/deps.mk endif ## ../src is where the generated file (config.h, globals.h) are. @@ -94,11 +96,7 @@ ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib -all: liblw.a -.PHONY: all - .c.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< liblw.a: $(OBJS) @@ -110,20 +108,14 @@ globals_h = ../src/globals.h $(globals_h): $(MAKE) -C ../src globals.h -ifeq ($(AUTO_DEPEND),yes) --include $(ALLOBJS:%.o=${DEPDIR}/%.d) -else -include $(srcdir)/deps.mk -endif - .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f *.o liblw.a \#* - -rm -rf ${DEPDIR} + rm -f *.o liblw.a \#* $(DEPDIR)/* distclean: clean rm -f Makefile + rm -fr $(DEPDIR) bootstrap-clean maintainer-clean: distclean rm -f TAGS diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 46061ab7ae..7a5c998592 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -111,15 +111,14 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEPDIR = deps AUTO_DEPEND = @AUTO_DEPEND@ - +DEPDIR = deps ifeq ($(AUTO_DEPEND),yes) -DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP -MKDEPDIR = ${MKDIR_P} ${DEPDIR} + DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP + -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) else -DEPFLAGS = -MKDEPDIR = : + DEPFLAGS = + include $(srcdir)/deps.mk endif ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ @@ -129,7 +128,6 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ -I../src -I../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib .c.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) @@ -137,20 +135,14 @@ libXMenu11.a: $(OBJS) $(EXTRA) $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) $(AM_V_at)$(RANLIB) $@ -ifeq ($(AUTO_DEPEND),yes) --include $(ALLOBJS:%.o=${DEPDIR}/%.d) -else -include $(srcdir)/deps.mk -endif - .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f libXMenu11.a *.o - -rm -rf ${DEPDIR} + rm -f libXMenu11.a *.o $(DEPDIR)/* bootstrap-clean maintainer-clean distclean: clean rm -f Makefile + rm -fr $(DEPDIR) ETAGS = ../lib-src/etags${EXEEXT} diff --git a/src/Makefile.in b/src/Makefile.in index 60aa686671..5a3d0bd044 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -347,15 +347,14 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEPDIR=deps AUTO_DEPEND = @AUTO_DEPEND@ - +DEPDIR = deps ifeq ($(AUTO_DEPEND),yes) -DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP -MKDEPDIR = ${MKDIR_P} ${DEPDIR} + DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP + -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) else -DEPFLAGS = -MKDEPDIR = : + DEPFLAGS = + include $(srcdir)/deps.mk endif # Flags that might be in WARN_CFLAGS but are not valid for Objective C. @@ -383,10 +382,8 @@ ALL_OBJC_CFLAGS = $(EMACS_CFLAGS) \ .SUFFIXES: .m .c.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $< .m.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $< ## lastfile must follow all files whose initialized data areas should @@ -650,8 +647,7 @@ mostlyclean: rm -f globals.h gl-stamp rm -f *.res *.tmp clean: mostlyclean - rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT) - -rm -rf $(DEPDIR) + rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT) $(DEPDIR)/* ## bootstrap-clean is used to clean up just before a bootstrap. ## It should remove all files generated during a compilation/bootstrap, @@ -666,6 +662,7 @@ bootstrap-clean: clean distclean: bootstrap-clean rm -f Makefile lisp.mk + rm -fr $(DEPDIR) maintainer-clean: distclean rm -f TAGS @@ -755,11 +752,3 @@ else endif @: Compile some files earlier to speed up further compilation. $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)" - -ifeq ($(AUTO_DEPEND),yes) --include $(ALLOBJS:%.o=${DEPDIR}/%.d) -else -include $(srcdir)/deps.mk -endif - -### Makefile.in ends here commit 14d8b6858a49e97f9b69593df5a8a7886430d43f Author: Paul Eggert Date: Tue Mar 21 09:18:42 2017 -0700 Port and simplify example sh script * doc/misc/org.texi (noweb-ref): Simplify shell script example and don’t use ‘tail -1’, which is not portable. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 21c8758b80..fca5185337 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -15327,14 +15327,9 @@ inheritance}).}. |sed '1d' \ #+END_SRC - ** sort by the percent full + ** output mount point of fullest disk #+BEGIN_SRC sh - |awk '@{print $5 " " $6@}'|sort -n |tail -1 \ - #+END_SRC - - ** extract the mount point - #+BEGIN_SRC sh - |awk '@{print $2@}' + |awk '@{if (u < +$5) @{u = +$5; m = $6@}@} END @{print m@}' #+END_SRC @end example