changeset 80801:d823156fd547

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (base, patch 1-2) - tag of [e-mail]/emacs--devo--0--patch-709 - Sync to CVS tag EMACS_22_BRANCHPOINT - Sync to CVS branch EMACS_22_BASE 2007-04-25 Richard Stallman <[e-mail]> * lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. 2007-04-24 Richard Stallman <[e-mail]> * lispref/text.texi (Special Properties): Add xref to Overlay Properties. * lispref/display.texi (Overlay Properties): Add xref to Special Properties. Revision: [e-mail]/emacs--devo--0--patch-716

--- a/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -1,3 +1,12 @@
[phone]  Andreas Schwab  <[e-mail]>
+
+	* Makefile.in (config.status): Depend on
+	${srcdir}/lisp/version.el.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* README: Increase version to 22.1.50.
+
 2007-04-24  Juanma Barranquero  <[e-mail]>
 
 	* INSTALL (DETAILED BUILDING AND INSTALLATION): Fix typo.

--- a/Makefile.in	Fri Apr 27 19:03:48 2007 +0000
+++ b/Makefile.in	Sat Apr 28 03:47:01 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

--- a/README	Fri Apr 27 19:03:48 2007 +0000
+++ b/README	Sat Apr 28 03:47:01 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

--- a/admin/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/admin/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -1,3 +1,7 @@
[phone]  Nick Roberts  <[e-mail]>
+
+	* make-tarball.txt: Add note about cutting the branch.
+
 2007-02-03  Eli Zaretskii  <[e-mail]>
 
 	* nt/makedist.bat: Change EOL format to DOS.  Don't use

--- a/admin/FOR-RELEASE	Fri Apr 27 19:03:48 2007 +0000
+++ b/admin/FOR-RELEASE	Sat Apr 28 03:47:01 2007 +0000
@@ -42,6 +42,14 @@
 ** [e-mail], April 22: Failure to build on OpenBSD macppc.
 OpenBSD compilation works on i386.
 
+** [e-mail], April 23: delete-overlay causes recentering
+(This is now the same as the spurious scrolling bug.)
+
+** finish fixing locate.el
+
+** [e-mail], April 23: Excessive refontification when setting
+	jit-lock-context-unfontify-pos
+
 ** [e-mail], Apr 24: 22.0.98  not starting on Solaris 10/I386
 
 ** [e-mail], Apr 24: [[e-mail]: Re: redisplay]

--- a/admin/make-tarball.txt	Fri Apr 27 19:03:48 2007 +0000
+++ b/admin/make-tarball.txt	Sat Apr 28 03:47:01 2007 +0000
@@ -76,7 +76,22 @@
 14. For a pretest, let Richard Stallman <[e-mail]> 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 <[e-mail]>.
-    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

--- a/admin/notes/copyright	Fri Apr 27 19:03:48 2007 +0000
+++ b/admin/notes/copyright	Sat Apr 28 03:47:01 2007 +0000
@@ -591,8 +591,8 @@
 
 *** These are copyright issues still to be addressed:
 
-Need an assignment from Kevin Rodgers (rms), else several changes to
-deal with.
+python.el potential legal problem
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
 
 
 

