From 61a808e8197bb47dad1a78d7b032268482c45a9c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 7 May 2010 23:28:26 -0400 Subject: [PATCH] Bump version to 23.2. --- ChangeLog | 4 ++ README | 2 +- admin/ChangeLog | 4 ++ configure | 18 ++--- configure.in | 2 +- doc/emacs/ChangeLog | 4 ++ doc/emacs/emacs.texi | 2 +- doc/lispintro/ChangeLog | 4 ++ doc/lispref/ChangeLog | 4 ++ doc/lispref/book-spine.texinfo | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/vol1.texi | 2 +- doc/lispref/vol2.texi | 2 +- doc/man/ChangeLog | 4 ++ doc/man/emacs.1 | 2 +- doc/misc/ChangeLog | 4 ++ doc/misc/faq.texi | 2 +- etc/ChangeLog | 4 ++ leim/ChangeLog | 4 ++ lib-src/ChangeLog | 4 ++ lib-src/makefile.w32-in | 2 +- lisp/ChangeLog | 4 ++ lisp/erc/ChangeLog | 4 ++ lisp/ldefs-boot.el | 66 +++++++++---------- lisp/mh-e/ChangeLog | 4 ++ lisp/org/ChangeLog | 4 ++ lisp/url/ChangeLog | 4 ++ lisp/version.el | 2 +- lwlib/ChangeLog | 4 ++ msdos/ChangeLog | 4 ++ nextstep/ChangeLog | 4 ++ nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 +- .../Resources/English.lproj/InfoPlist.strings | 4 +- .../Emacs.base/Resources/Emacs.desktop | 2 +- .../Emacs.base/Resources/Info-gnustep.plist | 4 +- nt/ChangeLog | 4 ++ nt/emacs.rc | 8 +-- nt/emacsclient.rc | 8 +-- oldXMenu/ChangeLog | 4 ++ src/ChangeLog | 4 ++ test/ChangeLog | 4 ++ 41 files changed, 156 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c95a1ffee2..6b2c016534c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-03 Štěpán Němec (tiny change) * INSTALL: Fix typos. diff --git a/README b/README index 3687e4e50b3..d41304b2f2c 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.97 of GNU Emacs, the extensible, +This directory tree holds version 23.2 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/admin/ChangeLog b/admin/ChangeLog index da7ef59e8e6..56166ffa7ce 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-14 Juanma Barranquero * quick-install-emacs (PRUNED): Fix typo in message. diff --git a/configure b/configure index 1b91ebf3b76..d6ee074415e 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.97. +# Generated by GNU Autoconf 2.62 for emacs 23.2. # # 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.97' -PACKAGE_STRING='emacs 23.1.97' +PACKAGE_VERSION='23.2' +PACKAGE_STRING='emacs 23.2' 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.97 to adapt to many kinds of systems. +\`configure' configures emacs 23.2 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.97:";; + short | recursive ) echo "Configuration of emacs 23.2:";; 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.97 +emacs configure 23.2 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.97, which was +It was created by emacs $as_me 23.2, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -26269,7 +26269,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.97, which was +This file was extended by emacs $as_me 23.2, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26322,7 +26322,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -emacs config.status 23.1.97 +emacs config.status 23.2 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 1ddd7c21472..6ed14667cc0 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 . AC_PREREQ(2.62) -AC_INIT(emacs, 23.1.97) +AC_INIT(emacs, 23.2) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 2b8482cf53b..5551cc4a5e1 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-07 Chong Yidong * building.texi (GDB Graphical Interface): Remove misleading comparison diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index f19c45c740c..7d82c08a01a 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.97 +@set EMACSVER 23.2 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index e683cc1054f..e5b31e52640 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-16 Glenn Morris * emacs-lisp-intro.texi: Fix typo in name of `find-tag' command. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e331a3d5df0..93e958c0746 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-03 Štěpán Němec (tiny change) * windows.texi (Textual Scrolling): diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo index d8717350e4d..54e0a5e7170 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.97 +@center Emacs Version 23.2 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 8b6f540c460..8117e456077 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.97 +@set EMACSVER 23.2 @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 5a2719ded08..d2e4fbe9b90 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.97 +@set EMACSVER 23.2 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 74cca078cd8..df31d031577 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.97 +@set EMACSVER 23.2 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 84ce0044cea..290482b6cdc 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-09 Chong Yidong * emacs.1: Copyedits. Update options -Q, -mm and --daemon. Remove diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 87f366cb0da..a42c07ec330 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.97" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2" . . .SH NAME diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index eac91977f31..2294dc3a070 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-03 Štěpán Němec (tiny change) * url.texi (HTTP language/coding, Customization): diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 782d6e1dce1..fd1b7d335d4 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.97 +@set VER 23.2 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd diff --git a/etc/ChangeLog b/etc/ChangeLog index c881bdd2bb4..083035717ba 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-04-27 Chong Yidong * PROBLEMS: Document gcc-4.5 bug (Bug#6031). diff --git a/leim/ChangeLog b/leim/ChangeLog index d9159694565..a16f52b8c78 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-04-06 Chong Yidong * quail/vntelex.el: Fix "af" rule (Bug#5836). diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5ff764a7573..6b3584eb90f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-05 Christoph (tiny change) * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 78f09cb6d10..75c5795cb90 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.97 +VERSION = 23.2 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/ChangeLog b/lisp/ChangeLog index 33e93d80026..99bbf884752 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-05-03 Chong Yidong * international/mule.el (auto-coding-alist): Only purecopy diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index c192b3400b4..3dea16b6dbf 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-07 Vivek Dasmohapatra * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 980c3fd2517..8afe722bd2a 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -4037,8 +4037,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" (19383 -;;;;;; 49284)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19405 +;;;;;; 51439)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -5979,7 +5979,7 @@ Major mode for editing the diary file. ;;;*** ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff" -;;;;;; "diff.el" (19383 49279)) +;;;;;; "diff.el" (19419 35832)) ;;; Generated autoloads from diff.el (defvar diff-switches (purecopy "-c") "\ @@ -9886,7 +9886,7 @@ Evaluate the forms in variable `ffap-bindings'. ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively ;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find ;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) -;;;;;; "filecache" "filecache.el" (19383 49279)) +;;;;;; "filecache" "filecache.el" (19409 46567)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -9899,8 +9899,8 @@ be added to the cache. (autoload 'file-cache-add-directory-list "filecache" "\ Add DIRECTORY-LIST (a list of directory names) to the file cache. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself. +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself. \(fn DIRECTORY-LIST &optional REGEXP)" t nil) @@ -9923,10 +9923,10 @@ STRING is passed as an argument to the locate command. (autoload 'file-cache-add-directory-recursively "filecache" "\ Adds DIR and any subdirectories to the file-cache. -This function does not use any external programs +This function does not use any external programs. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself. +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself. \(fn DIR &optional REGEXP)" t nil) @@ -10044,7 +10044,7 @@ result is a string that should be ready for the command line. ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (19383 49279)) +;;;;;; (19422 11991)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb")) (purecopy '("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -14285,7 +14285,7 @@ easy-to-use form. ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (19383 49279)) +;;;;;; "image-file.el" (19422 11991)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -14347,7 +14347,7 @@ Image files are those whose name has an extension in ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (19383 49276)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19412 35030)) ;;; 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) @@ -14382,7 +14382,7 @@ displays an image file as text. `image-minor-mode' provides the key to display an image file as the actual image. You can use `image-mode-as-text' in `auto-mode-alist' when you want -to display an image file as text inititally. +to display an image file as text initially. See commands `image-mode' and `image-minor-mode' for more information on these modes. @@ -14614,7 +14614,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;;;; 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" -;;;;;; (19387 20299)) +;;;;;; (19412 35030)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -15400,7 +15400,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19383 49284)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19421 38445)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16740,7 +16740,7 @@ Returns non-nil if the new state is enabled. ;;;;;; 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" (19383 49284)) +;;;;;; "gnus/message.el" (19409 46567)) ;;; 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) @@ -25167,8 +25167,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (19383 -;;;;;; 49282)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (19412 +;;;;;; 35030)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -25286,7 +25286,7 @@ the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-oracle-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25312,7 +25312,7 @@ the variables `sql-server', `sql-user', `sql-password', and `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-sybase-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25336,7 +25336,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-informix-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25364,7 +25364,7 @@ the variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-sqlite-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25392,7 +25392,7 @@ the variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-mysql-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25417,7 +25417,7 @@ Interpreter used comes from variable `sql-solid-program'. Login uses the variables `sql-user', `sql-password', and `sql-server' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25441,7 +25441,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-ingres-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25467,7 +25467,7 @@ variables `sql-user', `sql-password', `sql-database', and `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-ms-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25493,7 +25493,7 @@ the variables `sql-database' and `sql-server' as default, if set. Additional command line parameters can be stored in the list `sql-postgres-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25523,7 +25523,7 @@ Interpreter used comes from variable `sql-interbase-program'. Login uses the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25547,7 +25547,7 @@ If buffer exists and a process is running, just switch to buffer Interpreter used comes from variable `sql-db2-program'. There is not automatic login. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. If you use \\[sql-accumulate-and-indent] to send multiline commands to @@ -25585,7 +25585,7 @@ local connections, `sql-server' refers to the server name from the for this to work). If `sql-password' is an empty string, inl will use an empty password. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. \(Type \\[describe-mode] in the SQL buffer for a list of commands.) @@ -29590,7 +29590,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc-hg.el" (19403 31656)) +;;;### (autoloads nil "vc-hg" "vc-hg.el" (19405 52797)) ;;; Generated autoloads from vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -31971,8 +31971,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") (19405 -;;;;;; 42 652971)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19428 +;;;;;; 55161 909254)) ;;;*** diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 70f96e0dbc7..b72478a32bd 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-03-22 Juanma Barranquero * mh-scan.el (mh-scan-cmd-note-width): Doc fix. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 7ce303b5add..405232742a3 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-15 Chong Yidong * org-freemind.el (org-freemind-from-org-mode-node) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 2a8c6ebe25b..a1b045213da 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-23 Chong Yidong * url-util.el: Require url-vars (Bug#5459). diff --git a/lisp/version.el b/lisp/version.el index 7439fcf1b35..bc9ff1b41ca 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.97" "\ +(defconst emacs-version "23.2" "\ 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/lwlib/ChangeLog b/lwlib/ChangeLog index 65ef9431939..efe0f3bc1c8 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2009-10-19 Dan Nicolaescu * xlwmenu.c: diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 5889f04cf2f..dfd5c41d7d5 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-19 Eli Zaretskii * INSTALL: Remove a CVS-specific note. Update for latest versions diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 6e296cfc595..9396f90a5c7 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-11 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 5bdfc0a52f6..c84b94a7864 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 . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.1.97 Copyright (C) 2010 Free Software Foundation, Inc. + Emacs 23.2 Copyright (C) 2010 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.1.97 + 23.2 CFBundleSignature EMAx 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 e6cb862e887..6f342cbfc38 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.97"; -CFBundleGetInfoString = "Emacs version 23.1.97, NS Windowing"; +CFBundleShortVersionString = "Version 23.2"; +CFBundleGetInfoString = "Emacs version 23.2, 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 a5d27abf873..e7a7311536a 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.97 +Version=23.2 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 dee27e82e4d..41888523481 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.97"; + ApplicationRelease = "23.2"; 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.97, NS Windowing"; + FullVersionID = "Emacs 23.2, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/ChangeLog b/nt/ChangeLog index 624cb960b40..b00b5b616fc 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-13 Martin Rudalics * emacsclient.rc: Fix format of "LegalCopyright" value. diff --git a/nt/emacs.rc b/nt/emacs.rc index 4ea67f4789e..46a1fb4bc76 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,97,0 - PRODUCTVERSION 23,1,97,0 + FILEVERSION 23,2,0,0 + PRODUCTVERSION 23,2,0,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, 97, 0\0" + VALUE "FileVersion", "23, 2, 0, 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, 97, 0\0" + VALUE "ProductVersion", "23, 2, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 705cae8db82..187e209e753 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,97,0 - PRODUCTVERSION 23,1,97,0 + FILEVERSION 23,2,0,0 + PRODUCTVERSION 23,2,0,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, 97, 0\0" + VALUE "FileVersion", "23, 2, 0, 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, 97, 0\0" + VALUE "ProductVersion", "23, 2, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index bdf0957ef9d..a7a1b849519 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2009-06-21 Chong Yidong * Branch for 23.1. diff --git a/src/ChangeLog b/src/ChangeLog index 29506bee67e..34d52a4442c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-04-30 Andreas Schwab * composite.c (autocmp_chars): Save point as marker before calling diff --git a/test/ChangeLog b/test/ChangeLog index da85fc4a1bf..e030322c83e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-03-29 Chong Yidong * cedet/semantic-ia-utest.el -- 2.39.2