Mercurial > emacs
changeset 108848:10ebbc5247aa
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 26 May 2010 22:43:08 +0000 |
| parents | 3e401eb6d5ee (current diff) 7a3558eb670e (diff) |
| children | 84f3cdac426c |
| files | |
| diffstat | 15 files changed, 165 insertions(+), 117 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,3 +1,17 @@ +2010-05-26 Glenn Morris <rgm@gnu.org> + + * configure.in (YMF_PASS_LDFLAGS): Remove. + (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables. + + * configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS): + Add $GNUSTEP_LOCAL_HEADERS. + (LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES. + + * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) + (GNUSTEP_MAKEFILES): Remove. + (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS + stuff to here. + 2010-05-25 Glenn Morris <rgm@gnu.org> * configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...
--- a/configure Tue May 25 23:37:05 2010 +0000 +++ b/configure Wed May 26 22:43:08 2010 +0000 @@ -720,8 +720,6 @@ XMKMF LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX_RPATH -NS_IMPL_GNUSTEP_INC -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS TEMACS_LDFLAGS2 NS_OBJ NS_SUPPORT @@ -820,7 +818,8 @@ PRE_ALLOC_OBJ POST_ALLOC_OBJ LD_SWITCH_SYSTEM_TEMACS -YMF_PASS_LDFLAGS +PRE_EDIT_LDFLAGS +POST_EDIT_LDFLAGS LINKER LIB_GCC MOUSE_SUPPORT @@ -9935,8 +9934,6 @@ HAVE_NS=no NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no -NS_IMPL_GNUSTEP_INC= -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -9955,22 +9952,18 @@ ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" - GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" + GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" - ## Pull in stuff from GNUstep-make. - ## FIXME? Cleaner to use AC_SUBST_FILE for this? - NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu -GUI_LIB=gnu -include $GNUSTEP_MAKEFILES/Additional/base.make -include $GNUSTEP_MAKEFILES/Additional/gui.make -shared=no -" - NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" - CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" + GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)" + GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)" + test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \ + GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}" + test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \ + GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}" + CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" LIB_STANDARD= START_FILES= TEMACS_LDFLAGS2= @@ -10162,8 +10155,6 @@ fi - - ns_frag=/dev/null NS_OBJ= NS_SUPPORT= @@ -26634,6 +26625,11 @@ *) LD_SWITCH_SYSTEM_TEMACS= ;; esac +if test "$NS_IMPL_GNUSTEP" = "yes"; then + LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" +fi + + LINKER= @@ -26660,11 +26656,9 @@ ;; esac -## A macro which other sections of Makefile can redefine to munge the -## flags before they are passed to LD. This is helpful if you have -## redefined LD to something odd, like "gcc". -## (The YMF prefix is a holdover from the old name "ymakefile".) -YMF_PASS_LDFLAGS=flags + +PRE_EDIT_LDFLAGS= +POST_EDIT_LDFLAGS= if test "x$ORDINARY_LINK" = "xyes"; then LINKER="\$(CC)" @@ -26692,9 +26686,11 @@ ## shell''s ``for'' construct. Note that sane people do not have '.' in ## their paths, so we must use ./prefix-args. ## TODO either make prefix-args check ORDINARY_LINK internally, - ## or remove it altogether (bug#6184), removing the need for this macro. - YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' -fi + ## or remove it altogether (bug#6184), removing the need for this hack. + PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' + POST_EDIT_LDFLAGS='`' +fi + test "x$LINKER" = "x" && LINKER=ld
--- a/configure.in Tue May 25 23:37:05 2010 +0000 +++ b/configure.in Wed May 26 22:43:08 2010 +0000 @@ -1468,8 +1468,6 @@ HAVE_NS=no NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no -NS_IMPL_GNUSTEP_INC= -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -1491,24 +1489,20 @@ ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - dnl FIXME sourcing this 3 times in subshells seems inefficient. - GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" + dnl FIXME sourcing this several times in subshells seems inefficient. GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" - ## Pull in stuff from GNUstep-make. - ## FIXME? Cleaner to use AC_SUBST_FILE for this? - NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu -GUI_LIB=gnu -include $GNUSTEP_MAKEFILES/Additional/base.make -include $GNUSTEP_MAKEFILES/Additional/gui.make -shared=no -" - dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes. - NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" - CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" + dnl I seemed to need these as well with GNUstep-startup 0.25. + GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)" + GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)" + test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \ + GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}" + test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \ + GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}" + CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" LIB_STANDARD= START_FILES= TEMACS_LDFLAGS2= @@ -1525,8 +1519,6 @@ NS_HAVE_NSINTEGER=no fi fi -AC_SUBST(NS_IMPL_GNUSTEP_INC) -AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) AC_SUBST(TEMACS_LDFLAGS2) ns_frag=/dev/null @@ -3311,6 +3303,11 @@ *) LD_SWITCH_SYSTEM_TEMACS= ;; esac + +if test "$NS_IMPL_GNUSTEP" = "yes"; then + LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" +fi + AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) @@ -3338,11 +3335,9 @@ ;; esac -## A macro which other sections of Makefile can redefine to munge the -## flags before they are passed to LD. This is helpful if you have -## redefined LD to something odd, like "gcc". -## (The YMF prefix is a holdover from the old name "ymakefile".) -YMF_PASS_LDFLAGS=flags + +PRE_EDIT_LDFLAGS= +POST_EDIT_LDFLAGS= if test "x$ORDINARY_LINK" = "xyes"; then LINKER="\$(CC)" @@ -3366,21 +3361,23 @@ ## shell''s ``for'' construct. Note that sane people do not have '.' in ## their paths, so we must use ./prefix-args. ## TODO either make prefix-args check ORDINARY_LINK internally, - ## or remove it altogether (bug#6184), removing the need for this macro. - YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' + ## or remove it altogether (bug#6184), removing the need for this hack. + PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' + POST_EDIT_LDFLAGS='`' fi -AC_SUBST(YMF_PASS_LDFLAGS) +AC_SUBST(PRE_EDIT_LDFLAGS) +AC_SUBST(POST_EDIT_LDFLAGS) test "x$LINKER" = "x" && LINKER=ld -## FIXME? What setting of YMF_PASS_LDFLAGS should this have? +## FIXME? What setting of EDIT_LDFLAGS should this have? test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" AC_SUBST(LINKER) -## FIXME? The logic here is not precisely the same as that above -## setting YMF_PASS_LDFLAGS. There is no check here for a pre-defined -## LINKER. Should we only be setting LIB_GCC if LD ~ -nostdlib? +## FIXME? The logic here is not precisely the same as that above. +## There is no check here for a pre-defined LINKER. +## Should we only be setting LIB_GCC if LD ~ -nostdlib? LIB_GCC= if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
--- a/doc/misc/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/doc/misc/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,3 +1,8 @@ +2010-05-26 Michael Albinus <michael.albinus@gmx.de> + + * eshell.texi (Built-ins): Describe, how to disable a built-in command + by an alias. (Bug#6226) + 2010-05-16 Jay Belanger <jay.p.belanger@gmail.com> * calc.texi (Manipulating Vectors): Mention that vectors can
--- a/doc/misc/eshell.texi Tue May 25 23:37:05 2010 +0000 +++ b/doc/misc/eshell.texi Wed May 26 22:43:08 2010 +0000 @@ -369,6 +369,17 @@ /bin/ls @end example +If you want to discard a given built-in command, you could declare an +alias, @ref{Aliases}. Eample: + +@example +~ $ which sudo +eshell/sudo is a compiled Lisp function in `em-unix.el' +~ $ alias sudo '*sudo $*' +~ $ which sudo +sudo is an alias, defined as "*sudo $*" +@end example + Some of the built-in commands have a special behaviour in Eshell: @table @code
--- a/lisp/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/lisp/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,9 +1,18 @@ +2010-05-26 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/ada-xref.el (ada-gnat-parse-gpr): + * emulation/edt.el (edt-load-keys): Avoid (expand-file-name "."). + +2010-05-26 Glenn Morris <rgm@gnu.org> + + * emulation/edt.el (edt-load-keys): Use locate-library. + 2010-05-25 Chong Yidong <cyd@stupidchicken.com> * log-edit.el (log-edit-strip-single-file-name): Default to nil. (log-edit-changelog-entries): Doc fix. - (log-edit-changelog-insert-entries): Args changed. Rename - relative filenames in ChangeLog entries. Delete tabs. + (log-edit-changelog-insert-entries): Args changed. + Rename relative filenames in ChangeLog entries. Delete tabs. (log-edit-insert-changelog-entries): Reorganize return value of `log-edit-changelog-entries' to pass filenames to log-edit-changelog-insert-entries.
--- a/lisp/emulation/edt.el Tue May 25 23:37:05 2010 +0000 +++ b/lisp/emulation/edt.el Wed May 26 22:43:08 2010 +0000 @@ -1,7 +1,8 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> @@ -2056,40 +2057,32 @@ Ack!! You're running the Enhanced EDT Emulation without loading an EDT key mapping file. To create an EDT key mapping file, run the - edt-mapper.el program. It is safest to run it from an Emacs loaded + edt-mapper program. It is safest to run it from an Emacs loaded without any of your own customizations found in your .emacs file, etc. The reason for this is that some user customizations confuse edt-mapper. You can do this by quitting Emacs and then invoking Emacs again as follows: - emacs -q -l edt-mapper.el + emacs -q -l edt-mapper [NOTE: If you do nothing out of the ordinary in your .emacs file, and - the search for edt-mapper.el is successful, you can try running it now.] + the search for edt-mapper is successful, you can try running it now.] - The file edt-mapper.el includes these same directions on how to + The library edt-mapper includes these same directions on how to use it! Perhaps it's lying around here someplace. \n ") - (let ((file "edt-mapper.el") - (found nil) - (path nil) - (search-list (append (list (expand-file-name ".")) load-path))) - (while (and (not found) search-list) - (setq path (concat (car search-list) - (if (string-match "/$" (car search-list)) "" "/") - file)) - (if (and (file-exists-p path) (not (file-directory-p path))) - (setq found t)) - (setq search-list (cdr search-list))) - (cond (found - (insert (format - "Ah yes, there it is, in \n\n %s \n\n" path)) - (if (edt-y-or-n-p "Do you want to run it now? ") - (load-file path) - (error "EDT Emulation not configured"))) - (t - (insert "Nope, I can't seem to find it. :-(\n\n") - (sit-for 20) - (error "EDT Emulation not configured"))))))) + (let ((path (locate-library + "edt-mapper" + nil (append (list default-directory) load-path)))) + (if path + (progn + (insert (format + "Ah yes, there it is, in \n\n %s \n\n" path)) + (if (edt-y-or-n-p "Do you want to run it now? ") + (load-file path) + (error "EDT Emulation not configured"))) + (insert "Nope, I can't seem to find it. :-(\n\n") + (sit-for 20) + (error "EDT Emulation not configured")))))) ;;; ;;; Turning the EDT Emulation on and off. @@ -2570,12 +2563,12 @@ ;;; DEFAULT EDT KEYPAD HELP ;;; -;;; -;;; Upper case commands in the keypad diagram below indicate that the -;;; emulation should look and feel very much like EDT. Lower case -;;; commands are enhancements and/or additions to the EDT keypad -;;; commands or are native Emacs commands. -;;; +;; +;; Upper case commands in the keypad diagram below indicate that the +;; emulation should look and feel very much like EDT. Lower case +;; commands are enhancements and/or additions to the EDT keypad +;; commands or are native Emacs commands. +;; (defun edt-keypad-help () "DEFAULT EDT Keypad Active. @@ -2684,7 +2677,7 @@ ;;; ;;; EDT emulation screen width commands. -;;; +;; ;; Some terminals require modification of terminal attributes when ;; changing the number of columns displayed, hence the fboundp tests ;; below. These functions are defined in the corresponding terminal
--- a/lisp/org/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/lisp/org/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-26 Stefan Monnier <monnier@iro.umontreal.ca> + + * org.el (org-file-complete-link): Avoid (expand-file-name "."). + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released.
--- a/lisp/org/org.el Tue May 25 23:37:05 2010 +0000 +++ b/lisp/org/org.el Wed May 26 22:43:08 2010 +0000 @@ -8316,7 +8316,7 @@ (setq file (read-file-name "File: ")) (let ((pwd (file-name-as-directory (expand-file-name "."))) (pwd1 (file-name-as-directory (abbreviate-file-name - (expand-file-name "."))))) + default-directory)))) (cond ((equal arg '(16)) (setq link (org-make-link
--- a/lisp/progmodes/ada-xref.el Tue May 25 23:37:05 2010 +0000 +++ b/lisp/progmodes/ada-xref.el Wed May 26 22:43:08 2010 +0000 @@ -381,9 +381,9 @@ (forward-line 1) ; first directory in list (while (not (looking-at "^$")) ; terminate on blank line (back-to-indentation) ; skip whitespace - (if (looking-at "<Current_Directory>") - (add-to-list 'src-dir (expand-file-name ".")) - (add-to-list 'src-dir + (add-to-list 'src-dir + (if (looking-at "<Current_Directory>") + default-directory (expand-file-name (buffer-substring-no-properties (point) (line-end-position))))) @@ -395,9 +395,9 @@ (forward-line 1) (while (not (looking-at "^$")) (back-to-indentation) - (if (looking-at "<Current_Directory>") - (add-to-list 'obj-dir (expand-file-name ".")) - (add-to-list 'obj-dir + (add-to-list 'obj-dir + (if (looking-at "<Current_Directory>") + default-directory (expand-file-name (buffer-substring-no-properties (point) (line-end-position)))))
--- a/msdos/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/msdos/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,10 +1,17 @@ +2010-05-26 Glenn Morris <rgm@gnu.org> + + * sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing. + + * sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): + No longer present. + 2010-05-25 Glenn Morris <rgm@gnu.org> * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present. 2010-05-21 Glenn Morris <rgm@gnu.org> - * sed1v2.inp(@ns_frag@): Edit to nothing. + * sed1v2.inp (@ns_frag@): Edit to nothing. * sed1x.inp (OLDXMENU): Replace any initial value. * sed1v2.inp (OLDXMENU): Edit to "nothing".
--- a/msdos/sed1v2.inp Tue May 25 23:37:05 2010 +0000 +++ b/msdos/sed1v2.inp Wed May 26 22:43:08 2010 +0000 @@ -129,8 +129,6 @@ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// -/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^[ ]*$/d @@ -149,6 +147,8 @@ s/@YMF_PASS_LDFLAGS@/flags/ s/@deps_frag@// s/@ns_frag@// +s/@PRE_EDIT_LDFLAGS@// +s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/
--- a/src/ChangeLog Tue May 25 23:37:05 2010 +0000 +++ b/src/ChangeLog Wed May 26 22:43:08 2010 +0000 @@ -1,3 +1,17 @@ +2010-05-26 Glenn Morris <rgm@gnu.org> + + * Makefile.in (YMF_PASS_LDFLAGS): Remove. + (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS. + + * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): + Remove. + (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS. + +2010-05-26 Kenichi Handa <handa@m17n.org> + + * composite.c (composition_compute_stop_pos): Fix condition for + backward scanning. + 2010-05-25 Glenn Morris <rgm@gnu.org> * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
--- a/src/Makefile.in Tue May 25 23:37:05 2010 +0000 +++ b/src/Makefile.in Wed May 26 22:43:08 2010 +0000 @@ -111,14 +111,8 @@ ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ -## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. -@NS_IMPL_GNUSTEP_INC@ - -## This uses ${CONFIG_SYSTEM_LIBS} from @NS_IMPL_GNUSTEP_INC@. -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@ - ## Flags to pass to ld only for temacs. -TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) +TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ @@ -640,10 +634,14 @@ buildobj.h: Makefile echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h -#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@ +/* We cannot define variables for PRE_EDIT and POST_EDIT. + If !ORDINARY_LINK && !LINKER && GCC, they add a + \`./prefix-args -Xlinker ... \` wrapper, otherwise they are empty. + One alternative to this approach would be to always call prefix-args, + and have it DTRT in all cases, by testing the above defines. */ temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} - $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \ + $(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \ ${TEMACS_LDFLAGS2} \ -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}