Mercurial > emacs

changeset 108425:09e9c8115173

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 27 Feb 2010 13:17:05 +0000
parents a8944be1e493 (current diff) 528ba99a1dd3 (diff)
children fb6d984c76bf
files
diffstat 22 files changed, 249 insertions(+), 201 deletions(-) [+]
line wrap: on
line diff
--- a/README	Sat Feb 27 00:41:17 2010 +0000
+++ b/README	Sat Feb 27 13:17:05 2010 +0000
@@ -3,7 +3,7 @@
 See the end of the file for license conditions.
 
 
-This directory tree holds version 23.1.92 of GNU Emacs, the extensible,
+This directory tree holds version 23.1.93 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
--- a/configure	Sat Feb 27 00:41:17 2010 +0000
+++ b/configure	Sat Feb 27 13:17:05 2010 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for emacs 23.1.92.
+# Generated by GNU Autoconf 2.62 for emacs 23.1.93.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -594,8 +594,8 @@
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='23.1.92'
-PACKAGE_STRING='emacs 23.1.92'
+PACKAGE_VERSION='23.1.93'
+PACKAGE_STRING='emacs 23.1.93'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/lisp.h"
@@ -1371,7 +1371,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures emacs 23.1.92 to adapt to many kinds of systems.
+\`configure' configures emacs 23.1.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1445,7 +1445,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 23.1.92:";;
+     short | recursive ) echo "Configuration of emacs 23.1.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1588,7 +1588,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 23.1.92
+emacs configure 23.1.93
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1602,7 +1602,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by emacs $as_me 23.1.92, which was
+It was created by emacs $as_me 23.1.93, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -26259,7 +26259,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by emacs $as_me 23.1.92, which was
+This file was extended by emacs $as_me 23.1.93, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26312,7 +26312,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-emacs config.status 23.1.92
+emacs config.status 23.1.93
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
--- a/configure.in	Sat Feb 27 00:41:17 2010 +0000
+++ b/configure.in	Sat Feb 27 13:17:05 2010 +0000
@@ -22,7 +22,7 @@
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.62)
-AC_INIT(emacs, 23.1.92)
+AC_INIT(emacs, 23.1.93)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 
--- a/doc/emacs/emacs.texi	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/emacs/emacs.texi	Sat Feb 27 13:17:05 2010 +0000
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  23.1.92
+@set EMACSVER  23.1.93
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
--- a/doc/lispref/book-spine.texinfo	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/lispref/book-spine.texinfo	Sat Feb 27 13:17:05 2010 +0000
@@ -11,7 +11,7 @@
 @center @titlefont{GNU Emacs Lisp Reference Manual}
 @sp 5
 @center GNU
-@center Emacs Version 23.1.92
+@center Emacs Version 23.1.93
 @center for Unix Users
 @sp 5
 
--- a/doc/lispref/elisp.texi	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/lispref/elisp.texi	Sat Feb 27 13:17:05 2010 +0000
@@ -8,7 +8,7 @@
 @c Please remember to update the edition number in README as well.
 @c And also the copies in vol1.texi and vol2.texi.
 @set VERSION  3.0
-@set EMACSVER 23.1.92
+@set EMACSVER 23.1.93
 @set DATE July 2009
 
 @c in general, keep the following line commented out, unless doing a
--- a/doc/lispref/vol1.texi	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/lispref/vol1.texi	Sat Feb 27 13:17:05 2010 +0000
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 23.1.92
+@set EMACSVER 23.1.93
 @set DATE July 2009
 
 @dircategory Emacs
--- a/doc/lispref/vol2.texi	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/lispref/vol2.texi	Sat Feb 27 13:17:05 2010 +0000
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 23.1.92
+@set EMACSVER 23.1.93
 @set DATE July 2009
 
 @dircategory Emacs
--- a/doc/man/emacs.1	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/man/emacs.1	Sat Feb 27 13:17:05 2010 +0000
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.92"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.93"
 .
 .
 .SH NAME
--- a/doc/misc/faq.texi	Sat Feb 27 00:41:17 2010 +0000
+++ b/doc/misc/faq.texi	Sat Feb 27 13:17:05 2010 +0000
@@ -5,7 +5,7 @@
 @c %**end of header
 
 @c This is used in many places
-@set VER 23.1.92
+@set VER 23.1.93
 
 @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
 @c Feel free to install changes without prior permission (but I'd
--- a/etc/AUTHORS	Sat Feb 27 00:41:17 2010 +0000
+++ b/etc/AUTHORS	Sat Feb 27 13:17:05 2010 +0000
@@ -59,7 +59,7 @@
   cc-langs.el cc-mode.el cc-styles.el cc-vars.el
 and changed cc-mode.texi lread.c programs.texi lisp.el cc-subword.el
   display.texi font-lock.el isearch.el modes.texi os.texi search.texi
-  startup.el subr.el text.texi INSTALL.CVS add-log.el buffers.texi
+  startup.el subr.el text.texi INSTALL.BZR add-log.el buffers.texi
   bytecomp.el callint.c cc-fix.el cc-mode-19.el and 20 other files
 
 Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
@@ -434,9 +434,9 @@
 Chong Yidong: wrote redisplay-testsuite.el
 and co-wrote longlines.el
 and changed xdisp.c simple.el files.el display.texi files.texi
-  frames.texi keyboard.c faces.el xterm.c cus-edit.el Makefile.in
-  emacs.texi xfaces.c xfns.c font.c image.c misc.texi startup.el
-  compile.el configure.in custom.texi and 594 other files
+  frames.texi keyboard.c cus-edit.el faces.el xterm.c Makefile.in
+  emacs.texi xfaces.c font.c startup.el xfns.c image.c misc.texi
+  compile.el configure.in custom.texi and 608 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -629,12 +629,14 @@
 
 David Blacka: co-wrote nndb.el
 
+David Burger: changed macros.el
+
 David Byers: changed minibuf.c
 
 David Casperson: changed font-core.el menu-bar.el tex-mode.el
 
-David De La Harpe Golden: changed files.el simple.el mouse.el
-  cus-start.el fileio.c select.el w32-fns.el x-win.el xterm.c
+David De La Harpe Golden: changed files.el simple.el fileio.c mouse.el
+  cus-start.el select.el w32-fns.el x-win.el xterm.c
 
 David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
   mml2015.el nnfolder.el nnml.el
@@ -723,10 +725,10 @@
   no-handle.png no-handle.xpm open.png and 20 other files
 
 David Reitter: wrote mailclient.el
-and changed nsterm.m nsfns.m ns-win.el Makefile.in cus-start.el
-  macos.texi menu-bar.el nsfont.m commands.h cus-edit.el easy-mmode.el
-  emacsbug.el emacsclient.c faces.el flyspell.el info.el keyboard.c
-  keymap.c macterm.c menu.c minibuf.c and 11 other files
+and changed nsterm.m nsfns.m ns-win.el nsfont.m Makefile.in cus-start.el
+  macos.texi menu-bar.el commands.h cus-edit.el easy-mmode.el emacsbug.el
+  emacsclient.c faces.el flyspell.el info.el keyboard.c keymap.c
+  macterm.c menu.c minibuf.c and 11 other files
 
 David Robinow: changed makefile.w32-in w32inevt.c
 
@@ -825,8 +827,8 @@
 
 Ed Swarthout: changed hexl.el table.el
 
-Eduard Wiebe: changed browse-url.el flymake.texi footnote.el korean.el
-  mule-conf.el objects.texi ps-print.el vc-rcs.el
+Eduard Wiebe: changed browse-url.el flymake.texi footnote.el
+  javascript.el korean.el mule-conf.el objects.texi ps-print.el vc-rcs.el
 
 Eduardo Muñoz: changed dired.el ls-lisp.el
 
@@ -863,8 +865,8 @@
 Eli Zaretskii: wrote rxvt.el tty-colors.el
 and changed msdos.c makefile.w32-in Makefile.in files.el info.el rmail.el
   fileio.c mainmake.v2 pc-win.el startup.el config.bat simple.el msdos.h
-  dired.c w32.c frame.c internal.el menu-bar.el process.c xfaces.c
-  INSTALL and 602 other files
+  dired.c w32.c frame.c internal.el menu-bar.el process.c INSTALL
+  xfaces.c and 602 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
   gnus.el
@@ -903,14 +905,14 @@
 
 Eric M. Ludlam: wrote analyze.el args.el autoconf-edit.el bovine.el c.el
   cedet-cscope.el cedet-files.el cedet-global.el cedet-idutils.el
-  cedet-utests.el chart.el checkdoc.el compile.el complete.el cpp-root.el
+  cedet-utests.el chart.el checkdoc.el compile.el cpp-root.el
   cscope.el ctxt.el data-debug.el db-debug.el db-el.el db-file.el
   db-find.el db-global.el db-mode.el db-ref.el db-typecache.el db.el
   debug.el decorate.el dep.el dframe.el dictionary.el dired.el doc.el
   document.el ede-grammar.el ede.el edit.el eieio-base.el eieio-comp.el
   eieio-custom.el eieio-datadebug.el eieio-opt.el eieio-speedbar.el
-  eieio.el el.el emacs.el expandproto.el extract.el ezimage.el fcn.el
-  fields.el files.el filter.el filters.el find.el format.el fw.el gcc.el
+  eieio.el el.el expandproto.el extract.el ezimage.el fcn.el
+  fields.el filter.el filters.el find.el format.el fw.el gcc.el
   getset.el global.el grep.el html.el ia-sb.el ia.el idle.el idutils.el
   include.el insert.el inversion.el java.el javascript.el lex-spp.el
   lex.el linux.el list.el locate.el make.el makefile-edit.el map.el
@@ -990,6 +992,8 @@
 
 Ferenc Wagner: changed nnweb.el
 
+Filipe Cabecinhas: changed nsterm.m
+
 Flemming Hoejstrup Hansen: changed forms.el
 
 Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi
@@ -1005,6 +1009,8 @@
   rmail.el etags.el latin-alt.el sgml-mode.el data.c european.el
   filelock.c files.el generic-x.el gud.el and 45 other files
 
+Francis Devereux: changed nsfont.m
+
 Francis J. Wright: wrote woman.el
 and changed dired.el comint.el cus-edit.el files.el ps-print.el
 
@@ -1123,8 +1129,8 @@
 and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
   cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
   cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el
-  cal-china.el emacs.texi rmailsum.el startup.el cal-tex.el
-  and 968 other files
+  cal-china.el emacs.texi rmailsum.el simple.el startup.el
+  and 972 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1417,6 +1423,8 @@
 Jeremy Bertram Maitin-Shepard: changed erc.el erc-backend.el
   erc-button.el erc-track.el mml.el
 
+Jeremy Whitlock: changed python.el
+
 Jerry Frain: changed systime.h usg5-4.h
 
 Jerry James: changed format.el dns.el gnus-spec.el gnus-util.el
@@ -1594,7 +1602,7 @@
   erc-bbdb.el erc-imenu.el erc-lang.el erc-list.el erc-macs.el
   erc-menu.el and 8 other files
 
-Jose E. Marchesi: changed gomoku.el smtpmail.el
+Jose E. Marchesi: changed ada-mode.el gomoku.el smtpmail.el
 
 Joseph Arceneaux: wrote xrdb.c
 and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
@@ -1624,7 +1632,7 @@
 Juanma Barranquero: changed makefile.w32-in subr.el files.el bs.el
   faces.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
   desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el
-  keyboard.c replace.el eval.c and 922 other files
+  keyboard.c replace.el eval.c and 924 other files
 
 Juergen Hoetzel: changed url-handlers.el
 
@@ -1644,9 +1652,9 @@
 
 Juri Linkov: wrote files-x.el misearch.el
 and changed info.el isearch.el simple.el replace.el dired-aux.el
-  startup.el compile.el grep.el dired.el files.el faces.el display.texi
-  menu-bar.el descr-text.el cus-edit.el bindings.el man.el text.texi
-  dired-x.el edebug.el fill.el and 279 other files
+  startup.el grep.el compile.el dired.el files.el faces.el display.texi
+  menu-bar.el descr-text.el cus-edit.el bindings.el man.el image-mode.el
+  ispell.el text.texi dired-x.el and 280 other files
 
 Justin Bogner: changed fortune.el
 
@@ -1727,6 +1735,8 @@
 
 Kayvan Sylvan: changed supercite.el
 
+Kazuhiro Ito: changed coding.c
+
 Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
 
 Keiichi Suzuki: changed nntp.el
@@ -1756,9 +1766,9 @@
   py-punct.el pypunct-b5.el thai-word.el
 and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
 and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el
-  xterm.c xdisp.c font.c fileio.c Makefile.in mule-conf.el characters.el
-  fns.c mule-diag.el charset.h ccl.c ftfont.c xfaces.c coding.h
-  japanese.el and 376 other files
+  xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el
+  fns.c mule-diag.el ccl.c charset.h ftfont.c xfaces.c coding.h
+  japanese.el and 377 other files
 
 Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
 
@@ -1804,8 +1814,8 @@
 Kevin Ryde: wrote info-xref.el
 and changed info-look.el info.el checkdoc.el arc-mode.el cl.texi
   compilation.txt ffap.el gnus-art.el mule.el os.texi MORE.STUFF
-  browse-url.el dig.el gnus-sum.el mailcap.el man.el newst-backend.el
-  nroff-mode.el simple.el text.texi widget.texi and 71 other files
+  browse-url.el compile.el dig.el etags.c gnus-sum.el mailcap.el man.el
+  newst-backend.el nroff-mode.el simple.el and 71 other files
 
 Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
   keypad.el kmacro.el
@@ -1999,9 +2009,10 @@
   and 23 other files
 
 Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el
-  Makefile.in NXML-NEWS cc-mode.texi compilation.txt compile.el
-  esh-mode.el flymake.el gnus-group.el makefile.w32-in nxml
-  nxml-mode.texi programs.texi python.el schema timezone.el vc-bzr.el
+  vc-bzr.el Makefile.in NXML-NEWS cc-mode.texi compilation.txt compile.el
+  ede.texi eieio.texi esh-mode.el flymake.el gnus-group.el isearch.el
+  makefile.w32-in nxml nxml-mode.texi programs.texi python.el
+  and 5 other files
 
 Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el
   mh-search.el mh-customize.el mh-identity.el mh-seq.el mh-speed.el
@@ -2156,10 +2167,10 @@
   tramp-fish.el tramp-ftp.el tramp-gvfs.el tramp-gw.el tramp-smb.el
   xesam.el zeroconf.el
 and co-wrote tramp-cache.el tramp.el
-and changed tramp.texi dbusbind.c dbus.texi trampver.el trampver.texi
-  ange-ftp.el files.el files.texi tramp-vc.el Makefile.in tramp-util.el
-  tramp-uu.el dired-aux.el compile.el em-unix.el grep.el simple.el vc.el
-  configure.in fileio.c processes.texi and 49 other files
+and changed tramp.texi dbusbind.c dbus.texi ange-ftp.el trampver.el
+  trampver.texi files.el files.texi tramp-vc.el Makefile.in tramp-util.el
+  tramp-uu.el dired-aux.el tramp-imap.el compile.el em-unix.el grep.el
+  simple.el vc.el configure.in dired.el and 50 other files
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
@@ -2782,7 +2793,7 @@
 Sam Kendall: changed etags.c etags.el
 
 Sam Steingold: wrote gulp.el midnight.el
-and changed cl-indent.el compile.el vc.el vc-cvs.el font-lock.el mouse.el
+and changed cl-indent.el compile.el vc-cvs.el vc.el font-lock.el mouse.el
   simple.el ange-ftp.el pcvs.el tex-mode.el vc-hg.el add-log.el
   bindings.el bookmark.el debug.el diary-lib.el dired.el files.el grep.el
   inf-lisp.el sgml-mode.el and 108 other files
@@ -2921,9 +2932,9 @@
   vc-mtn.el
 and co-wrote font-lock.el
 and changed vc.el lisp.h subr.el keyboard.c simple.el files.el pcvs.el
-  keymap.c xdisp.c Makefile.in alloc.c vc-hooks.el newcomment.el
+  keymap.c xdisp.c Makefile.in vc-hooks.el alloc.c newcomment.el
   tex-mode.el bytecomp.el compile.el buffer.c info.el fill.el fileio.c
-  window.c and 900 other files
+  window.c and 901 other files
 
 Stefan Reichör: changed gnus-agent.el
 
@@ -3086,7 +3097,7 @@
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
-Thierry Volpiatto: changed bookmark.el
+Thierry Volpiatto: changed bookmark.el info.el
 
 Thomas Baumann: wrote org-mhe.el
 and co-wrote org-bbdb.el
@@ -3258,7 +3269,8 @@
   ps-print-def.el ps-print.ps ps-vars.el
 
 Vivek Dasmohapatra: wrote hfy-cmap.el htmlfontify.el
-and changed erc-backend.el erc.el emacs.c sh-script.el xterm.c xterm.h
+and changed erc-backend.el erc.el emacs.c erc-services.el sh-script.el
+  xterm.c xterm.h
 
 Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el
 
--- a/lib-src/makefile.w32-in	Sat Feb 27 00:41:17 2010 +0000
+++ b/lib-src/makefile.w32-in	Sat Feb 27 13:17:05 2010 +0000
@@ -22,7 +22,7 @@
 
 .PHONY: $(ALL)
 
-VERSION		= 23.1.92
+VERSION		= 23.1.93
 
 LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
--- a/lisp/ldefs-boot.el	Sat Feb 27 00:41:17 2010 +0000
+++ b/lisp/ldefs-boot.el	Sat Feb 27 13:17:05 2010 +0000
@@ -76,7 +76,7 @@
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (19291 28516))
+;;;;;;  (19312 40243))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload 'ada-add-extensions "ada-mode" "\
@@ -261,7 +261,7 @@
 
 ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice
 ;;;;;;  ad-enable-advice ad-default-compilation-action ad-redefinition-action)
-;;;;;;  "advice" "emacs-lisp/advice.el" (19291 32891))
+;;;;;;  "advice" "emacs-lisp/advice.el" (19322 43407))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action 'warn "\
@@ -801,7 +801,7 @@
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (19299 2741))
+;;;;;;  "net/ange-ftp.el" (19322 43174))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -1057,8 +1057,8 @@
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19297
-;;;;;;  60953))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19318
+;;;;;;  22201))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload 'archive-mode "arc-mode" "\
@@ -1149,8 +1149,8 @@
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19284
-;;;;;;  35873))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19315
+;;;;;;  29628))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload 'artist-mode "artist" "\
@@ -1962,7 +1962,7 @@
 ;;;;;;  bookmark-save bookmark-write bookmark-delete bookmark-insert
 ;;;;;;  bookmark-rename bookmark-insert-location bookmark-relocate
 ;;;;;;  bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark"
-;;;;;;  "bookmark.el" (19278 36335))
+;;;;;;  "bookmark.el" (19327 808))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2600,7 +2600,7 @@
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning
 ;;;;;;  byte-compile-warnings-safe-p) "bytecomp" "emacs-lisp/bytecomp.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19321 22156))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2963,7 +2963,7 @@
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19289 53536))
+;;;;;;  (19335 6619))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -2975,7 +2975,7 @@
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19335 6619))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -4037,8 +4037,8 @@
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-start-hook
-;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19278
-;;;;;;  4527))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19327
+;;;;;;  59567))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4851,7 +4851,7 @@
 ;;;;;;  customize-mode customize customize-save-variable customize-set-variable
 ;;;;;;  customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically
 ;;;;;;  custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19322 14239))
 ;;; Generated autoloads from cus-edit.el
 
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5294,7 +5294,7 @@
 ;;;***
 
 ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el"
-;;;;;;  (19278 4519))
+;;;;;;  (19322 12063))
 ;;; Generated autoloads from cedet/data-debug.el
 
 (autoload 'data-debug-new-buffer "data-debug" "\
@@ -5519,8 +5519,8 @@
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19278
-;;;;;;  4516))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19322
+;;;;;;  12603))
 ;;; Generated autoloads from delim-col.el
 
 (autoload 'delimit-columns-customize "delim-col" "\
@@ -6058,7 +6058,7 @@
 
 ;;;### (autoloads (dired-mode dired-auto-revert-buffer dired-noselect
 ;;;;;;  dired-other-frame dired-other-window dired dired-trivial-filenames
-;;;;;;  dired-listing-switches) "dired" "dired.el" (19287 12878))
+;;;;;;  dired-listing-switches) "dired" "dired.el" (19307 36715))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6423,7 +6423,7 @@
 ;;;***
 
 ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode
-;;;;;;  doc-view-mode-p) "doc-view" "doc-view.el" (19278 4516))
+;;;;;;  doc-view-mode-p) "doc-view" "doc-view.el" (19322 12465))
 ;;; Generated autoloads from doc-view.el
 
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -7239,7 +7239,7 @@
 
 ;;;***
 
-;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19278 4519))
+;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19322 43174))
 ;;; Generated autoloads from cedet/ede.el
 
 (defvar global-ede-mode nil "\
@@ -7594,7 +7594,7 @@
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (19278 4516))
+;;;;;;  "ediff-util" "ediff-util.el" (19307 36715))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -7784,7 +7784,7 @@
 
 ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer
 ;;;;;;  elint-directory elint-file) "elint" "emacs-lisp/elint.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19322 43174))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload 'elint-file "elint" "\
@@ -7800,13 +7800,13 @@
 
 (autoload 'elint-current-buffer "elint" "\
 Lint the current buffer.
-If necessary, this first calls `elint-initalize'.
+If necessary, this first calls `elint-initialize'.
 
 \(fn)" t nil)
 
 (autoload 'elint-defun "elint" "\
 Lint the function at point.
-If necessary, this first calls `elint-initalize'.
+If necessary, this first calls `elint-initialize'.
 
 \(fn)" t nil)
 
@@ -8673,7 +8673,7 @@
 ;;;***
 
 ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
-;;;;;;  "erc-services" "erc/erc-services.el" (19278 4522))
+;;;;;;  "erc-services" "erc/erc-services.el" (19310 24286))
 ;;; Generated autoloads from erc/erc-services.el
  (autoload 'erc-services-mode "erc-services" nil t)
 
@@ -8801,7 +8801,7 @@
 ;;;***
 
 ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell"
-;;;;;;  "eshell/eshell.el" (19278 4522))
+;;;;;;  "eshell/eshell.el" (19329 34899))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload 'eshell "eshell" "\
@@ -9561,7 +9561,7 @@
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19278 4527))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19327 809))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload 'f90-mode "f90" "\
@@ -9822,7 +9822,7 @@
 ;;;***
 
 ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (19278 4516))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (19318 22201))
 ;;; Generated autoloads from ffap.el
 
 (autoload 'ffap-next "ffap" "\
@@ -9868,6 +9868,7 @@
 
 (autoload 'dired-at-point "ffap" "\
 Start Dired, defaulting to file at point.  See `ffap'.
