Bump version to 23.1.93; regenerate AUTHORS.

19 files changed, 88 insertions, 76 deletions

diff --git a/README b/README
index fe9f74fa8c4..707033c8e83 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
 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
diff --git a/configure b/configure
index cb257fa0813..96c4a72555e 100755
--- a/configure
+++ b/configure
@@ -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 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # 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 @@ if test "$ac_init_help" = "long"; then
   # 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 @@ fi
 
 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 @@ fi
 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 @@ cat >config.log <<_ACEOF
 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 @@ exec 6>&1
 # 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 @@ Report bugs to <bug-autoconf@gnu.org>."
 _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'`\\"
 
diff --git a/configure.in b/configure.in
index 6440aa5b9af..da15b64125c 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 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)
 
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 5a94155144f..ff152fdf6df 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -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},@*
diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo
index 5dcd446a090..9291d998473 100644
--- a/doc/lispref/book-spine.texinfo
+++ b/doc/lispref/book-spine.texinfo
@@ -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
 
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index dc70b5373cd..576737edc5a 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -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
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index 0513987e9c4..9144adf18b9 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -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
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 4febdbfb571..64a4113a3c7 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -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
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 52fde92c3cf..1c93f9e7648 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -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
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 768bd5426bd..9dab41e9af9 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -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
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 8fc742b97f4..72988c24c64 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -59,7 +59,7 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
   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 @@ Chip Coldwell: changed font.c
 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 Bakhash: wrote strokes.el
 
 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 @@ and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm
   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 L. Cashin: changed gnus-sum.el imap.el
 
 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 Tziperman: wrote rmail-spam-filter.el
 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 Knauel: changed gnus.el spam-report.el spam.el
 
 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 @@ Felix S. T. Wu: co-wrote vi.el (public domain)
 
 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 @@ and changed etags.c man.el delta.h etags.1 undigest.el Makefile.in
   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 @@ Glenn Morris: wrote check-declare.el
 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 @@ Jeramey Crawford: changed amdx86-64.h configure.in
 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 @@ and changed erc.el erc-track.el erc-backend.el erc-match.el erc-stamp.el
   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 @@ and changed files.el perl-mode.el
 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 @@ Jure Cuhalev: changed ispell.el
 
 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 @@ Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 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 @@ Kenichi Handa: wrote composite.el cyrillic.el isearch-x.el ps-bdf.el
   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 Rodgers: changed compile.el mailabbrev.el dired-x.el files.el
 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 changed erc.el erc-dcc.el erc-speak.el erc-bbdb.el erc-complete.el
   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 @@ Michael Albinus: wrote dbus.el tramp-cmds.el tramp-compat.el
   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 Falkner: changed nntp.el
 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 @@ Stefan Monnier: wrote bibtex-style.el css-mode.el cvs-status.el
   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 @@ and changed ewoc.el vc.el zone.el info.el Makefile.in processes.texi
 
 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 @@ and changed ps-prin1.ps ps-bdf.el ps-prin0.ps blank-mode.el ps-prin3.ps
   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
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index c38c5c7062e..368e1acb447 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .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 \
diff --git a/lisp/version.el b/lisp/version.el
index ba963eab5e9..905733a56b3 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -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))) "\
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 0448494025d..a208344fd03 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -553,7 +553,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 	<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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 	<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. -->
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index cfda6cf31c7..e0e42c66056 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -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.";
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index ad27165402b..588c1b3ce0e 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -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
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index c7f40b29324..a3148621b6d 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -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;
diff --git a/nt/emacs.rc b/nt/emacs.rc
index adbe43409dd..ff8cc421450 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #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
 	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
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index f77d44624d9..479889ee95a 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #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
 	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