changeset 90837:70bf32a0f523

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 713-725) - Update from CVS - Merge from emacs--rel--22 - Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change. - Merge from gnus--rel--5.10 * emacs--rel--22 (base, patch 1-5) - tag of [e-mail]/emacs--devo--0--patch-709 - Sync to CVS tag EMACS_22_BRANCHPOINT - Sync to CVS branch EMACS_22_BASE - Update from CVS * gnus--rel--5.10 (patch 217) - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-202

--- a/AUTHORS	Tue May 01 13:23:50 2007 +0000
+++ b/AUTHORS	Tue May 01 23:03:36 2007 +0000
@@ -333,10 +333,10 @@
   url-file.el url-handlers.el url-http.el url-nfs.el
 
 Chong Yidong: changed cus-edit.el simple.el files.el custom.el
-  display.texi longlines.el xdisp.c files.texi keyboard.c compile.el
-  custom.texi info.el text.texi frames.texi image-mode.el mouse.el
+  display.texi longlines.el xdisp.c files.texi info.el keyboard.c
+  compile.el custom.texi text.texi frames.texi image-mode.el mouse.el
   misc.texi startup.el wid-edit.el xterm.c cus-theme.el
-  and 296 other files
+  and 295 other files
 
 Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
   hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
@@ -456,10 +456,10 @@
 
 Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el
   code-pages.el elide-head.el georgian.el hl-line.el latin-8.el
-  latin-9.el latin1-disp.el python.el refill.el rfc1345.el sgml-input.el
-  smiley.el subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el
-  tool-bar.el ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el
-  welsh.el
+  latin-9.el latin1-disp.el python.el refill.el rfc1345.el
+  sgml-input.el smiley.el subst-big5.el subst-gb2312.el subst-jis.el
+  subst-ksc.el tool-bar.el ucs-tables.el uni-input.el utf-16.el
+  utf-7.el utf-8-lang.el welsh.el
 and changed configure.in Makefile.in help.el fortran.el browse-url.el
   mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el
   wid-edit.el fns.c vc.el rfc2047.el bindings.el cus-start.el buffer.c
@@ -1728,7 +1728,7 @@
 Masayuki Fujii: changed dnd.el w32-win.el
 
 Mathias Dahl: wrote image-dired.el
-and changed dired.el dired.texi
+and changed tumme.el dired.el dired.texi
 
 Mathias Megyei: changed Makefile.in
 
@@ -2399,8 +2399,8 @@
 
 Skip Collins: changed w32fns.c w32term.c w32term.h
 
-Slawomir Nowaczyk: changed emacs.py python.el TUTORIAL.pl flyspell.el
-  ls-lisp.el w32proc.c
+Slawomir Nowaczyk: changed python.el TUTORIAL.pl flyspell.el ls-lisp.el
+  w32proc.c
 
 Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi
   server.el tcp.c unexec.c
@@ -2460,7 +2460,7 @@
 
 Steven E. Harris: changed nnheader.el
 
-Steven Huwig: changed emacs.py python.el
+Steven Huwig: changed python.el
 
 Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el
 and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el

--- a/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,8 @@
[phone]  Andreas Schwab  <[e-mail]>
+
+	* Makefile.in (config.status): Depend on
+	${srcdir}/lisp/version.el.
+
 2007-04-26  Glenn Morris  <[e-mail]>
 
 	* README: Increase version to 22.1.50.

--- a/INSTALL	Tue May 01 13:23:50 2007 +0000
+++ b/INSTALL	Tue May 01 23:03:36 2007 +0000
@@ -298,13 +298,13 @@
   --without-png        for PNG image support
 
 Use --without-toolkit-scroll-bars to disable LessTif/Motif or Xaw3d
-scroll bars.  
+scroll bars.
 
 Use --without-xim to inhibit the default use of X Input Methods.  In
 this case, the X resource useXIM can be used to turn on use of XIM.
 
 Use --disable-largefile omits support for files larger than 2GB on
-systems which support that.  
+systems which support that.
 
 Use --without-sound to disable sound support.
 
@@ -384,10 +384,10 @@
 switch to the compiler, and link against libfoo.a and libbar.a
 libraries in addition to the standard ones.
 
-For some libraries, like Gtk+, fontconfig and ALSA, `configure' use 
-pkg-config to find where those libraries are installed. 
-If you want pkg-config to look in special directories, you have to set 
-the environment variable PKG_CONFIG_PATH to point to the directories 
+For some libraries, like Gtk+, fontconfig and ALSA, `configure' use
+pkg-config to find where those libraries are installed.
+If you want pkg-config to look in special directories, you have to set
+the environment variable PKG_CONFIG_PATH to point to the directories
 where the .pc-files for those libraries are.
 For example:
 

--- a/Makefile.in	Tue May 01 13:23:50 2007 +0000
+++ b/Makefile.in	Tue May 01 23:03:36 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/admin/FOR-RELEASE	Tue May 01 13:23:50 2007 +0000
+++ b/admin/FOR-RELEASE	Tue May 01 23:03:36 2007 +0000
@@ -27,7 +27,7 @@
 These don't need to be fixed before a release, but we call the
 attention of Windows users to fixing them.
 
-** Drew Adams 12 Aug bug rpt: overlay  display artifact: trace left behind
+** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind
 Windows only bug. Bug appears only when Cleartype enabled, probably related
 to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
@@ -36,19 +36,25 @@
 
 * 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.
 
 ** [e-mail], April 22: Failure to build on OpenBSD macppc.
 OpenBSD compilation works on i386.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00932.html
 
-** [e-mail], April 23: delete-overlay causes recentering
-(This is now the same as the spurious scrolling bug.)
+** Spurious redisplay bug not fixed.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00443.html
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
 
-** finish fixing locate.el
+** [e-mail], Apr 24: 22.0.98  not starting on Solaris 10/I386
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
-** [e-mail], April 23: Excessive refontification when setting
-	jit-lock-context-unfontify-pos
+** [e-mail], Apr 24: [[e-mail]: Re: redisplay]
+  Gives test case for problem that a dialog box blocks redisplay.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00951.html
+
+** C mode fontification took 50 seconds
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01460.html
 
 * DOCUMENTATION
 

--- a/admin/notes/copyright	Tue May 01 13:23:50 2007 +0000
+++ b/admin/notes/copyright	Tue May 01 23:03:36 2007 +0000
@@ -421,6 +421,9 @@
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00225.html
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
 
+ But then an assignment arrived before the release of Emacs 22:
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html
+
 
 ** Issues that are "fixed" for the release of Emacs 22, but we may
    wish to revisit later in more detail

