Bump version to 23.2.93.

diff --git a/README b/README
index e002fced9967f2286af04d42edfb9269332c3fc6..cfc7d0b8fd4f53d90d120200d0d545e6843de320 100644 (file)
--- 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.2.92 of GNU Emacs, the extensible,
+This directory tree holds version 23.2.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 dd69fde936fbc16a9e9abb2d41849259e41f2943..c0c1753cbc6883d7455a5c1ae4ff1a45813791ea 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for emacs 23.2.92.
+# Generated by GNU Autoconf 2.67 for emacs 23.2.93.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='23.2.92'
-PACKAGE_STRING='emacs 23.2.92'
+PACKAGE_VERSION='23.2.93'
+PACKAGE_STRING='emacs 23.2.93'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1320,7 +1320,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.2.92 to adapt to many kinds of systems.
+\`configure' configures emacs 23.2.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1394,7 +1394,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 23.2.92:";;
+     short | recursive ) echo "Configuration of emacs 23.2.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1540,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 23.2.92
+emacs configure 23.2.93
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2091,7 +2091,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.2.92, which was
+It was created by emacs $as_me 23.2.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -14056,7 +14056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.2.92, which was
+This file was extended by emacs $as_me 23.2.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14122,7 +14122,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-emacs config.status 23.2.92
+emacs config.status 23.2.93
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.in b/configure.in
index dce2a6271c458b25b0197afee38617fe0b8f1c22..3bb678284e38aa643ed5624aa52753cd31d9377d 100644 (file)
--- 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.2.92)
+AC_INIT(emacs, 23.2.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 84a1a72ecb210c7928bb6ee30d69a21a875bf5d9..5332083cbfbb24860194ac65cb7366317745cb2e 100644 (file)
--- 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.2.92
+@set EMACSVER  23.2.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 d5688d592a99bb042976cd70d1700b8caa715326..8b4615a89a63b335d0939e881f0df86173baa263 100644 (file)
--- 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.2.92
+@center Emacs Version 23.2.93
 @center for Unix Users
 @sp 5
 

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 44161924188d077217eaf4a0a471acfdc6e16a7a..b33c9ae55cf033892e014422d05ae70f1328e9b5 100644 (file)
--- 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.2.92
+@set EMACSVER 23.2.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 425e09fdc2173f96815d1b6e129d5e47557a6d31..6a62e9b0dc5bb9b79c799c8c066c5efa5bd56684 100644 (file)
--- 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.2.92
+@set EMACSVER 23.2.93
 @set DATE July 2009
 
 @dircategory Emacs

diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 7d2f260c7727156800df421e292ba9f462f766e4..e872ccefa7b525b245463b65f1062bdbf5575cea 100644 (file)
--- 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.2.92
+@set EMACSVER 23.2.93
 @set DATE July 2009
 
 @dircategory Emacs

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 0279d3cbf69b167af3c927e367e45785ec66ea5d..91e8042e0e7fffc9f87d6433cb782b8102da5af7 100644 (file)
--- 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.2.92"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.93"
 .
 .
 .SH NAME

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 29533354bd855b17171bc503a3d924b292c51522..7c0f762979928350e4585417559625125b93e8c9 100644 (file)
--- 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.2.92
+@set VER 23.2.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 0e47f9c6b07583f23fd8ade0bee8af7ab4cb0914..6f691bc490c7d11890d7dea0403d1c679e490c39 100644 (file)
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -216,6 +216,8 @@ Angelo Graziosi: changed sysdep.c term.c
 
 Anna M. Bigatti: wrote cal-html.el
 
+Antoine Levitt: changed erc-track.el
+
 Ari Roponen: changed atimer.c mule.texi startup.el time-date.el
 
 Arisawa Akihiro: changed characters.el coding.c epa-file.el japan-util.el
@@ -439,8 +441,8 @@ 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 emacs.texi xterm.c keyboard.c cus-edit.el faces.el
-  Makefile.in xfaces.c misc.texi xfns.c font.c image.c startup.el
-  text.texi compile.el configure.in and 655 other files
+  Makefile.in font.c xfaces.c image.c misc.texi xfns.c startup.el
+  text.texi compile.el configure.in and 660 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -772,7 +774,7 @@ and changed complete.el
 
 Denis Stünkel: changed ibuf-ext.el
 
-Deniz Dogan: changed window.el
+Deniz Dogan: changed rcirc.el window.el
 
 Dennis Gilmore: changed sparc.h
 
@@ -1148,8 +1150,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
   calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi
-  files.el cal-china.el rmailsum.el cal-tex.el simple.el
-  and 1011 other files
+  files.el cal-china.el rmailsum.el simple.el cal-tex.el
+  and 1012 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1386,8 +1388,8 @@ Jared Finder: changed compile.el
 
 Jari Aalto: changed add-log.el filecache.el grep.el gnus-art.el
   gnus-sum.el gnus.texi ispell.el lisp-mnt.el man.el nnmail.el apropos.el
-  autorevert.el comint.el compile.el cperl-mode.el debug.el desktop.el
-  emacsclient.1 executable.el files.el find-dired.el and 15 other files
+  autorevert.el checkdoc.el comint.el compile.el cperl-mode.el debug.el
+  desktop.el emacsclient.1 executable.el files.el and 16 other files
 
 Jason Baker: changed gnus-art.el
 
@@ -1778,6 +1780,8 @@ Keiichi Suzuki: changed nntp.el
 
 Keisuke Nishida: changed print.c alloc.c bytecomp.el data.c keymap.c
 
+Keitaro Miyazaki: changed re-builder.el
+
 Keith Gabryelski: wrote hexl.c hexl.el
 
 Ken Brown: changed cygwin.h browse-url.el configure.in dired.c emacs.c
@@ -2589,7 +2593,8 @@ Peter Kleiweg: wrote ps-mode.el
 
 Peter Liljenberg: wrote elint.el
 
-Peter O'Gorman: changed configure.in frame.h hpux10-20.h termhooks.h
+Peter O'Gorman: changed configure.in frame.h hpux10-20.h hpux11.h
+  termhooks.h
 
 Peter Povinec: changed term.el
 
@@ -2712,7 +2717,7 @@ Richard G. Bielawski: changed modes.texi paren.el
 Richard Hoskins: changed message.el
 
 Richard Kim: wrote python.el
-and changed python-wy.el
+and changed loading.texi python-wy.el
 
 Richard King: wrote filelock.c uniquify.el userlock.el
 
@@ -2788,7 +2793,7 @@ Roland B. Roberts: changed buffer.h callproc.c dired.c files.el
 Roland McGrath: wrote autoload.el etags.el grep.el map-ynp.el
 and co-wrote compile.el find-dired.el
 and changed add-log.el configure.in files.el Makefile.in vc.el simple.el
-  mailabbrev.el buffer.c comint.el upd-copyr.el etags.c menu-bar.el
+  mailabbrev.el comint.el buffer.c upd-copyr.el etags.c menu-bar.el
   mem-limits.h ralloc.c fileio.c data.c process.c rlogin.el rmail.el
   shell.el vm-limit.c and 137 other files
 
@@ -2814,6 +2819,8 @@ Ronan Waide: changed smtpmail.el
 
 Ross Patterson: wrote org-protocol.el
 
+Roy Liu: changed ns-win.el
+
 Rui-Tao Dong: changed nnweb.el
 
 Rune Kleveland: changed xfns.c
@@ -2990,7 +2997,7 @@ and co-wrote font-lock.el
 and changed vc.el subr.el lisp.h keyboard.c simple.el files.el pcvs.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 909 other files
+  window.c and 910 other files
 
 Stefan Reichör: changed gnus-agent.el
 
@@ -3349,6 +3356,8 @@ and changed TUTORIAL.de Makefile.in calc.texi chinese.el czech.el emacs.1
   supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el
   china-util.el cl-macs.el cl.texi and 51 other files
 
+Werner Meisner: changed lwlib-Xm.c
+
 Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el
 
 Will Glozer: changed macterm.c

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index f7226e745c5a50593c3e13bf7228d204e74c9d1f..a642c3f4e0c9c3184d8e1737b97c2f0561b2b9b7 100644 (file)
--- 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.2.92
+VERSION                = 23.2.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/ldefs-boot.el b/lisp/ldefs-boot.el
index f0723936d1bb9a64a18c31c52a853de80265d2fe..f2e5ee7a79eb0b9685702c4c8aa1db03563133a4 100644 (file)
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -2961,7 +2961,7 @@ Obsoletes `c-forward-into-nomenclature'.
 ;;;***
 \f
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19776 49463))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3493,7 +3493,7 @@ Returns non-nil if any false statements are found.
 ;;;;;;  checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
 ;;;;;;  checkdoc-eval-current-buffer checkdoc-message-interactive
 ;;;;;;  checkdoc-interactive checkdoc checkdoc-list-of-strings-p)