+If `dired-at-point-require-prefix' is set, the prefix meaning is reversed.
 
 \(fn &optional FILENAME)" t nil)
 
@@ -10458,7 +10459,7 @@
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (19278 4528))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19319 39351))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\
@@ -10528,7 +10529,7 @@
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19321 25921))
 ;;; Generated autoloads from follow.el
 
 (autoload 'turn-on-follow-mode "follow" "\
@@ -10781,7 +10782,7 @@
 ;;;***
 
 ;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19327 809))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload 'gdb "gdb-ui" "\
@@ -11128,7 +11129,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19334 38589))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11818,7 +11819,7 @@
 
 ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19278 4527))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19302 10642))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -13365,7 +13366,7 @@
 
 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (19278 4519))
+;;;;;;  "calendar/icalendar.el" (19327 809))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload 'icalendar-export-file "icalendar" "\
@@ -14313,7 +14314,7 @@
 ;;;***
 
 ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
-;;;;;;  image-mode) "image-mode" "image-mode.el" (19278 4517))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (19308 49976))
 ;;; Generated autoloads from image-mode.el
  (push (cons (purecopy "\\.jpe?g\\'")    'image-mode) auto-mode-alist)
  (push (cons (purecopy "\\.png\\'")      'image-mode) auto-mode-alist)
@@ -14580,7 +14581,7 @@
 ;;;;;;  Info-goto-emacs-command-node Info-mode info-finder info-apropos
 ;;;;;;  Info-index Info-directory Info-on-current-buffer info-standalone
 ;;;;;;  info-emacs-manual info info-other-window) "info" "info.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19315 29628))
 ;;; Generated autoloads from info.el
 
 (autoload 'info-other-window "info" "\
@@ -15021,7 +15022,7 @@
 ;;;;;;  ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary)
-;;;;;;  "ispell" "textmodes/ispell.el" (19279 36174))
+;;;;;;  "ispell" "textmodes/ispell.el" (19307 36715))
 ;;; Generated autoloads from textmodes/ispell.el
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
 
@@ -15239,8 +15240,8 @@
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19314
+;;;;;;  31189))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -16102,7 +16103,7 @@
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19314 30682))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16155,7 +16156,7 @@
 ;;;***
 
 ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro
-;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19278 4517))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19307 36715))
 ;;; Generated autoloads from macros.el
 
 (autoload 'name-last-kbd-macro "macros" "\
@@ -16308,7 +16309,7 @@
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable-region mail-quote-printable
 ;;;;;;  mail-file-babyl-p mail-use-rfc822) "mail-utils" "mail/mail-utils.el"
-;;;;;;  (19291 28516))
+;;;;;;  (19307 36715))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -16348,7 +16349,9 @@
 Undo the \"quoted printable\" encoding in buffer from BEG to END.
 If the optional argument WRAPPER is non-nil,
 we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=.
-If NOERROR is non-nil, return t if successful.
+On encountering malformed quoted-printable text, exits with an error,
+unless NOERROR is non-nil, in which case it continues, and returns nil
+when finished.  Returns non-nil on successful completion.
 If UNIBYTE is non-nil, insert converted characters as unibyte.
 That is useful if you are going to character code decoding afterward,
 as Rmail does.
@@ -16601,7 +16604,7 @@
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (19278 4517))
+;;;### (autoloads (man-follow man) "man" "man.el" (19322 43174))
 ;;; Generated autoloads from man.el
 
 (defalias 'manual-entry 'man)
@@ -16704,7 +16707,7 @@
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
-;;;;;;  "gnus/message.el" (19283 41278))
+;;;;;;  "gnus/message.el" (19335 63611))
 ;;; Generated autoloads from gnus/message.el
 
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17760,7 +17763,7 @@
 ;;;;;;  coding-system-translation-table-for-decode coding-system-pre-write-conversion
 ;;;;;;  coding-system-post-read-conversion lookup-nested-alist set-nested-alist
 ;;;;;;  truncate-string-to-width store-substring string-to-sequence)
-;;;;;;  "mule-util" "international/mule-util.el" (19278 4524))
+;;;;;;  "mule-util" "international/mule-util.el" (19312 40161))
 ;;; Generated autoloads from international/mule-util.el
 
 (autoload 'string-to-sequence "mule-util" "\
@@ -17870,6 +17873,7 @@
 operations such as `find-coding-systems-region'.
 
 \(fn CODING-SYSTEMS &rest BODY)" nil (quote macro))