--- a/etc/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/etc/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,15 @@
[phone]  Glenn Morris  <[e-mail]>
+
+	* emacs.py: Restore file pending consideration of python.el legal
+	status.
+	* NEWS: Restore mention of python.el pending consideration of
+	legal status.
+
[phone]  David R. Linn  <[e-mail]>
+
+	* PROBLEMS: Add section on Solaris out-of-tree install issues with
+	non-GNU make.
+
 2007-04-25  Werner Lemberg  <[e-mail]>
 
 	* emacs.1: Replace -- with \(em.

--- a/etc/MORE.STUFF	Tue May 01 13:23:50 2007 +0000
+++ b/etc/MORE.STUFF	Tue May 01 23:03:36 2007 +0000
@@ -86,6 +86,8 @@
 
  * PS-print: <URL:http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage>
 
+ * Python mode: <URL:http://www.emacswiki.org/cgi-bin/wiki/PythonMode>
+
  * QuickURL: <URL:http://www.davep.org/emacs/>
 
  * RefTeX: <URL:http://www.gnu.org/software/auctex/reftex.html>

--- a/etc/NEWS	Tue May 01 13:23:50 2007 +0000
+++ b/etc/NEWS	Tue May 01 23:03:36 2007 +0000
@@ -113,6 +113,7 @@
 Some specific packages that are known to cause problems are:
 
 ** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
+
 ** cua.el, cua-mode.el: remove old versions.
 
 
@@ -3545,6 +3546,26 @@
 
 ** General Lisp changes:
 
+*** New syntax: \s now stands for the SPACE character.
+
+`?\s' is a new way to write the space character.  You must make sure
+it is not followed by a dash, since `?\s-...' indicates the "super"
+modifier.  However, it would be strange to write a character constant
+and a following symbol (beginning with `-') with no space between
+them.
+
+`\s' stands for space in strings, too, but it is not really meant for
+strings; it is easier and nicer just to write a space.
+
+*** New syntax: \uXXXX and \UXXXXXXXX specify Unicode code points in hex.
+
+For instance, you can use "\u0428" to specify a string consisting of
+CYRILLIC CAPITAL LETTER SHA, or `"U0001D6E2" to specify one consisting
+of MATHEMATICAL ITALIC CAPITAL ALPHA (the latter is greater than
+#xFFFF and thus needs the longer syntax).
+
+This syntax works for both character constants and strings.
+
 *** The function `expt' handles negative exponents differently.
 The value for `(expt A B)', if both A and B are integers and B is
 negative, is now a float.  For example: (expt 2 -2) => 0.25.
@@ -3754,12 +3775,6 @@
 
 ** String changes:
 
-*** The escape sequence \s is now interpreted as a SPACE character.
-
-Exception: In a character constant, if it is followed by a `-' in a
-character constant (e.g. ?\s-A), it is still interpreted as the super
-modifier.  In strings, \s is always interpreted as a space.
-
 *** A hex escape in a string constant forces the string to be multibyte.
 
 *** An octal escape in a string constant forces the string to be unibyte.
@@ -3780,12 +3795,6 @@
 `assoc-ignore-representation', which are still available, but have
 been declared obsolete.
 
-*** New syntax: \uXXXX and \UXXXXXXXX specify Unicode code points in hex.
-Use "\u0428" to specify a string consisting of CYRILLIC CAPITAL LETTER SHA,
-or "\U0001D6E2" to specify one consisting of MATHEMATICAL ITALIC CAPITAL
-ALPHA (the latter is greater than #xFFFF and thus needs the longer
-syntax).  Also available for characters.
-
 ** Displaying warnings to the user.
 
 See the functions `warn' and `display-warning', or the Lisp Manual.

--- a/etc/PROBLEMS	Tue May 01 13:23:50 2007 +0000
+++ b/etc/PROBLEMS	Tue May 01 23:03:36 2007 +0000
@@ -2165,6 +2165,11 @@
 of Windows. This is caused by a deficiency in the underlying system
 library function.
 
+Files larger than 4GB cause overflow in the size (represented as a
+32-bit integer) reported by `file-attributes'.  This affects Dired as
+well, since the Windows port uses a Lisp emulation of `ls' that relies
+on `file-attributes'.
+
 ** Typing Alt-Shift has strange effects on MS-Windows.
 
 This combination of keys is a command to change keyboard layout.  If
@@ -2785,6 +2790,25 @@
 Using directory paths with spaces is not supported at this time: you
 must re-configure without using spaces.
 
+*** On Solaris, use GNU Make when installing an out-of-tree build
+
+The Emacs configuration process allows you to configure the
+build environment so that you can build emacs in a directory
+outside of the distribution tree.  When installing Emacs from an
+out-of-tree build directory on Solaris, you may need to use GNU
+make.  The make programs bundled with Solaris support the VPATH
+macro but use it differently from the way the VPATH macro is
+used by GNU make.  The differences will cause the "make install"
+step to fail, leaving you with an incomplete emacs
+installation.  GNU make is available in /usr/sfw/bin on Solaris
+10 and can be installed as /opt/sfw/bin/gmake from the Solaris 9
+Software Companion CDROM.
+
+The problems due to the VPATH processing differences affect only
+out of tree builds so, if you are on a Solaris installation
+without GNU make, you can install Emacs completely by installing
+from a build environment using the original emacs distribution tree.
+
 ** First execution
 
 *** Emacs binary is not in executable format, and cannot be run.

--- a/etc/TODO	Tue May 01 13:23:50 2007 +0000
+++ b/etc/TODO	Tue May 01 23:03:36 2007 +0000
@@ -484,6 +484,13 @@
   the definition of `file-attributes' and `directory-files-and-attributes'
   and from the calls.
 
+** Modify the emulation of `stat' for MS-Windows to support large files.
+  The current version uses the stock Windows definition of `struct
+  stat', where the file's size is returned as a 32-bit integer.  That
+  overflows for files larger than 4GB.  To fix, modify `stat' to use
+  64-bit size, and use a declaration of `struct stat' that supports
+  such sizes.
+
 ** Make language-info-alist customizable.  Currently a user can customize
   only the variable `current-language-environment'.
 

--- a/lib-src/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/lib-src/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1849,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]>
@@ -3000,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]>
 
@@ -3564,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]>
@@ -3689,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]>
 
@@ -3727,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]>
 
@@ -3910,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])
@@ -4043,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])
 
@@ -4109,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]>
@@ -4194,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])
 
@@ -4345,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])
 
@@ -4493,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])
 
@@ -4531,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])
 
@@ -4553,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])
 
@@ -4583,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])
@@ -4625,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])
 
@@ -4637,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])
 
@@ -4670,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])
@@ -4815,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])
 
@@ -4841,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])
 
@@ -4926,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])
 
@@ -4945,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])
 
@@ -4981,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])
@@ -5270,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])
 
@@ -5315,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.
 
@@ -5598,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])
 
@@ -6011,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])
 
@@ -6118,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])
 
@@ -6201,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])
 
@@ -6212,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/lisp/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,71 @@
[phone]  Davis Herring  <[e-mail]>
+
+        * 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.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* dired-x.el: Revert 2007-04-06 change.
+
[phone]  Stephen Berman  <[e-mail]>
+
+	* find-dired.el (find-dired-filter): Propertize all text down to eob.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* international/mule.el (auto-coding-alist): Add pdf => no-conversion.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* progmodes/cc-mode.el (c-before-change): Use point-min rather
+	than 1.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* progmodes/sh-script.el (sh-mode): Recognize .profile as sh style.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so
+	don't put stop on toolbar.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* vc-hooks.el (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Use ./mh-e
+	instead of $(lisp)/mh-e.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* image-dired.el (image-dired-cmd-create-thumbnail-options)
+	(image-dired-cmd-create-temp-image-options): Replace option
+	+profile "*" with -strip.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* textmodes/flyspell.el (flyspell-auto-correct-previous-word):
+	Use window-start and window-end.
+
[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]>
 
 	* locate.el (locate-in-alternate-database): Doc fix.
@@ -9,18 +77,21 @@
 
 	* version.el (emacs-version): Increase to 22.1.50.
 
[phone]  Richard Stallman  <[e-mail]>
+
+	* hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.
+
 2007-04-25  J.D. Smith  <[e-mail]>
 
-	* progmodes/idlwave.el (idlwave-beginning-of-subprogram,
-	idlwave-end-of-subprogram): Take optional NOMARK arg to prevent
+	* progmodes/idlwave.el (idlwave-beginning-of-subprogram)
+	(idlwave-end-of-subprogram): Take optional NOMARK arg to prevent
 	pushing mark.
 	(idlwave-current-routine): Don't push mark.
 
 2007-04-25  Mathias Dahl  <[e-mail]>
 
-	* image-dired.el (image-dired-display-image): Derive image-type
-	from filename rather than assuming jpeg, in case no resizing was
-	needed.
+	* image-dired.el (image-dired-display-image): Derive image-type from
+	filename rather than assuming jpeg, in case no resizing was needed.
 
 2007-04-25  Johan Bockg,Ae(Brd  <[e-mail]>
 
@@ -28,12 +99,11 @@
 
 2007-04-24  J.D. Smith  <[e-mail]>
 
-	* progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): Don't
-	re-query for each cleared BP.
+	* progmodes/idlw-shell.el (idlwave-shell-clear-all-bp):
+	Don't re-query for each cleared BP.
 	(idlwave-shell-clear-bp): Optionally skip BP query.
-	(idlwave-shell-update-bp-overlays): Use set-window-margins
-	instead of set-window-buffer, which incorrectly moves displayed
-	region.
+	(idlwave-shell-update-bp-overlays): Use set-window-margins instead
+	of set-window-buffer, which incorrectly moves displayed region.
 
 2007-04-23  Jay Belanger  <[e-mail]>
 
@@ -47,8 +117,8 @@
 
 2007-04-23  Chong Yidong  <[e-mail]>
 
-	* info.el (Info-mouse-scroll-up, Info-mouse-scroll-down): New
-	functions.
+	* info.el (Info-mouse-scroll-up, Info-mouse-scroll-down):
+	New functions.
 	(Info-mode-line-node-keymap): Bind mouse commands to
 	Info-mouse-scroll-up/down instead of Info-scroll-up/down.
 
@@ -59,8 +129,8 @@
 	(locate-prompt-for-search-string): New function.
 	(locate): New optional arg.  Make locate-local-prompt
 	buffer-local.  Use locate-prompt-for-search-string.
-	(locate-with-filter): New optional arg.  Use
-	locate-prompt-for-search-string.
+	(locate-with-filter): New optional arg.
+	Use locate-prompt-for-search-string.
 	(locate-update): Bind locate-prompt-for-command.
 
 2007-04-23  Glenn Morris  <[e-mail]>
@@ -143,8 +213,8 @@
 	* progmodes/vhdl-mode.el (vhdl-template-type)
 	(vhdl-template-record, vhdl-template-nature)
 	(vhdl-template-configuration-spec, vhdl-template-component-inst)
-	(vhdl-template-break, vhdl-regress-line, vhdl-electric-tab): Use
-	delete-region instead of kill-word and kill-line.
+	(vhdl-template-break, vhdl-regress-line, vhdl-electric-tab):
+	Use delete-region instead of kill-word and kill-line.
 
 2007-04-21  Johan Bockg,Ae(Brd  <[e-mail]>
 

--- a/lisp/calendar/timeclock.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/calendar/timeclock.el	Tue May 01 23:03:36 2007 +0000
@@ -5,7 +5,7 @@
 
 ;; Author: John Wiegley <[e-mail]>
 ;; 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 "<p>"))
@@ -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 "<tr>\n")

--- a/lisp/dired-x.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/dired-x.el	Tue May 01 23:03:36 2007 +0000
@@ -45,8 +45,12 @@
 ;; (add-hook 'dired-load-hook
 ;;           (function (lambda ()
 ;;                       (load "dired-x")
-;;                       ;; Set variables here.  For example:
+;;                       ;; Set global variables here.  For example:
 ;;                       ;; (setq dired-guess-shell-gnutar "gtar")
+;;                       )))
+;; (add-hook 'dired-mode-hook
+;;           (function (lambda ()
+;;                       ;; Set buffer-local variables here.  For example:
 ;;                       ;; (dired-omit-mode 1)
 ;;                       )))
 ;;
@@ -1123,11 +1127,17 @@
   :group 'dired-x
   :type '(alist :key-type regexp :value-type (repeat sexp)))
 
+(defcustom dired-guess-shell-case-fold-search t
+  "If non-nil, `dired-guess-shell-alist-default' and
+`dired-guess-shell-alist-user' are matched case-insensitively."
+  :group 'dired-x
+  :type 'boolean)
+
 (defun dired-guess-default (files)
   "Guess a shell commands for FILES.  Return command or list of commands.
 See `dired-guess-shell-alist-user'."
 
-  (let* ((case-fold-search t)
+  (let* ((case-fold-search dired-guess-shell-case-fold-search)
          ;; Prepend the user's alist to the default alist.
          (alist (append dired-guess-shell-alist-user
                         dired-guess-shell-alist-default))

--- a/lisp/emacs-lisp/sregex.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/emacs-lisp/sregex.el	Tue May 01 23:03:36 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/find-dired.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/find-dired.el	Tue May 01 23:03:36 2007 +0000
@@ -257,7 +257,7 @@
 		  (delete-region (point) (- (point) 2)))
 		;; Find all the complete lines in the unprocessed
 		;; output and process it to add text properties.
-		(goto-char end)
+		(goto-char (point-max))
 		(if (search-backward "\n" (process-mark proc) t)
 		    (progn
 		      (dired-insert-set-properties (process-mark proc)

--- a/lisp/hi-lock.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/hi-lock.el	Tue May 01 23:03:36 2007 +0000
@@ -124,7 +124,7 @@
   :type '(repeat symbol)
   :group 'hi-lock)
 
-(defcustom hi-lock-file-patterns-policy 'never
+(defcustom hi-lock-file-patterns-policy 'ask
   "Specify when hi-lock should use patterns found in file.
 If `ask', prompt when patterns found in buffer; if bound to a function,
 use patterns when function returns t (function is called with patterns

--- a/lisp/image-dired.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/image-dired.el	Tue May 01 23:03:36 2007 +0000
@@ -228,7 +228,7 @@
   :group 'image-dired)
 
 (defcustom image-dired-cmd-create-thumbnail-options
-  "%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\""
+  "%p -size %wx%h \"%f\" -resize %wx%h -strip jpeg:\"%t\""
   "Format of command used to create thumbnail image.
 Available options are %p which is replaced by
 `image-dired-cmd-create-thumbnail-program', %w which is replaced by
@@ -246,7 +246,7 @@
   :group 'image-dired)
 
 (defcustom image-dired-cmd-create-temp-image-options
-  "%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\""
+  "%p -size %wx%h \"%f\" -resize %wx%h -strip jpeg:\"%t\""
   "Format of command used to create temporary image for display window.
 Available options are %p which is replaced by
 `image-dired-cmd-create-temp-image-program', %w and %h which is replaced by

--- a/lisp/international/mule.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/international/mule.el	Tue May 01 23:03:36 2007 +0000
@@ -1574,6 +1574,7 @@
     ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
     ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
     ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
+    ("\\.pdf\\'" . no-conversion)
     ("/#[^/]+#\\'" . emacs-mule))
   "Alist of filename patterns vs corresponding coding systems.
 Each element looks like (REGEXP . CODING-SYSTEM).

--- a/lisp/ldefs-boot.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/ldefs-boot.el	Tue May 01 23:03:36 2007 +0000
@@ -1129,8 +1129,8 @@
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17956
-;;;;;;  9517))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17960
+;;;;;;  49045))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload (quote archive-mode) "arc-mode" "\
@@ -1795,7 +1795,7 @@
 ;;;***
 
 ;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17956
-;;;;;;  9518))
+;;;;;;  21270))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload (quote bibtex-mode) "bibtex" "\
@@ -2582,8 +2582,8 @@
 ;;;***
 
 ;;;### (autoloads (insert-text-button make-text-button insert-button
-;;;;;;  make-button define-button-type) "button" "button.el" (17935
-;;;;;;  59428))
+;;;;;;  make-button define-button-type) "button" "button.el" (17964
+;;;;;;  48350))
 ;;; Generated autoloads from button.el
 
 (defvar button-map (let ((map (make-sparse-keymap))) (define-key map "
" (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\
@@ -2777,7 +2777,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17916 10823))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17956 13479))
 ;;; Generated autoloads from calendar/cal-dst.el
 
 (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t)
@@ -2787,7 +2787,7 @@
 ;;;***
 
 ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (17842 53792))
+;;;;;;  (17956 13479))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\
@@ -2802,7 +2802,7 @@
 ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
 ;;;;;;  calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
 ;;;;;;  full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el"
-;;;;;;  (17955 4296))
+;;;;;;  (17965 11665))
 ;;; Generated autoloads from calc/calc.el
 
 (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\
@@ -2909,7 +2909,7 @@
 ;;;;;;  mark-holidays-in-calendar view-calendar-holidays-initially
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
 ;;;;;;  view-diary-entries-initially calendar-offset) "calendar"
-;;;;;;  "calendar/calendar.el" (17944 20140))
+;;;;;;  "calendar/calendar.el" (17956 13479))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-offset 0 "\
@@ -3519,7 +3519,7 @@
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (17926 45410))
+;;;;;;  (17962 52849))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload (quote c-initialize-cc-mode) "cc-mode" "\
@@ -5960,10 +5960,10 @@
 (custom-autoload (quote global-cwarn-mode) "cwarn" nil)
 
 (autoload (quote global-cwarn-mode) "cwarn" "\
-Toggle Cwarn mode in every buffer.
+Toggle Cwarn mode in every possible buffer.
 With prefix ARG, turn Global-Cwarn mode on if and only if ARG is positive.
-Cwarn mode is actually not turned on in every buffer but only in those
-in which `turn-on-cwarn-mode-if-enabled' turns it on.
+Cwarn mode is enabled in all buffers where `turn-on-cwarn-mode-if-enabled' would do it.
+See `cwarn-mode' for more information on Cwarn mode.
 
 \(fn &optional ARG)" t nil)
 
@@ -6676,7 +6676,7 @@
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (17944 20140))
+;;;;;;  "calendar/diary-lib.el" (17958 11887))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -6788,7 +6788,7 @@
 ;;;;;;  dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink
 ;;;;;;  dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename
 ;;;;;;  dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches)
-;;;;;;  "dired" "dired.el" (17851 56703))
+;;;;;;  "dired" "dired.el" (17963 25980))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -7408,7 +7408,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  (17942 63381))
+;;;;;;  (17962 27565))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -7708,7 +7708,7 @@
 
 ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
 ;;;;;;  define-globalized-minor-mode define-minor-mode) "easy-mmode"
-;;;;;;  "emacs-lisp/easy-mmode.el" (17860 50628))
+;;;;;;  "emacs-lisp/easy-mmode.el" (17964 48351))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -10845,7 +10845,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "fill" "textmodes/fill.el" (17852 19718))
+;;;### (autoloads nil "fill" "textmodes/fill.el" (17961 33560))
 ;;; Generated autoloads from textmodes/fill.el
 (put 'colon-double-space 'safe-local-variable 'booleanp)
 
@@ -11267,7 +11267,7 @@
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (17942 63381))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (17962 52849))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -11948,7 +11948,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (17938 29201))
+;;;;;;  (17960 49045))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -13281,7 +13281,7 @@
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (17860 50601))
+;;;;;;  (17964 48351))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload (quote hi-lock-mode) "hi-lock" "\
@@ -13309,17 +13309,22 @@
   Remove highlighting on matches of REGEXP in current buffer.
 
 \\[hi-lock-write-interactive-patterns]
