Mercurial > emacs
changeset 29657:cdef08609770
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 14 Jun 2000 20:26:14 +0000 |
| parents | 54fbbb8d8578 |
| children | 7541a7e8924d |
| files | ChangeLog configure etc/NEWS lisp/ChangeLog lisp/Makefile lisp/Makefile.in src/ChangeLog |
| diffstat | 7 files changed, 194 insertions(+), 162 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 14 20:24:08 2000 +0000 +++ b/ChangeLog Wed Jun 14 20:26:14 2000 +0000 @@ -1,5 +1,7 @@ 2000-06-14 Gerd Moellmann <gerd@gnu.org> + * configure.in: Generate lisp/Makefile. + * configure.in: Add support for `*-lynxos*'. Use `cpp' as NON_GNU_CPP for `alpha*-dec-osf[5-9]*', as recommended by <Karen.Dorhamer@compaq.com> to fix problems
--- a/configure Wed Jun 14 20:24:08 2000 +0000 +++ b/configure Wed Jun 14 20:26:14 2000 +0000 @@ -7839,7 +7839,7 @@ trap 'rm -fr `echo "Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \ - leim/Makefile src/config.h:src/config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + lisp/Makefile leim/Makefile src/config.h:src/config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -7951,7 +7951,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \ - leim/Makefile"} + lisp/Makefile leim/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- a/etc/NEWS Wed Jun 14 20:24:08 2000 +0000 +++ b/etc/NEWS Wed Jun 14 20:26:14 2000 +0000 @@ -1222,6 +1222,9 @@ * Lisp changes made after edition 2.6 of the Emacs Lisp Manual, (Display-related features are described in a page of their own below.) +** The function `single-key-description' now encloses function key +and event names in ange brackets. + ** If the variable `message-truncate-lines' is bound to t around a call to `message', the echo area will not be resized to display that message; it will be truncated instead.
--- a/lisp/ChangeLog Wed Jun 14 20:24:08 2000 +0000 +++ b/lisp/ChangeLog Wed Jun 14 20:26:14 2000 +0000 @@ -1,5 +1,9 @@ 2000-06-14 Gerd Moellmann <gerd@gnu.org> + * Makefile.in (VPATH): New file. + + * Makefile: Removed. + * net/goto-addr.el (goto-address): Don't bind C-c RET locally. (goto-address-highlight-keymap): Bind C-c RET.
--- a/lisp/Makefile Wed Jun 14 20:24:08 2000 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -# -# Maintenance productions for the Lisp directory -# - -# You can specify a different executable on the make command line, -# e.g. "make EMACS=../src/emacs ...". - -EMACS = ../src/emacs - -# Command line flags for Emacs. This must include --multibyte, -# otherwise some files will not compile. - -EMACSOPT = -batch --no-site-file --multibyte - -SOURCES = *.el COPYING Makefile -lisptagsfiles1 = [a-zA-Z]*.el -lisptagsfiles2 = [a-zA-Z]*/[a-zA-Z]*.el -ETAGS = ../lib-src/etags - -# Files which should not be compiled. All file names must be relative -# to the `lisp' directory. -# - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's -# no point compiling it, although it doesn't hurt. - -DONTCOMPILE = bindings.el mail/blessmail.el play/bruce.el cus-load.el \ - cus-start.el forms-d2.el forms-pass.el \ - international/latin-1.el international/latin-2.el \ - international/latin-3.el international/latin-4.el \ - international/latin-5.el \ - loaddefs.el loadup.el international/mule-conf.el patcomp.el \ - paths.el mail/sc.el subdirs.el version.el \ - generic-x.el international/latin-8.el international/latin-9.el \ - emacs-lisp/cl-specs.el finder-inf.el term/internal.el - -# Files to compile before others during a bootstrap. This is done -# to speed up the bootstrap process. - -COMPILE_FIRST = emacs-lisp/bytecomp.el emacs-lisp/byte-opt.el subr.el - -# The actual Emacs command run in the targets below. - -emacs = $(EMACS) $(EMACSOPT) - -# Common command to find subdirectories - -setwins=subdirs=`find $$wd -type d -print`; \ - for file in $$subdirs; do \ - case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \ - *) wins="$$wins $$file" ;; \ - esac; \ - done - -doit: - -cus-load.el: - touch $@ -custom-deps: cus-load.el doit - wd=.; $(setwins); \ - echo Directories: $$wins; \ - $(emacs) -l cus-dep -f custom-make-dependencies $$wins - -finder-inf.el: - echo "(provide 'finder-inf)" >> $@ -finder-data: finder-inf.el doit - wd=.; $(setwins); \ - echo Directories: $$wins; \ - $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins - -loaddefs.el: - echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@ - echo ";;" >> $@; echo ";;; Code:" >> $@ - echo " " >> $@ - echo ";;; Local Variables:" >> $@ - echo ";;; version-control: never" >> $@ - echo ";;; no-byte-compile: t" >> $@ - echo ";;; no-update-autoloads: t" >> $@ - echo ";;; End:" >> $@ - echo ";;; loaddefs.el ends here" >> $@ -autoloads: loaddefs.el doit - wd=.; $(setwins); \ - echo Directories: $$wins; \ - $(emacs) -l autoload --eval '(setq generated-autoload-file "'`pwd`'/loaddefs.el")' -f batch-update-autoloads $$wins - -subdirs.el: - $(MAKE) $(MFLAGS) update-subdirs -update-subdirs: doit - wd=.; $(setwins); \ - for file in $$wins; do \ - ../update-subdirs $$file; \ - done; - -updates: update-subdirs autoloads finder-data custom-deps - -TAGS: $(lisptagsfiles1) $(lisptagsfiles2) - ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2) - -TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2) - ${ETAGS} -o TAGS-LISP \ - $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2) - -.el.elc: subdirs.el - -EMACSLOADPATH=`pwd` $(emacs) -f batch-byte-compile $< - -$(DONTCOMPILE:.el=.elc): - -rm -f $@ - -# Compile all Lisp files, except those from DONTCOMPILE. This -# compiles files unconditionally. All .elc files are made writable -# before compilation in case we checked out read-only (CVS option -r). -# Files MUST be compiled one by one. If we compile several files in a -# row we can't make sure that the compilation environment is clean. -# We also set the load-path of the Emacs used for compilation to the -# current directory and its subdirectories, to make sure require's and -# load's in the files being compiled find the right files. - -compile-files: subdirs.el doit - find . -name "*.elc" -print | xargs chmod +w; \ - wd=.; $(setwins); \ - elpat=`echo $$wins | tr ' ' '\012\012' | \ - sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ - els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \ - tr ' ' '\012\012' | sort | uniq -u`; \ - for el in $(COMPILE_FIRST) $$els; do \ - echo Compiling $$el; \ - EMACSLOADPATH=`pwd` $(emacs) -f batch-byte-compile $$el ;\ - done - -# Backup compiled Lisp files in elc.tar.gz. If that file already -# exists, make a backup of it. - -backup-compiled-files: - -mv elc.tar.gz elc.tar.gz~ - -tar czf elc.tar.gz *.elc */*.elc - -# Compile Lisp files, but save old compiled files first. - -compile: backup-compiled-files compile-files - -# Recompile all Lisp files which are newer than their .elc files. -# Note that this doesn't create .elc files. It only recompiles if an -# .elc is present. - -recompile: doit - $(emacs) -f batch-byte-recompile-directory . - -# Prepare a bootstrap in the lisp subdirectory. Build loaddefs.el, -# because it's not sure it's up-to-date, and if it's not, that might -# lead to errors during the bootstrap because something fails to -# autoload as expected. Remove compiled Lisp files so that -# bootstrap-emacs will be built from sources only. - -bootstrap-clean: - if test -f $(emacs); then $(MAKE) $(MFLAGS) autoloads; fi - -rm -f *.elc */*.elc - -# Generate/update files for the bootstrap process. - -bootstrap: autoloads compile-files custom-deps - -# Makefile ends here.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/Makefile.in Wed Jun 14 20:26:14 2000 +0000 @@ -0,0 +1,183 @@ +# +# Maintenance productions for the Lisp directory +# + +lisp=@srcdir@ +VPATH=@srcdir@ + +# You can specify a different executable on the make command line, +# e.g. "make EMACS=../src/emacs ...". + +EMACS = ../src/emacs + +# Command line flags for Emacs. This must include --multibyte, +# otherwise some files will not compile. + +EMACSOPT = -batch --no-site-file --multibyte + +SOURCES = *.el COPYING Makefile +lisptagsfiles1 = $(lisp)/[a-zA-Z]*.el +lisptagsfiles2 = $(lisp)/[a-zA-Z]*/[a-zA-Z]*.el +ETAGS = ../lib-src/etags + +# Files which should not be compiled. +# - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's +# no point compiling it, although it doesn't hurt. + +DONTCOMPILE = \ + $(lisp)/bindings.el \ + $(lisp)/cus-load.el \ + $(lisp)/cus-start.el \ + $(lisp)/emacs-lisp/cl-specs.el \ + $(lisp)/finder-inf.el \ + $(lisp)/forms-d2.el \ + $(lisp)/forms-pass.el \ + $(lisp)/generic-x.el \ + $(lisp)/international/latin-1.el \ + $(lisp)/international/latin-2.el \ + $(lisp)/international/latin-3.el \ + $(lisp)/international/latin-4.el \ + $(lisp)/international/latin-5.el \ + $(lisp)/international/latin-8.el \ + $(lisp)/international/latin-9.el \ + $(lisp)/international/mule-conf.el \ + $(lisp)/loaddefs.el \ + $(lisp)/loadup.el \ + $(lisp)/mail/blessmail.el \ + $(lisp)/mail/sc.el \ + $(lisp)/patcomp.el \ + $(lisp)/paths.el \ + $(lisp)/play/bruce.el \ + $(lisp)/subdirs.el \ + $(lisp)/term/internal.el \ + $(lisp)/version.el + +# Files to compile before others during a bootstrap. This is done +# to speed up the bootstrap process. + +COMPILE_FIRST = \ + $(lisp)/emacs-lisp/byte-opt.el \ + $(lisp)/emacs-lisp/bytecomp.el \ + $(lisp)/subr.el + +# The actual Emacs command run in the targets below. + +emacs = $(EMACS) $(EMACSOPT) + +# Common command to find subdirectories + +setwins=subdirs=`find $$wd -type d -print`; \ + for file in $$subdirs; do \ + case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \ + *) wins="$$wins $$file" ;; \ + esac; \ + done + +doit: + +cus-load.el: + touch $@ +custom-deps: cus-load.el doit + wd=$(lisp); $(setwins); \ + echo Directories: $$wins; \ + $(emacs) -l cus-dep -f custom-make-dependencies $$wins + +finder-inf.el: + echo "(provide 'finder-inf)" >> $@ +finder-data: finder-inf.el doit + wd=$(lisp); $(setwins); \ + echo Directories: $$wins; \ + $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins + +loaddefs.el: + echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@ + echo ";;" >> $@; echo ";;; Code:" >> $@ + echo " " >> $@ + echo ";;; Local Variables:" >> $@ + echo ";;; version-control: never" >> $@ + echo ";;; no-byte-compile: t" >> $@ + echo ";;; no-update-autoloads: t" >> $@ + echo ";;; End:" >> $@ + echo ";;; loaddefs.el ends here" >> $@ +autoloads: loaddefs.el doit + wd=$(lisp); $(setwins); \ + echo Directories: $$wins; \ + $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins + +subdirs.el: + $(MAKE) $(MFLAGS) update-subdirs +update-subdirs: doit + wd=$(lisp); $(setwins); \ + for file in $$wins; do \ + $(srcdir)/update-subdirs $$file; \ + done; + +updates: update-subdirs autoloads finder-data custom-deps + +TAGS: $(lisptagsfiles1) $(lisptagsfiles2) + ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2) + +TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2) + ${ETAGS} -o TAGS-LISP \ + $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2) + +.el.elc: subdirs.el + -EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $< + +$(DONTCOMPILE:.el=.elc): + -rm -f $@ + +# Compile all Lisp files, except those from DONTCOMPILE. This +# compiles files unconditionally. All .elc files are made writable +# before compilation in case we checked out read-only (CVS option -r). +# Files MUST be compiled one by one. If we compile several files in a +# row we can't make sure that the compilation environment is clean. +# We also set the load-path of the Emacs used for compilation to the +# current directory and its subdirectories, to make sure require's and +# load's in the files being compiled find the right files. + +compile-files: subdirs.el doit + find $(lisp) -name "*.elc" -print | xargs chmod +w; \ + wd=$(lisp); $(setwins); \ + elpat=`echo $$wins | tr ' ' '\012\012' | \ + sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ + els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \ + tr ' ' '\012\012' | sort | uniq -u`; \ + for el in $(COMPILE_FIRST) $$els; do \ + echo Compiling $$el; \ + EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \ + done + +# Backup compiled Lisp files in elc.tar.gz. If that file already +# exists, make a backup of it. + +backup-compiled-files: + -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~ + -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc + +# Compile Lisp files, but save old compiled files first. + +compile: backup-compiled-files compile-files + +# Recompile all Lisp files which are newer than their .elc files. +# Note that this doesn't create .elc files. It only recompiles if an +# .elc is present. + +recompile: doit + $(emacs) -f batch-byte-recompile-directory $(lisp) + +# Prepare a bootstrap in the lisp subdirectory. Build loaddefs.el, +# because it's not sure it's up-to-date, and if it's not, that might +# lead to errors during the bootstrap because something fails to +# autoload as expected. Remove compiled Lisp files so that +# bootstrap-emacs will be built from sources only. + +bootstrap-clean: + if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi + -rm -f $(lisp)/*.elc $(lisp)/*/*.elc + +# Generate/update files for the bootstrap process. + +bootstrap: autoloads compile-files custom-deps + +# Makefile ends here.