--- a/lib-src/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/lib-src/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -1,3 +1,7 @@
[phone]  Glenn Morris  <[e-mail]>
+
+	* makefile.w32-in (VERSION): Increase to 22.1.50.
+
 2007-02-26  Francesco Potort,Al(B  <[e-mail]>
 
 	* 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  <[e-mail]>
@@ -2996,7 +3000,7 @@
 
 1997-03-14  Francesco Potort,Al(B  <[e-mail]>
 
-	* etags.c (add_regex): reset *putbuf before using it.
+	* etags.c (add_regex): Reset *putbuf before using it.
 
 1997-02-23  Jonathan I. Kamens  <[e-mail]>
 
@@ -3560,7 +3564,7 @@
 
 1995-12-04  Francesco Potort,Al(B  <[e-mail]>
 
-	* 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  <[e-mail]>
@@ -3685,13 +3689,13 @@
 
 1995-06-27  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  <[e-mail]>
 
@@ -3723,13 +3727,13 @@
 
 1995-06-27  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  <[e-mail]>
 
@@ -3906,7 +3910,7 @@
 
 1995-03-13  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
@@ -4039,8 +4043,8 @@
 
 1994-11-22  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4105,9 +4109,9 @@
 
 1994-10-21  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  <[e-mail]>
@@ -4190,8 +4194,8 @@
 
 1994-10-17  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4341,7 +4345,7 @@
 
 1994-07-08  Dave Love  ([e-mail])
 
-	* etags.c (takeprec): recognise `character*(*) function'
+	* etags.c (takeprec): Recognise `character*(*) function'.
 
 1994-07-08  Francesco Potort,Al(B  ([e-mail])
 
@@ -4489,11 +4493,11 @@
 
 1994-04-18  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4527,21 +4531,21 @@
 
 1994-04-08  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4549,22 +4553,22 @@
 
 1994-03-25  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4579,8 +4583,8 @@
 
 1994-03-14  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
@@ -4621,7 +4625,7 @@
 1994-02-22  Karl Heuer  ([e-mail])
 
 	* profile.c (get_time): Simplify; avoid calling index.
-	(main): exit on EOF.
+	(main): Exit on EOF.
 
 1994-02-17  Francesco Potort,Al(B  ([e-mail])
 
@@ -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  ([e-mail])
 
@@ -4666,15 +4670,15 @@
 1994-01-14  Francesco Potort,Al(B  ([e-mail])
 
 	* 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  ([e-mail])
@@ -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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4837,9 +4841,9 @@
 
 1993-10-01  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -4922,10 +4926,10 @@
 
 1993-08-04  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -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  ([e-mail])
 
@@ -4977,20 +4981,20 @@
 
 1993-07-08  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
-	* 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  ([e-mail])
@@ -5266,38 +5270,38 @@
 
 1993-03-22  Francesco Potort,Al(B  ([e-mail])
 
-	* 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  ([e-mail])
 
 	* 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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -5311,7 +5315,7 @@
 
 1993-03-19  Eric S. Raymond  ([e-mail])
 
-	* 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  ([e-mail])
 
-	* 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  ([e-mail])
 
@@ -6007,13 +6011,13 @@
 
 1989-04-18  Richard Stallman  ([e-mail])
 
-	* 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  ([e-mail])
 
 	* 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  ([e-mail])
 
@@ -6114,7 +6118,7 @@
 
 1988-09-24  Richard Stallman  ([e-mail])
 
-	* etags.c (main): default setting of eflag was backwards.
+	* etags.c (main): Default setting of eflag was backwards.
 
 1988-09-23  Richard Stallman  ([e-mail])
 
@@ -6197,7 +6201,7 @@
 1988-04-28  Richard Stallman  ([e-mail])
 
 	* 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  ([e-mail])
 
@@ -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

--- a/lib-src/makefile.w32-in	Fri Apr 27 19:03:48 2007 +0000
+++ b/lib-src/makefile.w32-in	Sat Apr 28 03:47:01 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 \

--- a/lisp/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/lisp/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -3,10 +3,13 @@
 	* textmodes/flyspell.el (flyspell-auto-correct-previous-word): Use
 	window-start and window-end.
 
-2007-04-26  Glenn Morris  <[e-mail]>
-
-	* progmodes/python.el: Restore file pending consideration of legal
-	status.
[phone]  Andreas Schwab  <[e-mail]>
+
+	* emacs-lisp/sregex.el (sregexq): Fix doc string quoting.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* textmodes/fill.el (fill-paragraph): Doc fix.
 
 2007-04-26  Luc Teirlinck  <[e-mail]>
 
@@ -17,6 +20,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  <[e-mail]>
 
 	* hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.
@@ -38,10 +43,6 @@
 
 	* custom.el (defface): Doc fix.
 
-2007-04-24  Chong Yidong  <[e-mail]>
-
-	* progmodes/python.el: Remove due to unclear legal issues.
-
 2007-04-24  J.D. Smith  <[e-mail]>
 
 	* progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): Don't

--- a/lisp/emacs-lisp/sregex.el	Fri Apr 27 19:03:48 2007 +0000
+++ b/lisp/emacs-lisp/sregex.el	Sat Apr 28 03:47:01 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

--- a/lisp/textmodes/fill.el	Fri Apr 27 19:03:48 2007 +0000
+++ b/lisp/textmodes/fill.el	Sat Apr 28 03:47:01 2007 +0000
@@ -748,7 +748,9 @@
     (fill-paragraph arg)))
 
 (defun fill-paragraph (arg)
-  "Fill paragraph at or after point.  Prefix ARG means justify as well.
+  "Fill paragraph at or after point.
+
+If ARG is non-nil (interactively, with prefix argument), justify as well.
 If `sentence-end-double-space' is non-nil, then period followed by one
 space does not end a sentence, so don't break a line there.
 the variable `fill-column' controls the width for filling.

--- a/lisp/version.el	Fri Apr 27 19:03:48 2007 +0000
+++ b/lisp/version.el	Sat Apr 28 03:47:01 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

--- a/lispref/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/lispref/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -1,3 +1,12 @@
[phone]  Glenn Morris  <[e-mail]>
+
+	* elisp.texi (EMACSVER): Increase to 22.1.50.
+
[phone]  Karl Berry  <[e-mail]>
+
+	* elisp.texi: Improve line breaks on copyright page,
+	similar layout to emacs manual, 8.5x11 by default.
+
 2007-04-24  Richard Stallman  <[e-mail]>
 
 	* text.texi (Special Properties): Add xref to Overlay Properties.

--- a/lispref/elisp.texi	Fri Apr 27 19:03:48 2007 +0000
+++ b/lispref/elisp.texi	Sat Apr 28 03:47:01 2007 +0000
@@ -7,15 +7,17 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.99
+@set EMACSVER 22.1.50
 
 @dircategory Emacs
 @direntry
 * Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
 
-@c for full 8.5x11, comment this out.
-@set smallbook
+@c in general, keep the following line commented out, unless doing a
+@c copy of this manual that will be published.  the manual should go
+@c onto the distribution in the full, 8.5 x 11" size.
+@c set smallbook
 
 @ifset smallbook
 @smallbook
@@ -41,8 +43,8 @@
 @c @syncodeindex tp fn
 
 @copying
-This is edition @value{VERSION} of the GNU Emacs Lisp
-Reference Manual, corresponding to Emacs version @value{EMACSVER}.
+This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@*
+corresponding to Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software
@@ -74,14 +76,14 @@
 @vskip 0pt plus 1filll
 @insertcopying
 
-@sp 1
+@sp 2
 Published by the Free Software Foundation @*
 51 Franklin St, Fifth Floor @*
 Boston, MA 02110-1301 @*
 USA @*
 ISBN 1-882114-74-4
 
-@sp 1
+@sp 2
 Cover art by Etienne Suvasa.
 @end titlepage
 

--- a/mac/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/mac/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -3,6 +3,11 @@
 	* INSTALL: Fix description about using colors in terminal.
 	Fix typos (/Application -> /Applications).
 
[phone]  Glenn Morris  <[e-mail]>
+
+	* Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:
+	* src/Emacs.r: Increase version to 22.1.50.
+
 2007-04-09  YAMAMOTO Mitsuharu  <[e-mail]>
 
 	* make-package (compver): Don't hardcode processor type.

--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Fri Apr 27 19:03:48 2007 +0000
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Sat Apr 28 03:47:01 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.";

--- a/mac/src/Emacs.r	Fri Apr 27 19:03:48 2007 +0000
+++ b/mac/src/Emacs.r	Sat Apr 28 03:47:01 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 */
 };
 

--- a/man/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/man/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -2,6 +2,17 @@
 
 	* idlwave.texi: Minor updates for IDLWAVE 6.1.
 
[phone]  Glenn Morris  <[e-mail]>
+
+	* emacs.texi (EMACSVER): Increase to 22.1.50.
+
[phone]  Karl Berry  <[e-mail]>
+
+	* 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-24  Chong Yidong  <[e-mail]>
 
 	* programs.texi (Program Modes):

--- a/man/dired.texi	Fri Apr 27 19:03:48 2007 +0000
+++ b/man/dired.texi	Sat Apr 28 03:47:01 2007 +0000
@@ -1196,13 +1196,13 @@
 
   You can also enter Image-Dired directly by typing @kbd{M-x
 image-dired}.  This prompts for a directory; specify one that has
-images files.  This creates thumbnails for all the images in that
+image files.  This creates thumbnails for all the images in that
 directory, and displays them all in the ``thumbnail buffer.''  This
 takes a long time if the directory contains many image files, and it
 asks for confirmation if the number of image files exceeds
 @code{image-dired-show-all-from-dir-max-files}.
 
-  With point in the thumbnail buffer, type @kbd{RET}
+  With point in the thumbnail buffer, you can type @kbd{RET}
 (@code{image-dired-display-thumbnail-original-image}) to display a
 sized version of it in another window.  This sizes the image to fit
 the window.  Use the arrow keys to move around in the buffer.  For

--- a/man/emacs.texi	Fri Apr 27 19:03:48 2007 +0000
+++ b/man/emacs.texi	Sat Apr 28 03:47:01 2007 +0000
@@ -5,10 +5,10 @@
 
 @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},
+This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
 updated for Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
@@ -39,7 +39,7 @@
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  the manual should go
 @c onto the distribution in the full, 8.5 x 11" size.
-@set smallbook
+@c set smallbook
 
 @ifset smallbook
 @smallbook
@@ -76,10 +76,10 @@
 @insertcopying
 
 @sp 2
-ISBN 1-882114-86-8*
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
-Boston, MA 02110-1301 USA
+Boston, MA 02110-1301 USA @*
+ISBN 1-882114-86-8
 
 @sp 2
 Cover art by Etienne Suvasa.

--- a/nt/ChangeLog	Fri Apr 27 19:03:48 2007 +0000
+++ b/nt/ChangeLog	Sat Apr 28 03:47:01 2007 +0000
@@ -1,3 +1,7 @@
[phone]  Glenn Morris  <[e-mail]>
+
+	* emacs.rc: Increase version to 22.1.50.
+
 2007-03-31  Eli Zaretskii  <[e-mail]>
 
 	* INSTALL: Mention the VCVARS32.BAT batch file for VS.NET users.

--- a/nt/emacs.rc	Fri Apr 27 19:03:48 2007 +0000
+++ b/nt/emacs.rc	Sat Apr 28 03:47:01 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