-;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (19752 41642))
+;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (19770 11773))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
 (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
@@ -3905,7 +3905,7 @@ is run).
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19776 18606))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4039,8 +4039,8 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  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" (19752
-;;;;;;  41642))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19770
+;;;;;;  11773))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -6060,7 +6060,7 @@ Optional arguments are passed to `dig-invoke'.
 \f
 ;;;### (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" (19752 41900))
+;;;;;;  dired-listing-switches) "dired" "dired.el" (19772 35352))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6518,7 +6518,7 @@ Play sounds in message buffers.
 \f
 ;;;### (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" (19752 41642))
+;;;;;;  "emacs-lisp/easy-mmode.el" (19767 41074))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -6532,8 +6532,9 @@ Optional INIT-VALUE is the initial value of the mode's variable.
 Optional LIGHTER is displayed in the modeline when the mode is on.
 Optional KEYMAP is the default keymap bound to the mode keymap.
   If non-nil, it should be a variable name (whose value is a keymap),
-  a keymap, or a list of arguments for `easy-mmode-define-keymap'.
-  If KEYMAP is a keymap or list, this also defines the variable MODE-map.
+  or an expression that returns either a keymap or a list of
+  arguments for `easy-mmode-define-keymap'.  If KEYMAP is not a symbol,
+  this also defines the variable MODE-map.
 
 BODY contains code to execute each time the mode is enabled or disabled.
   It is executed after toggling the mode, and before running MODE-hook.
@@ -8732,7 +8733,7 @@ This will add a speedbar major display mode.
 ;;;***
 \f
 ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19783 2570))
 ;;; Generated autoloads from erc/erc-track.el
 
 (defvar erc-track-minor-mode nil "\
@@ -14160,7 +14161,7 @@ Example:
 ;;;;;;  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" (19752 41642))
+;;;;;;  "image-dired" "image-dired.el" (19779 1536))
 ;;; Generated autoloads from image-dired.el
 
 (autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\
@@ -15409,7 +15410,7 @@ by `jka-compr-installed'.
 
 ;;;***
 \f
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19752 41642))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19770 11773))
 ;;; Generated autoloads from progmodes/js.el
 
 (autoload 'js-mode "js" "\
@@ -17643,7 +17644,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 \f
-;;;### (autoloads (msb-mode) "msb" "msb.el" (19752 41642))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (19777 41324))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -21925,7 +21926,7 @@ them into characters should be done separately.
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (19752 41642))
+;;;;;;  "international/quail.el" (19778 61528))
 ;;; Generated autoloads from international/quail.el
 
 (autoload 'quail-title "quail" "\
@@ -22229,7 +22230,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 \f
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (19752 41642))
+;;;;;;  "net/rcirc.el" (19783 16707))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -22277,7 +22278,7 @@ See \\[compile].
 ;;;***
 \f
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19771 17123))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias 'regexp-builder 're-builder)
@@ -22863,8 +22864,8 @@ variable.
 ;;;;;;  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" (19752