-  Write active REGEXPs into buffer as comments (if possible).  They will
+  Write active REGEXPs into buffer as comments (if possible).  They may
   be read the next time file is loaded or when the \\[hi-lock-find-patterns] command
   is issued.  The inserted regexps are in the form of font lock keywords.
-  (See `font-lock-keywords'.)  They may be edited and re-loaded with \\[hi-lock-find-patterns],
-  any valid `font-lock-keywords' form is acceptable.
+  (See `font-lock-keywords'.)  They may be edited and re-loaded with \\[hi-lock-find-patterns], 
+  any valid `font-lock-keywords' form is acceptable. When a file is
+  loaded the patterns are read if `hi-lock-file-patterns-policy is
+  'ask and the user responds y to the prompt, or if
+  `hi-lock-file-patterns-policy' is bound to a function and that
+  function returns t.
 
 \\[hi-lock-find-patterns]
   Re-read patterns stored in buffer (in the format produced by \\[hi-lock-write-interactive-patterns]).
 
-When hi-lock is started and if the mode is not excluded, the
-beginning of the buffer is searched for lines of the form:
+When hi-lock is started and if the mode is not excluded or patterns
+rejected, the beginning of the buffer is searched for lines of the
+form:
   Hi-lock: FOO
 where FOO is a list of patterns.  These are added to the font lock
 keywords already present.  The patterns must start before position
@@ -13340,10 +13345,10 @@
 (custom-autoload (quote global-hi-lock-mode) "hi-lock" nil)
 
 (autoload (quote global-hi-lock-mode) "hi-lock" "\
-Toggle Hi-Lock mode in every buffer.
+Toggle Hi-Lock mode in every possible buffer.
 With prefix ARG, turn Global-Hi-Lock mode on if and only if ARG is positive.
-Hi-Lock mode is actually not turned on in every buffer but only in those
-in which `turn-on-hi-lock-if-enabled' turns it on.
+Hi-Lock mode is enabled in all buffers where `turn-on-hi-lock-if-enabled' would do it.
+See `hi-lock-mode' for more information on Hi-Lock mode.
 
 \(fn &optional ARG)" t nil)
 
@@ -13768,7 +13773,7 @@
 ;;;***
 
 ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;;  (17842 53792))
+;;;;;;  (17956 13479))
 ;;; Generated autoloads from calendar/holidays.el
 
 (autoload (quote holidays) "holidays" "\
@@ -14448,7 +14453,7 @@
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (17935 59227))
+;;;;;;  (17965 23638))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -14609,8 +14614,8 @@
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17932
-;;;;;;  16456))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963
+;;;;;;  25911))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -15077,6 +15082,145 @@
 
 ;;;***
 
+;;;### (autoloads (image-dired-dired-edit-comment-and-tags image-dired-mark-tagged-files
+;;;;;;  image-dired-dired-comment-files image-dired-dired-display-image
+;;;;;;  image-dired-dired-display-external image-dired-display-thumb
+;;;;;;  image-dired-display-thumbs-append image-dired-setup-dired-keybindings
+;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
+;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
+;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs)
+;;;;;;  "image-dired" "image-dired.el" (17963 26200))
+;;; Generated autoloads from image-dired.el
+
+(autoload (quote image-dired-dired-insert-marked-thumbs) "image-dired" "\
+Insert thumbnails before file names of marked files in the dired buffer.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-dired-with-window-configuration) "image-dired" "\
+Open directory DIR and create a default window configuration.
+
+Convenience command that:
+
+ - Opens dired in folder DIR
+ - Splits windows in most useful (?) way
+ - Set `truncate-lines' to t
+
+After the command has finished, you would typically mark some
+image files in dired and type
+\\[image-dired-display-thumbs] (`image-dired-display-thumbs').
+
+If called with prefix argument ARG, skip splitting of windows.
+
+The current window configuration is saved and can be restored by
+calling `image-dired-restore-window-configuration'.
+
+\(fn DIR &optional ARG)" t nil)
+
+(autoload (quote image-dired-display-thumbs) "image-dired" "\
+Display thumbnails of all marked files, in `image-dired-thumbnail-buffer'.
+If a thumbnail image does not exist for a file, it is created on the
+fly.  With prefix argument ARG, display only thumbnail for file at
+point (this is useful if you have marked some files but want to show
+another one).
+
+Recommended usage is to split the current frame horizontally so that
+you have the dired buffer in the left window and the
+`image-dired-thumbnail-buffer' buffer in the right window.
+
+With optional argument APPEND, append thumbnail to thumbnail buffer
+instead of erasing it first.
+
+Option argument DO-NOT-POP controls if `pop-to-buffer' should be
+used or not.  If non-nil, use `display-buffer' instead of
+`pop-to-buffer'.  This is used from functions like
+`image-dired-next-line-and-display' and
+`image-dired-previous-line-and-display' where we do not want the
+thumbnail buffer to be selected.
+
+\(fn &optional ARG APPEND DO-NOT-POP)" t nil)
+
+(autoload (quote image-dired-show-all-from-dir) "image-dired" "\
+Make a preview buffer for all images in DIR and display it.
+If the number of files in DIR matching `image-file-name-regexp'
+exceeds `image-dired-show-all-from-dir-max-files', a warning will be
+displayed.
+
+\(fn DIR)" t nil)
+
+(defalias (quote image-dired) (quote image-dired-show-all-from-dir))
+
+(defalias (quote tumme) (quote image-dired-show-all-from-dir))
+
+(autoload (quote image-dired-tag-files) "image-dired" "\
+Tag marked file(s) in dired.  With prefix ARG, tag file at point.
+
+\(fn ARG)" t nil)
+
+(autoload (quote image-dired-delete-tag) "image-dired" "\
+Remove tag for selected file(s).
+With prefix argument ARG, remove tag from file at point.
+
+\(fn ARG)" t nil)
+
+(autoload (quote image-dired-jump-thumbnail-buffer) "image-dired" "\
+Jump to thumbnail buffer.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-setup-dired-keybindings) "image-dired" "\
+Setup easy-to-use keybindings for the commands to be used in dired mode.
+Note that n, p and <down> and <up> will be hijacked and bound to
+`image-dired-dired-x-line'.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-display-thumbs-append) "image-dired" "\
+Append thumbnails to `image-dired-thumbnail-buffer'.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-display-thumb) "image-dired" "\
+Shorthand for `image-dired-display-thumbs' with prefix argument.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-dired-display-external) "image-dired" "\
+Display file at point using an external viewer.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-dired-display-image) "image-dired" "\
+Display current image file.
+See documentation for `image-dired-display-image' for more information.
+With prefix argument ARG, display image in its original size.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote image-dired-dired-comment-files) "image-dired" "\
+Add comment to current or marked files in dired.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-mark-tagged-files) "image-dired" "\
+Use regexp to mark files with matching tag.
+A `tag' is a keyword, a piece of meta data, associated with an
+image file and stored in image-dired's database file.  This command
+lets you input a regexp and this will be matched against all tags
+on all image files in the database file.  The files that have a
+matching tags will be marked in the dired buffer.
+
+\(fn)" t nil)
+
+(autoload (quote image-dired-dired-edit-comment-and-tags) "image-dired" "\
+Edit comment and tags of current or marked image files.
+Edit comment and tags for all marked image files in an
+easy-to-use form.
+
+\(fn)" t nil)
+
+;;;***
+
 ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp
 ;;;;;;  image-file-name-regexps image-file-name-extensions) "image-file"
 ;;;;;;  "image-file.el" (17842 58279))
@@ -15404,7 +15548,7 @@
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node Info-mode info-apropos Info-index
 ;;;;;;  Info-directory Info-on-current-buffer info-standalone info-emacs-manual
-;;;;;;  info info-other-window) "info" "info.el" (17936 34375))
+;;;;;;  info info-other-window) "info" "info.el" (17964 52883))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -16731,7 +16875,7 @@
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (17842 58279))
+;;;;;;  "locate" "locate.el" (17965 12050))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches "-al" "\
@@ -16759,7 +16903,9 @@
 The main use of FILTER is to implement `locate-with-filter'.  See
 the docstring of that function for its meaning.
 
-\(fn SEARCH-STRING &optional FILTER)" t nil)
+ARG is the interactive prefix arg.
+
+\(fn SEARCH-STRING &optional FILTER ARG)" t nil)
 
 (autoload (quote locate-with-filter) "locate" "\
 Run the executable program `locate' with a filter.
@@ -16771,10 +16917,12 @@
 contain a match for the regular expression FILTER; this is often useful
 to constrain a big search.
 
+ARG is the interactive prefix arg, which has the same effect as in `locate'.
+
 When called from Lisp, this function is identical with `locate',
 except that FILTER is not optional.
 
-\(fn SEARCH-STRING FILTER)" t nil)
+\(fn SEARCH-STRING FILTER &optional ARG)" t nil)
 
 ;;;***
 
@@ -16938,8 +17086,8 @@
 
 ;;;***
 
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17916
-;;;;;;  10998))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17956
+;;;;;;  13479))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload (quote phases-of-moon) "lunar" "\
@@ -19637,7 +19785,7 @@
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17842 58279))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17960 50513))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -19662,7 +19810,7 @@
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (17842 53792))
+;;;;;;  (17957 43164))
 ;;; Generated autoloads from calendar/parse-time.el
 
 (autoload (quote parse-time-string) "parse-time" "\
@@ -20090,7 +20238,7 @@
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (17955 36604))
+;;;;;;  (17962 28280))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -21446,81 +21594,6 @@
 
 ;;;***
 
