# HG changeset patch # User Miles Bader # Date 1178500175 0 # Node ID bfd32b1a7afde6f5a65085ac702ad0f4a2c22c59 # Parent 6c44ac3ba98ff7683312b460b41f4b7956fe94c1# Parent 2256012fcd2a74db1ae4b2c3fae333c6add955c3 Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 9-10) - Update from CVS 2007-05-06 Richard Stallman * lisp/emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix. 2007-05-03 Ryan Yeske * lisp/net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted disconnections. 2007-05-06 Richard Stallman * lispref/processes.texi (Accepting Output): Revert most of previous change. 2007-05-05 Richard Stallman * lispref/processes.texi (Accepting Output): accept-process-output uses microseconds, not milliseconds. But that arg is obsolete. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-734 diff -r 2256012fcd2a -r bfd32b1a7afd ChangeLog --- a/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -2,6 +2,15 @@ * configure: Tweak message about the absence of shell functions. +2007-04-27 Andreas Schwab + + * Makefile.in (config.status): Depend on + ${srcdir}/lisp/version.el. + +2007-04-26 Glenn Morris + + * README: Increase version to 22.1.50. + 2007-04-24 Juanma Barranquero * INSTALL (DETAILED BUILDING AND INSTALLATION): Fix typo. diff -r 2256012fcd2a -r bfd32b1a7afd INSTALL diff -r 2256012fcd2a -r bfd32b1a7afd Makefile.in --- a/Makefile.in Sun May 06 18:10:44 2007 +0000 +++ b/Makefile.in Mon May 07 01:09:35 2007 +0000 @@ -311,7 +311,7 @@ Makefile: $(srcdir)/Makefile.in config.status ./config.status -config.status: ${srcdir}/configure +config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ./config.status --recheck AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4 diff -r 2256012fcd2a -r bfd32b1a7afd README --- a/README Sun May 06 18:10:44 2007 +0000 +++ b/README Mon May 07 01:09:35 2007 +0000 @@ -3,7 +3,7 @@ See the end of the file for license conditions. -This directory tree holds version 22.0.99 of GNU Emacs, the extensible, +This directory tree holds version 22.1.50 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff -r 2256012fcd2a -r bfd32b1a7afd admin/ChangeLog --- a/admin/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/admin/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-25 Nick Roberts + + * make-tarball.txt: Add note about cutting the branch. + 2007-02-03 Eli Zaretskii * nt/makedist.bat: Change EOL format to DOS. Don't use diff -r 2256012fcd2a -r bfd32b1a7afd admin/FOR-RELEASE --- a/admin/FOR-RELEASE Sun May 06 18:10:44 2007 +0000 +++ b/admin/FOR-RELEASE Mon May 07 01:09:35 2007 +0000 @@ -22,6 +22,10 @@ Reminders sent out on 2006-06-08. +** Remove temporary +++/--- lines in NEWS. + +** Try to reorder NEWS: most important things first, related items together. + * WINDOWS SUPPORT BUGS. These don't need to be fixed before a release, but we call the @@ -36,8 +40,7 @@ * BUGS -** python.el legal problem? -http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html +See the copy of this file on the EMACS_22_BASE branch. ** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc. OpenBSD compilation works on i386. diff -r 2256012fcd2a -r bfd32b1a7afd admin/make-tarball.txt --- a/admin/make-tarball.txt Sun May 06 18:10:44 2007 +0000 +++ b/admin/make-tarball.txt Mon May 07 01:09:35 2007 +0000 @@ -76,7 +76,22 @@ 14. For a pretest, let Richard Stallman know about the new pretest and tell him to announce it using the announcement you prepared. Remind him to set a Reply-to header to . - For a release, Richard should prepare the announcement himself, + +15. Shortly before the release, cut the branch with the following commands: + + cvs rtag EMACS_`NUMBER'_BASE + cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE + +where `NUMBER' is the major version number of the release. This makes it +easier to see what changes have been applied to the branch with: + + cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC + +or merge changes back to the trunk with "cvs update -j", if necessary. + +After doing this, increase the version number on the trunk as per step 4. + +16. For a release, Richard should prepare the announcement himself, possibly starting from a previous announcment. # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390 diff -r 2256012fcd2a -r bfd32b1a7afd admin/notes/copyright --- a/admin/notes/copyright Sun May 06 18:10:44 2007 +0000 +++ b/admin/notes/copyright Mon May 07 01:09:35 2007 +0000 @@ -228,6 +228,7 @@ the concept. rms: "My understanding is that game rules as such are not copyrightable." + rms: Legal advice is that we are ok and need not worry about this. lispref/doclicense.texi man/doclicense.texi @@ -405,6 +406,7 @@ Accordingly, FSF copyright was added. src/unexhp9k800.c (and dependent src/m/sr2k.h) + http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html - briefly removed due to legal uncertainly Jan-Mar 2007. The relevant assignment is under "hp9k800" in copyright.list. File was written by John V. Morris at HP, and disclaimed by the author and @@ -549,9 +551,6 @@ Emacs 22 is released (though if they can be fixed before, that is obviously good): -Maybe some relevant comments here? - - Is it OK to just `cvs remove' a file for legal reasons, or is something more drastic needed? A removed file is still available from @@ -586,18 +585,10 @@ Done: TUTORIAL.eo -REMOVED src/unexhp9k800.c - - we would like to re-add this file if possible. Please let us know - if you can clarify its legal status. - http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html - - *** These are copyright issues still to be addressed: python.el potential legal problem http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html - - This file is part of GNU Emacs. diff -r 2256012fcd2a -r bfd32b1a7afd etc/ChangeLog diff -r 2256012fcd2a -r bfd32b1a7afd etc/NEWS diff -r 2256012fcd2a -r bfd32b1a7afd lib-src/ChangeLog --- a/lib-src/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/lib-src/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-26 Glenn Morris + + * makefile.w32-in (VERSION): Increase to 22.1.50. + 2007-02-26 Francesco Potort,Al(B * Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs". @@ -1845,7 +1849,7 @@ [WINDOWSNT]: #undef DOS_NT and #define it even if built with HAVE_CONFIG_H. This change does nothing in Emacs, as DOS_NT is always defined when HAVE_CONFIG_H and WINDOWS are both defined. - [!HAVE_UNISTD_H]: use defined(WINDOWSNT) instead of the bare + [!HAVE_UNISTD_H]: Use defined(WINDOWSNT) instead of the bare WINDOWSNT, as this is the correct way to use it. 2001-01-28 Francesco Potort,Al(B @@ -2996,7 +3000,7 @@ 1997-03-14 Francesco Potort,Al(B - * etags.c (add_regex): reset *putbuf before using it. + * etags.c (add_regex): Reset *putbuf before using it. 1997-02-23 Jonathan I. Kamens @@ -3560,7 +3564,7 @@ 1995-12-04 Francesco Potort,Al(B - * Makefile.in (ctags): depend on etags only for simplicity; + * Makefile.in (ctags): Depend on etags only for simplicity; compile with regexp support enabled. 1995-11-24 Richard Stallman @@ -3685,13 +3689,13 @@ 1995-06-27 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (plain_C_entries): new function. - (lowcase): new macro. - (tail, Fortran_functions, Pascal_functions): use new macro lowcase. - (lang_suffixes): new suffix ".pc" for Pro*C files. - (consider_token): don't tag all tokens beginning with DEFUN & Co.. - (tail): look for the end of the token when comparing. - (takeprec): since now tail behaves differently, use strneq. + * etags.c (plain_C_entries): New function. + (lowcase): New macro. + (tail, Fortran_functions, Pascal_functions): Use new macro lowcase. + (lang_suffixes): New suffix ".pc" for Pro*C files. + (consider_token): Don't tag all tokens beginning with DEFUN & Co.. + (tail): Look for the end of the token when comparing. + (takeprec): Since now tail behaves differently, use strneq. 1995-07-08 Paul Eggert @@ -3723,13 +3727,13 @@ 1995-06-27 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (plain_C_entries): new function. - (lowcase): new macro. - (tail, Fortran_functions, Pascal_functions): use new macro lowcase. - (lang_suffixes): new suffix ".pc" for Pro*C files. - (consider_token): don't tag all tokens beginning with DEFUN & Co.. - (tail): look for the end of the token when comparing. - (takeprec): since now tail behaves differently, use strneq. + * etags.c (plain_C_entries): New function. + (lowcase): New macro. + (tail, Fortran_functions, Pascal_functions): Use new macro lowcase. + (lang_suffixes): New suffix ".pc" for Pro*C files. + (consider_token): Don't tag all tokens beginning with DEFUN & Co.. + (tail): Look for the end of the token when comparing. + (takeprec): Since now tail behaves differently, use strneq. 1995-06-26 Richard Stallman @@ -3906,7 +3910,7 @@ 1995-03-13 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (process_file): free (filename) after using it. + * etags.c (process_file): Free (filename) after using it. (readline_internal): Do not access the char before start of line. 1995-02-22 Francesco Potort,Al(B (pot@cnuce.cnr.it) @@ -4039,8 +4043,8 @@ 1994-11-22 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (print_help): print --regex usage for ctags also. - (main): use -h in addition to -H as abbreviation for --help. + * etags.c (print_help): Print --regex usage for ctags also. + (main): Use -h in addition to -H as abbreviation for --help. 1994-11-16 Francesco Potort,Al(B (pot@cnuce.cnr.it) @@ -4105,9 +4109,9 @@ 1994-10-21 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (prestr, substr): return a logical type. + * etags.c (prestr, substr): Return a logical type. (consider_token): Comment out "EXFUN". Use "DEFUN" instead of "DEF". - (consider_token): set funcdef to fignore when a DEFUN is met. + (consider_token): Set funcdef to fignore when a DEFUN is met. (C_entries): Now we can use Tom Hageman patch for extern "C". 1994-10-20 Richard Stallman @@ -4190,8 +4194,8 @@ 1994-10-17 Francesco Potort,Al(B (pot@fly.cnuce.cnr.it) - * Makefile.in.in (etags): add dependency on regex.o, link with it. - (REGEXPOBJ, REGEXPDEPS, regex.o): target and macros added. + * Makefile.in.in (etags): Add dependency on regex.o, link with it. + (REGEXPOBJ, REGEXPDEPS, regex.o): Target and macros added. 1994-10-12 David J. MacKenzie (djm@duality.gnu.ai.mit.edu) @@ -4341,7 +4345,7 @@ 1994-07-08 Dave Love (d.love@dl.ac.uk) - * etags.c (takeprec): recognise `character*(*) function' + * etags.c (takeprec): Recognise `character*(*) function'. 1994-07-08 Francesco Potort,Al(B (pot@cnuce.cnr.it) @@ -4489,11 +4493,11 @@ 1994-04-18 Francesco Potort,Al(B (pot@fly.cnuce.cnr.it) - * etags.c (main, print_help): eliminate the -F option. + * etags.c (main, print_help): Eliminate the -F option. 1994-04-18 Francesco Potort,Al(B (pot@fly.cnuce.cnr.it) - * etags.c (absolute_filename): compare against '\0' instead of NULL. + * etags.c (absolute_filename): Compare against '\0' instead of NULL. 1994-04-16 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4527,21 +4531,21 @@ 1994-04-08 Francesco Potort,Al(B (pot@fly.cnuce.cnr.it) - * etags.c (outf, outfiledir): renamed to tagf, tagfiledir. - (PF_funcs, Asm_funcs, L_funcs, PAS_funcs, TEX_funcs, - Scheme_funcs, prolog_funcs): renamed to Fortran_functions, + * etags.c (outf, outfiledir): Renamed to tagf, tagfiledir. + (PF_funcs, Asm_funcs, L_funcs, PAS_funcs, TEX_funcs) + (Scheme_funcs, prolog_funcs): Renamed to Fortran_functions, Asm_labels, Lisp_functions, Pascal_functions, Scheme_functions, TeX_functions, Prolog_functions. - (inf): no more a global variable. - (C_entries): take 2nd parameter `inf' instead of using the global one. - (find_entries): added the cp1 var for optimisation. - (find_entries): added more suffixes for assembler files. + (inf): No more a global variable. + (C_entries): Take 2nd parameter `inf' instead of using the global one. + (find_entries): Added the cp1 var for optimisation. + (find_entries): Added more suffixes for assembler files. (Asm_funcs): Now finds labels even without an ending colon. 1994-03-30 Francesco Potort,Al(B (pot@fly.cnuce.cnr.it) - * etags.c (main): use etags_getcwd for compatibility. - (etags_getcwd): new function. + * etags.c (main): Use etags_getcwd for compatibility. + (etags_getcwd): New function. 1994-03-25 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4549,22 +4553,22 @@ 1994-03-25 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (emacs_tags_format, ETAGS): removed. Use CTAGS instead. - (main): don't allow the use of -t and -T in etags mode. - (print_help): don't show options enabled by default. - (print_version): show the emacs version number if VERSION is #defined. - (find_entries): add "ss" as suffix for Chez Scheme. + * etags.c (emacs_tags_format, ETAGS): Removed. Use CTAGS instead. + (main): Don't allow the use of -t and -T in etags mode. + (print_help): Don't show options enabled by default. + (print_version): Show the emacs version number if VERSION is #defined. + (find_entries): Add "ss" as suffix for Chez Scheme. 1994-03-23 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (cwd, outfiledir): vars added. + * etags.c (cwd, outfiledir): Vars added. (relative_filename, absolute_filename, absolute_dirname): functions added to compute filenames in tags files. - (process_file): filenames in tags file are relative to the + (process_file): Filenames in tags file are relative to the directory where the tags file is (useful with the -o option). - (main): initialise the outfiledir var. - (TYPEDST): added the `tignore' value. - (C_entries): corrected various small bugs. + (main): Initialise the outfiledir var. + (TYPEDST): Added the `tignore' value. + (C_entries): Corrected various small bugs. 1994-03-19 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4579,8 +4583,8 @@ 1994-03-14 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (TYPEDST): added the `tignore' value. - (C_entries): corrected various bugs, now correctly parses the + * etags.c (TYPEDST): Added the `tignore' value. + (C_entries): Corrected various bugs, now correctly parses the `extern "C" {' construction (patch by Tom R.Hageman). 1994-03-05 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4621,7 +4625,7 @@ 1994-02-22 Karl Heuer (kwzh@gnu.ai.mit.edu) * profile.c (get_time): Simplify; avoid calling index. - (main): exit on EOF. + (main): Exit on EOF. 1994-02-17 Francesco Potort,Al(B (pot@cnuce.cnr.it) @@ -4633,11 +4637,11 @@ 1994-02-14 Francesco Potort,Al(B (pot@fly) - * etags.c (absolute_pathnames, cwd): added global vars. - (longopts, print_help, main, process_file): put absolute filenames + * etags.c (absolute_pathnames, cwd): Added global vars. + (longopts, print_help, main, process_file): Put absolute filenames in the tag file if the -A --absolute-pathnames option is used. - (print_help): alfabetically order the options. - (malloc, realloc, strcpy, strncpy, strcmp): remove extern declar. + (print_help): Alfabetically order the options. + (malloc, realloc, strcpy, strncpy, strcmp): Remove extern declar. 1994-02-09 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4666,15 +4670,15 @@ 1994-01-14 Francesco Potort,Al(B (pot@cnuce.cnr.it) * etags.c (stab_entry, stab_create, stab_find, stab_search, - stab_type, add_keyword, C_reate_stab, C_create_stabs): deleted. + stab_type, add_keyword, C_reate_stab, C_create_stabs): Deleted. Use gperf generated hash table instead of linked list. - (C_stab_entry, hash, in_word_set, get_C_stab, C_symtype): added. + (C_stab_entry, hash, in_word_set, get_C_stab, C_symtype): Added. Mostly code generated by gperf. - (consider_token): removed unused parameter `lp'. - (PF_funcs, getit): allow subroutine and similar declarations + (consider_token): Removed unused parameter `lp'. + (PF_funcs, getit): Allow subroutine and similar declarations to span multiple lines. - (C_entries): check for newline if inchar to avoid bus errors. - (process_file, find_entries): distinguish among nonexistent + (C_entries): Check for newline if inchar to avoid bus errors. + (process_file, find_entries): Distinguish among nonexistent and not regular file. 1994-01-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4811,14 +4815,14 @@ functions returning a pointer to a function, a la `signal', can be parsed. This also required new state `fstartlist' to `FUNCST'. (SAVE_TOKEN, RESTORE_TOKEN, TOKEN_SAVED_P): 1-deep token save stack. - (C_entries, CNL): use it to isolate preprocessor directive processing + (C_entries, CNL): Use it to isolate preprocessor directive processing from the other state engines. - (begtk): add '~', for C++ class destructors. + (begtk): Add '~', for C++ class destructors. 1993-11-02 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (consider_token): removed unused variable firsttok. - (prolog_getit): call pfnote with the right number of arguments. + * etags.c (consider_token): Removed unused variable firsttok. + (prolog_getit): Call pfnote with the right number of arguments. 1993-10-19 Paul Eggert (eggert@twinsun.com) @@ -4837,9 +4841,9 @@ 1993-10-01 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (process_file): dead code removed. + * etags.c (process_file): Dead code removed. (S_ISREG): #define it using S_IFREG if not defined. - (process_file): regular files have nothing to do with symlinks. + (process_file): Regular files have nothing to do with symlinks. 1993-09-28 Brian Fox (bfox@ai.mit.edu) @@ -4922,10 +4926,10 @@ 1993-08-04 Francesco Potort,Al(B (pot@spiff.gnu.ai.mit.edu) - * etags.c (L_isdef, L_isquote, L_getit): small optimisations. - (L_funcs): the (foo::defmumble stuff now should work. - (consider_token): function returned random value--corrected. - (C_entries): corrected == versus = typo. + * etags.c (L_isdef, L_isquote, L_getit): Small optimisations. + (L_funcs): The (foo::defmumble stuff now should work. + (consider_token): Function returned random value--corrected. + (C_entries): Corrected == versus = typo. 1993-08-01 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -4941,11 +4945,11 @@ * etags.c (FINCST): Added the fignore status. Means we are after the parameter list and before the open curly brace. Allows correct parsing of C++ constructors. - (C_entries, consider_token): make use of fignore. - (consider_token): reset funcdef when next_token_is_func: when in + (C_entries, consider_token): Make use of fignore. + (consider_token): Reset funcdef when next_token_is_func: when in ctags mode makes DEFVAR and others work better. - (L_isquote): function that recognises the "(quote" string. - (L_getit): ignore quoting via "'" or "(quote". Useful for defalias. + (L_isquote): Function that recognises the "(quote" string. + (L_getit): Ignore quoting via "'" or "(quote". Useful for defalias. 1993-07-29 Paul Eggert (eggert@twinsun.com) @@ -4977,20 +4981,20 @@ 1993-07-08 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (alloca): removed all references to it. - (main): now calls xnew instead of alloca for portability. - (../src/config.h): included only if HAVE_CONFIG_H. - (const): void definition removed--config.h takes care of it. + * etags.c (alloca): Removed all references to it. + (main): Now calls xnew instead of alloca for portability. + (../src/config.h): Included only if HAVE_CONFIG_H. + (const): Void definition removed--config.h takes care of it. 1993-07-08 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (consider_token): was `==', now is `='. + * etags.c (consider_token): Was `==', now is `='. (consider_token): DEFUNs now treated like funcs in ctags mode. - * etags.c (LEVEL_OK_FOR_FUNCDEF): removed. - (C_entries): optimized the test that used LEVEL_OK_FOR_FUNCDEF. - (C_entries): removed a piece of useless code. - (C_entries): making typedef tags is delayed until a semicolon + * etags.c (LEVEL_OK_FOR_FUNCDEF): Removed. + (C_entries): Optimized the test that used LEVEL_OK_FOR_FUNCDEF. + (C_entries): Removed a piece of useless code. + (C_entries): Making typedef tags is delayed until a semicolon is met. This handles "typedef int X, Y, Z;" correctly. 1993-07-06 Jim Blandy (jimb@geech.gnu.ai.mit.edu) @@ -5266,38 +5270,38 @@ 1993-03-22 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (YACC): flag added to c_ext. - (c_ext): no more a synonim for c_ext&C_PLPL because of YACC. - (find_entries): consistently use streq when reasonable. - (find_entries): a .y file is a yacc file. + * etags.c (YACC): Flag added to c_ext. + (c_ext): No more a synonim for c_ext&C_PLPL because of YACC. + (find_entries): Consistently use streq when reasonable. + (find_entries): A .y file is a yacc file. (get_C_stab): c_ext becomes c_ext&C_PLPL. - (C_entries): logical cplpl means c_ext&C_PLPL. - (C_entries): logical yacc_rules means we are after the first %%. - (C_entries): added logic for yacc files. + (C_entries): Logical cplpl means c_ext&C_PLPL. + (C_entries): Logical yacc_rules means we are after the first %%. + (C_entries): Added logic for yacc files. 1993-03-16 Francesco Potort,Al(B (pot@cnuce.cnr.it) * etags.c (C_entries): ':' case moved to the second switch. - (C_entries): do not examine token if structdef==scolonseen. + (C_entries): Do not examine token if structdef==scolonseen. (consider_token): structtag set to null string for enum. 1993-03-12 Francesco Potort,Al(B (pot@cnuce.cnr.it) - * etags.c (GET_COOKIE): and related macros removed. - (logical): is now int, no more a char. - (reg): define deleted. - (isgood, _gd, notgd): deleted. - (gotone): deleted. - (TOKEN): member linestart removed. - (linepos, prev_linepos, lb1): deleted. - (main): call initbuffer on lbs array instead of lb1. - (init): removed the initialisation of the logical _gd array; - (find_entries): a .sa suffix means assembler file. + * etags.c (GET_COOKIE): And related macros removed. + (logical): Is now int, no more a char. + (reg): Define deleted. + (isgood, _gd, notgd): Deleted. + (gotone): Deleted. + (TOKEN): Member linestart removed. + (linepos, prev_linepos, lb1): Deleted. + (main): Call initbuffer on lbs array instead of lb1. + (init): Removed the initialisation of the logical _gd array; + (find_entries): A .sa suffix means assembler file. (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec. All C state machines rewritten. - (C_entries): complete rewrite. - (condider_token): complete rewrite. - (getline): deleted. + (C_entries): Complete rewrite. + (condider_token): Complete rewrite. + (getline): Deleted. 1993-03-01 Francesco Potort,Al(B (pot@fly.CNUCE.CNR.IT) @@ -5311,7 +5315,7 @@ 1993-03-19 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) - * Makefile.in (EXECUTABLES): added rcs-checkin. + * Makefile.in (EXECUTABLES): Added rcs-checkin. * Makefile.in (unlock, relock): New productions. @@ -5594,7 +5598,7 @@ 1992-05-04 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * Makefile.in: flags in CC invocations rearranged for no reason. + * Makefile.in: Flags in CC invocations rearranged for no reason. 1992-04-20 Jim Blandy (jimb@pogo.cs.oberlin.edu) @@ -6007,13 +6011,13 @@ 1989-04-18 Richard Stallman (rms@sugar-bombs.ai.mit.edu) - * loadst.c: on bsd4.3, use gettimeofday instead of CPUSTATES. + * loadst.c: On bsd4.3, use gettimeofday instead of CPUSTATES. 1989-03-15 Jeff Peck (rms@sugar-bombs.ai.mit.edu) * emacstool.c: setenv IN_EMACSTOOL=t, TERM=sun, TERMCAP=. - * emacsstool.1: update to document environment variables. + * emacsstool.1: Update to document environment variables. 1989-02-21 Richard Stallman (rms@sugar-bombs.ai.mit.edu) @@ -6114,7 +6118,7 @@ 1988-09-24 Richard Stallman (rms@gluteus.ai.mit.edu) - * etags.c (main): default setting of eflag was backwards. + * etags.c (main): Default setting of eflag was backwards. 1988-09-23 Richard Stallman (rms@sugar-bombs.ai.mit.edu) @@ -6197,7 +6201,7 @@ 1988-04-28 Richard Stallman (rms@frosted-flakes.ai.mit.edu) * movemail.c: #undef close, since config can #define it on V.3. - * emacsclient.c, fakemail.c, loadst.c, server.c: likewise. + * emacsclient.c, fakemail.c, loadst.c, server.c: Likewise. 1988-04-26 Richard Stallman (rms@lucky-charms.ai.mit.edu) @@ -6208,9 +6212,9 @@ 1988-03-20 Richard M. Stallman (rms@wilson) - * server.c [not BSD and not HAVE_SYSVIPC]: fix error message. - - * loadst.c (main) [XENIX]: use /usr/spool/mail, not /usr/mail. + * server.c [not BSD and not HAVE_SYSVIPC]: Fix error message. + + * loadst.c (main) [XENIX]: Use /usr/spool/mail, not /usr/mail. ;; Local Variables: ;; coding: iso-2022-7bit diff -r 2256012fcd2a -r bfd32b1a7afd lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Sun May 06 18:10:44 2007 +0000 +++ b/lib-src/makefile.w32-in Mon May 07 01:09:35 2007 +0000 @@ -24,7 +24,7 @@ .PHONY: $(ALL) -VERSION = 22.0.99 +VERSION = 22.1.50 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff -r 2256012fcd2a -r bfd32b1a7afd lisp/ChangeLog --- a/lisp/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/lisp/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -2,6 +2,29 @@ * emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix. +2007-05-05 Stefan Monnier + + * diff.el (diff): Use buffer-local vars diff-old-file and diff-new-file + rather than storing their value in the revert-buffer function. + +2007-05-04 Nick Roberts + + * t-mouse.el (t-mouse-mode): Do nothing on a graphical display + when disabling t-mouse-mode. + +2007-05-01 Davis Herring + + * calendar/timeclock.el: Update version number. + (timeclock-modeline-display): Mention timeclock-use-display-time + in explanatory message. + (timeclock-in): Fix non-interactive workday specifications. + (timeclock-log): Don't kill the log buffer if it already existed. + Suppress warnings when finding the log. Don't check for a nil + project twice. Run hooks after killing the buffer (if applicable). + (timeclock-geometric-mean): Rename to `timeclock-mean' (it never + was geometric). All uses changed. + (timeclock-generate-report): Support prefix argument. + 2007-05-03 Ryan Yeske * net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted @@ -11,21 +34,10 @@ * dired-x.el: Revert 2007-04-06 change. -2007-04-30 Nick Roberts - - * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so - don't put stop on toolbar. - 2007-04-29 Stephen Berman * find-dired.el (find-dired-filter): Propertize all text down to eob. -2007-04-29 Davis Herring - - * calendar/timeclock.el (timeclock-in): Fix non-interactive - workday specifications. - (timeclock-log): Don't kill the log buffer if it already existed. - 2007-04-29 Richard Stallman * international/mule.el (auto-coding-alist): Add pdf => no-conversion. @@ -39,6 +51,11 @@ * progmodes/sh-script.el (sh-mode): Recognize .profile as sh style. +2007-04-28 Nick Roberts + + * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so + don't put stop on toolbar. + 2007-04-28 Stefan Monnier * vc-hooks.el (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem. @@ -48,8 +65,6 @@ * makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Use ./mh-e instead of $(lisp)/mh-e. - * textmodes/fill.el (fill-paragraph): Doc fix. - 2007-04-28 Glenn Morris * image-dired.el (image-dired-cmd-create-thumbnail-options) @@ -61,10 +76,13 @@ * textmodes/flyspell.el (flyspell-auto-correct-previous-word): Use window-start and window-end. -2007-04-26 Glenn Morris - - * progmodes/python.el: Restore file pending consideration of legal - status. +2007-04-27 Andreas Schwab + + * emacs-lisp/sregex.el (sregexq): Fix doc string quoting. + +2007-04-27 Eli Zaretskii + + * textmodes/fill.el (fill-paragraph): Doc fix. 2007-04-26 Luc Teirlinck @@ -75,6 +93,8 @@ * button.el (button): Use underline if supported, else fall back to color. + * version.el (emacs-version): Increase to 22.1.50. + 2007-04-25 Richard Stallman * hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. @@ -95,10 +115,6 @@ * custom.el (defface): Doc fix. -2007-04-24 Chong Yidong - - * progmodes/python.el: Remove due to unclear legal issues. - 2007-04-24 J.D. Smith * progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): diff -r 2256012fcd2a -r bfd32b1a7afd lisp/ChangeLog.8 --- a/lisp/ChangeLog.8 Sun May 06 18:10:44 2007 +0000 +++ b/lisp/ChangeLog.8 Mon May 07 01:09:35 2007 +0000 @@ -5354,12 +5354,12 @@ * international/mule.el (auto-coding-alist): Add .tgz. -1999-05-2 Eli Zaretskii +1999-05-02 Eli Zaretskii * international/codepage.el (cp-coding-system-for-codepage-1): Make the magnification parameter for the -dos encoder be 2. -1999-05-2 Andrew Innes +1999-05-02 Andrew Innes * term/w32-win.el (w32-drag-n-drop): Select file in window where it is dropped, rather than current window. diff -r 2256012fcd2a -r bfd32b1a7afd lisp/calendar/timeclock.el --- a/lisp/calendar/timeclock.el Sun May 06 18:10:44 2007 +0000 +++ b/lisp/calendar/timeclock.el Mon May 07 01:09:35 2007 +0000 @@ -5,7 +5,7 @@ ;; Author: John Wiegley ;; Created: 25 Mar 1999 -;; Version: 2.6 +;; Version: 2.6.1 ;; Keywords: calendar data ;; This file is part of GNU Emacs. @@ -304,8 +304,8 @@ ;; Update immediately so there is a visible change ;; on calling this function. (if display-time-mode (timeclock-update-modeline) - (message "Activate `display-time-mode' to see \ -timeclock information")) + (message "Activate `display-time-mode' or turn off \ +`timeclock-use-display-time' to see timeclock information")) (add-hook 'display-time-hook 'timeclock-update-modeline)) (setq timeclock-update-timer (run-at-time nil 60 'timeclock-update-modeline)))) @@ -375,8 +375,9 @@ (setq timeclock-discrepancy (- (or timeclock-discrepancy 0) workday)) (if (not (= workday timeclock-workday)) - (timeclock-log "h" (and (numberp arg) - (number-to-string arg)))))) + (timeclock-log "h" (number-to-string + (/ workday (if (zerop (% workday (* 60 60))) + 60 60.0) 60)))))) (timeclock-log "i" (or project (and timeclock-get-project-function (or find-project (interactive-p)) @@ -588,6 +589,38 @@ (message "%s" string) string))) +(defun timeclock-make-hours-explicit (old-default) + "Specify all workday lengths in `timeclock-file'. +OLD-DEFAULT hours are set for every day that has no number indicated." + (interactive "P") + (if old-default (setq old-default (prefix-numeric-value old-default)) + (error "timelog-make-hours-explicit requires an explicit argument")) + (let ((extant-timelog (find-buffer-visiting timeclock-file)) + current-date) + (with-current-buffer (find-file-noselect timeclock-file t) + (unwind-protect + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (while (progn (skip-chars-forward "\n") (not (eobp))) + ;; This is just a variant of `timeclock-moment-regexp'. + (unless (looking-at + (concat "^\\([bhioO]\\) \\([0-9]+/[0-9]+/[0-9]+\\) " + "\\([0-9]+:[0-9]+:[0-9]+\\)")) + (error "Can't parse `%s'" timeclock-file)) + (let ((this-date (match-string 2))) + (unless (or (and current-date + (string= this-date current-date)) + (string= (match-string 1) "h")) + (insert (format "h %s %s %s\n" (match-string 2) + (match-string 3) old-default))) + (if (string-match "^[ih]" (match-string 1)) ; ignore logouts + (setq current-date this-date))) + (forward-line)) + (save-buffer))) + (unless extant-timelog (kill-buffer (current-buffer))))))) + ;;; Internal Functions: (defvar timeclock-project-list nil) @@ -651,31 +684,34 @@ "Log the event CODE to the timeclock log, at the time of call. If PROJECT is a string, it represents the project which the event is being logged for. Normally only \"in\" events specify a project." - (with-current-buffer (find-file-noselect timeclock-file) - (goto-char (point-max)) - (if (not (bolp)) - (insert "\n")) - (let ((now (current-time))) - (insert code " " - (format-time-string "%Y/%m/%d %H:%M:%S" now) - (or (and project - (stringp project) - (> (length project) 0) - (concat " " project)) - "") - "\n") - (if (equal (downcase code) "o") - (setq timeclock-last-period - (- (timeclock-time-to-seconds now) - (timeclock-time-to-seconds - (cadr timeclock-last-event))) - timeclock-discrepancy - (+ timeclock-discrepancy - timeclock-last-period))) - (setq timeclock-last-event (list code now project))) - (save-buffer) - (run-hooks 'timeclock-event-hook) - (kill-buffer (current-buffer)))) + (let ((extant-timelog (find-buffer-visiting timeclock-file))) + (with-current-buffer (find-file-noselect timeclock-file t) + (save-excursion + (save-restriction + (widen) + (goto-char (point-max)) + (if (not (bolp)) + (insert "\n")) + (let ((now (current-time))) + (insert code " " + (format-time-string "%Y/%m/%d %H:%M:%S" now) + (or (and (stringp project) + (> (length project) 0) + (concat " " project)) + "") + "\n") + (if (equal (downcase code) "o") + (setq timeclock-last-period + (- (timeclock-time-to-seconds now) + (timeclock-time-to-seconds + (cadr timeclock-last-event))) + timeclock-discrepancy + (+ timeclock-discrepancy + timeclock-last-period))) + (setq timeclock-last-event (list code now project))))) + (save-buffer) + (unless extant-timelog (kill-buffer (current-buffer))))) + (run-hooks 'timeclock-event-hook)) (defvar timeclock-moment-regexp (concat "\\([bhioO]\\)\\s-+" @@ -1147,8 +1183,8 @@ (setcar (nthcdr 2 decoded) 0) (apply 'encode-time decoded))) -(defun timeclock-geometric-mean (l) - "Compute the geometric mean of the values in the list L." +(defun timeclock-mean (l) + "Compute the arithmetic mean of the values in the list L." (let ((total 0) (count 0)) (while l @@ -1163,7 +1199,7 @@ "Generate a summary report based on the current timelog file. By default, the report is in plain text, but if the optional argument HTML-P is non-nil, HTML markup is added." - (interactive) + (interactive "P") (let ((log (timeclock-log-data)) (today (timeclock-day-base))) (if html-p (insert "

