aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-02-14 23:01:16 -0500
committerChong Yidong2011-02-14 23:01:16 -0500
commit4648b91b097ad9f3dfbd8a988846293ea5a5c78c (patch)
tree697cf7c00cb27b10a1bb0fef7eaa489b1c32aa0b
parent35a7fb0b751e71320b8dd749ac4d762bab372257 (diff)
downloademacs-4648b91b097ad9f3dfbd8a988846293ea5a5c78c.tar.gz
emacs-4648b91b097ad9f3dfbd8a988846293ea5a5c78c.zip
Bump versio to 23.2.94.emacs-pretest-23.2.94
Regenerate release files.
-rw-r--r--README2
-rwxr-xr-xconfigure18
-rw-r--r--configure.in2
-rw-r--r--doc/emacs/emacs.texi2
-rw-r--r--doc/lispref/book-spine.texinfo2
-rw-r--r--doc/lispref/elisp.texi2
-rw-r--r--doc/lispref/vol1.texi2
-rw-r--r--doc/lispref/vol2.texi2
-rw-r--r--doc/man/emacs.12
-rw-r--r--doc/misc/faq.texi2
-rw-r--r--etc/AUTHORS16
-rw-r--r--lib-src/makefile.w32-in2
-rw-r--r--lisp/ldefs-boot.el32
-rw-r--r--lisp/version.el2
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Info.plist4
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings4
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop2
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist4
-rw-r--r--nt/emacs.rc8
-rw-r--r--nt/emacsclient.rc8
20 files changed, 59 insertions, 59 deletions
diff --git a/README b/README
index cfc7d0b8fd4..db6104b0e06 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
3See the end of the file for license conditions. 3See the end of the file for license conditions.
4 4
5 5
6This directory tree holds version 23.2.93 of GNU Emacs, the extensible, 6This directory tree holds version 23.2.94 of GNU Emacs, the extensible,
7customizable, self-documenting real-time display editor. 7customizable, self-documenting real-time display editor.
8 8
9The file INSTALL in this directory says how to build and install GNU 9The file INSTALL in this directory says how to build and install GNU
diff --git a/configure b/configure
index c0c1753cbc6..e87e7a184a6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for emacs 23.2.93. 3# Generated by GNU Autoconf 2.67 for emacs 23.2.94.
4# 4#
5# 5#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
549# Identity of this package. 549# Identity of this package.
550PACKAGE_NAME='emacs' 550PACKAGE_NAME='emacs'
551PACKAGE_TARNAME='emacs' 551PACKAGE_TARNAME='emacs'
552PACKAGE_VERSION='23.2.93' 552PACKAGE_VERSION='23.2.94'
553PACKAGE_STRING='emacs 23.2.93' 553PACKAGE_STRING='emacs 23.2.94'
554PACKAGE_BUGREPORT='' 554PACKAGE_BUGREPORT=''
555PACKAGE_URL='' 555PACKAGE_URL=''
556 556
@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
1320 # Omit some internal or obsolete options to make the list less imposing. 1320 # Omit some internal or obsolete options to make the list less imposing.
1321 # This message is too long to be a string in the A/UX 3.1 sh. 1321 # This message is too long to be a string in the A/UX 3.1 sh.
1322 cat <<_ACEOF 1322 cat <<_ACEOF
1323\`configure' configures emacs 23.2.93 to adapt to many kinds of systems. 1323\`configure' configures emacs 23.2.94 to adapt to many kinds of systems.
1324 1324
1325Usage: $0 [OPTION]... [VAR=VALUE]... 1325Usage: $0 [OPTION]... [VAR=VALUE]...
1326 1326
@@ -1394,7 +1394,7 @@ fi
1394 1394
1395if test -n "$ac_init_help"; then 1395if test -n "$ac_init_help"; then
1396 case $ac_init_help in 1396 case $ac_init_help in
1397 short | recursive ) echo "Configuration of emacs 23.2.93:";; 1397 short | recursive ) echo "Configuration of emacs 23.2.94:";;
1398 esac 1398 esac
1399 cat <<\_ACEOF 1399 cat <<\_ACEOF
1400 1400
@@ -1540,7 +1540,7 @@ fi
1540test -n "$ac_init_help" && exit $ac_status 1540test -n "$ac_init_help" && exit $ac_status
1541if $ac_init_version; then 1541if $ac_init_version; then
1542 cat <<\_ACEOF 1542 cat <<\_ACEOF
1543emacs configure 23.2.93 1543emacs configure 23.2.94
1544generated by GNU Autoconf 2.67 1544generated by GNU Autoconf 2.67
1545 1545
1546Copyright (C) 2010 Free Software Foundation, Inc. 1546Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@ cat >config.log <<_ACEOF
2091This file contains any messages produced by compilers while 2091This file contains any messages produced by compilers while
2092running configure, to aid debugging if configure makes a mistake. 2092running configure, to aid debugging if configure makes a mistake.
2093 2093
2094It was created by emacs $as_me 23.2.93, which was 2094It was created by emacs $as_me 23.2.94, which was
2095generated by GNU Autoconf 2.67. Invocation command line was 2095generated by GNU Autoconf 2.67. Invocation command line was
2096 2096
2097 $ $0 $@ 2097 $ $0 $@
@@ -14056,7 +14056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
14056# report actual input values of CONFIG_FILES etc. instead of their 14056# report actual input values of CONFIG_FILES etc. instead of their
14057# values after options handling. 14057# values after options handling.
14058ac_log=" 14058ac_log="
14059This file was extended by emacs $as_me 23.2.93, which was 14059This file was extended by emacs $as_me 23.2.94, which was
14060generated by GNU Autoconf 2.67. Invocation command line was 14060generated by GNU Autoconf 2.67. Invocation command line was
14061 14061
14062 CONFIG_FILES = $CONFIG_FILES 14062 CONFIG_FILES = $CONFIG_FILES
@@ -14122,7 +14122,7 @@ _ACEOF
14122cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 14122cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14123ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 14123ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14124ac_cs_version="\\ 14124ac_cs_version="\\
14125emacs config.status 23.2.93 14125emacs config.status 23.2.94
14126configured by $0, generated by GNU Autoconf 2.67, 14126configured by $0, generated by GNU Autoconf 2.67,
14127 with options \\"\$ac_cs_config\\" 14127 with options \\"\$ac_cs_config\\"
14128 14128
diff --git a/configure.in b/configure.in
index 3bb678284e3..a89d6d596de 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
22dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 22dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23 23
24AC_PREREQ(2.62) 24AC_PREREQ(2.62)
25AC_INIT(emacs, 23.2.93) 25AC_INIT(emacs, 23.2.94)
26AC_CONFIG_HEADER(src/config.h:src/config.in) 26AC_CONFIG_HEADER(src/config.h:src/config.in)
27AC_CONFIG_SRCDIR(src/lisp.h) 27AC_CONFIG_SRCDIR(src/lisp.h)
28 28
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 5332083cbfb..ec2d00e3c31 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -5,7 +5,7 @@
5 5
6@c The edition number appears in several places in this file 6@c The edition number appears in several places in this file
7@set EDITION Sixteenth 7@set EDITION Sixteenth
8@set EMACSVER 23.2.93 8@set EMACSVER 23.2.94
9 9
10@copying 10@copying
11This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* 11This 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 8b4615a89a6..9a6f549dc49 100644
--- a/doc/lispref/book-spine.texinfo
+++ b/doc/lispref/book-spine.texinfo
@@ -11,7 +11,7 @@
11@center @titlefont{GNU Emacs Lisp Reference Manual} 11@center @titlefont{GNU Emacs Lisp Reference Manual}
12@sp 5 12@sp 5
13@center GNU 13@center GNU
14@center Emacs Version 23.2.93 14@center Emacs Version 23.2.94
15@center for Unix Users 15@center for Unix Users
16@sp 5 16@sp 5
17 17
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index b33c9ae55cf..aef8229e4b4 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -8,7 +8,7 @@
8@c Please remember to update the edition number in README as well. 8@c Please remember to update the edition number in README as well.
9@c And also the copies in vol1.texi and vol2.texi. 9@c And also the copies in vol1.texi and vol2.texi.
10@set VERSION 3.0 10@set VERSION 3.0
11@set EMACSVER 23.2.93 11@set EMACSVER 23.2.94
12@set DATE July 2009 12@set DATE July 2009
13 13
14@c in general, keep the following line commented out, unless doing a 14@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 6a62e9b0dc5..9d6bb7da68c 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -27,7 +27,7 @@
27@c Version of the manual and of Emacs. 27@c Version of the manual and of Emacs.
28@c Please remember to update the edition number in README as well. 28@c Please remember to update the edition number in README as well.
29@set VERSION 3.0 29@set VERSION 3.0
30@set EMACSVER 23.2.93 30@set EMACSVER 23.2.94
31@set DATE July 2009 31@set DATE July 2009
32 32
33@dircategory Emacs 33@dircategory Emacs
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index e872ccefa7b..18027ee362f 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -27,7 +27,7 @@
27@c Version of the manual and of Emacs. 27@c Version of the manual and of Emacs.
28@c Please remember to update the edition number in README as well. 28@c Please remember to update the edition number in README as well.
29@set VERSION 3.0 29@set VERSION 3.0
30@set EMACSVER 23.2.93 30@set EMACSVER 23.2.94
31@set DATE July 2009 31@set DATE July 2009
32 32
33@dircategory Emacs 33@dircategory Emacs
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 91e8042e0e7..8f01e4a2165 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
1.\" See section COPYING for copyright and redistribution information. 1.\" See section COPYING for copyright and redistribution information.
2.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.93" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.94"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 7c0f7629799..adacecbabd1 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -5,7 +5,7 @@
5@c %**end of header 5@c %**end of header
6 6
7@c This is used in many places 7@c This is used in many places
8@set VER 23.2.93 8@set VER 23.2.94
9 9
10@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>. 10@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
11@c Feel free to install changes without prior permission (but I'd 11@c Feel free to install changes without prior permission (but I'd
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 6f691bc490c..ad9142931a6 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -169,7 +169,7 @@ Andreas Politz: changed editfns.c elp.el ido.el term.el
169 169
170Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el 170Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el
171 coding.c alloc.c process.c fileio.c print.c editfns.c fns.c dired.el 171 coding.c alloc.c process.c fileio.c print.c editfns.c fns.c dired.el
172 keyboard.c xterm.c eval.c simple.el info.el buffer.c sysdep.c emacs.c 172 keyboard.c xterm.c eval.c simple.el info.el buffer.c sysdep.c window.c
173 and 490 other files 173 and 490 other files
174 174
175Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el 175Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el
@@ -442,7 +442,7 @@ and co-wrote longlines.el
442and changed xdisp.c simple.el files.el display.texi files.texi 442and changed xdisp.c simple.el files.el display.texi files.texi
443 frames.texi emacs.texi xterm.c keyboard.c cus-edit.el faces.el 443 frames.texi emacs.texi xterm.c keyboard.c cus-edit.el faces.el
444 Makefile.in font.c xfaces.c image.c misc.texi xfns.c startup.el 444 Makefile.in font.c xfaces.c image.c misc.texi xfns.c startup.el
445 text.texi compile.el configure.in and 660 other files 445 text.texi compile.el configure.in and 664 other files
446 446
447Chris Chase: co-wrote idlw-shell.el idlwave.el 447Chris Chase: co-wrote idlw-shell.el idlwave.el
448 448
@@ -882,8 +882,8 @@ Eli Tziperman: wrote rmail-spam-filter.el
882Eli Zaretskii: wrote rxvt.el tty-colors.el 882Eli Zaretskii: wrote rxvt.el tty-colors.el
883and changed msdos.c makefile.w32-in Makefile.in files.el info.el fileio.c 883and changed msdos.c makefile.w32-in Makefile.in files.el info.el fileio.c
884 rmail.el mainmake.v2 pc-win.el simple.el startup.el config.bat msdos.h 884 rmail.el mainmake.v2 pc-win.el simple.el startup.el config.bat msdos.h
885 w32.c dired.c frame.c menu-bar.el process.c INSTALL internal.el 885 w32.c dired.c frame.c menu-bar.el process.c INSTALL internal.el xdisp.c
886 files.texi and 605 other files 886 and 606 other files
887 887
888Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el 888Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
889 gnus.el 889 gnus.el
@@ -1150,7 +1150,7 @@ Glenn Morris: wrote check-declare.el
1150and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el 1150and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
1151 cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in 1151 cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
1152 calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi 1152 calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi
1153 files.el cal-china.el rmailsum.el simple.el cal-tex.el 1153 files.el cal-china.el simple.el rmailsum.el cal-tex.el
1154 and 1012 other files 1154 and 1012 other files
1155 1155
1156Glynn Clements: wrote gamegrid.el snake.el tetris.el 1156Glynn Clements: wrote gamegrid.el snake.el tetris.el
@@ -1806,7 +1806,7 @@ Kenichi Handa: wrote composite.el cyrillic.el isearch-x.el ps-bdf.el
1806and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el 1806and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
1807and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el 1807and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el
1808 xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el 1808 xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el
1809 fns.c mule-diag.el charset.h ftfont.c ccl.c coding.h xfaces.c 1809 fns.c mule-diag.el ftfont.c charset.h ccl.c coding.h xfaces.c
1810 japanese.el and 380 other files 1810 japanese.el and 380 other files
1811 1811
1812Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el 1812Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
@@ -3164,7 +3164,7 @@ and changed ewoc.el vc.el zone.el info.el Makefile.in processes.texi
3164 3164
3165Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el 3165Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
3166 3166
3167Thierry Volpiatto: changed bookmark.el info.el 3167Thierry Volpiatto: changed bookmark.el files.el info.el
3168 3168
3169Thomas Baumann: wrote org-mhe.el 3169Thomas Baumann: wrote org-mhe.el
3170and co-wrote org-bbdb.el 3170and co-wrote org-bbdb.el
@@ -3302,7 +3302,7 @@ Ulrich Leodolter: changed w32proc.c
3302Ulrich Mueller: changed configure.in Makefile.in files.el gud.el 3302Ulrich Mueller: changed configure.in Makefile.in files.el gud.el
3303 server.el ChgPane.c ChgSel.c HELLO INSTALL XMakeAssoc.c authors.el 3303 server.el ChgPane.c ChgSel.c HELLO INSTALL XMakeAssoc.c authors.el
3304 bytecomp.el calc-units.el case-table.el configure doctor.el emacs.1 3304 bytecomp.el calc-units.el case-table.el configure doctor.el emacs.1
3305 emacs.c emacs.desktop emacsclient.c fortran.el and 14 other files 3305 emacs.c emacs.desktop emacsclient.c fortran.el and 15 other files
3306 3306
3307Ulrich Neumerkel: changed xterm.c 3307Ulrich Neumerkel: changed xterm.c
3308 3308
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index c7d58b9780c..139fd64406c 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
22 22
23.PHONY: $(ALL) 23.PHONY: $(ALL)
24 24
25VERSION = 23.2.93 25VERSION = 23.2.94
26 26
27LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ 27LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
28 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ 28 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index f2e5ee7a79e..0e3564d9664 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -2602,7 +2602,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
2602;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile 2602;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile
2603;;;;;; compile-defun byte-compile-file byte-recompile-directory 2603;;;;;; compile-defun byte-compile-file byte-recompile-directory
2604;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) 2604;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning)
2605;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19752 41642)) 2605;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19800 50267))
2606;;; Generated autoloads from emacs-lisp/bytecomp.el 2606;;; Generated autoloads from emacs-lisp/bytecomp.el
2607(put 'byte-compile-dynamic 'safe-local-variable 'booleanp) 2607(put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
2608(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) 2608(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2961,7 +2961,7 @@ Obsoletes `c-forward-into-nomenclature'.
2961;;;*** 2961;;;***
2962 2962
2963;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" 2963;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
2964;;;;;; (19776 49463)) 2964;;;;;; (19800 14993))
2965;;; Generated autoloads from progmodes/cc-engine.el 2965;;; Generated autoloads from progmodes/cc-engine.el
2966 2966
2967(autoload 'c-guess-basic-syntax "cc-engine" "\ 2967(autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3493,7 +3493,7 @@ Returns non-nil if any false statements are found.
3493;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer 3493;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
3494;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive 3494;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive
3495;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p) 3495;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p)
3496;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19770 11773)) 3496;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19798 54314))
3497;;; Generated autoloads from emacs-lisp/checkdoc.el 3497;;; Generated autoloads from emacs-lisp/checkdoc.el
3498(put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp) 3498(put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
3499(put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp) 3499(put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
@@ -4794,7 +4794,7 @@ Major mode to edit Cascading Style Sheets.
4794;;;*** 4794;;;***
4795 4795
4796;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" 4796;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
4797;;;;;; (19752 41642)) 4797;;;;;; (19798 54314))
4798;;; Generated autoloads from emulation/cua-base.el 4798;;; Generated autoloads from emulation/cua-base.el
4799 4799
4800(defvar cua-mode nil "\ 4800(defvar cua-mode nil "\
@@ -5938,7 +5938,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
5938;;;*** 5938;;;***
5939 5939
5940;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" 5940;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
5941;;;;;; "calendar/diary-lib.el" (19752 41642)) 5941;;;;;; "calendar/diary-lib.el" (19788 46601))
5942;;; Generated autoloads from calendar/diary-lib.el 5942;;; Generated autoloads from calendar/diary-lib.el
5943 5943
5944(autoload 'diary "diary-lib" "\ 5944(autoload 'diary "diary-lib" "\
@@ -7592,7 +7592,7 @@ Not documented
7592;;;*** 7592;;;***
7593 7593
7594;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el" 7594;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
7595;;;;;; (19752 41642)) 7595;;;;;; (19798 54314))
7596;;; Generated autoloads from ediff-mult.el 7596;;; Generated autoloads from ediff-mult.el
7597 7597
7598(autoload 'ediff-show-registry "ediff-mult" "\ 7598(autoload 'ediff-show-registry "ediff-mult" "\
@@ -8178,7 +8178,7 @@ Encrypt marked files.
8178;;;*** 8178;;;***
8179 8179
8180;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler) 8180;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler)
8181;;;;;; "epa-file" "epa-file.el" (19752 41642)) 8181;;;;;; "epa-file" "epa-file.el" (19797 53811))
8182;;; Generated autoloads from epa-file.el 8182;;; Generated autoloads from epa-file.el
8183 8183
8184(autoload 'epa-file-handler "epa-file" "\ 8184(autoload 'epa-file-handler "epa-file" "\
@@ -8264,7 +8264,7 @@ Minor mode to hook EasyPG into Mail mode.
8264 8264
8265;;;*** 8265;;;***
8266 8266
8267;;;### (autoloads (epg-make-context) "epg" "epg.el" (19752 41642)) 8267;;;### (autoloads (epg-make-context) "epg" "epg.el" (19797 53798))
8268;;; Generated autoloads from epg.el 8268;;; Generated autoloads from epg.el
8269 8269
8270(autoload 'epg-make-context "epg" "\ 8270(autoload 'epg-make-context "epg" "\
@@ -9572,7 +9572,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
9572 9572
9573;;;*** 9573;;;***
9574 9574
9575;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19752 41642)) 9575;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19788 46601))
9576;;; Generated autoloads from progmodes/f90.el 9576;;; Generated autoloads from progmodes/f90.el
9577 9577
9578(autoload 'f90-mode "f90" "\ 9578(autoload 'f90-mode "f90" "\
@@ -13368,7 +13368,7 @@ bound to the current value of the filter.
13368;;;*** 13368;;;***
13369 13369
13370;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) 13370;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
13371;;;;;; "ibuffer" "ibuffer.el" (19752 41900)) 13371;;;;;; "ibuffer" "ibuffer.el" (19789 64363))
13372;;; Generated autoloads from ibuffer.el 13372;;; Generated autoloads from ibuffer.el
13373 13373
13374(autoload 'ibuffer-list-buffers "ibuffer" "\ 13374(autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -20365,8 +20365,8 @@ Includes files as well as host names followed by a colon.
20365 20365
20366;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list 20366;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
20367;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete 20367;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
20368;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19752 20368;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19786
20369;;;;;; 41642)) 20369;;;;;; 56078))
20370;;; Generated autoloads from pcomplete.el 20370;;; Generated autoloads from pcomplete.el
20371 20371
20372(autoload 'pcomplete "pcomplete" "\ 20372(autoload 'pcomplete "pcomplete" "\
@@ -20706,7 +20706,7 @@ Import public keys in the current buffer.
20706;;;*** 20706;;;***
20707 20707
20708;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" 20708;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
20709;;;;;; (19752 41642)) 20709;;;;;; (19801 45655))
20710;;; Generated autoloads from pgg-gpg.el 20710;;; Generated autoloads from pgg-gpg.el
20711 20711
20712(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg" "\ 20712(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg" "\
@@ -22566,7 +22566,7 @@ With no argument, this command toggles
22566;;;*** 22566;;;***
22567 22567
22568;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" 22568;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
22569;;;;;; (19752 41642)) 22569;;;;;; (19798 54314))
22570;;; Generated autoloads from textmodes/reftex-index.el 22570;;; Generated autoloads from textmodes/reftex-index.el
22571 22571
22572(autoload 'reftex-index-phrases-mode "reftex-index" "\ 22572(autoload 'reftex-index-phrases-mode "reftex-index" "\
@@ -32014,8 +32014,8 @@ Zone out, completely.
32014;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" 32014;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
32015;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" 32015;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
32016;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" 32016;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el"
32017;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19783 32017;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19801
32018;;;;;; 30333 273722)) 32018;;;;;; 62231 520663))
32019 32019
32020;;;*** 32020;;;***
32021 32021
diff --git a/lisp/version.el b/lisp/version.el
index 189d0f922ab..aa5016960cb 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
32(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ 32(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\
33Short copyright string for this version of Emacs.") 33Short copyright string for this version of Emacs.")
34 34
35(defconst emacs-version "23.2.93" "\ 35(defconst emacs-version "23.2.94" "\
36Version numbers of this version of Emacs.") 36Version numbers of this version of Emacs.")
37 37
38(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ 38(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 1d37957d878..6ed6a9a2359 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/>.
553 <key>CFBundleExecutable</key> 553 <key>CFBundleExecutable</key>
554 <string>Emacs</string> 554 <string>Emacs</string>
555 <key>CFBundleGetInfoString</key> 555 <key>CFBundleGetInfoString</key>
556 <string>Emacs 23.2.93 Copyright (C) 2011 Free Software Foundation, Inc.</string> 556 <string>Emacs 23.2.94 Copyright (C) 2011 Free Software Foundation, Inc.</string>
557 <key>CFBundleIconFile</key> 557 <key>CFBundleIconFile</key>
558 <string>Emacs.icns</string> 558 <string>Emacs.icns</string>
559 <key>CFBundleIdentifier</key> 559 <key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
566 <string>APPL</string> 566 <string>APPL</string>
567 <!-- This should be the emacs version number. --> 567 <!-- This should be the emacs version number. -->
568 <key>CFBundleShortVersionString</key> 568 <key>CFBundleShortVersionString</key>
569 <string>23.2.93</string> 569 <string>23.2.94</string>
570 <key>CFBundleSignature</key> 570 <key>CFBundleSignature</key>
571 <string>EMAx</string> 571 <string>EMAx</string>
572 <!-- This SHOULD be a build number. --> 572 <!-- 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 6e892f08609..02ad5911e8d 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 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Emacs"; 3CFBundleName = "Emacs";
4CFBundleShortVersionString = "Version 23.2.93"; 4CFBundleShortVersionString = "Version 23.2.94";
5CFBundleGetInfoString = "Emacs version 23.2.93, NS Windowing"; 5CFBundleGetInfoString = "Emacs version 23.2.94, NS Windowing";
6NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; 6NSHumanReadableCopyright = "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 f846f635fec..cf38bab8282 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Encoding=UTF-8 2Encoding=UTF-8
3Type=Application 3Type=Application
4Version=23.2.93 4Version=23.2.94
5Categories=GNUstep 5Categories=GNUstep
6Name=Emacs 6Name=Emacs
7Comment=GNU Emacs for NeXT/Open/GNUstep and OS X 7Comment=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 d66de209b7f..45472835d85 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -2,7 +2,7 @@
2 ApplicationDescription = "GNU Emacs for GNUstep / OS X"; 2 ApplicationDescription = "GNU Emacs for GNUstep / OS X";
3 ApplicationIcon = emacs.tiff; 3 ApplicationIcon = emacs.tiff;
4 ApplicationName = Emacs; 4 ApplicationName = Emacs;
5 ApplicationRelease = "23.2.93"; 5 ApplicationRelease = "23.2.94";
6 Authors = ( 6 Authors = (
7 "Adrian Robert (GNUstep)", 7 "Adrian Robert (GNUstep)",
8 "Christophe de Dinechin (MacOS X)", 8 "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
13 ); 13 );
14 Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; 14 Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; 15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
16 FullVersionID = "Emacs 23.2.93, NS Windowing"; 16 FullVersionID = "Emacs 23.2.94, NS Windowing";
17 NSExecutable = Emacs; 17 NSExecutable = Emacs;
18 NSIcon = emacs.tiff; 18 NSIcon = emacs.tiff;
19 NSPrincipalClass = NSApplication; 19 NSPrincipalClass = NSApplication;
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 0fd0b491be5..d370bff1633 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico
7#endif 7#endif
8 8
9VS_VERSION_INFO VERSIONINFO 9VS_VERSION_INFO VERSIONINFO
10 FILEVERSION 23,2,93,0 10 FILEVERSION 23,2,94,0
11 PRODUCTVERSION 23,2,93,0 11 PRODUCTVERSION 23,2,94,0
12 FILEFLAGSMASK 0x3FL 12 FILEFLAGSMASK 0x3FL
13#ifdef EMACSDEBUG 13#ifdef EMACSDEBUG
14 FILEFLAGS 0x1L 14 FILEFLAGS 0x1L
@@ -25,12 +25,12 @@ BEGIN
25 BEGIN 25 BEGIN
26 VALUE "CompanyName", "Free Software Foundation\0" 26 VALUE "CompanyName", "Free Software Foundation\0"
27 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" 27 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
28 VALUE "FileVersion", "23, 2, 93, 0\0" 28 VALUE "FileVersion", "23, 2, 94, 0\0"
29 VALUE "InternalName", "Emacs\0" 29 VALUE "InternalName", "Emacs\0"
30 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" 30 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
31 VALUE "OriginalFilename", "emacs.exe" 31 VALUE "OriginalFilename", "emacs.exe"
32 VALUE "ProductName", "Emacs\0" 32 VALUE "ProductName", "Emacs\0"
33 VALUE "ProductVersion", "23, 2, 93, 0\0" 33 VALUE "ProductVersion", "23, 2, 94, 0\0"
34 VALUE "OLESelfRegister", "\0" 34 VALUE "OLESelfRegister", "\0"
35 END 35 END
36 END 36 END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 0cfd3cac1b1..fc1e6b12b2b 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico
5#endif 5#endif
6 6
7VS_VERSION_INFO VERSIONINFO 7VS_VERSION_INFO VERSIONINFO
8 FILEVERSION 23,2,93,0 8 FILEVERSION 23,2,94,0
9 PRODUCTVERSION 23,2,93,0 9 PRODUCTVERSION 23,2,94,0
10 FILEFLAGSMASK 0x3FL 10 FILEFLAGSMASK 0x3FL
11#ifdef EMACSDEBUG 11#ifdef EMACSDEBUG
12 FILEFLAGS 0x1L 12 FILEFLAGS 0x1L
@@ -23,12 +23,12 @@ BEGIN
23 BEGIN 23 BEGIN
24 VALUE "CompanyName", "Free Software Foundation\0" 24 VALUE "CompanyName", "Free Software Foundation\0"
25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" 25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
26 VALUE "FileVersion", "23, 2, 93, 0\0" 26 VALUE "FileVersion", "23, 2, 94, 0\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient\0" 30 VALUE "ProductName", "EmacsClient\0"
31 VALUE "ProductVersion", "23, 2, 93, 0\0" 31 VALUE "ProductVersion", "23, 2, 94, 0\0"
32 VALUE "OLESelfRegister", "\0" 32 VALUE "OLESelfRegister", "\0"
33 END 33 END
34 END 34 END