From: Miles Bader Date: Mon, 18 Aug 2008 05:33:28 +0000 (+0000) Subject: Merge from emacs--rel--22 X-Git-Tag: emacs-pretest-23.0.90~3435 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/a971635315e259c076de020b3676c04d1dcc415e Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1382 --- a971635315e259c076de020b3676c04d1dcc415e diff --cc ChangeLog index 925ac49ded,c08e179054..6d662c6768 --- a/ChangeLog +++ b/ChangeLog @@@ -1,32 -1,16 +1,40 @@@ + 2008-08-16 Chong Yidong + + * make-dist: Omit info/.arch-inventory. + + 2008-08-16 Jason Rumney + + * make-dist (tempdir/nt): Link emacsclient.rc. + -2008-08-10 Glenn Morris +2008-08-07 Dan Nicolaescu + + * configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable. + AC_SUBST it. + (GNU_OBJC_CFLAGS): Define as a shell variable instead of #define. + AC_SUBST it. + (OTHER_FILES): Always define for HAVE_NS. + (C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA. + * configure: Regenerate. - * configure.in (cpp_undefs): Rename from `undefs', update uses. - Use $srcdir rather than $top_srcdir. Set before calling AC_OUTPUT, - and explicitly export there. (Bug#507.) (Sync of trunk 2008-07-01). +2008-08-07 Andreas Schwab + + * configure.in: Correctly handle + --enable-cocoa-experimental-ctrl-g=no and + --enable-ns-self-contained=yes. + +2008-08-06 Adrian Robert + + * configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. + (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. Don't + bother undef'ing since won't have desired effect. + +2008-08-06 Andreas Schwab + + * configure.in: Fix quoting. + +2008-08-06 Chong Yidong + + * configure.in (COCOA_EXPERIMENTAL_CTRL_G): Fix 2008-08-04 change. 2008-08-05 Ulrich Mueller diff --cc admin/ChangeLog index 3998111475,4320cba429..7e5edd426c --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,268 -1,14 +1,272 @@@ + 2008-08-16 Jason Rumney + + * admin.el (set-version): Set version in nt/emacsclient.rc + -2008-03-26 Chong Yidong +2008-08-06 Juanma Barranquero - * Version 22.2 released. + * nt/dump.bat: Fix mixed EOLs. -2008-03-09 Reiner Steib +2008-08-04 Adrian Robert - * FOR-RELEASE (WINDOWS SUPPORT BUGS): Add two issues. + * CPP_DEFINES: Add DARWIN_OS. Move USE_LISP_UNION_TYPE away from OS's. + +2008-08-02 Eli Zaretskii + + * CPP-DEFINES: Add defines for accessing system processes. + +2008-07-27 Dan Nicolaescu + + * make-tarball.txt: + * admin.el: + * FOR-RELEASE: + * CPP-DEFINES: Remove mentions of Mac Carbon. + +2008-07-16 Glenn Morris + + * admin.el (set-version, set-copyright): Add nextstep/ files. + +2008-07-15 Adrian Robert + + * CPP_DEFINES: Add NS port related defines. + +2008-06-16 Glenn Morris + + * admin.el (set-version): Add doc/lispref/vol1.texi,vol2.texi, + doc/lispref/book-spine.texinfo. + +2008-06-15 Glenn Morris + + * admin.el (set-version): Add doc/misc/faq.texi. + +2008-05-22 Juanma Barranquero + + * FOR-RELEASE: Remove Windows problem about the XPM image library + being loaded too soon (fixed by Stefan Monnier on 2008-05-07). + +2008-04-15 Juanma Barranquero + + * unidata/UnicodeData.txt: Update to Unicode 5.1. + +2008-04-14 Juanma Barranquero + + * unidata/unidata-gen.el (unidata-prop-alist): + Fix typo in description of `numeric-value'. + (unidata-put-character): Fix typo in error message. + +2008-02-21 Glenn Morris + + * notes/unicode, notes/font-backend: New files, split off from + README.unicode. + +2008-02-20 Kenichi Handa + + * FOR-RELEASE: Remove the problem of ucs-mule-8859-to-mule-unicode + being used in latin1-disp.el. Remove the problem of + cp-supported-codepages. Remove the problem of lost changelog for + ps-prin1.ps. + +2008-02-16 Eli Zaretskii + + * unidata/makefile.w32-in (unidata.txt): Don't use $<, it's + non-portable in this context. + + * unidata/Makefile.in (unidata.txt): Don't use $<, it's + non-portable in this context. + +2008-02-09 Eli Zaretskii + + * unidata/makefile.w32-in (lisp): New variable. + (EMACSLOADPATH): Use $(lisp). Add lisp/international and + lisp/emacs-lisp. + +2008-02-04 Jason Rumney + + * unidata/makefile.w32-in (unidata.txt): Use ARGQUOTE and DQUOTE macros. + +2008-02-02 Juanma Barranquero + + * unidata/.cvsignore: Ignore also "Makefile.unix" and "makefile". + +2008-02-02 Eli Zaretskii + + * unidata/makefile.w32-in (charprop-CMD): Fix last change. + + * unidata/Makefile.in: Rename from Makefile. + + * unidata/makefile.w32-in: New file. + +2008-02-02 Jason Rumney + + * unidata/unidata-gen.el (unidata-gen-files): Force unix line ends. + +2008-02-01 Kenichi Handa + + * unidata/copyright.html: New file. + +2008-02-01 Kenichi Handa + + * unidata/unidata-gen.el (unidata-get-decomposition): For Hangul + decomposition, if T is the same as TBase, don't include it in the + returned list. + +2008-02-01 Kenichi Handa + + * unidata/unidata-gen.el (unidata-text-file): Delete it. + (unidata-list): Initialize to nil. + (unidata-setup-list): New function. + (unidata-gen-files): New optional arg unidata-text-file. + If it's nil, set unidata-text-file to the left command line arg. + Call unidate-setup-list at first. + + * unidata/Makefile (all): Depends on ${DSTDIR}/charprop.el. + (${DSTDIR}/charprop.el): Run emacs after cd to DISDIR. + +2008-02-01 Kenichi Handa + + * unidata/unidata-gen.el: Fix comment typo. + Change string-to-int to string-to-number. + (unidata-text-file): Define to .../unidata.txt. + (unidata-list): Just insert unidata-text-file. + (unidata-get-decomposition): Handle Hangul decomposition. + (unidata-gen-files): Don't use \040, instead at ^L near the end of file. + + * unidata/Makefile (unidata.txt): New target. + (charprop.el): Depends on unidata.txt. + (clean): Remove unidata.txt. + +2008-02-01 Kenichi Handa + + * unidata/unidata-gen.el (unidata-get-name): Handle "CJK IDEOGRAPH". + (unidata-get-name): Handle U+110B. + +2008-02-01 Kenichi Handa + + Sub-directory `unidata' is for codes to generate charprop.el and + many other uni-*.el files from `UnicodeData.txt'. + + * Unidata/README: New file. + + * unidata/Makefile: New file. + + * unidata/unidata-gen.el: New file. + + * unidata/UnicodeData.txt: New file. Copied from + http://www.unicode.org on 2006-05-23. + + * unidata/.cvsignore: New file. + +2008-02-01 Kenichi Handa + + * charsets/.cvsignore: New file. + + * charsets/mapconv: Add code for handling KANJI-DATABASE format. + + * charsets/Makefile (all): Rename target from charsets. + Depend on ${TRANS_TABLE}. + (CNS-2.map, CNS-3.map, CNS-4.map, CNS-5.map, CNS-6.map, CNS-7.map): + Generate from cns2ucsdkw.txt. + (install): Copy updated files only. + +2008-02-02 Kenichi Handa + + * charsets/cp932.awk: Append user-defined area of CP932. + +2008-02-02 Kenichi Handa + + * charsets/Makefile (JISX2131.map): Convert 0x2015 to 0x2014, + 0x2299 to 0x29BF. + +2008-02-01 Kenichi Handa + + * charsets/Makefile (TRANS_TABLE): New macro. + (JISX0208.map): Convert 0x2015 to 0x2014. + (cp51932.el): New target. + (eucjp-ms.el): New target. + (install): Include ${TRANS_TABLE}. + (CJK): Include JISX213A.map. + (JISX213A.map): New target. + + * charsets/eucjp-ms.awk: New file. + + * charsets/cp51932.awk: New file. + +2008-02-01 Kenichi Handa + + * charsets/cp932.awk: New file. + + * charsets/Makefile (CP932-2BYTE.map): Call mapconv with cp932.awk. + + * charsets/mapconv: In UNICODE2 case, sort by 4th field after + running an awk program. + +2008-02-01 Kenichi Handa + + * charsets/mapconv: Handle UNICODE2. + + * charsets/Makefile (CJK): Include CP932-2BYTE.map + (CP932-2BYTE.map): New target. + +2008-02-01 Kenichi Handa + + * charsets: New directory for scripts to generate charset map + files in ../etc/charsets/. + + * charsets/Makefile, charsets/mapconv, charsets/compact.awk: + * charsets/big5.awk, charsets/gb18030-2.awk, charsets/gb18030-4.awk: + * charsets/kuten.awk: New files. + +2008-01-08 Glenn Morris + + * admin.el (set-version): Add doc/man/emacs.1. + +2008-01-06 Dan Nicolaescu + + * notes/copyright: + * MAINTAINERS: Remove references to files that have been removed. + +2008-01-04 Glenn Morris + + * admin.el (set-copyright): Add lib-src/ebrowse.c. + +2007-12-10 Stefan Monnier + + * CPP-DEFINES: New file. + +2007-12-08 Reiner Steib + + * FOR-RELEASE: Remove "window-system in face definition" [of + gnus-treat-emphasize]. Remove "Gnus archive groups". Add comment + on gnus-dired.el. + +2007-12-05 Glenn Morris + + * admin.el (set-version): Handle configure.in. Adapt for doc/ + directory layout for manuals. + +2007-12-01 Reiner Steib + + * FOR-RELEASE: Remove Gnus send mail problem. Other Gnus bugs have + been fixed in Gnus CVS but have not yet been synched to Emacs. + +2007-11-17 Glenn Morris + + * admin.el (process-lines): Move to ../lisp/subr.el. + +2007-10-23 Glenn Morris + + * MAINTAINERS: Move here from ../. + +2007-10-17 Juanma Barranquero + + * make-emacs: Doc fix. + +2007-08-28 Glenn Morris + + * admin.el: Provide self. + +2007-08-10 Jan Djärv + + * FOR-RELEASE: Add Gtk+ tool bar and GUD focus problem. 2007-07-25 Glenn Morris diff --cc admin/admin.el index 26072ead86,b5481039b4..d30583cd07 --- a/admin/admin.el +++ b/admin/admin.el @@@ -121,78 -118,59 +121,92 @@@ Root must be the root of an Emacs sourc (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space) ?\" (submatch (1+ (in "0-9, "))) "\\0\""))) (set-version-in-file root "nt/emacs.rc" comma-space-version + (rx (and "\"ProductVersion\"" (0+ space) ?, + (0+ space) ?\" (submatch (1+ (in "0-9, "))) + "\\0\""))) + ;; Likewise for emacsclient.rc + (set-version-in-file root "nt/emacsclient.rc" comma-version + (rx (and "FILEVERSION" (1+ space) + (submatch (1+ (in "0-9,")))))) + (set-version-in-file root "nt/emacsclient.rc" comma-version + (rx (and "PRODUCTVERSION" (1+ space) + (submatch (1+ (in "0-9,")))))) + (set-version-in-file root "nt/emacsclient.rc" comma-space-version + (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space) + ?\" (submatch (1+ (in "0-9, "))) "\\0\""))) + (set-version-in-file root "nt/emacsclient.rc" comma-space-version (rx (and "\"ProductVersion\"" (0+ space) ?, (0+ space) ?\" (submatch (1+ (in "0-9, "))) - "\\0\""))) - ;; Some files in the "mac" subdirectory also contain the version - ;; number. - (set-version-in-file - root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" - version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (set-version-in-file - root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" - version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "mac/src/Emacs.r" (car version-components) - (rx (and "GNU Emacs " (submatch (1+ (in "0-9"))) - " for Mac OS"))) - (set-version-in-file root "mac/src/Emacs.r" (car version-components) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Major revision in BCD */"))) - (set-version-in-file root "mac/src/Emacs.r" (cadr version-components) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Minor revision in BCD */"))) - (set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components)) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Non-final release # */"))) - (set-version-in-file root "mac/src/Emacs.r" version - (rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\, - (0+ space) "/* Short version number */"))) - (set-version-in-file root "mac/src/Emacs.r" version - (rx (and "/* Short version number */" (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (let* ((third-component (string-to-number (cadr (cdr version-components)))) - (release (cond ((>= third-component 90) "alpha") - ((>= third-component 50) "development") - (t "final")))) - (set-version-in-file - root "mac/src/Emacs.r" release - (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space) - "/* development, alpha, beta, or final (release) */")))))) + "\\0\"")))) + ;; nextstep. + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" + version (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space) + (submatch (1+ (in "0-9.")))))) + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" + version (rx (and "CFBundleShortVersionString" (1+ anything) + "Version" (1+ space) + (submatch (1+ (in "0-9.")))))) + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings" + version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) + ?\" (0+ space) "Version" (1+ space) + (submatch (1+ (in "0-9.")))))) + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings" + version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) + ?\" (0+ space) "Emacs version" (1+ space) + (submatch (1+ (in "0-9.")))))) + (set-version-in-file + root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist" + version (rx (and "FullVersionID" (0+ space) ?= (0+ space) + ?\" (0+ space) "Emacs" (1+ space) + (submatch (1+ (in "0-9."))))))) + +;; Note this makes some assumptions about form of short copyright. +;; FIXME add the \year in the refcards/*.tex files. +(defun set-copyright (root copyright) + "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT. +Root must be the root of an Emacs source tree." + (interactive (list + (read-directory-name "Emacs root directory: " nil nil t) + (read-string + "Short copyright string: " + (format "Copyright (C) %s Free Software Foundation, Inc." + (format-time-string "%Y"))))) + (unless (file-exists-p (expand-file-name "src/emacs.c" root)) + (error "%s doesn't seem to be the root of an Emacs source tree" root)) + (set-version-in-file root "lisp/version.el" copyright + (rx (and "emacs-copyright" (0+ space) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) + (set-version-in-file root "lib-src/ebrowse.c" copyright + (rx (and "emacs_copyright" (0+ (not (in ?\"))) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) + (set-version-in-file root "lib-src/etags.c" copyright + (rx (and "emacs_copyright" (0+ (not (in ?\"))) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) + (set-version-in-file root "lib-src/rcs2log" copyright + (rx (and "Copyright" (0+ space) ?= (0+ space) + ?\' (submatch (1+ nonl))))) + ;; This one is a nuisance, as it needs to be split over two lines. + (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) + ;; nextstep. + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" + copyright (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space) + (1+ (in "0-9.")) (1+ space) + (submatch (1+ (not (in ?\<))))))) + (set-version-in-file + root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings" + copyright (rx (and "NSHumanReadableCopyright" (0+ space) ?\= (0+ space) + ?\" (submatch (1+ (not (in ?\"))))))) + (set-version-in-file + root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist" + copyright (rx (and "Copyright" (0+ space) ?\= (0+ space) + ?\" (submatch (1+ (not (in ?\")))))))) + +(provide 'admin) -;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5 -;; admin.el ends here. +;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5 +;;; admin.el ends here diff --cc make-dist index 2b3c583b69,3871dc6005..817daa8ac9 --- a/make-dist +++ b/make-dist @@@ -672,17 -627,18 +672,17 @@@ echo "Making links to \`info' cd ../${tempdir}/info # Avoid an error when expanding the wildcards later. ln emacs dummy~ ; ln emacs \#dummy\# - rm -f *~ \#*\# core) + rm -f *~ \#*\# core .arch-inventory) -echo "Making links to \`man'" -(cd man - ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man - ln makefile.w32-in ../${tempdir}/man - test -f README && ln README ../${tempdir}/man - test -f Makefile.in && ln Makefile.in ../${tempdir}/man - ln ChangeLog ../${tempdir}/man - test -f split-man && ln split-man ../${tempdir}/man - cp texinfo.tex ../${tempdir}/man - cd ../${tempdir}/man +echo "Making links to \`doc/emacs'" +(cd doc/emacs + ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/emacs + ln makefile.w32-in ../../${tempdir}/doc/emacs + test -f README && ln README ../../${tempdir}/doc/emacs + test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/emacs + ln ChangeLog ../../${tempdir}/doc/emacs + cp texinfo.tex ../../${tempdir}/doc/emacs + cd ../../${tempdir}/doc/emacs rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)