")) @@ -1295,14 +1331,10 @@ ;; average statistics (let ((i 0) (l 5)) (while (< i l) - (aset time-in i (timeclock-geometric-mean - (cdr (aref time-in i)))) - (aset time-out i (timeclock-geometric-mean - (cdr (aref time-out i)))) - (aset breaks i (timeclock-geometric-mean - (cdr (aref breaks i)))) - (aset workday i (timeclock-geometric-mean - (cdr (aref workday i)))) + (aset time-in i (timeclock-mean (cdr (aref time-in i)))) + (aset time-out i (timeclock-mean (cdr (aref time-out i)))) + (aset breaks i (timeclock-mean (cdr (aref breaks i)))) + (aset workday i (timeclock-mean (cdr (aref workday i)))) (setq i (1+ i)))) ;; Output the HTML table (insert "\n") diff -r 2256012fcd2a -r bfd32b1a7afd lisp/diff.el --- a/lisp/diff.el Sun May 06 18:10:44 2007 +0000 +++ b/lisp/diff.el Mon May 07 01:09:35 2007 +0000 @@ -124,9 +124,13 @@ (erase-buffer)) (buffer-enable-undo (current-buffer)) (diff-mode) + ;; Use below 2 vars for backward-compatibility. + (set (make-local-variable 'diff-old-file) old) + (set (make-local-variable 'diff-new-file) new) + (set (make-local-variable 'diff-extra-args) (list switches no-async)) (set (make-local-variable 'revert-buffer-function) - `(lambda (ignore-auto noconfirm) - (diff ',old ',new ',switches ',no-async))) + (lambda (ignore-auto noconfirm) + (apply 'diff diff-old-file diff-new-file diff-extra-args))) (set (make-local-variable 'diff-old-temp-file) old-alt) (set (make-local-variable 'diff-new-temp-file) new-alt) (setq default-directory thisdir) @@ -186,5 +190,5 @@ (provide 'diff) -;;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd +;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd ;;; diff.el ends here diff -r 2256012fcd2a -r bfd32b1a7afd lisp/emacs-lisp/sregex.el --- a/lisp/emacs-lisp/sregex.el Sun May 06 18:10:44 2007 +0000 +++ b/lisp/emacs-lisp/sregex.el Mon May 07 01:09:35 2007 +0000 @@ -436,11 +436,11 @@ or end of a word. - the symbol `bow' - Stands for \"\\\\\\=<\", matching the empty string at the beginning of a + Stands for \"\\\\=\\<\", matching the empty string at the beginning of a word. - the symbol `eow' - Stands for \"\\\\\\=>\", matching the empty string at the end of a word. + Stands for \"\\\\=\\>\", matching the empty string at the end of a word. - the symbol `wordchar' Stands for the regex \"\\\\w\", matching a word-constituent character diff -r 2256012fcd2a -r bfd32b1a7afd lisp/progmodes/python.el diff -r 2256012fcd2a -r bfd32b1a7afd lisp/t-mouse.el --- a/lisp/t-mouse.el Sun May 06 18:10:44 2007 +0000 +++ b/lisp/t-mouse.el Mon May 07 01:09:35 2007 +0000 @@ -275,32 +275,32 @@ Turn it on to use Emacs mouse commands, and off to use t-mouse commands." nil " Mouse" nil :global t - (if t-mouse-mode - ;; Turn it on - (unless window-system - ;; Starts getting a stream of mouse events from an asynchronous process. - ;; Only works if Emacs is running on a virtual terminal without a window system. + (unless window-system + (if t-mouse-mode + ;; Turn it on. Starts getting a stream of mouse events from an + ;; asynchronous process. Only works if Emacs is running on a virtual + ;; terminal without a window system. (progn - (setq mouse-position-function #'t-mouse-mouse-position-function) - (let ((tty (t-mouse-tty)) - (process-connection-type t)) - (if (not (stringp tty)) - (error "Cannot find a virtual terminal")) - (setq t-mouse-process - (start-process "t-mouse" nil - "mev" "-i" "-E" "-C" tty - (if t-mouse-swap-alt-keys - "-M-leftAlt" "-M-rightAlt") - "-e-move" - "-dall" "-d-hard" - "-f"))) - (setq t-mouse-filter-accumulator "") - (set-process-filter t-mouse-process 't-mouse-process-filter) - (set-process-query-on-exit-flag t-mouse-process nil))) + (setq mouse-position-function #'t-mouse-mouse-position-function) + (let ((tty (t-mouse-tty)) + (process-connection-type t)) + (if (not (stringp tty)) + (error "Cannot find a virtual terminal")) + (setq t-mouse-process + (start-process "t-mouse" nil + "mev" "-i" "-E" "-C" tty + (if t-mouse-swap-alt-keys + "-M-leftAlt" "-M-rightAlt") + "-e-move" + "-dall" "-d-hard" + "-f"))) + (setq t-mouse-filter-accumulator "") + (set-process-filter t-mouse-process 't-mouse-process-filter) + (set-process-query-on-exit-flag t-mouse-process nil)) ;; Turn it off - (setq mouse-position-function nil) - (delete-process t-mouse-process) - (setq t-mouse-process nil))) + (setq mouse-position-function nil) + (delete-process t-mouse-process) + (setq t-mouse-process nil)))) (provide 't-mouse) diff -r 2256012fcd2a -r bfd32b1a7afd lisp/version.el --- a/lisp/version.el Sun May 06 18:10:44 2007 +0000 +++ b/lisp/version.el Mon May 07 01:09:35 2007 +0000 @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "22.0.99" "\ +(defconst emacs-version "22.1.50" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version diff -r 2256012fcd2a -r bfd32b1a7afd lispref/ChangeLog --- a/lispref/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/lispref/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -16,7 +16,7 @@ * tips.texi (Documentation Tips): Rearrange items to place the more important ones first. Add an index entry for hyperlinks. -2007-05-03 Karl Berry +2007-05-03 Karl Berry * elisp.texi (\urlcolor, \linkcolor) [smallbook]: \Black for printing. (EMACSVER) [smallbook]: 22 for printed version. @@ -24,6 +24,10 @@ * control.texi (Signaling Errors) : texinfo.tex is fixed, so restore anchor to normal position after defun. Found by Kevin Ryde. +2007-04-26 Glenn Morris + + * elisp.texi (EMACSVER): Increase to 22.1.50. + 2007-04-28 Karl Berry * elisp.texi: Improve line breaks on copyright page, diff -r 2256012fcd2a -r bfd32b1a7afd lispref/control.texi diff -r 2256012fcd2a -r bfd32b1a7afd lispref/elisp.texi --- a/lispref/elisp.texi Sun May 06 18:10:44 2007 +0000 +++ b/lispref/elisp.texi Mon May 07 01:09:35 2007 +0000 @@ -34,6 +34,8 @@ \global\let\linkcolor=\Black @end ifset \global\hbadness=6666 % don't worry about not-too-underfull boxes +\global\let\urlcolor=\Black % don't print links in grayscale +\global\let\linkcolor=\Black @end tex @c Combine indices. diff -r 2256012fcd2a -r bfd32b1a7afd mac/ChangeLog --- a/mac/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/mac/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -3,6 +3,11 @@ * INSTALL: Fix description about using colors in terminal. Fix typos (/Application -> /Applications). +2007-04-26 Glenn Morris + + * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings: + * src/Emacs.r: Increase version to 22.1.50. + 2007-04-09 YAMAMOTO Mitsuharu * make-package (compver): Don't hardcode processor type. diff -r 2256012fcd2a -r bfd32b1a7afd mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Sun May 06 18:10:44 2007 +0000 +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Mon May 07 01:09:35 2007 +0000 @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.99"; -CFBundleGetInfoString = "22.0.99, Copyright (C) 2007 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.1.50"; +CFBundleGetInfoString = "22.1.50, Copyright (C) 2007 Free Software Foundation, Inc."; diff -r 2256012fcd2a -r bfd32b1a7afd mac/src/Emacs.r --- a/mac/src/Emacs.r Sun May 06 18:10:44 2007 +0000 +++ b/mac/src/Emacs.r Mon May 07 01:09:35 2007 +0000 @@ -219,12 +219,12 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ - 0x0, /* Minor revision in BCD */ - alpha, /* development, alpha, beta, or final (release) */ - 99, /* Non-final release # */ + 0x1, /* Minor revision in BCD */ + development, /* development, alpha, beta, or final (release) */ + 50, /* Non-final release # */ 0, /* Region code */ - "22.0.99", /* Short version number */ - "22.0.99, Copyright \0xa9 2007 " + "22.1.50", /* Short version number */ + "22.1.50, Copyright \0xa9 2007 " "Free Software Foundation, Inc." /* Long version number */ }; diff -r 2256012fcd2a -r bfd32b1a7afd man/ChangeLog --- a/man/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/man/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -1,13 +1,17 @@ +2007-05-06 Richard Stallman + + * maintaining.texi (Create Tags Table): Clean up previous change. + 2007-05-05 Francesco Potort,Al(B * maintaining.texi (Create Tags Table): Add text about the dangers of - making symbolic links to tags files. (Clarified by RMS.) - -2007-05-04 Karl Berry + making symbolic links to tags files. + +2007-05-04 Karl Berry * emacs.texi (EMACSVER) [smallbook]: 22.1 for printed version, not 22. -2007-05-03 Karl Berry +2007-05-03 Karl Berry * emacs.texi (EMACSVER) [smallbook]: 22 for printed version. @@ -22,6 +26,10 @@ * cmdargs.texi (Initial Options): Under --batch, mention --eval. +2007-04-30 Reiner Steib + + * gnus.texi (Article Highlighting): Clarify gnus-cite-parse-max-size. + 2007-04-28 Glenn Morris * ack.texi (Acknowledgments): @@ -34,17 +42,21 @@ * files.texi (File Names): Fixes to ~ description on MS systems. -2007-04-28 Karl Berry +2007-04-27 J.D. Smith + + * idlwave.texi: Minor updates for IDLWAVE 6.1. + +2007-04-26 Glenn Morris + + * emacs.texi (EMACSVER): Increase to 22.1.50. + +2007-04-25 Karl Berry * emacs.texi: Improve line breaks on copyright page, similar layout to lispref, 8.5x11 by default. * dired.texi (Image-Dired): Improve line break, fix typo. -2007-04-27 J.D. Smith - - * idlwave.texi: Minor updates for IDLWAVE 6.1. - 2007-04-24 Chong Yidong * programs.texi (Program Modes): @@ -74,8 +86,8 @@ * misc.texi (Thumbnails): Node deleted. * emacs.texi (Top): Update node listing. - * files.texi (File Conveniences): - * ack.texi (Acknowledgments): + * files.texi (File Conveniences): + * ack.texi (Acknowledgments): * faq.texi (New in Emacs 22): Rename "tumme" to "image-dired". 2007-04-21 Richard Stallman diff -r 2256012fcd2a -r bfd32b1a7afd man/anti.texi diff -r 2256012fcd2a -r bfd32b1a7afd man/dired.texi diff -r 2256012fcd2a -r bfd32b1a7afd man/emacs.texi --- a/man/emacs.texi Sun May 06 18:10:44 2007 +0000 +++ b/man/emacs.texi Mon May 07 01:09:35 2007 +0000 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.0.99 +@set EMACSVER 22.1.50 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff -r 2256012fcd2a -r bfd32b1a7afd man/gnus.texi --- a/man/gnus.texi Sun May 06 18:10:44 2007 +0000 +++ b/man/gnus.texi Mon May 07 01:09:35 2007 +0000 @@ -8148,8 +8148,8 @@ @vindex gnus-cite-parse-max-size @item gnus-cite-parse-max-size -If the article size if bigger than this variable (which is 25000 by -default), no citation highlighting will be performed. +If the article size in bytes is bigger than this variable (which is +25000 by default), no citation highlighting will be performed. @item gnus-cite-max-prefix @vindex gnus-cite-max-prefix diff -r 2256012fcd2a -r bfd32b1a7afd man/maintaining.texi diff -r 2256012fcd2a -r bfd32b1a7afd man/texinfo.tex --- a/man/texinfo.tex Sun May 06 18:10:44 2007 +0000 +++ b/man/texinfo.tex Mon May 07 01:09:35 2007 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2007-05-03.09} +\def\texinfoversion{2007-05-04.09} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1435,7 +1435,7 @@ \indexnofonts \setupdatafile \catcode`\\=\active \otherbackslash - \input \jobname.toc + \input \tocreadfilename \endgroup } % @@ -4301,11 +4301,8 @@ % The following is kludged to not output a line of dots in the index if % there are no page numbers. The next person who breaks this will be % cursed by a Unix daemon. - \def\tempa{{\rm }}% - \def\tempb{#1}% - \edef\tempc{\tempa}% - \edef\tempd{\tempb}% - \ifx\tempc\tempd + \setbox\boxA = \hbox{#1}% + \ifdim\wd\boxA = 0pt \ % \else % @@ -5177,7 +5174,7 @@ \def\readtocfile{% \setupdatafile \activecatcodes - \input \jobname.toc + \input \tocreadfilename } \newskip\contentsrightmargin \contentsrightmargin=1in @@ -5208,11 +5205,16 @@ \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi } +% redefined for the two-volume lispref. We always output on +% \jobname.toc even if this is redefined. +% +\def\tocreadfilename{\jobname.toc} % Normal (long) toc. +% \def\contents{% \startcontents{\putwordTOC}% - \openin 1 \jobname.toc + \openin 1 \tocreadfilename\space \ifeof 1 \else \readtocfile \fi @@ -5250,7 +5252,7 @@ \let\numsubsubsecentry = \numsecentry \let\appsubsubsecentry = \numsecentry \let\unnsubsubsecentry = \numsecentry - \openin 1 \jobname.toc + \openin 1 \tocreadfilename\space \ifeof 1 \else \readtocfile \fi @@ -8340,7 +8342,7 @@ \textleading = 12pt % \internalpagesizes{7.5in}{5in}% - {\voffset}{.25in}% + {-.2in}{0in}% {\bindingoffset}{16pt}% {9.25in}{7in}% % diff -r 2256012fcd2a -r bfd32b1a7afd nt/ChangeLog --- a/nt/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/nt/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-26 Glenn Morris + + * emacs.rc: Increase version to 22.1.50. + 2007-03-31 Eli Zaretskii * INSTALL: Mention the VCVARS32.BAT batch file for VS.NET users. diff -r 2256012fcd2a -r bfd32b1a7afd nt/emacs.rc --- a/nt/emacs.rc Sun May 06 18:10:44 2007 +0000 +++ b/nt/emacs.rc Mon May 07 01:09:35 2007 +0000 @@ -6,8 +6,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,99,0 - PRODUCTVERSION 22,0,99,0 + FILEVERSION 22,1,50,0 + PRODUCTVERSION 22,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 99, 0\0" + VALUE "FileVersion", "22, 1, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 99, 0\0" + VALUE "ProductVersion", "22, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff -r 2256012fcd2a -r bfd32b1a7afd src/ChangeLog --- a/src/ChangeLog Sun May 06 18:10:44 2007 +0000 +++ b/src/ChangeLog Mon May 07 01:09:35 2007 +0000 @@ -1,14 +1,3 @@ -2007-05-06 Richard Stallman - - * process.c: Undo May 3 change. - -2007-05-03 Per Cederqvist (tiny change) - - * process.c (Faccept_process_output): Revert 2006-03-22 change so - that the third argument once again is in microseconds (not - milliseconds). This makes it compatible with Emacs 21 and - earlier. Problem found by Henrik Rindl,Av(Bw. - 2007-05-01 YAMAMOTO Mitsuharu * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c. @@ -18,11 +7,19 @@ * insdel.c (replace_range): For undo, record insertion first. +2007-04-29 Andreas Schwab + + * lisp.h (VECSIZE): Use OFFSETOF. + 2007-04-29 YAMAMOTO Mitsuharu * xdisp.c (try_window_reusing_current_matrix): Fix number of disabled lines. +2007-04-28 Richard Stallman + + * lread.c (read_escape): In a string, \s is always space. + 2007-04-27 Jan Dj,Ad(Brv * xmenu.c (xdialog_show): Call Fredisplay before showing the dialog. diff -r 2256012fcd2a -r bfd32b1a7afd src/lisp.h --- a/src/lisp.h Sun May 06 18:10:44 2007 +0000 +++ b/src/lisp.h Mon May 07 01:09:35 2007 +0000 @@ -735,9 +735,9 @@ /* If a struct is made to look like a vector, this macro returns the length of the shortest vector that would hold that struct. */ -#define VECSIZE(type) ((sizeof (type) - (sizeof (struct Lisp_Vector) \ - - sizeof (Lisp_Object)) \ - + sizeof(Lisp_Object) - 1) /* round up */ \ +#define VECSIZE(type) ((sizeof (type) \ + - OFFSETOF (struct Lisp_Vector, contents[0]) \ + + sizeof(Lisp_Object) - 1) /* round up */ \ / sizeof (Lisp_Object)) /* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields diff -r 2256012fcd2a -r bfd32b1a7afd src/lread.c --- a/src/lread.c Sun May 06 18:10:44 2007 +0000 +++ b/src/lread.c Mon May 07 01:09:35 2007 +0000 @@ -1894,7 +1894,7 @@ case 's': c = READCHAR; - if (c != '-') + if (stringp || c != '-') { UNREAD (c); return ' '; diff -r 2256012fcd2a -r bfd32b1a7afd src/process.c