-;;;;;;  41899))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19761
+;;;;;;  5822))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23316,7 +23317,7 @@ for modes derived from Text mode, like Mail mode.
 ;;;***
 \f
 ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19771 32139))
 ;;; Generated autoloads from progmodes/ruby-mode.el
 
 (autoload 'ruby-mode "ruby-mode" "\
@@ -24349,7 +24350,7 @@ If BINARY is non-nil, return a string in binary form.
 ;;;***
 \f
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (19752 41642))
+;;;;;;  (19780 34298))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload 'list-load-path-shadows "shadow" "\
@@ -32013,8 +32014,8 @@ Zone out, completely.
 ;;;;;;  "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") (19761
-;;;;;;  5801 21534))
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19783
+;;;;;;  30333 273722))
 
 ;;;***
 \f

diff --git a/lisp/version.el b/lisp/version.el
index 083722d2dd7d1ae7103195782b25cb3427146180..189d0f922ab4772eab9a6b37f23b28f1e885cf20 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
 (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.2.92" "\
+(defconst emacs-version "23.2.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 53be1dc385a9807e8682e812e7f5f0cf37facc8c..1d37957d878fe9955b0e9c33ae6ff95b50e9e468 100644 (file)
--- 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.2.92 Copyright (C) 2011 Free Software Foundation, Inc.</string>
+       <string>Emacs 23.2.93 Copyright (C) 2011 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.2.92</string>
+       <string>23.2.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 76bb53e184381f2db36ac1824425da163bd10d12..6e892f0860915b56da791b2310d9fb2834a04420 100644 (file)
--- 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.2.92";
-CFBundleGetInfoString = "Emacs version 23.2.92, NS Windowing";
+CFBundleShortVersionString = "Version 23.2.93";
+CFBundleGetInfoString = "Emacs version 23.2.93, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc.";

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 8de3ae4e96b3a5b67fa295479afd7cef0b2546a1..f846f635fec61378b9ebc94efeb4e01d820b17b8 100644 (file)
--- 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.2.92
+Version=23.2.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 a61db8c0f14fa31f832e71df60ce45e172ea6efc..d66de209b7f5b7201a82850b6b58c3a063fe0a48 100644 (file)
--- 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.2.92";
+    ApplicationRelease = "23.2.93";
     Authors = (
        "Adrian Robert (GNUstep)",
        "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 23.2.92, NS Windowing";
+    FullVersionID = "Emacs 23.2.93, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

diff --git a/nt/emacs.rc b/nt/emacs.rc
index af149c5c87800588bd416a16ead1e60e6d135083..0fd0b491be5ab951dd2034273eb61ea72a7de996 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,2,92,0
- PRODUCTVERSION 23,2,92,0
+ FILEVERSION 23,2,93,0
+ PRODUCTVERSION 23,2,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, 2, 92, 0\0"
+           VALUE "FileVersion", "23, 2, 93, 0\0"
            VALUE "InternalName", "Emacs\0"
            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "23, 2, 92, 0\0"
+           VALUE "ProductVersion", "23, 2, 93, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index b8acf03fea1b56fa1a57f49e1352936f7e50c052..0cfd3cac1b14434989f68193cc0f875c9d5ca68d 100644 (file)
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,2,92,0
- PRODUCTVERSION 23,2,92,0
+ FILEVERSION 23,2,93,0
+ PRODUCTVERSION 23,2,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, 2, 92, 0\0"
+           VALUE "FileVersion", "23, 2, 93, 0\0"
            VALUE "InternalName", "EmacsClient\0"
            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
-           VALUE "ProductVersion", "23, 2, 92, 0\0"
+           VALUE "ProductVersion", "23, 2, 93, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END