-;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17956 9518))
-;;; Generated autoloads from progmodes/python.el
-
-(add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
-
-(add-to-list (quote interpreter-mode-alist) (quote ("python" . python-mode)))
-
-(add-to-list (quote auto-mode-alist) (quote ("\\.py\\'" . python-mode)))
-
-(autoload (quote run-python) "python" "\
-Run an inferior Python process, input and output via buffer *Python*.
-CMD is the Python command to run.  NOSHOW non-nil means don't show the
-buffer automatically.
-
-Normally, if there is a process already running in `python-buffer',
-switch to that buffer.  Interactively, a prefix arg allows you to edit
-the initial command line (default is `python-command'); `-i' etc. args
-will be added to this as appropriate.  A new process is started if:
-one isn't running attached to `python-buffer', or interactively the
-default `python-command', or argument NEW is non-nil.  See also the
-documentation for `python-buffer'.
-
-Runs the hook `inferior-python-mode-hook' (after the
-`comint-mode-hook' is run).  (Type \\[describe-mode] in the process
-buffer for a list of commands.)
-
-\(fn &optional CMD NOSHOW NEW)" t nil)
-
-(autoload (quote python-mode) "python" "\
-Major mode for editing Python files.
-Font Lock mode is currently required for correct parsing of the source.
-See also `jython-mode', which is actually invoked if the buffer appears to
-contain Jython code.  See also `run-python' and associated Python mode
-commands for running Python under Emacs.
-
-The Emacs commands which work with `defun's, e.g. \\[beginning-of-defun], deal
-with nested `def' and `class' blocks.  They take the innermost one as
-current without distinguishing method and class definitions.  Used multiple
-times, they move over others at the same indentation level until they reach
-the end of definitions at that level, when they move up a level.
-\\<python-mode-map>
-Colon is electric: it outdents the line if appropriate, e.g. for
-an else statement.  \\[python-backspace] at the beginning of an indented statement
-deletes a level of indentation to close the current block; otherwise it
-deletes a character backward.  TAB indents the current line relative to
-the preceding code.  Successive TABs, with no intervening command, cycle
-through the possibilities for indentation on the basis of enclosing blocks.
-
-\\[fill-paragraph] fills comments and multi-line strings appropriately, but has no
-effect outside them.
-
-Supports Eldoc mode (only for functions, using a Python process),
-Info-Look and Imenu.  In Outline minor mode, `class' and `def'
-lines count as headers.  Symbol completion is available in the
-same way as in the Python shell using the `rlcompleter' module
-and this is added to the Hippie Expand functions locally if
-Hippie Expand mode is turned on.  Completion of symbols of the
-form x.y only works if the components are literal
-module/attribute names, not variables.  An abbrev table is set up
-with skeleton expansions for compound statement templates.
-
-\\{python-mode-map}
-
-\(fn)" t nil)
-
-(autoload (quote jython-mode) "python" "\
-Major mode for editing Jython files.
-Like `python-mode', but sets up parameters for Jython subprocesses.
-Runs `jython-mode-hook' after `python-mode-hook'.
-
-\(fn)" t nil)
-
-;;;***
-
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
 ;;;;;;  (17842 54741))
 ;;; Generated autoloads from gnus/qp.el
@@ -24137,7 +24210,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "simple" "simple.el" (17949 41467))
+;;;### (autoloads nil "simple" "simple.el" (17965 11665))
 ;;; Generated autoloads from simple.el
 (put 'fill-prefix 'safe-local-variable 'string-or-null-p)
 
@@ -24410,7 +24483,7 @@
 
 ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name
 ;;;;;;  calendar-longitude calendar-latitude calendar-time-display-form)