+(put 'with-coding-priority 'lisp-indent-function 1)
 
 (autoload 'detect-coding-with-priority "mule-util" "\
 Detect a coding system of the text between FROM and TO with PRIORITY-LIST.
@@ -18417,8 +18421,8 @@
 
 ;;;***
 
-;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19282
-;;;;;;  15364))
+;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19320
+;;;;;;  55181))
 ;;; Generated autoloads from nxml/nxml-mode.el
 
 (autoload 'nxml-mode "nxml-mode" "\
@@ -19393,7 +19397,7 @@
 ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree
 ;;;;;;  org-freemind-from-org-mode org-freemind-from-org-mode-node
 ;;;;;;  org-freemind-show org-export-as-freemind) "org-freemind"
-;;;;;;  "org/org-freemind.el" (19278 4526))
+;;;;;;  "org/org-freemind.el" (19321 2184))
 ;;; Generated autoloads from org/org-freemind.el
 
 (autoload 'org-export-as-freemind "org-freemind" "\
@@ -19953,7 +19957,7 @@
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19322 43174))
 ;;; Generated autoloads from outline.el
 (put 'outline-regexp 'safe-local-variable 'string-or-null-p)
 
@@ -21734,7 +21738,7 @@
 ;;;***
 
 ;;;### (autoloads (python-shell jython-mode python-mode run-python)
-;;;;;;  "python" "progmodes/python.el" (19293 49653))
+;;;;;;  "python" "progmodes/python.el" (19336 25572))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -22811,8 +22815,8 @@
 ;;;;;;  rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
 ;;;;;;  rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
 ;;;;;;  rmail-dont-reply-to-names rmail-user-mail-address-regexp
