Now on revision 108339. ------------------------------------------------------------ revno: 108339 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:38:10 -0700 message: Missing piece of previous change diff: === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2012-05-22 03:31:34 +0000 +++ lisp/mail/emacsbug.el 2012-05-22 03:38:10 +0000 @@ -339,7 +339,7 @@ " Type \\[report-emacs-bug-insert-to-mailer] to copy text to your preferred mail program.\n"))) (terpri) (princ (substitute-command-keys - " Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section + " Type \\[info-emacs-bug] to visit in Info the Emacs Manual section about when and how to write a bug report, and what information you should include to help fix the bug."))) (shrink-window-if-larger-than-buffer (get-buffer-window "*Bug Help*"))) ------------------------------------------------------------ revno: 108338 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:35:14 -0700 message: * doc/emacs/emacs.texi (Acknowledgments): Add another contributor. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-05-12 00:57:48 +0000 +++ doc/emacs/ChangeLog 2012-05-22 03:35:14 +0000 @@ -1,3 +1,7 @@ +2012-05-22 Glenn Morris + + * emacs.texi (Acknowledgments): Add another contributor. + 2012-05-12 Glenn Morris * Makefile.in (MKDIR_P): New, set by configure. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2012-05-01 07:38:15 +0000 +++ doc/emacs/emacs.texi 2012-05-22 03:35:14 +0000 @@ -1348,7 +1348,7 @@ Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy -Andras, Benjamin Andresen, Ralf Angeli, Joe Arceneaux, Emil Åström, +Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström, Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl ------------------------------------------------------------ revno: 108337 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:31:34 -0700 message: Add "How to Report a Bug" to Help menu * lisp/info.el (info-emacs-bug): New command. * lisp/menu-bar.el (menu-bar-help-menu): Add "How to Report a Bug" to Help. * lisp/mail/emacsbug.el (report-emacs-bug): Replace with info-emacs-bug. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-21 20:40:55 +0000 +++ lisp/ChangeLog 2012-05-22 03:31:34 +0000 @@ -1,3 +1,9 @@ +2012-05-22 Glenn Morris + + * info.el (info-emacs-bug): New command. + * menu-bar.el (menu-bar-help-menu): Add "How to Report a Bug" to Help. + * mail/emacsbug.el (report-emacs-bug): Replace with info-emacs-bug. + 2012-05-21 Glenn Morris * makefile.w32-in (update-subdirs-SH): === modified file 'lisp/info.el' --- lisp/info.el 2012-05-04 23:16:47 +0000 +++ lisp/info.el 2012-05-22 03:31:34 +0000 @@ -1,6 +1,6 @@ ;; info.el --- info package for Emacs -;; Copyright (C) 1985-1986, 1992-2012 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992-2012 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help @@ -683,6 +683,12 @@ (info "emacs")) ;;;###autoload +(defun info-emacs-bug () + "Display the \"Reporting Bugs\" section of the Emacs manual in Info mode." + (interactive) + (info "(emacs)Bugs")) + +;;;###autoload (defun info-standalone () "Run Emacs as a standalone Info reader. Usage: emacs -f info-standalone [filename] === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2012-04-07 19:51:51 +0000 +++ lisp/mail/emacsbug.el 2012-05-22 03:31:34 +0000 @@ -316,7 +316,7 @@ (fill-region (line-beginning-position 0) (point)) ;; This is so the user has to type something in order to send easily. (use-local-map (nconc (make-sparse-keymap) (current-local-map))) - (define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info) + (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug) (if can-insert-mail (define-key (current-local-map) "\C-cm" 'report-emacs-bug-insert-to-mailer)) @@ -353,10 +353,7 @@ (buffer-substring-no-properties (point-min) (point))) (goto-char user-point))) -(defun report-emacs-bug-info () - "Go to the Info node on reporting Emacs bugs." - (interactive) - (info "(emacs)Bugs")) +(define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.2") ;; It's the default mail mode, so it seems OK to use its features. (autoload 'message-bogus-recipient-p "message") === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2012-01-31 08:38:58 +0000 +++ lisp/menu-bar.el 2012-05-22 03:31:34 +0000 @@ -1,6 +1,6 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF @@ -1752,6 +1752,9 @@ (define-key menu [send-emacs-bug-report] `(menu-item ,(purecopy "Send Bug Report...") report-emacs-bug :help ,(purecopy "Send e-mail to Emacs maintainers"))) + (define-key menu [emacs-manual-bug] + `(menu-item ,(purecopy "How to Report a Bug") info-emacs-bug + :help ,(purecopy "Read about how to report an Emacs bug"))) (define-key menu [emacs-known-problems] `(menu-item ,(purecopy "Emacs Known Problems") view-emacs-problems :help ,(purecopy "Read about known problems with Emacs"))) ------------------------------------------------------------ revno: 108336 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:28:12 -0700 message: Use C-h r in BUGS diff: === modified file 'BUGS' --- BUGS 2012-05-21 19:32:04 +0000 +++ BUGS 2012-05-22 03:28:12 +0000 @@ -4,10 +4,13 @@ (1) how to tell when to report a bug, and (2) how to write a useful bug report and what information it needs to have. -You can read the read the Bugs section of the manual from inside Emacs. -Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the -Emacs manual, then m Bugs RET to get to the section on bugs. -Or you can use the standalone Info program in a like manner. +You can read the Bugs section of the manual from inside Emacs. +Start Emacs, and press + C-h r (to view the Emacs manual) + m Bugs RET (to go to the section on Bugs) +Or you can use the standalone Info program: + info emacs + m Bugs RET (Standalone Info is part of the Texinfo distribution, not part of the Emacs distribution.) ------------------------------------------------------------ revno: 108335 fixes bug(s): http://debbugs.gnu.org/11529 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-05-21 18:19:43 -0700 message: * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529) Without this further fix, aclocal was being invoked unnecessarily. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-22 01:10:05 +0000 +++ ChangeLog 2012-05-22 01:19:43 +0000 @@ -1,3 +1,8 @@ +2012-05-22 Paul Eggert + + * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529) + Without this further fix, aclocal was being invoked unnecessarily. + 2012-05-22 Glenn Morris * Makefile.in (blessmail, install-arch-dep, uninstall): === modified file 'Makefile.in' --- Makefile.in 2012-05-22 01:10:05 +0000 +++ Makefile.in 2012-05-22 01:19:43 +0000 @@ -272,7 +272,7 @@ # are treated separately. # quail appears twice because in out-of-tree builds, it exists twice. COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail -COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail +COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail all: ${SUBDIR} @@ -365,7 +365,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf -ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4) +ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && aclocal -I m4 ------------------------------------------------------------ revno: 108334 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 21:10:05 -0400 message: More small tweaks for Makefile.in * Makefile.in (blessmail, install-arch-dep, uninstall): Check cd lib-src works. (install-arch-dep, uninstall): Remove unneeded subshells. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 20:40:55 +0000 +++ ChangeLog 2012-05-22 01:10:05 +0000 @@ -1,3 +1,9 @@ +2012-05-22 Glenn Morris + + * Makefile.in (blessmail, install-arch-dep, uninstall): + Check cd lib-src works. + (install-arch-dep, uninstall): Remove unneeded subshells. + 2012-05-21 Glenn Morris * update-subdirs: Move to build-aux/. === modified file 'Makefile.in' --- Makefile.in 2012-05-21 20:40:55 +0000 +++ Makefile.in 2012-05-22 01:10:05 +0000 @@ -340,7 +340,7 @@ VCSWITNESS="$$vcswitness" blessmail: Makefile src FRC - cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ + cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ MAKE='${MAKE}' archlibdir='$(archlibdir)' # We used to have one rule per */Makefile.in, but that leads to race @@ -417,11 +417,11 @@ ### Lisp files and DOC file to work properly. install-arch-dep: install-arch-indep install-doc umask 022; ${MKDIR_P} $(DESTDIR)${bindir} - (cd lib-src; \ + cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ - INSTALL_STRIP=${INSTALL_STRIP}) + INSTALL_STRIP=${INSTALL_STRIP} if test "${ns_self_contained}" = "no"; then \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ @@ -630,10 +630,10 @@ ### ### Don't delete the lisp and etc directories if they're in the source tree. uninstall: - (cd lib-src; \ + cd lib-src && \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ - bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}) + bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} -unset CDPATH; \ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ ------------------------------------------------------------ revno: 108333 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:58:17 -0400 message: * lib-src/Makefile.in (install): Remove unneeded chmods. INSTALL_PROGRAM and INSTALL_SCRIPT default to mode 755. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-05-21 15:36:54 +0000 +++ lib-src/ChangeLog 2012-05-22 00:58:17 +0000 @@ -1,3 +1,7 @@ +2012-05-22 Glenn Morris + + * Makefile.in (install): Remove unneeded chmods. + 2012-05-21 Paul Eggert Assume C89 or later. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2012-05-21 00:44:34 +0000 +++ lib-src/Makefile.in 2012-05-22 00:58:17 +0000 @@ -262,11 +262,9 @@ umask 022; ${MKDIR_P} $(DESTDIR)${bindir} for file in ${INSTALLABLES} ; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ - chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ done for file in ${INSTALLABLE_SCRIPTS} ; do \ $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ - chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ done uninstall: ------------------------------------------------------------ revno: 108332 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 20:46:40 -0400 message: Remove leim/Makefile.in's SUBDIRS It isn't necessary given MKDIR_P, and I have some vague memory that the time-stamping was causing unncessary re-dumping in some instance. * leim/Makefile.in (SUBDIRS): Remove variable and rule. (MKDIR_P): Add it back. (all, changed.tit, changed.misc, leim-list.el): Don't depend on SUBDIRS. (changed.tit, changed.misc): Ensure output directory exists. (distclean): Don't use SUBDIRS. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-05-21 20:13:49 +0000 +++ leim/ChangeLog 2012-05-22 00:46:40 +0000 @@ -1,3 +1,12 @@ +2012-05-22 Glenn Morris + + * Makefile.in (SUBDIRS): Remove variable and rule. + (MKDIR_P): Add it back. + (all, changed.tit, changed.misc, leim-list.el): + Don't depend on SUBDIRS. + (changed.tit, changed.misc): Ensure output directory exists. + (distclean): Don't use SUBDIRS. + 2012-05-21 Glenn Morris * Makefile.in (install): Remove, let top-level do it. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-21 20:13:49 +0000 +++ leim/Makefile.in 2012-05-22 00:46:40 +0000 @@ -39,9 +39,7 @@ RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ ${EMACS} -batch --no-site-file --no-site-lisp -# Subdirectories to be made if ${srcdir} is different from the current -# directory. -SUBDIRS=quail +MKDIR_P = @MKDIR_P@ # Files generated from TIT dictionaries for Chinese GB character set. TIT_GB=\ @@ -83,11 +81,7 @@ @echo Compiling $< @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< -all: ${SUBDIRS} leim-list.el compile-main - -${SUBDIRS}: - mkdir $@ - touch stamp-subdir +all: leim-list.el compile-main TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ @@ -107,9 +101,6 @@ ${CHINESE_TIT}: changed.tit @true -## FIXME remove subdirs if possible - time-stamping. -## Emacs should make the directory if it does not exist. - ## The changed.* files act to serialize this part of the build. ## A single Emacs invocation creates all the CHINESE_TIT files. ## Otherwise in a parallel build multiple Emacs instances could @@ -118,7 +109,8 @@ ## file. Something like the pattern rule: ## quail/%.el: CXTERM-DIC/%.tit ## It doesn't seem possible to do this with VPATH and suffix rules. -changed.tit: ${SUBDIRS} ${TIT_SOURCES} +changed.tit: ${TIT_SOURCES} + @${MKDIR_P} quail ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ echo "changed" > $@ @@ -134,12 +126,13 @@ ${MISC}: changed.misc @true -changed.misc: ${SUBDIRS} ${MISC_SOURCES} +changed.misc: ${MISC_SOURCES} + @${MKDIR_P} quail ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ echo "changed" > $@ -leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el +leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el rm -f leim-list.el if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ ${RUN_EMACS} -l ${buildlisppath}/international/quail \ @@ -184,7 +177,7 @@ $(setwins); for w in $$wins; do rm -f $$w/*.elc; done distclean: clean - if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi + -[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && rm -rf quail rm -f Makefile maintainer-clean: distclean bootstrap-clean ------------------------------------------------------------ revno: 108331 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 16:40:55 -0400 message: * update-subdirs: Move to build-aux/. * make-dist: * Makefile.in (install-arch-indep): * lisp/Makefile.in (update-subdirs): * lisp/makefile.w32-in (update-subdirs-SH): Update for this change. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 20:13:49 +0000 +++ ChangeLog 2012-05-21 20:40:55 +0000 @@ -1,5 +1,8 @@ 2012-05-21 Glenn Morris + * update-subdirs: Move to build-aux/. + * make-dist, Makefile.in (install-arch-indep): Update for this change. + * Makefile.in (leimdir): New, set by configure. (COPYDIR, COPYDESTS): Add leim directories. (install-leim): Remove. === modified file 'Makefile.in' --- Makefile.in 2012-05-21 20:13:49 +0000 +++ Makefile.in 2012-05-21 20:40:55 +0000 @@ -523,7 +523,7 @@ -rm -f $(DESTDIR)${leimdir}/leim-list.el ${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el -rm -f $(DESTDIR)${lispdir}/subdirs.el - umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir} + umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir} subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ ${write_subdir} subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ === renamed file 'update-subdirs' => 'build-aux/update-subdirs' === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-21 04:33:54 +0000 +++ lisp/ChangeLog 2012-05-21 20:40:55 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * makefile.w32-in (update-subdirs-SH): + * Makefile.in (update-subdirs): Update for moved update-subdirs. + 2012-05-21 Stefan Monnier * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2012-05-21 00:44:34 +0000 +++ lisp/Makefile.in 2012-05-21 20:40:55 +0000 @@ -1,5 +1,5 @@ # Maintenance productions for the Lisp directory -# Copyright (C) 2000-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -179,7 +179,7 @@ update-subdirs: doit cd $(lisp); $(setwins_for_subdirs); \ for file in $$wins; do \ - $(top_srcdir)/update-subdirs $$file; \ + $(top_srcdir)/build-aux/update-subdirs $$file; \ done; updates: update-subdirs autoloads finder-data custom-deps === modified file 'lisp/makefile.w32-in' --- lisp/makefile.w32-in 2012-03-25 18:17:46 +0000 +++ lisp/makefile.w32-in 2012-05-21 20:40:55 +0000 @@ -1,5 +1,5 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (C) 2000-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -243,9 +243,9 @@ echo ;; End:>> $(lisp)/subdirs.el update-subdirs-SH: doit - $(srcdir)/update-subdirs $(lisp); \ + $(srcdir)/build-aux/update-subdirs $(lisp); \ for file in $(WINS_SUBDIR); do \ - $(srcdir)/update-subdirs $$file; \ + $(srcdir)/build-aux/update-subdirs $$file; \ done; updates: update-subdirs autoloads mh-autoloads finder-data custom-deps === modified file 'make-dist' --- make-dist 2012-05-21 19:16:27 +0000 +++ make-dist 2012-05-21 20:40:55 +0000 @@ -285,7 +285,7 @@ echo "Making links to top-level files" ln INSTALL README BUGS ${tempdir} ln ChangeLog Makefile.in configure configure.in ${tempdir} -ln config.bat make-dist update-subdirs .dir-locals.el ${tempdir} +ln config.bat make-dist .dir-locals.el ${tempdir} ln aclocal.m4 ${tempdir} echo "Creating subdirectories" @@ -346,7 +346,7 @@ echo "Making links to \`build-aux'" (cd build-aux ln compile config.guess config.sub depcomp ../${tempdir}/build-aux - ln install-sh missing move-if-change ../${tempdir}/build-aux) + ln install-sh missing move-if-change update-subdirs ../${tempdir}/build-aux) echo "Making links to \`build-aux/snippet'" (cd build-aux/snippet ------------------------------------------------------------ revno: 108330 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 16:13:49 -0400 message: Let the top-level Makefile install leim * Makefile.in (leimdir): New, set by configure. (COPYDIR, COPYDESTS): Add leim directories. (install-leim): Remove. (install-arch-indep): Handle leim installation directly. * leim/Makefile.in (install): Remove, let top-level do it. (version, prefix, datarootdir, datadir, ns_appresdir, leimdir): (MKDIR_P, GZIP_PROG): Remove, no longer used. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 19:16:27 +0000 +++ ChangeLog 2012-05-21 20:13:49 +0000 @@ -1,5 +1,10 @@ 2012-05-21 Glenn Morris + * Makefile.in (leimdir): New, set by configure. + (COPYDIR, COPYDESTS): Add leim directories. + (install-leim): Remove. + (install-arch-indep): Handle leim installation directly. + * vpath.sed: Remove unused file. * make-dist: No more vpath.sed. === modified file 'Makefile.in' --- Makefile.in 2012-05-21 02:33:13 +0000 +++ Makefile.in 2012-05-21 20:13:49 +0000 @@ -181,11 +181,12 @@ # These variables hold the values Emacs will actually use. They are # based on the values of the standard Make variables above. -# Where to install the lisp files distributed with +# Where to install the lisp, leim files distributed with # Emacs. This includes the Emacs version, so that the # lisp files for different versions of Emacs will install # themselves in separate directories. lispdir=@lispdir@ +leimdir=@leimdir@ # Directories Emacs should search for lisp files specific # to this site (i.e. customizations), before consulting @@ -267,12 +268,11 @@ # Subdirectories to install, and where they'll go. # lib-src's makefile knows how to install it, so we don't do that here. -# leim's makefile also knows how to install it, so we don't do that here. -# When installing the info files, we need to do special things to -# avoid nuking an existing dir file, so we don't do that here; -# instead, we have written out explicit code in the `install' targets. -COPYDIR = ${srcdir}/etc ${srcdir}/lisp -COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} +# Directories that cannot simply be copied, eg info, +# are treated separately. +# quail appears twice because in out-of-tree builds, it exists twice. +COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail +COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail all: ${SUBDIR} @@ -482,7 +482,7 @@ ## work correctly, and therefore no idea when tar can be replaced. ## See also these comments from 2004 about cp -r working fine: ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html -install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} +install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} umask 022 ; \ $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` -set ${COPYDESTS} ; \ @@ -494,8 +494,13 @@ [ -d $${dest} ] && \ [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \ continue ; \ - rm -rf $${dest} ; \ - umask 022; ${MKDIR_P} $${dest} ; \ + if [ "$${dir}" = "leim/quail" ]; then \ + [ `cd $${dir} && /bin/pwd` = `cd ${srcdir}/leim/quail && /bin/pwd` ] && \ + continue ; \ + else \ + rm -rf $${dest} ; \ + umask 022; ${MKDIR_P} $${dest} ; \ + fi ; \ echo "Copying $${dir} to $${dest}..." ; \ (cd $${dir}; tar -chf - . ) \ | (cd $${dest}; umask 022; \ @@ -515,6 +520,8 @@ done ; \ find $${dest} -exec chown $${installuser} {} ';' ;\ done + -rm -f $(DESTDIR)${leimdir}/leim-list.el + ${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el -rm -f $(DESTDIR)${lispdir}/subdirs.el umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir} subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ @@ -524,9 +531,13 @@ [ -z "${GZIP_PROG}" ] || \ ( echo "Compressing *.el ..." ; \ unset CDPATH; \ - cd $(DESTDIR)${lispdir}; \ - for f in `find . -name "*.elc" -print`; do \ - ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ + thisdir=`/bin/pwd`; \ + for dir in $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}; do \ + cd $${thisdir} ; \ + cd $${dir} || exit 1 ; \ + for f in `find . -name "*.elc" -print`; do \ + ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ + done ; \ done ) -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} @@ -610,13 +621,6 @@ done ; \ done -### Install LEIM files. Although they are machine-independent, we -### have separate target here instead of including it in -### `install-arch-indep'. People who extracted LEIM files after they -### installed Emacs itself can install only LEIM files by this target. -install-leim: leim/Makefile - cd leim && $(MAKE) $(MFLAGS) install - ### Build Emacs and install it, stripping binaries while installing them. install-strip: $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-05-21 07:30:23 +0000 +++ leim/ChangeLog 2012-05-21 20:13:49 +0000 @@ -1,5 +1,9 @@ 2012-05-21 Glenn Morris + * Makefile.in (install): Remove, let top-level do it. + (version, prefix, datarootdir, datadir, ns_appresdir, leimdir): + (MKDIR_P, GZIP_PROG): Remove, no longer used. + * Makefile.in (install_prefix): Remove. (LEIM_INSTALLDIR): Rename to leimdir. (install): Update for this change. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-21 07:30:23 +0000 +++ leim/Makefile.in 2012-05-21 20:13:49 +0000 @@ -27,21 +27,7 @@ SHELL = /bin/sh # Here are the things that we expect ../configure to edit. -version=@version@ -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ srcdir=@srcdir@ -ns_appresdir=@ns_appresdir@ - -# Where to install LEIM files. -# For most builds, this is ${datadir}/emacs/${version}/leim. -# For self-contained ns builds, it is ${ns_appresdir}/leim. -leimdir=@leimdir@ - -MKDIR_P = @MKDIR_P@ - -GZIP_PROG = @GZIP_PROG@ # Which Emacs to use to convert TIT files to Emacs Lisp files, # byte-compile Emacs Lisp files, and generate the file leim-list.el. @@ -187,44 +173,6 @@ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done -install: all - umask 022; ${MKDIR_P} $(DESTDIR)${leimdir} - if [ x`cd $(DESTDIR)${leimdir} && /bin/pwd` != x`/bin/pwd` ] ; then \ - rm -f $(DESTDIR)${leimdir}/leim-list.el; \ - rm -rf $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/ja-dic ; \ - echo "Copying leim files to $(DESTDIR)${leimdir} ..." ; \ - if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ - tar -chf - leim-list.el quail ja-dic \ - | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ - else \ - tar -chf - leim-list.el quail \ - | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ - cd ${srcdir}; \ - tar -chf - quail/* ja-dic \ - | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ - fi; \ - rm -f $(DESTDIR)${leimdir}/.gitignore $(DESTDIR)${leimdir}/*/.gitignore; \ - rm -f $(DESTDIR)${leimdir}/.arch-inventory $(DESTDIR)${leimdir}/*/.arch-inventory; \ - rm -f $(DESTDIR)${leimdir}/\#* $(DESTDIR)${leimdir}/*/\#* ; \ - rm -f $(DESTDIR)${leimdir}/.\#* $(DESTDIR)${leimdir}/*/.\#* ; \ - rm -f $(DESTDIR)${leimdir}/*~ $(DESTDIR)${leimdir}/*/*~ ; \ - rm -f $(DESTDIR)${leimdir}/*.orig $(DESTDIR)${leimdir}/*/*.orig ; \ - else true; fi - -unset CDPATH; \ - if [ -n "${GZIP_PROG}" ]; \ - then \ - echo "Compressing *.el ..." ; \ - (cd $(DESTDIR)${leimdir}; for f in `find . -name "*.elc" -print`; do \ - ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ - done) \ - else true; fi - -chmod -R a+r $(DESTDIR)${leimdir} - for installuser in $${LOGNAME} $${USERNAME} $${USER} \ - `id -un 2> /dev/null`; do \ - [ -n "$${installuser}" ] && break ; \ - done ; \ - find $(DESTDIR)${leimdir} -exec chown $${installuser} '{}' ';' - clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ leim-list.el changed.tit changed.misc ------------------------------------------------------------ revno: 108329 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 15:32:04 -0400 message: Update regexp in BUGS. diff: === modified file 'BUGS' --- BUGS 2011-02-01 17:09:25 +0000 +++ BUGS 2012-05-21 19:32:04 +0000 @@ -16,7 +16,7 @@ If necessary, you can read the manual without an info program: - cat info/emacs* | more "+/^File: emacs, Node: Bugs," + cat info/emacs* | more "+/^File: emacs.*, Node: Bugs," Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to ------------------------------------------------------------ revno: 108328 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 15:16:27 -0400 message: Remove vpath.sed; unused for literally decades AFAICS * vpath.sed: Remove unused file. * make-dist: No more vpath.sed. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 19:04:11 +0000 +++ ChangeLog 2012-05-21 19:16:27 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * vpath.sed: Remove unused file. + * make-dist: No more vpath.sed. + 2012-05-21 Paul Eggert Use full name for m4/gnulib-comp.m4. (Bug#11529) === modified file 'make-dist' --- make-dist 2012-05-08 07:18:18 +0000 +++ make-dist 2012-05-21 19:16:27 +0000 @@ -285,7 +285,7 @@ echo "Making links to top-level files" ln INSTALL README BUGS ${tempdir} ln ChangeLog Makefile.in configure configure.in ${tempdir} -ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} +ln config.bat make-dist update-subdirs .dir-locals.el ${tempdir} ln aclocal.m4 ${tempdir} echo "Creating subdirectories" === removed file 'vpath.sed' --- vpath.sed 2011-02-01 17:09:25 +0000 +++ vpath.sed 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -/^VPATH *=/c\ -# This works only in GNU make. Using the patterns avoids\ -# object files being found by VPATH, and thus permits building\ -# when $srcdir is configured itself.\ -vpath %.c $(srcdir)\ -vpath %.h $(srcdir)\ -\ - ------------------------------------------------------------ revno: 108327 fixes bug(s): http://debbugs.gnu.org/11529 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-05-21 12:04:11 -0700 message: Use full name for m4/gnulib-comp.m4. (Bug#11529) Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions, even though the file's name in gnulib is m4/gnulib-comp.m4. This had a problem when merging from gnulib, as the code temporarily renamed it to the full name, causing problems when interrupted. Now the file has its full name, with the idea that we will find a solution for MS-DOS that does not affect the rest of Emacs. * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4. * admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 15:36:54 +0000 +++ ChangeLog 2012-05-21 19:04:11 +0000 @@ -1,5 +1,14 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4. (Bug#11529) + Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions, + even though the file's name in gnulib is m4/gnulib-comp.m4. + This had a problem when merging from gnulib, as the code temporarily + renamed it to the full name, causing problems when interrupted. + Now the file has its full name, with the idea that we will find + a solution for MS-DOS that does not affect the rest of Emacs. + * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4. + Assume C89 or later. * configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST) (POINTER_TYPE, PROTOTYPES): Remove. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-21 15:36:54 +0000 +++ admin/ChangeLog 2012-05-21 19:04:11 +0000 @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4. (Bug#11529) + * merge-gnulib: Leave m4/gnulib-comp.m4's name alone. + Assume C89 or later. * CPP-DEFINES: Remove NULL, const. === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2012-05-21 02:33:13 +0000 +++ admin/merge-gnulib 2012-05-21 19:04:11 +0000 @@ -79,10 +79,8 @@ exit 1 } -cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 && "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && -mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} === renamed file 'm4/gl-comp.m4' => 'm4/gnulib-comp.m4' ------------------------------------------------------------ revno: 108326 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-05-21 08:36:54 -0700 message: Assume C89 or later. * configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST) (POINTER_TYPE, PROTOTYPES): Remove. * admin/CPP-DEFINES: Remove NULL, const. * lib-src/etags.c (static, const): Remove macros. (PTR): Remove; all uses replaced with void *. Omit needless casts. * src/alloc.c, src/buffer.c, lisp.h: Replace POINTER_TYPE with void. * alloc.c (overrun_check_malloc, overrun_check_realloc, xmalloc) (xrealloc): * buffer.c (mmap_free_1, mmap_enlarge): Omit needless casts. * editfns.c, fns.c, gmalloc.c, insdel.c, sysdep.c, termcap.c (NULL): * textprop.c, tparam.c (NULL): Remove. * ralloc.c, vm-limit.c (POINTER): Assume void * works. * regex.c (SIGN_EXTEND_CHAR): Assume signed char works. * regex.h (_RE_ARGS): Remove. All uses rewritten to use prototypes. * unexelf.c (ElfBitsW): Assume c89 preprocessor or better. * xterm.c (input_signal_count): Assume volatile works. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 07:30:23 +0000 +++ ChangeLog 2012-05-21 15:36:54 +0000 @@ -1,10 +1,9 @@ -2012-05-21 Glenn Morris - - * configure.in (LEIM_INSTALLDIR): - Rename to leimdir, treat like lispdir. - 2012-05-21 Paul Eggert + Assume C89 or later. + * configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST) + (POINTER_TYPE, PROTOTYPES): Remove. + Make merging from gnulib a script, not a makefile action. Putting it in a makefile has some problems with reflection, as merging from gnulib updates 'configure', which can update the makefile. @@ -15,6 +14,11 @@ 2012-05-21 Glenn Morris + * configure.in (LEIM_INSTALLDIR): + Rename to leimdir, treat like lispdir. + +2012-05-21 Glenn Morris + * Makefile.in (install-arch-indep, install-doc, install-info) (uninstall): Scrap superfluous subshells. === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2012-05-19 18:04:49 +0000 +++ admin/CPP-DEFINES 2012-05-21 15:36:54 +0000 @@ -201,7 +201,6 @@ NO_TERMIO NSIG NSIG_MINIMUM -NULL NULL_DEVICE ORDINARY_LINK O_APPEND @@ -272,7 +271,6 @@ chmod chown close -const creat ctime dup === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-21 02:33:13 +0000 +++ admin/ChangeLog 2012-05-21 15:36:54 +0000 @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert + Assume C89 or later. + * CPP-DEFINES: Remove NULL, const. + Make merging from gnulib a script, not a makefile action. * merge-gnulib: New script, with actions moved here from ../Makefile.in. === modified file 'configure.in' --- configure.in 2012-05-21 07:30:23 +0000 +++ configure.in 2012-05-21 15:36:54 +0000 @@ -1355,27 +1355,6 @@ #include #endif]) -dnl checks for compiler characteristics - -dnl Testing __STDC__ to determine prototype support isn't good enough. -dnl DEC C, for instance, doesn't define it with default options, and -dnl is used on 64-bit systems (OSF Alphas). Similarly for volatile -dnl and void *. -AC_C_PROTOTYPES -AC_C_VOLATILE -AC_C_CONST -AC_CACHE_CHECK([for void * support], emacs_cv_void_star, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[void * foo;]])], - emacs_cv_void_star=yes, emacs_cv_void_star=no)]) -if test $emacs_cv_void_star = yes; then - AC_DEFINE(POINTER_TYPE, void) -else - AC_DEFINE(POINTER_TYPE, char) -fi -AH_TEMPLATE(POINTER_TYPE, - [Define as `void' if your compiler accepts `void *'; otherwise - define as `char'.])dnl - dnl Check for endianness. AC_C_BIGENDIAN @@ -3663,10 +3642,6 @@ #define BITS_PER_LONG_LONG 64 #endif -/* Define if the compiler supports function prototypes. It may do so but - not define __STDC__ (e.g. DEC C by default) or may define it as zero. */ -#undef PROTOTYPES - #include #include === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-05-21 00:44:34 +0000 +++ lib-src/ChangeLog 2012-05-21 15:36:54 +0000 @@ -1,3 +1,9 @@ +2012-05-21 Paul Eggert + + Assume C89 or later. + * etags.c (static, const): Remove macros. + (PTR): Remove; all uses replaced with void *. Omit needless casts. + 2012-05-21 Glenn Morris * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}): === modified file 'lib-src/etags.c' --- lib-src/etags.c 2012-05-10 00:27:32 +0000 +++ lib-src/etags.c 2012-05-21 15:36:54 +0000 @@ -93,22 +93,6 @@ #ifdef HAVE_CONFIG_H # include - /* This is probably not necessary any more. On some systems, config.h - used to define static as nothing for the sake of unexec. We don't - want that here since we don't use unexec. None of these systems - are supported any more, but the idea is still mentioned in - etc/PROBLEMS. */ -# undef static -# ifndef PTR /* for XEmacs */ -# define PTR void * -# endif -#else /* no config.h */ -# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C)) -# define PTR void * /* for generic pointers */ -# else /* not standard C */ -# define const /* remove const for old compilers' sake */ -# define PTR long * /* don't use void* */ -# endif #endif /* !HAVE_CONFIG_H */ #ifndef _GNU_SOURCE @@ -415,8 +399,8 @@ static void canonicalize_filename (char *); static void linebuffer_init (linebuffer *); static void linebuffer_setlen (linebuffer *, int); -static PTR xmalloc (size_t); -static PTR xrealloc (char *, size_t); +static void *xmalloc (size_t); +static void *xrealloc (char *, size_t); static char searchar = '/'; /* use /.../ searches */ @@ -6686,19 +6670,19 @@ } /* Like malloc but get fatal error if memory is exhausted. */ -static PTR +static void * xmalloc (size_t size) { - PTR result = (PTR) malloc (size); + void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *)NULL); return result; } -static PTR +static void * xrealloc (char *ptr, size_t size) { - PTR result = (PTR) realloc (ptr, size); + void *result = realloc (ptr, size); if (result == NULL) fatal ("virtual memory exhausted", (char *)NULL); return result; === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-21 13:35:40 +0000 +++ src/ChangeLog 2012-05-21 15:36:54 +0000 @@ -1,3 +1,18 @@ +2012-05-21 Paul Eggert + + Assume C89 or later. + * alloc.c, buffer.c, lisp.h: Replace POINTER_TYPE with void. + * alloc.c (overrun_check_malloc, overrun_check_realloc, xmalloc) + (xrealloc): + * buffer.c (mmap_free_1, mmap_enlarge): Omit needless casts. + * editfns.c, fns.c, gmalloc.c, insdel.c, sysdep.c, termcap.c (NULL): + * textprop.c, tparam.c (NULL): Remove. + * ralloc.c, vm-limit.c (POINTER): Assume void * works. + * regex.c (SIGN_EXTEND_CHAR): Assume signed char works. + * regex.h (_RE_ARGS): Remove. All uses rewritten to use prototypes. + * unexelf.c (ElfBitsW): Assume c89 preprocessor or better. + * xterm.c (input_signal_count): Assume volatile works. + 2012-05-21 Ken Brown * xgselect.c (xg_select): Fix first argument in call to 'select' === modified file 'src/alloc.c' --- src/alloc.c 2012-04-23 05:44:49 +0000 +++ src/alloc.c 2012-05-21 15:36:54 +0000 @@ -66,7 +66,7 @@ #include #ifndef HAVE_UNISTD_H -extern POINTER_TYPE *sbrk (); +extern void *sbrk (); #endif #include @@ -306,7 +306,7 @@ MEM_TYPE_VECTORLIKE }; -static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); +static void *lisp_malloc (size_t, enum mem_type); #if GC_MARK_STACK || defined GC_MALLOC_CHECK @@ -388,7 +388,7 @@ #define MEM_NIL &mem_z static struct Lisp_Vector *allocate_vectorlike (EMACS_INT); -static void lisp_free (POINTER_TYPE *); +static void lisp_free (void *); static void mark_stack (void); static int live_vector_p (struct mem_node *, void *); static int live_buffer_p (struct mem_node *, void *); @@ -435,15 +435,15 @@ static int staticidx = 0; -static POINTER_TYPE *pure_alloc (size_t, int); +static void *pure_alloc (size_t, int); /* Value is SZ rounded up to the next multiple of ALIGNMENT. ALIGNMENT must be a power of 2. */ #define ALIGN(ptr, ALIGNMENT) \ - ((POINTER_TYPE *) ((((uintptr_t) (ptr)) + (ALIGNMENT) - 1) \ - & ~((ALIGNMENT) - 1))) + ((void *) (((uintptr_t) (ptr) + (ALIGNMENT) - 1) \ + & ~ ((ALIGNMENT) - 1))) @@ -604,7 +604,7 @@ /* Like malloc, but wraps allocated block with header and trailer. */ -static POINTER_TYPE * +static void * overrun_check_malloc (size_t size) { register unsigned char *val; @@ -622,15 +622,15 @@ XMALLOC_OVERRUN_CHECK_SIZE); } --check_depth; - return (POINTER_TYPE *)val; + return val; } /* Like realloc, but checks old block for overrun, and wraps new block with header and trailer. */ -static POINTER_TYPE * -overrun_check_realloc (POINTER_TYPE *block, size_t size) +static void * +overrun_check_realloc (void *block, size_t size) { register unsigned char *val = (unsigned char *) block; int overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_OVERHEAD : 0; @@ -652,7 +652,7 @@ memset (val, 0, XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE); } - val = (unsigned char *) realloc ((POINTER_TYPE *)val, size + overhead); + val = realloc (val, size + overhead); if (val && check_depth == 1) { @@ -663,13 +663,13 @@ XMALLOC_OVERRUN_CHECK_SIZE); } --check_depth; - return (POINTER_TYPE *)val; + return val; } /* Like free, but checks block for overrun. */ static void -overrun_check_free (POINTER_TYPE *block) +overrun_check_free (void *block) { unsigned char *val = (unsigned char *) block; @@ -718,13 +718,13 @@ /* Like malloc but check for no memory and block interrupt input.. */ -POINTER_TYPE * +void * xmalloc (size_t size) { - register POINTER_TYPE *val; + void *val; MALLOC_BLOCK_INPUT; - val = (POINTER_TYPE *) malloc (size); + val = malloc (size); MALLOC_UNBLOCK_INPUT; if (!val && size) @@ -735,18 +735,18 @@ /* Like realloc but check for no memory and block interrupt input.. */ -POINTER_TYPE * -xrealloc (POINTER_TYPE *block, size_t size) +void * +xrealloc (void *block, size_t size) { - register POINTER_TYPE *val; + void *val; MALLOC_BLOCK_INPUT; /* We must call malloc explicitly when BLOCK is 0, since some reallocs don't do this. */ if (! block) - val = (POINTER_TYPE *) malloc (size); + val = malloc (size); else - val = (POINTER_TYPE *) realloc (block, size); + val = realloc (block, size); MALLOC_UNBLOCK_INPUT; if (!val && size) @@ -758,7 +758,7 @@ /* Like free but block interrupt input. */ void -xfree (POINTER_TYPE *block) +xfree (void *block) { if (!block) return; @@ -893,7 +893,7 @@ static void *lisp_malloc_loser; #endif -static POINTER_TYPE * +static void * lisp_malloc (size_t nbytes, enum mem_type type) { register void *val; @@ -938,7 +938,7 @@ call to lisp_malloc. */ static void -lisp_free (POINTER_TYPE *block) +lisp_free (void *block) { MALLOC_BLOCK_INPUT; free (block); @@ -1034,7 +1034,7 @@ /* Allocate an aligned block of nbytes. Alignment is on a multiple of BLOCK_ALIGN and `nbytes' has to be smaller or equal to BLOCK_BYTES. */ -static POINTER_TYPE * +static void * lisp_align_malloc (size_t nbytes, enum mem_type type) { void *base, *val; @@ -1141,7 +1141,7 @@ } static void -lisp_align_free (POINTER_TYPE *block) +lisp_align_free (void *block) { struct ablock *ablock = block; struct ablocks *abase = ABLOCK_ABASE (ablock); @@ -4722,10 +4722,10 @@ pointer to it. TYPE is the Lisp type for which the memory is allocated. TYPE < 0 means it's not used for a Lisp object. */ -static POINTER_TYPE * +static void * pure_alloc (size_t size, int type) { - POINTER_TYPE *result; + void *result; #ifdef USE_LSB_TAG size_t alignment = (1 << GCTYPEBITS); #else === modified file 'src/buffer.c' --- src/buffer.c 2012-05-02 17:21:54 +0000 +++ src/buffer.c 2012-05-21 15:36:54 +0000 @@ -2051,10 +2051,10 @@ eassert (current_buffer->text == ¤t_buffer->own_text); eassert (other_buffer->text == &other_buffer->own_text); #ifdef REL_ALLOC - r_alloc_reset_variable ((POINTER_TYPE **) ¤t_buffer->own_text.beg, - (POINTER_TYPE **) &other_buffer->own_text.beg); - r_alloc_reset_variable ((POINTER_TYPE **) &other_buffer->own_text.beg, - (POINTER_TYPE **) ¤t_buffer->own_text.beg); + r_alloc_reset_variable ((void **) ¤t_buffer->own_text.beg, + (void **) &other_buffer->own_text.beg); + r_alloc_reset_variable ((void **) &other_buffer->own_text.beg, + (void **) ¤t_buffer->own_text.beg); #endif /* REL_ALLOC */ swapfield (pt, EMACS_INT); @@ -4383,7 +4383,7 @@ /* Pointer to the location holding the address of the memory allocated with the mmap'd block. The variable actually points after this structure. */ - POINTER_TYPE **var; + void **var; /* Next and previous in list of all mmap'd regions. */ struct mmap_region *next, *prev; @@ -4430,7 +4430,7 @@ to the start of the user-visible part of the region. */ #define MMAP_USER_AREA(P) \ - ((POINTER_TYPE *) ((char *) (P) + MMAP_REGION_STRUCT_SIZE)) + ((void *) ((char *) (P) + MMAP_REGION_STRUCT_SIZE)) #define MEM_ALIGN sizeof (double) @@ -4479,7 +4479,7 @@ is at END - 1. */ static struct mmap_region * -mmap_find (POINTER_TYPE *start, POINTER_TYPE *end) +mmap_find (void *start, void *end) { struct mmap_region *r; char *s = (char *) start, *e = (char *) end; @@ -4517,7 +4517,7 @@ else mmap_regions = r->next; - if (munmap ((POINTER_TYPE *) r, r->nbytes_mapped) == -1) + if (munmap (r, r->nbytes_mapped) == -1) { fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); return 0; @@ -4559,13 +4559,13 @@ I'm not sure this is worth doing, let's see. */ if (!MMAP_ALLOCATED_P (region_end, region_end + nbytes)) { - POINTER_TYPE *p; + void *p; p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0); if (p == MAP_FAILED) ; /* fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); */ - else if (p != (POINTER_TYPE *) region_end) + else if (p != region_end) { /* Kernels are free to choose a different address. In that case, unmap what we've mapped above; we have @@ -4627,8 +4627,8 @@ If we can't allocate the necessary memory, set *VAR to null, and return null. */ -static POINTER_TYPE * -mmap_alloc (POINTER_TYPE **var, size_t nbytes) +static void * +mmap_alloc (void **var, size_t nbytes) { void *p; size_t map; @@ -4669,7 +4669,7 @@ PTR. Store 0 in *PTR to show there's no block allocated. */ static void -mmap_free (POINTER_TYPE **var) +mmap_free (void **var) { mmap_init (); @@ -4686,10 +4686,10 @@ and return this value. If more memory cannot be allocated, then leave *VAR unchanged, and return null. */ -static POINTER_TYPE * -mmap_realloc (POINTER_TYPE **var, size_t nbytes) +static void * +mmap_realloc (void **var, size_t nbytes) { - POINTER_TYPE *result; + void *result; mmap_init (); @@ -4708,7 +4708,7 @@ if (room < nbytes) { /* Must enlarge. */ - POINTER_TYPE *old_ptr = *var; + void *old_ptr = *var; /* Try to map additional pages at the end of the region. If that fails, allocate a new region, copy data @@ -4770,13 +4770,13 @@ static void alloc_buffer_text (struct buffer *b, ptrdiff_t nbytes) { - POINTER_TYPE *p; + void *p; BLOCK_INPUT; #if defined USE_MMAP_FOR_BUFFERS - p = mmap_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); + p = mmap_alloc ((void **) &b->text->beg, nbytes); #elif defined REL_ALLOC - p = r_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); + p = r_alloc ((void **) &b->text->beg, nbytes); #else p = xmalloc (nbytes); #endif @@ -4797,14 +4797,14 @@ void enlarge_buffer_text (struct buffer *b, EMACS_INT delta) { - POINTER_TYPE *p; + void *p; ptrdiff_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1 + delta); BLOCK_INPUT; #if defined USE_MMAP_FOR_BUFFERS - p = mmap_realloc ((POINTER_TYPE **) &b->text->beg, nbytes); + p = mmap_realloc ((void **) &b->text->beg, nbytes); #elif defined REL_ALLOC - p = r_re_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); + p = r_re_alloc ((void **) &b->text->beg, nbytes); #else p = xrealloc (b->text->beg, nbytes); #endif @@ -4828,9 +4828,9 @@ BLOCK_INPUT; #if defined USE_MMAP_FOR_BUFFERS - mmap_free ((POINTER_TYPE **) &b->text->beg); + mmap_free ((void **) &b->text->beg); #elif defined REL_ALLOC - r_alloc_free ((POINTER_TYPE **) &b->text->beg); + r_alloc_free ((void **) &b->text->beg); #else xfree (b->text->beg); #endif === modified file 'src/editfns.c' --- src/editfns.c 2012-05-03 20:04:29 +0000 +++ src/editfns.c 2012-05-21 15:36:54 +0000 @@ -59,10 +59,6 @@ #include "window.h" #include "blockinput.h" -#ifndef NULL -#define NULL 0 -#endif - #ifndef USER_FULL_NAME #define USER_FULL_NAME pw->pw_gecos #endif === modified file 'src/fns.c' --- src/fns.c 2012-04-09 13:05:48 +0000 +++ src/fns.c 2012-05-21 15:36:54 +0000 @@ -42,10 +42,6 @@ #endif #endif /* HAVE_MENUS */ -#ifndef NULL -#define NULL ((POINTER_TYPE *)0) -#endif - Lisp_Object Qstring_lessp; static Lisp_Object Qprovide, Qrequire; static Lisp_Object Qyes_or_no_p_history; === modified file 'src/gmalloc.c' --- src/gmalloc.c 2012-05-20 12:19:13 +0000 +++ src/gmalloc.c 2012-05-21 15:36:54 +0000 @@ -1531,10 +1531,6 @@ extern void *__sbrk (ptrdiff_t increment); #endif /* __GNU_LIBRARY__ && ! defined (__UCLIBC__) */ -#ifndef NULL -#define NULL 0 -#endif - /* Allocate INCREMENT more bytes of data space, and return the start of data space, or NULL on errors. If INCREMENT is negative, shrink data space. */ === modified file 'src/insdel.c' --- src/insdel.c 2012-01-19 07:21:25 +0000 +++ src/insdel.c 2012-05-21 15:36:54 +0000 @@ -31,10 +31,6 @@ #include "blockinput.h" #include "region-cache.h" -#ifndef NULL -#define NULL 0 -#endif - static void insert_from_string_1 (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT nchars, EMACS_INT nbytes, === modified file 'src/lisp.h' --- src/lisp.h 2012-05-09 17:51:30 +0000 +++ src/lisp.h 2012-05-21 15:36:54 +0000 @@ -2780,7 +2780,7 @@ extern void syms_of_xsettings (void); /* Defined in vm-limit.c. */ -extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char *)); +extern void memory_warnings (void *, void (*warnfun) (const char *)); /* Defined in alloc.c */ extern void check_pure_size (void); @@ -3597,9 +3597,9 @@ extern int immediate_quit; /* Nonzero means ^G can quit instantly */ -extern POINTER_TYPE *xmalloc (size_t); -extern POINTER_TYPE *xrealloc (POINTER_TYPE *, size_t); -extern void xfree (POINTER_TYPE *); +extern void *xmalloc (size_t); +extern void *xrealloc (void *, size_t); +extern void xfree (void *); extern void *xnmalloc (ptrdiff_t, ptrdiff_t); extern void *xnrealloc (void *, ptrdiff_t, ptrdiff_t); extern void *xpalloc (void *, ptrdiff_t *, ptrdiff_t, ptrdiff_t, ptrdiff_t); === modified file 'src/ralloc.c' --- src/ralloc.c 2012-04-16 01:18:13 +0000 +++ src/ralloc.c 2012-05-21 15:36:54 +0000 @@ -31,9 +31,6 @@ #include -typedef POINTER_TYPE *POINTER; -typedef size_t SIZE; - #ifdef DOUG_LEA_MALLOC #define M_TOP_PAD -2 extern int mallopt (int, int); @@ -47,9 +44,6 @@ #include -typedef size_t SIZE; -typedef void *POINTER; - #include #include @@ -58,6 +52,8 @@ #include "getpagesize.h" +typedef size_t SIZE; +typedef void *POINTER; #define NIL ((POINTER) 0) /* A flag to indicate whether we have initialized ralloc yet. For === modified file 'src/regex.c' --- src/regex.c 2012-04-09 07:45:59 +0000 +++ src/regex.c 2012-05-21 15:36:54 +0000 @@ -434,17 +434,7 @@ #endif /* not emacs */ -/* We remove any previous definition of `SIGN_EXTEND_CHAR', - since ours (we hope) works properly with all combinations of - machines, compilers, `char' and `unsigned char' argument types. - (Per Bothner suggested the basic approach.) */ -#undef SIGN_EXTEND_CHAR -#if __STDC__ -# define SIGN_EXTEND_CHAR(c) ((signed char) (c)) -#else /* not __STDC__ */ -/* As in Harbison and Steele. */ -# define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) -#endif +#define SIGN_EXTEND_CHAR(c) ((signed char) (c)) /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we use `alloca' instead of `malloc'. This is because using malloc in @@ -553,12 +543,12 @@ #define false 0 #define true 1 -static regoff_t re_match_2_internal _RE_ARGS ((struct re_pattern_buffer *bufp, - re_char *string1, size_t size1, - re_char *string2, size_t size2, - ssize_t pos, - struct re_registers *regs, - ssize_t stop)); +static regoff_t re_match_2_internal (struct re_pattern_buffer *bufp, + re_char *string1, size_t size1, + re_char *string2, size_t size2, + ssize_t pos, + struct re_registers *regs, + ssize_t stop); /* These are the command codes that appear in compiled regular expressions. Some opcodes are followed by argument bytes. A @@ -735,11 +725,8 @@ } while (0) #ifdef DEBUG -static void extract_number _RE_ARGS ((int *dest, re_char *source)); static void -extract_number (dest, source) - int *dest; - re_char *source; +extract_number (int *dest, re_char *source) { int temp = SIGN_EXTEND_CHAR (*(source + 1)); *dest = *source & 0377; @@ -763,12 +750,8 @@ } while (0) #ifdef DEBUG -static void extract_number_and_incr _RE_ARGS ((int *destination, - re_char **source)); static void -extract_number_and_incr (destination, source) - int *destination; - re_char **source; +extract_number_and_incr (int *destination, re_char **source) { extract_number (destination, *source); *source += 2; @@ -1672,25 +1655,22 @@ /* Subroutine declarations and macros for regex_compile. */ -static reg_errcode_t regex_compile _RE_ARGS ((re_char *pattern, size_t size, - reg_syntax_t syntax, - struct re_pattern_buffer *bufp)); -static void store_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, int arg)); -static void store_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg1, int arg2)); -static void insert_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg, unsigned char *end)); -static void insert_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg1, int arg2, unsigned char *end)); -static boolean at_begline_loc_p _RE_ARGS ((re_char *pattern, - re_char *p, - reg_syntax_t syntax)); -static boolean at_endline_loc_p _RE_ARGS ((re_char *p, - re_char *pend, - reg_syntax_t syntax)); -static re_char *skip_one_char _RE_ARGS ((re_char *p)); -static int analyse_first _RE_ARGS ((re_char *p, re_char *pend, - char *fastmap, const int multibyte)); +static reg_errcode_t regex_compile (re_char *pattern, size_t size, + reg_syntax_t syntax, + struct re_pattern_buffer *bufp); +static void store_op1 (re_opcode_t op, unsigned char *loc, int arg); +static void store_op2 (re_opcode_t op, unsigned char *loc, int arg1, int arg2); +static void insert_op1 (re_opcode_t op, unsigned char *loc, + int arg, unsigned char *end); +static void insert_op2 (re_opcode_t op, unsigned char *loc, + int arg1, int arg2, unsigned char *end); +static boolean at_begline_loc_p (re_char *pattern, re_char *p, + reg_syntax_t syntax); +static boolean at_endline_loc_p (re_char *p, re_char *pend, + reg_syntax_t syntax); +static re_char *skip_one_char (re_char *p); +static int analyse_first (re_char *p, re_char *pend, + char *fastmap, const int multibyte); /* Fetch the next character in the uncompiled pattern, with no translation. */ @@ -2442,9 +2422,8 @@ #endif /* not MATCH_MAY_ALLOCATE */ -static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type - compile_stack, - regnum_t regnum)); +static boolean group_in_compile_stack (compile_stack_type compile_stack, + regnum_t regnum); /* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX. Returns one of error codes defined in `regex.h', or zero for success. @@ -4554,10 +4533,10 @@ /* Declarations and macros for re_match_2. */ -static int bcmp_translate _RE_ARGS ((re_char *s1, re_char *s2, - register ssize_t len, - RE_TRANSLATE_TYPE translate, - const int multibyte)); +static int bcmp_translate (re_char *s1, re_char *s2, + register ssize_t len, + RE_TRANSLATE_TYPE translate, + const int multibyte); /* This converts PTR, a pointer into one of the search strings `string1' and `string2' into an offset from the beginning of that string. */ === modified file 'src/regex.h' --- src/regex.h 2012-01-19 07:21:25 +0000 +++ src/regex.h 2012-05-21 15:36:54 +0000 @@ -451,38 +451,21 @@ /* Declarations for routines. */ -/* To avoid duplicating every routine declaration -- once with a - prototype (if we are ANSI), and once without (if we aren't) -- we - use the following macro to declare argument types. This - unfortunately clutters up the declarations a bit, but I think it's - worth it. */ - -#if defined __STDC__ || defined PROTOTYPES - -# define _RE_ARGS(args) args - -#else /* not __STDC__ || PROTOTYPES */ - -# define _RE_ARGS(args) () - -#endif /* not __STDC__ || PROTOTYPES */ - /* Sets the current default syntax to SYNTAX, and return the old syntax. You can also simply assign to the `re_syntax_options' variable. */ -extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); +extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax); /* Compile the regular expression PATTERN, with length LENGTH and syntax given by the global `re_syntax_options', into the buffer BUFFER. Return NULL if successful, and an error string if not. */ -extern const char *re_compile_pattern - _RE_ARGS ((const char *pattern, size_t length, - struct re_pattern_buffer *buffer)); +extern const char *re_compile_pattern (const char *__pattern, size_t __length, + struct re_pattern_buffer *__buffer); /* Compile a fastmap for the compiled pattern in BUFFER; used to accelerate searches. Return 0 if successful and -2 if was an internal error. */ -extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); +extern int re_compile_fastmap (struct re_pattern_buffer *__buffer); /* Search in the string STRING (with length LENGTH) for the pattern @@ -490,33 +473,35 @@ characters. Return the starting position of the match, -1 for no match, or -2 for an internal error. Also return register information in REGS (if REGS and BUFFER->no_sub are nonzero). */ -extern regoff_t re_search - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - size_t length, ssize_t start, ssize_t range, - struct re_registers *regs)); +extern regoff_t re_search (struct re_pattern_buffer *__buffer, + const char *__string, size_t __length, + ssize_t __start, ssize_t __range, + struct re_registers *__regs); /* Like `re_search', but search in the concatenation of STRING1 and STRING2. Also, stop searching at index START + STOP. */ -extern regoff_t re_search_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - size_t length1, const char *string2, size_t length2, - ssize_t start, ssize_t range, struct re_registers *regs, - ssize_t stop)); +extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer, + const char *__string1, size_t __length1, + const char *__string2, size_t __length2, + ssize_t __start, ssize_t __range, + struct re_registers *__regs, + ssize_t __stop); /* Like `re_search', but return how many characters in STRING the regexp in BUFFER matched, starting at position START. */ -extern regoff_t re_match - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - size_t length, ssize_t start, struct re_registers *regs)); +extern regoff_t re_match (struct re_pattern_buffer *__buffer, + const char *__string, size_t __length, + ssize_t __start, struct re_registers *__regs); /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern regoff_t re_match_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - size_t length1, const char *string2, size_t length2, - ssize_t start, struct re_registers *regs, ssize_t stop)); +extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer, + const char *__string1, size_t __length1, + const char *__string2, size_t __length2, + ssize_t __start, struct re_registers *__regs, + ssize_t __stop); /* Set REGS to hold NUM_REGS registers, storing them in STARTS and @@ -531,15 +516,16 @@ Unless this function is called, the first search or match using PATTERN_BUFFER will allocate its own register data, without freeing the old data. */ -extern void re_set_registers - _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, - unsigned num_regs, regoff_t *starts, regoff_t *ends)); +extern void re_set_registers (struct re_pattern_buffer *__buffer, + struct re_registers *__regs, + unsigned __num_regs, + regoff_t *__starts, regoff_t *__ends); #if defined _REGEX_RE_COMP || defined _LIBC # ifndef _CRAY /* 4.2 bsd compatibility. */ -extern char *re_comp _RE_ARGS ((const char *)); -extern int re_exec _RE_ARGS ((const char *)); +extern char *re_comp (const char *); +extern int re_exec (const char *); # endif #endif @@ -562,20 +548,19 @@ #endif /* POSIX compatibility. */ -extern reg_errcode_t regcomp _RE_ARGS ((regex_t *__restrict __preg, - const char *__restrict __pattern, - int __cflags)); - -extern reg_errcode_t regexec _RE_ARGS ((const regex_t *__restrict __preg, - const char *__restrict __string, - size_t __nmatch, - regmatch_t __pmatch[__restrict_arr], - int __eflags)); - -extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size)); - -extern void regfree _RE_ARGS ((regex_t *__preg)); +extern reg_errcode_t regcomp (regex_t *__restrict __preg, + const char *__restrict __pattern, + int __cflags); + +extern reg_errcode_t regexec (const regex_t *__restrict __preg, + const char *__restrict __string, size_t __nmatch, + regmatch_t __pmatch[__restrict_arr], + int __eflags); + +extern size_t regerror (int __errcode, const regex_t * __preg, + char *__errbuf, size_t __errbuf_size); + +extern void regfree (regex_t *__preg); #ifdef __cplusplus === modified file 'src/sysdep.c' --- src/sysdep.c 2012-04-22 02:58:23 +0000 +++ src/sysdep.c 2012-05-21 15:36:54 +0000 @@ -52,9 +52,6 @@ #define read sys_read #define write sys_write #include -#ifndef NULL -#define NULL 0 -#endif #endif /* not WINDOWSNT */ #include === modified file 'src/termcap.c' --- src/termcap.c 2011-09-09 01:06:52 +0000 +++ src/termcap.c 2012-05-21 15:36:54 +0000 @@ -30,10 +30,6 @@ #include "msdos.h" #endif -#ifndef NULL -#define NULL (char *) 0 -#endif - /* BUFSIZE is the initial size allocated for the buffer for reading the termcap file. It is not a limit. @@ -661,10 +657,6 @@ #ifdef TEST -#ifdef NULL -#undef NULL -#endif - #include static void === modified file 'src/textprop.c' --- src/textprop.c 2012-01-19 07:21:25 +0000 +++ src/textprop.c 2012-05-21 15:36:54 +0000 @@ -23,10 +23,6 @@ #include "buffer.h" #include "window.h" -#ifndef NULL -#define NULL (void *)0 -#endif - /* Test for membership, allowing for t (actually any non-cons) to mean the universal set. */ === modified file 'src/tparam.c' --- src/tparam.c 2011-08-05 02:15:35 +0000 +++ src/tparam.c 2012-05-21 15:36:54 +0000 @@ -22,10 +22,6 @@ #include #include "lisp.h" /* for xmalloc */ #include "tparam.h" - -#ifndef NULL -#define NULL (char *) 0 -#endif /* Assuming STRING is the value of a termcap string entry containing `%' constructs to expand parameters, === modified file 'src/unexelf.c' --- src/unexelf.c 2012-01-19 07:21:25 +0000 +++ src/unexelf.c 2012-05-21 15:36:54 +0000 @@ -506,11 +506,7 @@ #endif #ifndef ElfW -# ifdef __STDC__ -# define ElfBitsW(bits, type) Elf##bits##_##type -# else -# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type -# endif +# define ElfBitsW(bits, type) Elf##bits##_##type # ifdef _LP64 # define ELFSIZE 64 # else === modified file 'src/vm-limit.c' --- src/vm-limit.c 2012-01-19 07:21:25 +0000 +++ src/vm-limit.c 2012-05-21 15:36:54 +0000 @@ -31,7 +31,7 @@ enum warnlevel { not_warned, warned_75, warned_85, warned_95 }; static enum warnlevel warnlevel; -typedef POINTER_TYPE *POINTER; +typedef void *POINTER; /* Function to call to issue a warning; 0 means don't issue them. */ === modified file 'src/xterm.c' --- src/xterm.c 2012-05-02 10:17:03 +0000 +++ src/xterm.c 2012-05-21 15:36:54 +0000 @@ -256,11 +256,7 @@ /* Incremented by XTread_socket whenever it really tries to read events. */ -#ifdef __STDC__ static int volatile input_signal_count; -#else -static int input_signal_count; -#endif /* Used locally within XTread_socket. */ ------------------------------------------------------------ revno: 108325 committer: Ken Brown branch nick: trunk timestamp: Mon 2012-05-21 09:35:40 -0400 message: * src/xgselect.c (xg_select): Fix first argument in call to 'select' (bug#11508). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-20 12:19:13 +0000 +++ src/ChangeLog 2012-05-21 13:35:40 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Ken Brown + + * xgselect.c (xg_select): Fix first argument in call to 'select' + (bug#11508). + 2012-05-20 Ken Brown * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) === modified file 'src/xgselect.c' --- src/xgselect.c 2012-05-19 21:46:43 +0000 +++ src/xgselect.c 2012-05-21 13:35:40 +0000 @@ -33,7 +33,7 @@ static ptrdiff_t gfds_size; int -xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, +xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, EMACS_TIME *timeout) { SELECT_TYPE all_rfds, all_wfds; @@ -41,11 +41,11 @@ GMainContext *context; int have_wfds = wfds != NULL; - int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0; - int i, nfds, fds_lim, tmo_in_millisec; + int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0, max_fds = fds_lim - 1; + int i, nfds, tmo_in_millisec; if (!x_in_use) - return select (max_fds, rfds, wfds, efds, timeout); + return select (fds_lim, rfds, wfds, efds, timeout); if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds)); else FD_ZERO (&all_rfds); ------------------------------------------------------------ revno: 108324 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 06:17:34 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-05-18 10:17:28 +0000 +++ autogen/Makefile.in 2012-05-21 10:17:34 +0000 @@ -492,7 +492,6 @@ LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ -LEIM_INSTALLDIR = @LEIM_INSTALLDIR@ LIBGIF = @LIBGIF@ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ @@ -755,6 +754,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +leimdir = @leimdir@ libdir = @libdir@ libexecdir = @libexecdir@ liblockfile = @liblockfile@ === modified file 'autogen/configure' --- autogen/configure 2012-05-20 10:18:48 +0000 +++ autogen/configure 2012-05-21 10:17:34 +0000 @@ -1099,6 +1099,7 @@ x_default_search_path lisppath locallisppath +leimdir lispdir srcdir canonical @@ -1164,7 +1165,6 @@ NS_OBJC_OBJ NS_OBJ ns_self_contained -LEIM_INSTALLDIR INSTALL_ARCH_INDEP_EXTRA TEMACS_LDFLAGS2 LD_SWITCH_X_SITE_RPATH @@ -3731,6 +3731,7 @@ lispdir='${datadir}/emacs/${version}/lisp' +leimdir='${datadir}/emacs/${version}/leim' locallisppath='${datadir}/emacs/${version}/site-lisp:'\ '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' @@ -10109,7 +10110,6 @@ INSTALL_ARCH_INDEP_EXTRA=install-etc -LEIM_INSTALLDIR="\${install_prefix}/leim" ns_self_contained=no ns_frag=/dev/null NS_OBJ= @@ -10133,7 +10133,7 @@ infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" - LEIM_INSTALLDIR="\${ns_appresdir}/leim" + leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk @@ -10149,7 +10149,6 @@ - case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes @@ -15992,6 +15991,7 @@ + ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the ## end of LIBX_BASE, but nothing ever set it. ------------------------------------------------------------ revno: 108323 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-05-21 00:30:23 -0700 message: Rename LEIM_INSTALLDIR to leimdir, treat consistently with lispdir * configure.in (LEIM_INSTALLDIR): Rename to leimdir, treat like lispdir. * leim/Makefile.in (install_prefix): Remove. (LEIM_INSTALLDIR): Rename to leimdir. (install): Update for this change. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-21 02:33:13 +0000 +++ ChangeLog 2012-05-21 07:30:23 +0000 @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * configure.in (LEIM_INSTALLDIR): + Rename to leimdir, treat like lispdir. + 2012-05-21 Paul Eggert Make merging from gnulib a script, not a makefile action. === modified file 'configure.in' --- configure.in 2012-05-19 18:04:49 +0000 +++ configure.in 2012-05-21 07:30:23 +0000 @@ -37,6 +37,7 @@ dnl (autoconf) Installation Directory Variables dnl See also epaths.h below. lispdir='${datadir}/emacs/${version}/lisp' +leimdir='${datadir}/emacs/${version}/leim' locallisppath='${datadir}/emacs/${version}/site-lisp:'\ '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' @@ -1572,7 +1573,6 @@ AC_SUBST(TEMACS_LDFLAGS2) INSTALL_ARCH_INDEP_EXTRA=install-etc -LEIM_INSTALLDIR="\${install_prefix}/leim" ns_self_contained=no ns_frag=/dev/null NS_OBJ= @@ -1599,7 +1599,7 @@ infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" - LEIM_INSTALLDIR="\${ns_appresdir}/leim" + leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk @@ -1609,7 +1609,6 @@ CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(INSTALL_ARCH_INDEP_EXTRA) -AC_SUBST(LEIM_INSTALLDIR) AC_SUBST(ns_self_contained) AC_SUBST(NS_OBJ) AC_SUBST(NS_OBJC_OBJ) @@ -3222,6 +3221,7 @@ AC_SUBST(mandir) AC_SUBST(infodir) AC_SUBST(lispdir) +AC_SUBST(leimdir) AC_SUBST(locallisppath) AC_SUBST(lisppath) AC_SUBST(x_default_search_path) === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-05-21 00:44:34 +0000 +++ leim/ChangeLog 2012-05-21 07:30:23 +0000 @@ -1,5 +1,9 @@ 2012-05-21 Glenn Morris + * Makefile.in (install_prefix): Remove. + (LEIM_INSTALLDIR): Rename to leimdir. + (install): Update for this change. + * Makefile.in (leim-list.el, install): Scrap superfluous subshells. 2012-05-12 Glenn Morris === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-21 00:44:34 +0000 +++ leim/Makefile.in 2012-05-21 07:30:23 +0000 @@ -34,12 +34,10 @@ srcdir=@srcdir@ ns_appresdir=@ns_appresdir@ -install_prefix=$(DESTDIR)${datadir}/emacs/${version} - # Where to install LEIM files. -# For most builds, this is ${install_prefix}/leim. +# For most builds, this is ${datadir}/emacs/${version}/leim. # For self-contained ns builds, it is ${ns_appresdir}/leim. -LEIM_INSTALLDIR=@LEIM_INSTALLDIR@ +leimdir=@leimdir@ MKDIR_P = @MKDIR_P@ @@ -190,42 +188,42 @@ done install: all - umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR} - if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \ - rm -f ${LEIM_INSTALLDIR}/leim-list.el; \ - rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \ - echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \ + umask 022; ${MKDIR_P} $(DESTDIR)${leimdir} + if [ x`cd $(DESTDIR)${leimdir} && /bin/pwd` != x`/bin/pwd` ] ; then \ + rm -f $(DESTDIR)${leimdir}/leim-list.el; \ + rm -rf $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/ja-dic ; \ + echo "Copying leim files to $(DESTDIR)${leimdir} ..." ; \ if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ tar -chf - leim-list.el quail ja-dic \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ else \ tar -chf - leim-list.el quail \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ cd ${srcdir}; \ tar -chf - quail/* ja-dic \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ fi; \ - rm -f ${LEIM_INSTALLDIR}/.gitignore ${LEIM_INSTALLDIR}/*/.gitignore; \ - rm -f ${LEIM_INSTALLDIR}/.arch-inventory ${LEIM_INSTALLDIR}/*/.arch-inventory; \ - rm -f ${LEIM_INSTALLDIR}/\#* ${LEIM_INSTALLDIR}/*/\#* ; \ - rm -f ${LEIM_INSTALLDIR}/.\#* ${LEIM_INSTALLDIR}/*/.\#* ; \ - rm -f ${LEIM_INSTALLDIR}/*~ ${LEIM_INSTALLDIR}/*/*~ ; \ - rm -f ${LEIM_INSTALLDIR}/*.orig ${LEIM_INSTALLDIR}/*/*.orig ; \ + rm -f $(DESTDIR)${leimdir}/.gitignore $(DESTDIR)${leimdir}/*/.gitignore; \ + rm -f $(DESTDIR)${leimdir}/.arch-inventory $(DESTDIR)${leimdir}/*/.arch-inventory; \ + rm -f $(DESTDIR)${leimdir}/\#* $(DESTDIR)${leimdir}/*/\#* ; \ + rm -f $(DESTDIR)${leimdir}/.\#* $(DESTDIR)${leimdir}/*/.\#* ; \ + rm -f $(DESTDIR)${leimdir}/*~ $(DESTDIR)${leimdir}/*/*~ ; \ + rm -f $(DESTDIR)${leimdir}/*.orig $(DESTDIR)${leimdir}/*/*.orig ; \ else true; fi -unset CDPATH; \ if [ -n "${GZIP_PROG}" ]; \ then \ echo "Compressing *.el ..." ; \ - (cd ${LEIM_INSTALLDIR}; for f in `find . -name "*.elc" -print`; do \ + (cd $(DESTDIR)${leimdir}; for f in `find . -name "*.elc" -print`; do \ ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ done) \ else true; fi - -chmod -R a+r ${LEIM_INSTALLDIR} + -chmod -R a+r $(DESTDIR)${leimdir} for installuser in $${LOGNAME} $${USERNAME} $${USER} \ `id -un 2> /dev/null`; do \ [ -n "$${installuser}" ] && break ; \ done ; \ - find ${LEIM_INSTALLDIR} -exec chown $${installuser} '{}' ';' + find $(DESTDIR)${leimdir} -exec chown $${installuser} '{}' ';' clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ ------------------------------------------------------------ revno: 108322 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2012-05-21 00:33:54 -0400 message: * lisp/hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-21 04:28:41 +0000 +++ lisp/ChangeLog 2012-05-21 04:33:54 +0000 @@ -1,5 +1,7 @@ 2012-05-21 Stefan Monnier + * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. + * progmodes/compile.el (compilation-error-regexp-alist-alist): Simplify Maven regexp, and make sure the file can't start with a space (bug#11517). @@ -18,10 +20,11 @@ * calc/calc.el (calc-ensure-consistent-units): New variable. - * calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency): - New functions. - (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when - `calc-ensure-consistent-units' is non-nil. + * calc/calc-units.el (math-consistent-units-p) + (math-check-unit-consistency): New functions. + (calc-quick-units, calc-convert-units): + Use `math-check-unit-consistency' when `calc-ensure-consistent-units' + is non-nil. (calc-extract-units): Fix typo. 2012-05-18 Stefan Monnier === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2012-01-19 07:21:25 +0000 +++ lisp/hi-lock.el 2012-05-21 04:33:54 +0000 @@ -204,16 +204,15 @@ (defvar hi-lock-interactive-patterns nil "Patterns provided to hi-lock by user. Should not be changed.") +(define-obsolete-variable-alias 'hi-lock-face-history + 'hi-lock-face-defaults "23.1") (defvar hi-lock-face-defaults '("hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-black-b" "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb") "Default faces for hi-lock interactive functions.") -;(dolist (f hi-lock-face-defaults) (unless (facep f) (error "%s not a face" f))) - -(define-obsolete-variable-alias 'hi-lock-face-history - 'hi-lock-face-defaults - "23.1") +;;(dolist (f hi-lock-face-defaults) +;; (unless (facep f) (error "%s not a face" f))) (define-obsolete-variable-alias 'hi-lock-regexp-history 'regexp-history