-;;;;;;  "solar" "calendar/solar.el" (17916 11038))
+;;;;;;  "solar" "calendar/solar.el" (17956 13479))
 ;;; Generated autoloads from calendar/solar.el
 
 (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\
@@ -25400,7 +25473,7 @@
 
 ;;;***
 
-;;;### (autoloads (locate-library) "subr" "subr.el" (17949 41467))
+;;;### (autoloads (locate-library) "subr" "subr.el" (17964 48351))
 ;;; Generated autoloads from subr.el
 
 (autoload (quote locate-library) "subr" "\
@@ -25454,7 +25527,7 @@
 
 ;;;***
 
-;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17938 61442))
+;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17963 25911))
 ;;; Generated autoloads from t-mouse.el
 
 (defvar t-mouse-mode nil "\
@@ -26849,7 +26922,7 @@
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (17842 58278))
+;;;;;;  (17963 26308))
 ;;; Generated autoloads from thumbs.el
 
 (autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -27433,7 +27506,7 @@
 
 ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities
 ;;;;;;  todo-insert-item todo-add-item-non-interactively todo-add-category)
-;;;;;;  "todo-mode" "calendar/todo-mode.el" (17842 53792))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (17962 52848))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -27786,142 +27859,6 @@
 
 ;;;***
 