-;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19291
-;;;;;;  28516))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19307
+;;;;;;  36715))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23727,7 +23731,7 @@
 ;;;***
 
 ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
-;;;;;;  "cedet/semantic.el" (19284 35872))
+;;;;;;  "cedet/semantic.el" (19322 11780))
 ;;; Generated autoloads from cedet/semantic.el
 
 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -23779,7 +23783,7 @@
 ;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name
 ;;;;;;  mail-header-separator send-mail-function mail-interactive
 ;;;;;;  mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;;  "sendmail" "mail/sendmail.el" (19283 39841))
+;;;;;;  "sendmail" "mail/sendmail.el" (19335 63611))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -23833,6 +23837,7 @@
 `message-send-mail-function' for use with the Message package.")
 
 (custom-autoload 'send-mail-function "sendmail" t)
+(custom-initialize-delay 'send-mail-function nil)
 
 (defvar mail-header-separator (purecopy "--text follows this line--") "\
 Line used to separate headers from text in messages being composed.")
@@ -26673,7 +26678,7 @@
 ;;;;;;  tex-start-commands tex-start-options slitex-run-command latex-run-command
 ;;;;;;  tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
 ;;;;;;  tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19322 43578))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -27955,7 +27960,7 @@
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
-;;;;;;  "net/tramp.el" (19299 11838))
+;;;;;;  "net/tramp.el" (19330 42052))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-mode t "\
@@ -29457,7 +29462,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "vc-bzr" "vc-bzr.el" (19299 35601))
+;;;### (autoloads nil "vc-bzr" "vc-bzr.el" (19324 59407))
 ;;; Generated autoloads from vc-bzr.el
 
 (defconst vc-bzr-admin-dirname ".bzr" "\
@@ -29472,7 +29477,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (19278 4518))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (19327 809))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -29598,7 +29603,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (19297 48769))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (19308 49976))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
@@ -30733,7 +30738,7 @@
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19320 64906))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -31738,45 +31743,46 @@
 ;;;;;;  "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el"
 ;;;;;;  "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el"
 ;;;;;;  "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el"
-;;;;;;  "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el"
-;;;;;;  "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el"
-;;;;;;  "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el"
-;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
-;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
-;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-undo.el"
-;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
-;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
-;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el"
-;;;;;;  "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el"
-;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el"
-;;;;;;  "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el"
-;;;;;;  "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el"
-;;;;;;  "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el"
-;;;;;;  "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
+;;;;;;  "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el"
+;;;;;;  "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el"
+;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el"
+;;;;;;  "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el"
+;;;;;;  "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el"
+;;;;;;  "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el"
+;;;;;;  "calc/calc-undo.el" "calc/calc-units.el" "calc/calc-vec.el"
+;;;;;;  "calc/calc-yank.el" "calc/calcalg2.el" "calc/calcalg3.el"
+;;;;;;  "calc/calccomp.el" "calc/calcsel2.el" "calendar/cal-bahai.el"
+;;;;;;  "calendar/cal-coptic.el" "calendar/cal-french.el" "calendar/cal-html.el"
+;;;;;;  "calendar/cal-islam.el" "calendar/cal-iso.el" "calendar/cal-julian.el"
+;;;;;;  "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" "calendar/cal-menu.el"
+;;;;;;  "calendar/cal-move.el" "calendar/cal-persia.el" "calendar/cal-tex.el"
+;;;;;;  "calendar/cal-x.el" "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el"
+;;;;;;  "cdl.el" "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
 ;;;;;;  "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/autoconf-edit.el"
 ;;;;;;  "cedet/ede/cpp-root.el" "cedet/ede/dired.el" "cedet/ede/emacs.el"
-;;;;;;  "cedet/ede/files.el" "cedet/ede/linux.el" "cedet/ede/locate.el"
-;;;;;;  "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el"
-;;;;;;  "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el"
-;;;;;;  "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el"
-;;;;;;  "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el"
-;;;;;;  "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el"
-;;;;;;  "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el"
-;;;;;;  "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el"
-;;;;;;  "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el"
-;;;;;;  "cedet/mode-local.el" "cedet/pulse.el" "cedet/semantic/analyze.el"
-;;;;;;  "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el"
-;;;;;;  "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el"
-;;;;;;  "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el"
-;;;;;;  "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el"
-;;;;;;  "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el"
-;;;;;;  "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el"
-;;;;;;  "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el"
-;;;;;;  "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el"
-;;;;;;  "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el"
-;;;;;;  "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el"
-;;;;;;  "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el"
-;;;;;;  "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
+;;;;;;  "cedet/ede/files.el" "cedet/ede/linux.el" "cedet/ede/loaddefs.el"
+;;;;;;  "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el"
+;;;;;;  "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el"
+;;;;;;  "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el"
+;;;;;;  "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el"
+;;;;;;  "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el"
+;;;;;;  "cedet/ede/proj.el" "cedet/ede/project-am.el" "cedet/ede/shell.el"
+;;;;;;  "cedet/ede/simple.el" "cedet/ede/source.el" "cedet/ede/speedbar.el"
+;;;;;;  "cedet/ede/srecode.el" "cedet/ede/system.el" "cedet/ede/util.el"
+;;;;;;  "cedet/inversion.el" "cedet/mode-local.el" "cedet/pulse.el"
+;;;;;;  "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el"
+;;;;;;  "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el"
+;;;;;;  "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el"
+;;;;;;  "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el"
+;;;;;;  "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el"
+;;;;;;  "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el"
+;;;;;;  "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el"
+;;;;;;  "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el"
+;;;;;;  "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el"
+;;;;;;  "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el"
+;;;;;;  "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el"
+;;;;;;  "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el"
+;;;;;;  "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
 ;;;;;;  "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el"
 ;;;;;;  "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el"
 ;;;;;;  "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el"
@@ -31784,7 +31790,7 @@
 ;;;;;;  "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
 ;;;;;;  "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
 ;;;;;;  "cedet/semantic/idle.el" "cedet/semantic/java.el" "cedet/semantic/lex-spp.el"
-;;;;;;  "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
+;;;;;;  "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" "cedet/semantic/mru-bookmark.el"
 ;;;;;;  "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
 ;;;;;;  "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
 ;;;;;;  "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
@@ -31802,18 +31808,18 @@
 ;;;;;;  "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el"
 ;;;;;;  "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el"
 ;;;;;;  "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el"
-;;;;;;  "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el"
-;;;;;;  "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el"
-;;;;;;  "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el"
-;;;;;;  "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el"
-;;;;;;  "dos-w32.el" "ediff-diff.el" "ediff-init.el" "ediff-merg.el"
-;;;;;;  "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el" "electric.el"
-;;;;;;  "emacs-lisp/assoc.el" "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el"
-;;;;;;  "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/chart.el"
-;;;;;;  "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el"
-;;;;;;  "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el"
-;;;;;;  "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-comp.el"
-;;;;;;  "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
+;;;;;;  "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el"
+;;;;;;  "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el"
+;;;;;;  "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el"
+;;;;;;  "cus-dep.el" "cus-load.el" "dframe.el" "dired-aux.el" "dired-x.el"
+;;;;;;  "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el"
+;;;;;;  "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el"
+;;;;;;  "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
+;;;;;;  "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el"
+;;;;;;  "emacs-lisp/chart.el" "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el"
+;;;;;;  "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el"
+;;;;;;  "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el"
+;;;;;;  "emacs-lisp/eieio-comp.el" "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
 ;;;;;;  "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el"
 ;;;;;;  "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
 ;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/lmenu.el" "emacs-lisp/regi.el"
@@ -31830,18 +31836,19 @@
 ;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
 ;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
 ;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-io.el"
-;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
-;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "foldout.el"
-;;;;;;  "font-setting.el" "format-spec.el" "forms-d2.el" "forms-pass.el"
-;;;;;;  "fringe.el" "generic-x.el" "gnus/auth-source.el" "gnus/compface.el"
-;;;;;;  "gnus/gnus-async.el" "gnus/gnus-bcklg.el" "gnus/gnus-cite.el"
-;;;;;;  "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el"
-;;;;;;  "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-int.el"
-;;;;;;  "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el"
-;;;;;;  "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el"
-;;;;;;  "gnus/gnus-sum.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el"
-;;;;;;  "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el"
+;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
+;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
+;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
+;;;;;;  "ezimage.el" "finder-inf.el" "foldout.el" "font-setting.el"
+;;;;;;  "format-spec.el" "forms-d2.el" "forms-pass.el" "fringe.el"
+;;;;;;  "generic-x.el" "gnus/auth-source.el" "gnus/compface.el" "gnus/gnus-async.el"
+;;;;;;  "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
+;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el"
+;;;;;;  "gnus/gnus-ems.el" "gnus/gnus-int.el" "gnus/gnus-logic.el"
+;;;;;;  "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el"
+;;;;;;  "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-sum.el"
+;;;;;;  "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el"
+;;;;;;  "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el"
 ;;;;;;  "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el"
 ;;;;;;  "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el"
 ;;;;;;  "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-encode.el"
@@ -31923,8 +31930,8 @@
 ;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
 ;;;;;;  "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
 ;;;;;;  "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19299
-;;;;;;  37261 473427))
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19336
+;;;;;;  35929 287335))
 
 ;;;***
 
--- a/lisp/version.el	Sat Feb 27 00:41:17 2010 +0000
+++ b/lisp/version.el	Sat Feb 27 13:17:05 2010 +0000
@@ -32,7 +32,7 @@
 (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.1.92" "\
+(defconst emacs-version "23.1.93" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Sat Feb 27 00:41:17 2010 +0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Sat Feb 27 13:17:05 2010 +0000
@@ -553,7 +553,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Emacs</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Emacs 23.1.92 Copyright (C) 2010 Free Software Foundation, Inc.</string>
+	<string>Emacs 23.1.93 Copyright (C) 2010 Free Software Foundation, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>Emacs.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@
 	<string>APPL</string>
 	<!-- This should be the emacs version number. -->
 	<key>CFBundleShortVersionString</key>
-	<string>23.1.92</string>
+	<string>23.1.93</string>
 	<key>CFBundleSignature</key>
 	<string>EMAx</string>
 	<!-- This SHOULD be a build number. -->
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Sat Feb 27 00:41:17 2010 +0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Sat Feb 27 13:17:05 2010 +0000
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "Version 23.1.92";
-CFBundleGetInfoString = "Emacs version 23.1.92, NS Windowing";
+CFBundleShortVersionString = "Version 23.1.93";
+CFBundleGetInfoString = "Emacs version 23.1.93, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop	Sat Feb 27 00:41:17 2010 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop	Sat Feb 27 13:17:05 2010 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=23.1.92
+Version=23.1.93
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Sat Feb 27 00:41:17 2010 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Sat Feb 27 13:17:05 2010 +0000
@@ -2,7 +2,7 @@
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "23.1.92";
+    ApplicationRelease = "23.1.93";
     Authors = (
 	"Adrian Robert (GNUstep)",
 	"Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 23.1.92, NS Windowing";
+    FullVersionID = "Emacs 23.1.93, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;
--- a/nt/emacs.rc	Sat Feb 27 00:41:17 2010 +0000
+++ b/nt/emacs.rc	Sat Feb 27 13:17:05 2010 +0000
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,1,92,0
- PRODUCTVERSION 23,1,92,0
+ FILEVERSION 23,1,93,0
+ PRODUCTVERSION 23,1,93,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -25,12 +25,12 @@
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-	    VALUE "FileVersion", "23, 1, 92, 0\0"
+	    VALUE "FileVersion", "23, 1, 93, 0\0"
 	    VALUE "InternalName", "Emacs\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs\0"
-	    VALUE "ProductVersion", "23, 1, 92, 0\0"
+	    VALUE "ProductVersion", "23, 1, 93, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
--- a/nt/emacsclient.rc	Sat Feb 27 00:41:17 2010 +0000
+++ b/nt/emacsclient.rc	Sat Feb 27 13:17:05 2010 +0000
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,1,92,0
- PRODUCTVERSION 23,1,92,0
+ FILEVERSION 23,1,93,0
+ PRODUCTVERSION 23,1,93,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
-	    VALUE "FileVersion", "23, 1, 92, 0\0"
+	    VALUE "FileVersion", "23, 1, 93, 0\0"
 	    VALUE "InternalName", "EmacsClient\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
 	    VALUE "OriginalFilename", "emacsclientw.exe"
 	    VALUE "ProductName", "EmacsClient\0"
-	    VALUE "ProductVersion", "23, 1, 92, 0\0"
+	    VALUE "ProductVersion", "23, 1, 93, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
--- a/src/ChangeLog	Sat Feb 27 00:41:17 2010 +0000
+++ b/src/ChangeLog	Sat Feb 27 13:17:05 2010 +0000
@@ -1,3 +1,8 @@
+2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* font.c (font_parse_fcname): Recognize "Book", "Condensed",
+	"Medium", and "Semi-Condensed" keywords in GTK names (Bug#5646).
+
 2010-02-26  Kenichi Handa  <handa@m17n.org>
 
 	* ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec.
--- a/src/font.c	Sat Feb 27 00:41:17 2010 +0000
+++ b/src/font.c	Sat Feb 27 13:17:05 2010 +0000
@@ -1576,6 +1576,18 @@
 	      prop = font_intern_prop ("light", 5, 1);
 	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
 	    }
+	  else if (PROP_MATCH ("Book", 4))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("book", 4, 1);
+	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+	    }
+	  else if (PROP_MATCH ("Medium", 6))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("medium", 6, 1);
+	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+	    }
 	  else if (PROP_MATCH ("Semi-Bold", 9))
 	    {
 	      prop_found = 1;
@@ -1600,6 +1612,18 @@
 	      prop = font_intern_prop ("oblique", 7, 1);
 	      FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
 	    }
+	  else if (PROP_MATCH ("Semi-Condensed", 14))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("semi-condensed", 14, 1);
+	      FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+	    }
+	  else if (PROP_MATCH ("Condensed", 9))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("condensed", 9, 1);
+	      FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+	    }
 	  else {
 	    if (prop_found)
 	      return -1; /* Unknown property in GTK-style font name.  */