-;;;### (autoloads (tumme-dired-edit-comment-and-tags tumme-mark-tagged-files
-;;;;;;  tumme-dired-comment-files tumme-dired-display-image tumme-dired-display-external
-;;;;;;  tumme-display-thumb tumme-display-thumbs-append tumme-setup-dired-keybindings
-;;;;;;  tumme-jump-thumbnail-buffer tumme-delete-tag tumme-tag-files
-;;;;;;  tumme-show-all-from-dir tumme-display-thumbs tumme-dired-with-window-configuration
-;;;;;;  tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17842
-;;;;;;  58278))
-;;; Generated autoloads from tumme.el
-
-(autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\
-Insert thumbnails before file names of marked files in the dired buffer.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-dired-with-window-configuration) "tumme" "\
-Open directory DIR and create a default window configuration.
-
-Convenience command that:
-
- - Opens dired in folder DIR
- - Splits windows in most useful (?) way
- - Set `truncate-lines' to t
-
-After the command has finished, you would typically mark some
-image files in dired and type
-\\[tumme-display-thumbs] (`tumme-display-thumbs').
-
-If called with prefix argument ARG, skip splitting of windows.
-
-The current window configuration is saved and can be restored by
-calling `tumme-restore-window-configuration'.
-
-\(fn DIR &optional ARG)" t nil)
-
-(autoload (quote tumme-display-thumbs) "tumme" "\
-Display thumbnails of all marked files, in `tumme-thumbnail-buffer'.
-If a thumbnail image does not exist for a file, it is created on the
-fly.  With prefix argument ARG, display only thumbnail for file at
-point (this is useful if you have marked some files but want to show
-another one).
-
-Recommended usage is to split the current frame horizontally so that
-you have the dired buffer in the left window and the
-`tumme-thumbnail-buffer' buffer in the right window.
-
-With optional argument APPEND, append thumbnail to thumbnail buffer
-instead of erasing it first.
-
-Option argument DO-NOT-POP controls if `pop-to-buffer' should be
-used or not.  If non-nil, use `display-buffer' instead of
-`pop-to-buffer'.  This is used from functions like
-`tumme-next-line-and-display' and
-`tumme-previous-line-and-display' where we do not want the
-thumbnail buffer to be selected.
-
-\(fn &optional ARG APPEND DO-NOT-POP)" t nil)
-
-(autoload (quote tumme-show-all-from-dir) "tumme" "\
-Make a preview buffer for all images in DIR and display it.
-If the number of files in DIR matching `image-file-name-regexp'
-exceeds `tumme-show-all-from-dir-max-files', a warning will be
-displayed.
-
-\(fn DIR)" t nil)
-
-(defalias (quote tumme) (quote tumme-show-all-from-dir))
-
-(autoload (quote tumme-tag-files) "tumme" "\
-Tag marked file(s) in dired.  With prefix ARG, tag file at point.
-
-\(fn ARG)" t nil)
-
-(autoload (quote tumme-delete-tag) "tumme" "\
-Remove tag for selected file(s).
-With prefix argument ARG, remove tag from file at point.
-
-\(fn ARG)" t nil)
-
-(autoload (quote tumme-jump-thumbnail-buffer) "tumme" "\
-Jump to thumbnail buffer.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-setup-dired-keybindings) "tumme" "\
-Setup easy-to-use keybindings for the commands to be used in dired mode.
-Note that n, p and <down> and <up> will be hijacked and bound to
-`tumme-dired-x-line'.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-display-thumbs-append) "tumme" "\
-Append thumbnails to `tumme-thumbnail-buffer'.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-display-thumb) "tumme" "\
-Shorthand for `tumme-display-thumbs' with prefix argument.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-dired-display-external) "tumme" "\
-Display file at point using an external viewer.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-dired-display-image) "tumme" "\
-Display current image file.
-See documentation for `tumme-display-image' for more information.
-With prefix argument ARG, display image in its original size.
-
-\(fn &optional ARG)" t nil)
-
-(autoload (quote tumme-dired-comment-files) "tumme" "\
-Add comment to current or marked files in dired.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-mark-tagged-files) "tumme" "\
-Use regexp to mark files with matching tag.
-A `tag' is a keyword, a piece of meta data, associated with an
-image file and stored in tumme's database file.  This command
-lets you input a regexp and this will be matched against all tags
-on all image files in the database file.  The files that have a
-matching tags will be marked in the dired buffer.
-
-\(fn)" t nil)
-
-(autoload (quote tumme-dired-edit-comment-and-tags) "tumme" "\
-Edit comment and tags of current or marked image files.
-Edit comment and tags for all marked image files in an
-easy-to-use form.
-
-\(fn)" t nil)
-
-;;;***
-
 ;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17892
 ;;;;;;  62683))
 ;;; Generated autoloads from tutorial.el
@@ -29251,7 +29188,7 @@
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (17854 10062))
+;;;;;;  (17962 27361))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload (quote vhdl-mode) "vhdl-mode" "\
@@ -30914,7 +30851,7 @@
 ;;;;;;  "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el"
 ;;;;;;  "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el"
 ;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el"
-;;;;;;  "x-dnd.el") (17956 9728 35408))
+;;;;;;  "x-dnd.el") (17965 26976 559735))
 
 ;;;***
 

--- a/lisp/locate.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/locate.el	Tue May 01 23:03:36 2007 +0000
@@ -669,7 +669,7 @@
 
 ;; Only for GNU locate
 (defun locate-in-alternate-database  (search-string database)
-  "Run the GNU locate command, using an alternate database.
+  "Run the GNU locate program, using an alternate database.
 
 This command only works if you use GNU locate.  It does not work
 properly if `locate-prompt-for-command' is set to t.  In that

--- a/lisp/makefile.w32-in	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/makefile.w32-in	Tue May 01 23:03:36 2007 +0000
@@ -311,6 +311,8 @@
 	$(lisp)/mh-e/mh-tool-bar.el $(lisp)/mh-e/mh-utils.el	\
 	$(lisp)/mh-e/mh-xface.el
 
+# See the commentary for autoloads above for why we use ./mh-e below
+# instead of $(lisp)/mh-e.
 mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
 $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 	$(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE)
@@ -322,7 +324,7 @@
 	   --eval "(setq find-file-suppress-same-file-warnings t)" \
 	   --eval "(setq make-backup-files nil)" \
 	   -f w32-batch-update-autoloads \
-	   "$(lisp)/mh-e/mh-loaddefs.el" $(lisp)/mh-e
+	   "$(lisp)/mh-e/mh-loaddefs.el" ./mh-e
 
 pre-mh-loaddefs.el-SH:
 	echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@

--- a/lisp/progmodes/cc-mode.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/progmodes/cc-mode.el	Tue May 01 23:03:36 2007 +0000
@@ -522,7 +522,7 @@
 	    (setq lim (max (point-min) (1- (point))))
 
 	    ;; Look for the latest `c-type' property before end1
-	    (when (and (> end1 1)
+	    (when (and (> end1 (point-min))
 		       (setq type-pos
 			     (if (get-text-property (1- end1) 'c-type)
 				 end1

--- a/lisp/progmodes/gud.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/progmodes/gud.el	Tue May 01 23:03:36 2007 +0000
@@ -152,7 +152,7 @@
 		  :visible (and (not gud-running)
 				(eq gud-minor-mode 'gdba)))
     ([stop]	menu-item "Stop" gud-stop-subjob
-		  :visible (or (not (eq gud-minor-mode 'gdba))
+		  :visible (or (not (memq gud-minor-mode '(gdba pdb)))
 			       (and gud-running
 				    (eq gud-minor-mode 'gdba))))
     ([until]	menu-item "Continue to selection" gud-until

--- a/lisp/progmodes/sh-script.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/progmodes/sh-script.el	Tue May 01 23:03:36 2007 +0000
@@ -1530,6 +1530,8 @@
           "ksh")
          ((string-match "[.]csh\\>" buffer-file-name)
           "csh")
+	 ((equal (file-name-nondirectory buffer-file-name) ".profile")
+          "sh")
          (t
           sh-shell-file))
    nil nil)

--- a/lisp/textmodes/fill.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/textmodes/fill.el	Tue May 01 23:03:36 2007 +0000
@@ -753,7 +753,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/textmodes/flyspell.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/textmodes/flyspell.el	Tue May 01 23:03:36 2007 +0000
@@ -1961,12 +1961,8 @@
 But don't look beyond what's visible on the screen."
   (interactive "d")
 
-  (let (top bot)
-    (save-excursion
-      (move-to-window-line 0)
-      (setq top (point))
-      (move-to-window-line -1)
-      (setq bot (point)))
+  (let ((top (window-start))
+	(bot (window-end)))
     (save-excursion
       (save-restriction
 	(narrow-to-region top bot)

--- a/lisp/vc-hooks.el	Tue May 01 13:23:50 2007 +0000
+++ b/lisp/vc-hooks.el	Tue May 01 23:03:36 2007 +0000
@@ -52,7 +52,9 @@
 (defvar vc-header-alist ())
 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header)
 
-(defcustom vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
+(defcustom vc-ignore-dir-regexp
+  ;; Stop SMB, automounter, AFS, and DFS host lookups.
+  "\\`\\(?:[\\/][\\/]\\|/\\(?:net\\|afs\\|\\.\\\.\\.\\)/\\)\\'"
   "Regexp matching directory names that are not under VC's control.
 The default regexp prevents fruitless and time-consuming attempts
 to determine the VC status in directories in which filenames are

--- a/lispref/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/lispref/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -7,6 +7,12 @@
 	* elisp.texi: Improve line breaks on copyright page,
 	similar layout to emacs manual, 8.5x11 by default.
 
[phone]  Richard Stallman  <[e-mail]>
+
+	* text.texi (Special Properties): Add xref to Overlay Properties.
+
+	* display.texi (Overlay Properties): Add xref to Special Properties.
+
 2007-04-22  Richard Stallman  <[e-mail]>
 
 	* keymaps.texi (Extended Menu Items): Move the info about

--- a/lispref/display.texi	Tue May 01 13:23:50 2007 +0000
+++ b/lispref/display.texi	Tue May 01 23:03:36 2007 +0000
@@ -1418,6 +1418,9 @@
 @code{inhibit-modification-hooks} to @code{t} around doing so, to
 avoid confusing the internal mechanism that calls these hooks.
 
+Text properties also support the @code{modification-hooks} property,
+but the details are somewhat different (@pxref{Special Properties}).
+
 @item insert-in-front-hooks
 @kindex insert-in-front-hooks @r{(overlay property)}
 This property's value is a list of functions to be called before and

--- a/lispref/text.texi	Tue May 01 13:23:50 2007 +0000
+++ b/lispref/text.texi	Tue May 01 23:03:36 2007 +0000
@@ -3195,6 +3195,9 @@
 @code{inhibit-modification-hooks} to @code{t} around doing so, to
 avoid confusing the internal mechanism that calls these hooks.
 
+Overlays also support the @code{modification-hooks} property, but the
+details are somewhat different (@pxref{Overlay Properties}).
+
 @item insert-in-front-hooks
 @itemx insert-behind-hooks
 @kindex insert-in-front-hooks @r{(text property)}

--- a/mac/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/mac/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,8 @@
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* INSTALL: Fix description about using colors in terminal.
+	Fix typos (/Application -> /Applications).
+
 2007-04-26  Glenn Morris  <[e-mail]>
 
 	* Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:

--- a/mac/INSTALL	Tue May 01 13:23:50 2007 +0000
+++ b/mac/INSTALL	Tue May 01 23:03:36 2007 +0000
@@ -21,8 +21,8 @@
 recommended; see the notes section below for more details.
 
 The --enable-carbon-app specifies that the Carbon GUI application
-should be installed into /Application.  If you want it to install in a
-different location, specify --enable-carbon-app=<mydir>
+should be installed into /Applications.  If you want it to install in
+a different location, specify --enable-carbon-app=<mydir>
 
 You can type `make bootstrap' instead of `make' to rebuild everything,
 including byte-compiling the Lisp files.
@@ -44,7 +44,7 @@
 To start Emacs as a GUI application from the terminal, the pathname to
 the executable in the bundle, i.e.,
 
-  /Application/Emacs.app/Contents/MacOS/Emacs
+  /Applications/Emacs.app/Contents/MacOS/Emacs
 
 must be typed to the shell to enable Emacs to locate its resources
 correctly.  You may want to create an alias to this path to quickly
@@ -60,8 +60,8 @@
 Note that the Carbon-specific functions mentioned above are not
 available on the X11-enabled build.
 
-To use colors in a terminal, put the following lines in the file
-~/.termcap and log in again.
+To use colors in Terminal.app on Mac OS X 10.1, put the following
+lines in the file ~/.termcap and log in again.
 
 -----
 # added ANSI color

--- a/man/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/man/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,23 @@
[phone]  Reiner Steib  <[e-mail]>
+
+	* gnus.texi (Article Highlighting): Clarify gnus-cite-parse-max-size.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* ack.texi (Acknowledgments):
+	* anti.texi (Antinews):
+	* faq.texi (New in Emacs 22):
+	* programs.texi (Program Modes): Restore mention of python.el pending
+	consideration of legal status.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* files.texi (File Names): Fixes to ~ description on MS systems.
+
[phone]  J.D. Smith  <[e-mail]>
+
+	* idlwave.texi: Minor updates for IDLWAVE 6.1.
+
 2007-04-26  Glenn Morris  <[e-mail]>
 
 	* emacs.texi (EMACSVER): Increase to 22.1.50.
@@ -9,6 +29,13 @@
 
 	* dired.texi (Image-Dired): Improve line break, fix typo.
 
[phone]  Chong Yidong  <[e-mail]>
+
+	* programs.texi (Program Modes):
+	* faq.texi (New in Emacs 22):
+	* anti.texi (Antinews):
+	* ack.texi (Acknowledgments): python.el removed.
+
 2007-04-23  Jay Belanger  <[e-mail]>
 
 	* calc.texi (Reporting bugs): Update maintainer's address.

--- a/man/ack.texi	Tue May 01 13:23:50 2007 +0000
+++ b/man/ack.texi	Tue May 01 23:03:36 2007 +0000
@@ -682,7 +682,7 @@
 @file{latin1-disp.el}, a package that lets you display ISO 8859
 characters on Latin-1 terminals by setting up appropriate display
 tables,
-@item
+@item                                                                          
 @file{python.el}, a major mode for the Python programming language.
 @item
 @file{refill.el}, a mode for automatic paragraph refilling, akin to

--- a/man/dired.texi	Tue May 01 13:23:50 2007 +0000
+++ b/man/dired.texi	Tue May 01 23:03:36 2007 +0000
@@ -1206,7 +1206,7 @@
 (@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
-easy browsing, type @kbd{SPC}
+easy browsing, use @kbd{SPC}
 (@code{image-dired-display-next-thumbnail-original}) to advance and
 display the next image.  Typing @kbd{DEL}
 (@code{image-dired-display-previous-thumbnail-original}) backs up to

--- a/man/files.texi	Tue May 01 13:23:50 2007 +0000
+++ b/man/files.texi	Tue May 01 23:03:36 2007 +0000
@@ -112,9 +112,9 @@
 or @file{~@var{user-id}/} to mean the home directory of a user whose
 login name is @code{user-id}@footnote{
 On MS-Windows and MS-DOS systems, where a user doesn't have a home
-directory, Emacs substitutes @file{~/} with the value of the
-environment variable @code{HOME}; see @ref{General Variables}.  The
-@file{~@var{user-id}/} construct is supported on those systems only
+directory, Emacs replaces @file{~/} with the value of the
+environment variable @code{HOME}; see @ref{General Variables}.  On
+these systems, the @file{~@var{user-id}/} construct is supported only
 for the current user, i.e., only if @var{user-id} is the current
 user's login name.}.
 

--- a/man/gnus.texi	Tue May 01 13:23:50 2007 +0000
+++ b/man/gnus.texi	Tue May 01 23:03:36 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

--- a/man/idlwave.texi	Tue May 01 13:23:50 2007 +0000
+++ b/man/idlwave.texi	Tue May 01 23:03:36 2007 +0000
@@ -9,16 +9,13 @@
 @synindex ky cp
 @syncodeindex vr cp
 @syncodeindex fn cp
-@set VERSION 6.0
-@set EDITION 6.0
-@set IDLVERSION 6.2
-@set NSYSROUTINES 1966
-@set DATE Feb, 2006
+@set VERSION 6.1
+@set EDITION 6.1
+@set IDLVERSION 6.3
+@set NSYSROUTINES 4346
+@set DATE April, 2007
 @set AUTHOR J.D. Smith & Carsten Dominik
-@set AUTHOREMAIL jdsmith@@as.arizona.edu
 @set MAINTAINER J.D. Smith
-@set MAINTAINEREMAIL jdsmith@@as.arizona.edu
-@set IDLWAVEHOMEPAGE http://idlwave.org/
 @c %**end of header
 @finalout
 
@@ -320,6 +317,9 @@
 @tab Re-indent all lines in the current statement.
 @item @kbd{M-@key{RET}}
 @tab Start a continuation line, splitting the current line at point.
+@item @kbd{M-;}
+@tab Start new comment at line beginning or after code, or (un)comment
+highlighted region.
 @item @kbd{M-q}
 @tab Fill the current comment paragraph.
 @item @kbd{C-c ?}
@@ -354,6 +354,8 @@
 @tab Complete a procedure name, function name or keyword in the shell buffer.
 @item @kbd{C-c C-d C-c}
 @tab Save and compile the source file in the current buffer.
+@item @kbd{C-c C-d C-e}
+@tab Compile and run the current region.
 @item @kbd{C-c C-d C-x}
 @tab Go to next syntax error.
 @item @kbd{C-c C-d C-v}
@@ -2954,6 +2956,13 @@
 been set (or you give two prefix arguments), the last command on the
 @code{comint} input history is sent.
 
+@kindex C-c C-d C-e
+@cindex Compiling regions
+For quickly compiling and running the currently marked region as a main
+level program @kbd{C-c C-d C-e} (@code{idlwave-shell-run-region}) is
+very useful.  A temporary file is created holding the contents of the
+current region (with @code{END} appended), and run from the shell.
+
 @node Walking the Calling Stack, Electric Debug Mode, Compiling Programs, Debugging IDL Programs
 @subsection Walking the Calling Stack
 @cindex Calling stack, walking
@@ -3439,7 +3448,7 @@
 @item
 It has a @emph{builtin list} with information about the routines IDL
 ships with.  IDLWAVE @value{VERSION} is distributed with a list of
-@value{NSYSROUTINES} routines, reflecting IDL version
+@value{NSYSROUTINES} routines and object methods, reflecting IDL version
 @value{IDLVERSION}.  As of IDL v6.2, the routine info is distributed
 directly with IDL in the form of an XML catalog which IDLWAVE scans.
 Formerly, this list was created by scanning the IDL manuals to produce
@@ -4062,7 +4071,7 @@
 Here is an example of the additional configuration needed for a Windows
 system.  I am assuming that IDLWAVE has been installed in
 @w{@samp{C:\Program Files\IDLWAVE}} and that IDL is installed in
-@w{@samp{C:\RSI\IDL62}}.
+@w{@samp{C:\RSI\IDL63}}.
 
 @lisp
 ;; location of the lisp files (only needed if IDLWAVE is not part of
@@ -4072,10 +4081,10 @@
 ;; The location of the IDL library directories, both standard,  and your own.
 ;; note that the initial "+" expands the path recursively
 (setq idlwave-library-path
-        '("+c:/RSI/IDL55/lib/" "+c:/path/to/my/idllibs" ))
+        '("+c:/RSI/IDL63/lib/" "+c:/path/to/my/idllibs" ))
 
 ;; location of the IDL system directory (try "print,!DIR")
-(setq idlwave-system-directory "c:/RSI/IDL62/")
+(setq idlwave-system-directory "c:/RSI/IDL63/")
 
 @end lisp
 

--- a/src/ChangeLog	Tue May 01 13:23:50 2007 +0000
+++ b/src/ChangeLog	Tue May 01 23:03:36 2007 +0000
@@ -1,3 +1,32 @@
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
+	(Fx_popup_dialog) [MAC_OSX]: Likewise.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* insdel.c (replace_range): For undo, record insertion first.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h (VECSIZE): Use OFFSETOF.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* xdisp.c (try_window_reusing_current_matrix): Fix number of
+	disabled lines.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* lread.c (read_escape): In a string, \s is always space.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.
+
+	* gtkutil.c (xg_update_menubar, create_menus): Create empty
+	submenu for menu bar items.
+
 2007-04-24  Chong Yidong  <[e-mail]>
 
 	* xdisp.c (redisplay_window): Use BEG_UNCHANGED and END_UNCHANGED

--- a/src/gtkutil.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/gtkutil.c	Tue May 01 23:03:36 2007 +0000
@@ -2192,7 +2192,9 @@
                                       cl_data,
                                       &group);
 
-          if (item->contents)
+          /* Create a possibly empty submenu for menu bar items, since some
+             themes don't highlight items correctly without it. */
+          if (item->contents || menu_bar_p)
             {
               GtkWidget *submenu = create_menus (item->contents,
                                                  f,
@@ -2479,8 +2481,14 @@
                                                  cl_data,
                                                  &group);
 
+          /* Create a possibly empty submenu for menu bar items, since some
+             themes don't highlight items correctly without it. */
+          GtkWidget *submenu = create_menus (NULL, f,
+                                             select_cb, NULL, highlight_cb,
+                                             0, 0, 0, 0, cl_data, 0);
           gtk_widget_set_name (w, MENU_ITEM_NAME);
           gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos);
+          gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu);
 
           g_list_free (*list);
           *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));

--- a/src/insdel.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/insdel.c	Tue May 01 23:03:36 2007 +0000
@@ -1636,8 +1636,12 @@
 
   if (! EQ (current_buffer->undo_list, Qt))
     {
+      /* Record the insertion first, so that when we undo,
+	 the deletion will be undone first.  Thus, undo
+	 will insert before deleting, and thus will keep
+	 the markers before and after this text separate.  */
+      record_insert (from + SCHARS (deletion), inschars);
       record_delete (from, deletion);
-      record_insert (from, inschars);
     }
 
   GAP_SIZE -= outgoing_insbytes;

--- a/src/lisp.h	Tue May 01 13:23:50 2007 +0000
+++ b/src/lisp.h	Tue May 01 23:03:36 2007 +0000
@@ -738,9 +738,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

--- a/src/lread.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/lread.c	Tue May 01 23:03:36 2007 +0000
@@ -2057,7 +2057,7 @@
 
     case 's':
       c = READCHAR;
-      if (c != '-')
+      if (stringp || c != '-')
 	{
 	  UNREAD (c);
 	  return ' ';

--- a/src/macmenu.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/macmenu.c	Tue May 01 23:03:36 2007 +0000
@@ -1011,6 +1011,11 @@
       DialogItemIndex item_hit;
       Lisp_Object tem;
 
+      /* Force a redisplay before showing the dialog.  If a frame is
+	 created just before showing the dialog, its contents may not
+	 have been fully drawn.  */
+      Fredisplay (Qt);
+
       tem = Fstring_match (concat3 (build_string ("\\("),
 				    call0 (intern ("sentence-end")),
 				    build_string ("\\)\n")),
@@ -2943,6 +2948,11 @@
     first_wv = wv;
   }
 
+  /* Force a redisplay before showing the dialog.  If a frame is created
+     just before showing the dialog, its contents may not have been fully
+     drawn.  */
+  Fredisplay (Qt);
+
   /* Actually create the dialog.  */
 #if TARGET_API_MAC_CARBON
   menu_item_selection = create_and_show_dialog (f, first_wv);

--- a/src/xdisp.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/xdisp.c	Tue May 01 23:03:36 2007 +0000
@@ -13960,7 +13960,7 @@
 			 nrows_scrolled);
 
 	  /* Disable lines that must be updated.  */
-	  for (i = 0; i < it.vpos; ++i)
+	  for (i = 0; i < nrows_scrolled; ++i)
 	    (start_row + i)->enabled_p = 0;
 
 	  /* Re-compute Y positions.  */

--- a/src/xmenu.c	Tue May 01 13:23:50 2007 +0000
+++ b/src/xmenu.c	Tue May 01 23:03:36 2007 +0000
@@ -3333,6 +3333,14 @@
   /* No selection has been chosen yet.  */
   menu_item_selection = 0;
 
+  /* Force a redisplay before showing the dialog.  If a frame is created
+     just before showing the dialog, its contents may not have been fully
+     drawn, as this depends on timing of events from the X server.  Redisplay
+     is not done when a dialog is shown.  If redisplay could be done in the
+     X event loop (i.e. the X event loop does not run in a signal handler)
+     this would not be needed.  */
+  Fredisplay (Qt);
+
   /* Actually create and show the dialog.  */
   create_and_show_dialog (f, first_wv);