Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99643. ------------------------------------------------------------ revno: 99643 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-03-10 22:20:24 -0800 message: * cus-edit.el (customize-changed-options-previous-release): Bump to 23.1. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-11 06:17:08 +0000 +++ lisp/ChangeLog 2010-03-11 06:20:24 +0000 @@ -1,5 +1,8 @@ 2010-03-11 Glenn Morris + * cus-edit.el (customize-changed-options-previous-release): + Bump to 23.1. + * image.el (image-animate-max-time): Fix :version tag. 2010-03-10 Chong Yidong === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2010-02-16 14:35:45 +0000 +++ lisp/cus-edit.el 2010-03-11 06:20:24 +0000 @@ -1136,7 +1136,7 @@ (unless (eq symbol basevar) (message "`%s' is an alias for `%s'" symbol basevar)))) -(defvar customize-changed-options-previous-release "22.1" +(defvar customize-changed-options-previous-release "23.1" "Version for `customize-changed-options' to refer back to by default.") ;; Packages will update this variable, so make it available. ------------------------------------------------------------ revno: 99642 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-03-10 22:17:08 -0800 message: Minor animated image housekeeping. * image.el (image-animate-max-time): Fix :version tag. * NEWS: Add animated image placeholder entry. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-03-11 06:10:50 +0000 +++ etc/NEWS 2010-03-11 06:17:08 +0000 @@ -36,6 +36,8 @@ * Changes in Specialized Modes and Packages in Emacs 24.1 +** FIXME animated image API + * New Modes and Packages in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-10 15:17:13 +0000 +++ lisp/ChangeLog 2010-03-11 06:17:08 +0000 @@ -1,3 +1,7 @@ +2010-03-11 Glenn Morris + + * image.el (image-animate-max-time): Fix :version tag. + 2010-03-10 Chong Yidong * Branch for 23.2. === modified file 'lisp/image.el' --- lisp/image.el 2010-03-07 19:02:20 +0000 +++ lisp/image.el 2010-03-11 06:17:08 +0000 @@ -1,7 +1,7 @@ ;;; image.el --- image API -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: multimedia @@ -590,7 +590,7 @@ (defcustom image-animate-max-time 30 "Time in seconds to animate images." :type 'integer - :version "22.1" + :version "24.1" :group 'image) (defconst image-animated-types '(gif) ------------------------------------------------------------ revno: 99641 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-03-10 22:10:50 -0800 message: Rotate NEWS to NEWS.23, create new NEWS for Emacs 24. diff: === added file 'etc/NEWS' --- etc/NEWS 1970-01-01 00:00:00 +0000 +++ etc/NEWS 2010-03-11 06:10:50 +0000 @@ -0,0 +1,72 @@ +GNU Emacs NEWS -- history of user-visible changes. + +Copyright (C) 2010 Free Software Foundation, Inc. +See the end of the file for license conditions. + +Please send Emacs bug reports to bug-gnu-emacs@gnu.org. +If possible, use M-x report-emacs-bug. + +This file is about changes in Emacs version 24. + +See files NEWS.23, NEWS.22, NEWS.21, NEWS.20, NEWS.19, NEWS.18, +and NEWS.1-17 for changes in older Emacs versions. + +You can narrow news to a specific version by calling `view-emacs-news' +with a prefix argument or by typing C-u C-h C-n. + + +Temporary note: + +++ indicates that the appropriate manual has already been updated. + --- means no change in the manuals is called for. +When you add a new item, please add it without either +++ or --- +so we will look at it and add it to the manual. + + +* Installation Changes in Emacs 24.1 + + +* Startup Changes in Emacs 24.1 + + +* Changes in Emacs 24.1 + + +* Editing Changes in Emacs 24.1 + + +* Changes in Specialized Modes and Packages in Emacs 24.1 + + +* New Modes and Packages in Emacs 24.1 + + +* Incompatible Lisp Changes in Emacs 24.1 + + +* Lisp changes in Emacs 24.1 + + +* Changes in Emacs 24.1 on non-free operating systems + + +---------------------------------------------------------------------- +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . + + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +end: === renamed file 'etc/NEWS' => 'etc/NEWS.23' ------------------------------------------------------------ revno: 99640 committer: Chong Yidong branch nick: trunk timestamp: Wed 2010-03-10 10:17:13 -0500 message: Bump version to 24.0.50. diff: === modified file 'ChangeLog' --- ChangeLog 2010-01-31 21:28:22 +0000 +++ ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-01-31 Juri Linkov * .bzrignore: Add TAGS-LISP. === modified file 'README' --- README 2010-02-27 03:09:45 +0000 +++ README 2010-03-10 15:17:13 +0000 @@ -3,7 +3,7 @@ See the end of the file for license conditions. -This directory tree holds version 23.1.93 of GNU Emacs, the extensible, +This directory tree holds version 24.0.50 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 === modified file 'admin/ChangeLog' --- admin/ChangeLog 2010-03-10 14:16:06 +0000 +++ admin/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-10 Miles Bader * quick-install-emacs: Use more portable shell syntax. === modified file 'configure.in' --- configure.in 2010-02-27 03:09:45 +0000 +++ configure.in 2010-03-10 15:17:13 +0000 @@ -22,7 +22,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.62) -AC_INIT(emacs, 23.1.93) +AC_INIT(emacs, 24.0.50) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-03-06 19:02:49 +0000 +++ doc/emacs/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-06 Chong Yidong * custom.texi (Init Examples): Add xref to Locals. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2010-02-27 03:09:45 +0000 +++ doc/emacs/emacs.texi 2010-03-10 15:17:13 +0000 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 23.1.93 +@set EMACSVER 24.0.50 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2010-02-16 02:38:00 +0000 +++ doc/lispintro/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-16 Glenn Morris * emacs-lisp-intro.texi: Fix typo in name of `find-tag' command. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-03-06 20:27:19 +0000 +++ doc/lispref/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-06 Chong Yidong * objects.texi (Integer Type): Take note of the read syntax === modified file 'doc/lispref/book-spine.texinfo' --- doc/lispref/book-spine.texinfo 2010-02-27 03:09:45 +0000 +++ doc/lispref/book-spine.texinfo 2010-03-10 15:17:13 +0000 @@ -11,7 +11,7 @@ @center @titlefont{GNU Emacs Lisp Reference Manual} @sp 5 @center GNU -@center Emacs Version 23.1.93 +@center Emacs Version 24.0.50 @center for Unix Users @sp 5 === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2010-02-27 03:09:45 +0000 +++ doc/lispref/elisp.texi 2010-03-10 15:17:13 +0000 @@ -8,7 +8,7 @@ @c Please remember to update the edition number in README as well. @c And also the copies in vol1.texi and vol2.texi. @set VERSION 3.0 -@set EMACSVER 23.1.93 +@set EMACSVER 24.0.50 @set DATE July 2009 @c in general, keep the following line commented out, unless doing a === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2010-02-27 03:09:45 +0000 +++ doc/lispref/vol1.texi 2010-03-10 15:17:13 +0000 @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.93 +@set EMACSVER 24.0.50 @set DATE July 2009 @dircategory Emacs === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2010-02-27 03:09:45 +0000 +++ doc/lispref/vol2.texi 2010-03-10 15:17:13 +0000 @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.93 +@set EMACSVER 24.0.50 @set DATE July 2009 @dircategory Emacs === modified file 'doc/man/ChangeLog' --- doc/man/ChangeLog 2010-01-13 08:35:10 +0000 +++ doc/man/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-01-09 Chong Yidong * emacs.1: Copyedits. Update options -Q, -mm and --daemon. Remove === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2010-02-27 03:09:45 +0000 +++ doc/man/emacs.1 2010-03-10 15:17:13 +0000 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.93" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.50" . . .SH NAME === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-03-03 02:44:52 +0000 +++ doc/misc/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-03 Chong Yidong * faq.texi (Escape sequences in shell output): Note that ansi-color is === modified file 'doc/misc/faq.texi' --- doc/misc/faq.texi 2010-03-03 02:44:52 +0000 +++ doc/misc/faq.texi 2010-03-10 15:17:13 +0000 @@ -5,7 +5,7 @@ @c %**end of header @c This is used in many places -@set VER 23.1.93 +@set VER 24.0.50 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-06 03:06:37 +0000 +++ etc/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-06 Glenn Morris * srecode/default.srt (COPYRIGHT): Update template copyright to GPLv3+. === modified file 'leim/ChangeLog' --- leim/ChangeLog 2010-02-16 06:58:32 +0000 +++ leim/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-16 Kenichi Handa * SKK-DIC/SKK-JISYO.L: Updated to the latest version. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-03-08 13:00:18 +0000 +++ lib-src/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-20 Kevin Ryde * etags.c (Scheme_functions): Don't loop past a null character === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2010-02-27 03:09:45 +0000 +++ lib-src/makefile.w32-in 2010-03-10 15:17:13 +0000 @@ -22,7 +22,7 @@ .PHONY: $(ALL) -VERSION = 23.1.93 +VERSION = 24.0.50 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-10 06:32:43 +0000 +++ lisp/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-10 Stefan Monnier * vc-git.el (vc-git-revision-table): Include remote branches. === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2010-02-07 06:36:17 +0000 +++ lisp/erc/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-07 Vivek Dasmohapatra * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2010-01-13 08:35:10 +0000 +++ lisp/mh-e/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2009-12-01 Bill Wohler * mh-search.el (mh-mairix-execute-search): Use mh vfolder_format. === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2010-02-16 14:46:15 +0000 +++ lisp/org/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-15 Chong Yidong * org-freemind.el (org-freemind-from-org-mode-node) === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-01-23 22:50:13 +0000 +++ lisp/url/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-01-23 Chong Yidong * url-util.el: Require url-vars (Bug#5459). === modified file 'lisp/version.el' --- lisp/version.el 2010-02-27 03:09:45 +0000 +++ lisp/version.el 2010-03-10 15:17:13 +0000 @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.1.93" "\ +(defconst emacs-version "24.0.50" "\ 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))) "\ === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2010-01-13 08:35:10 +0000 +++ lwlib/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2009-10-19 Dan Nicolaescu * xlwmenu.c: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-02-19 13:26:50 +0000 +++ msdos/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-19 Eli Zaretskii * INSTALL: Remove a CVS-specific note. Update for latest versions === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2010-01-13 08:35:10 +0000 +++ nextstep/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-01-11 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: === modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist' --- nextstep/Cocoa/Emacs.base/Contents/Info.plist 2010-02-27 03:09:45 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Info.plist 2010-03-10 15:17:13 +0000 @@ -553,7 +553,7 @@ CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.1.93 Copyright (C) 2010 Free Software Foundation, Inc. + Emacs 24.0.50 Copyright (C) 2010 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ APPL CFBundleShortVersionString - 23.1.93 + 24.0.50 CFBundleSignature EMAx === modified file 'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings' --- nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2010-02-27 03:09:45 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2010-03-10 15:17:13 +0000 @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 23.1.93"; -CFBundleGetInfoString = "Emacs version 23.1.93, NS Windowing"; +CFBundleShortVersionString = "Version 24.0.50"; +CFBundleGetInfoString = "Emacs version 24.0.50, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc."; === modified file 'nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop' --- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2010-02-27 03:09:45 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2010-03-10 15:17:13 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=23.1.93 +Version=24.0.50 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2010-02-27 03:09:45 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2010-03-10 15:17:13 +0000 @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "23.1.93"; + ApplicationRelease = "24.0.50"; 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.93, NS Windowing"; + FullVersionID = "Emacs 24.0.50, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-01-13 12:11:48 +0000 +++ nt/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-01-13 Martin Rudalics * emacsclient.rc: Fix format of "LegalCopyright" value. === modified file 'nt/emacs.rc' --- nt/emacs.rc 2010-02-27 03:09:45 +0000 +++ nt/emacs.rc 2010-03-10 15:17:13 +0000 @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,93,0 - PRODUCTVERSION 23,1,93,0 + FILEVERSION 24,0,50,0 + PRODUCTVERSION 24,0,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 93, 0\0" + VALUE "FileVersion", "24, 0, 50, 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, 93, 0\0" + VALUE "ProductVersion", "24, 0, 50, 0\0" VALUE "OLESelfRegister", "\0" END END === modified file 'nt/emacsclient.rc' --- nt/emacsclient.rc 2010-02-27 03:09:45 +0000 +++ nt/emacsclient.rc 2010-03-10 15:17:13 +0000 @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,93,0 - PRODUCTVERSION 23,1,93,0 + FILEVERSION 24,0,50,0 + PRODUCTVERSION 24,0,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 93, 0\0" + VALUE "FileVersion", "24, 0, 50, 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, 93, 0\0" + VALUE "ProductVersion", "24, 0, 50, 0\0" VALUE "OLESelfRegister", "\0" END END === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2010-01-13 08:35:10 +0000 +++ oldXMenu/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2009-06-21 Chong Yidong * Branch for 23.1. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-10 14:45:21 +0000 +++ src/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-03-10 Stefan Monnier Cleanup setup of gl_state in various parts of the code. === modified file 'test/ChangeLog' --- test/ChangeLog 2010-02-19 18:59:00 +0000 +++ test/ChangeLog 2010-03-10 15:17:13 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong + + * Branch for 23.2. + 2010-02-19 Ulf Jasper * icalendar-testsuite.el ------------------------------------------------------------ revno: 99639 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2010-03-10 09:45:21 -0500 message: Cleanup setup of gl_state in various parts of the code. * syntax.h (SETUP_BUFFER_SYNTAX_TABLE): New macro. (SETUP_SYNTAX_TABLE, SETUP_SYNTAX_TABLE_FOR_OBJECT): * syntax.c (find_defun_start, Fchar_syntax, Fmatching_paren, skip_chars): * regex.c (regex_compile): Use it. (re_compile_pattern): Don't set gl_state.current_syntax_table since it's now set in regex_compile when/if we need it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-05 23:08:18 +0000 +++ src/ChangeLog 2010-03-10 14:45:21 +0000 @@ -1,3 +1,14 @@ +2010-03-10 Stefan Monnier + + Cleanup setup of gl_state in various parts of the code. + * syntax.h (SETUP_BUFFER_SYNTAX_TABLE): New macro. + (SETUP_SYNTAX_TABLE, SETUP_SYNTAX_TABLE_FOR_OBJECT): + * syntax.c (find_defun_start, Fchar_syntax, Fmatching_paren) + (skip_chars): + * regex.c (regex_compile): Use it. + (re_compile_pattern): Don't set gl_state.current_syntax_table since + it's now set in regex_compile when/if we need it. + 2010-03-05 Stefan Monnier Make it possible to C-g in a tight bytecode loop again (bug#5680). === modified file 'src/keyboard.c' --- src/keyboard.c 2010-01-13 08:35:10 +0000 +++ src/keyboard.c 2010-03-10 14:45:21 +0000 @@ -11235,6 +11235,7 @@ GCPRO4 (saved.object, saved.global_code, saved.current_syntax_table, saved.old_prop); Fsignal (Qquit, Qnil); + /* FIXME: AFAIK, `quit' can never return, so this code is dead! */ gl_state = saved; UNGCPRO; } === modified file 'src/regex.c' --- src/regex.c 2010-03-05 19:54:39 +0000 +++ src/regex.c 2010-03-10 14:45:21 +0000 @@ -3070,7 +3070,7 @@ syntax-table for ASCII chars, while the other chars will obey syntax-table properties. It's not ideal, but it's the way it's been done until now. */ - SETUP_SYNTAX_TABLE (BEGV, 0); + SETUP_BUFFER_SYNTAX_TABLE (); for (ch = 0; ch < 256; ++ch) { @@ -4496,7 +4496,7 @@ anchored_start = (bufp->buffer[0] == begline); #ifdef emacs - gl_state.object = re_match_object; + gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */ { int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (startpos)); @@ -5099,7 +5099,7 @@ #ifdef emacs int charpos; - gl_state.object = re_match_object; + gl_state.object = re_match_object; /* Used by SYNTAX_TABLE_BYTE_TO_CHAR. */ charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (pos)); SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); #endif @@ -6504,10 +6504,6 @@ { reg_errcode_t ret; -#ifdef emacs - gl_state.current_syntax_table = current_buffer->syntax_table; -#endif - /* GNU code is written to assume at least RE_NREGS registers will be set (and at least one extra will be -1). */ bufp->regs_allocated = REGS_UNALLOCATED; === modified file 'src/syntax.c' --- src/syntax.c 2010-03-05 18:42:38 +0000 +++ src/syntax.c 2010-03-10 14:45:21 +0000 @@ -385,8 +385,7 @@ /* We optimize syntax-table lookup for rare updates. Thus we accept only those `^\s(' which are good in global _and_ text-property syntax-tables. */ - gl_state.current_syntax_table = current_buffer->syntax_table; - gl_state.use_global = 0; + SETUP_BUFFER_SYNTAX_TABLE (); while (PT > BEGV) { int c; @@ -401,8 +400,7 @@ if (SYNTAX (c) == Sopen) break; /* Now fallback to the default value. */ - gl_state.current_syntax_table = current_buffer->syntax_table; - gl_state.use_global = 0; + SETUP_BUFFER_SYNTAX_TABLE (); } /* Move to beg of previous line. */ scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -2, 1); @@ -860,11 +858,9 @@ Lisp_Object character; { int char_int; - gl_state.current_syntax_table = current_buffer->syntax_table; - - gl_state.use_global = 0; CHECK_NUMBER (character); char_int = XINT (character); + SETUP_BUFFER_SYNTAX_TABLE (); return make_number (syntax_code_spec[(int) SYNTAX (char_int)]); } @@ -874,10 +870,9 @@ Lisp_Object character; { int char_int, code; - gl_state.current_syntax_table = current_buffer->syntax_table; - gl_state.use_global = 0; CHECK_NUMBER (character); char_int = XINT (character); + SETUP_BUFFER_SYNTAX_TABLE (); code = SYNTAX (char_int); if (code == Sopen || code == Sclose) return SYNTAX_MATCH (char_int); @@ -1752,7 +1747,7 @@ let's initialize it manually. We ignore syntax-table text-properties for now, since that's what we've done in the past. */ - SETUP_SYNTAX_TABLE (BEGV, 0); + SETUP_BUFFER_SYNTAX_TABLE (); if (forwardp) { if (multibyte) === modified file 'src/syntax.h' --- src/syntax.h 2010-01-13 08:35:10 +0000 +++ src/syntax.h 2010-03-10 14:45:21 +0000 @@ -245,6 +245,14 @@ 1) \ : 0)) +/* This macro sets up the buffer-global syntax table. */ +#define SETUP_BUFFER_SYNTAX_TABLE() \ +do \ + { \ + gl_state.use_global = 0; \ + gl_state.current_syntax_table = current_buffer->syntax_table; \ + } while (0) + /* This macro should be called with FROM at the start of forward search, or after the last position of the backward search. It makes sure that the first char is picked up with correct table, so @@ -256,12 +264,11 @@ #define SETUP_SYNTAX_TABLE(FROM, COUNT) \ do \ { \ + SETUP_BUFFER_SYNTAX_TABLE (); \ gl_state.b_property = BEGV; \ gl_state.e_property = ZV + 1; \ gl_state.object = Qnil; \ - gl_state.use_global = 0; \ gl_state.offset = 0; \ - gl_state.current_syntax_table = current_buffer->syntax_table; \ if (parse_sexp_lookup_properties) \ if ((COUNT) > 0 || (FROM) > BEGV) \ update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\ @@ -279,6 +286,7 @@ #define SETUP_SYNTAX_TABLE_FOR_OBJECT(OBJECT, FROM, COUNT) \ do \ { \ + SETUP_BUFFER_SYNTAX_TABLE (); \ gl_state.object = (OBJECT); \ if (BUFFERP (gl_state.object)) \ { \ @@ -305,8 +313,6 @@ gl_state.e_property = 1 + SCHARS (gl_state.object); \ gl_state.offset = 0; \ } \ - gl_state.use_global = 0; \ - gl_state.current_syntax_table = current_buffer->syntax_table; \ if (parse_sexp_lookup_properties) \ update_syntax_table (((FROM) + gl_state.offset \ + (COUNT > 0 ? 0 : -1)), \ ------------------------------------------------------------ revno: 99638 committer: Miles Bader branch nick: trunk timestamp: Wed 2010-03-10 23:16:06 +0900 message: quick-install-emacs: Use more portable shell syntax diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2010-03-10 14:14:34 +0000 +++ admin/ChangeLog 2010-03-10 14:16:06 +0000 @@ -1,6 +1,8 @@ 2010-03-10 Miles Bader - * quick-install-emacs (AVOID): Be more picky about files we avoid + * quick-install-emacs: Use more portable shell syntax. + + * quick-install-emacs: (AVOID): Be more picky about files we avoid installing. 2010-02-14 Juanma Barranquero === modified file 'admin/quick-install-emacs' --- admin/quick-install-emacs 2010-03-10 14:14:34 +0000 +++ admin/quick-install-emacs 2010-03-10 14:16:06 +0000 @@ -120,7 +120,7 @@ EOF exit 0 ;; - -[^-]?*) + -[!-]?*) # split concatenated single-letter options apart FIRST="$1"; shift set -- `echo $FIRST | sed 's/-\(.\)\(.*\)/-\1 -\2/'` "$@" ------------------------------------------------------------ revno: 99637 committer: Miles Bader branch nick: trunk timestamp: Wed 2010-03-10 23:14:34 +0900 message: quick-install-emacs: Be more picky about files we avoid installing diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2010-02-14 17:30:41 +0000 +++ admin/ChangeLog 2010-03-10 14:14:34 +0000 @@ -1,3 +1,8 @@ +2010-03-10 Miles Bader + + * quick-install-emacs (AVOID): Be more picky about files we avoid + installing. + 2010-02-14 Juanma Barranquero * quick-install-emacs (PRUNED): Fix typo in message. === modified file 'admin/quick-install-emacs' --- admin/quick-install-emacs 2010-02-14 17:30:41 +0000 +++ admin/quick-install-emacs 2010-03-10 14:14:34 +0000 @@ -31,7 +31,7 @@ PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse' PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin' -AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile makefile stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib" +AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ Makefile.c$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib" # Prune old binaries lying around in the source tree PRUNE=no ------------------------------------------------------------ revno: 99636 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2010-03-10 01:32:43 -0500 message: vc-git.el (vc-git-revision-table): Include remote branches. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-10 05:18:51 +0000 +++ lisp/ChangeLog 2010-03-10 06:32:43 +0000 @@ -1,3 +1,7 @@ +2010-03-10 Stefan Monnier + + * vc-git.el (vc-git-revision-table): Include remote branches. + 2010-03-10 Kim F. Storm Animated image API. === modified file 'lisp/vc-git.el' --- lisp/vc-git.el 2010-03-09 13:24:44 +0000 +++ lisp/vc-git.el 2010-03-10 06:32:43 +0000 @@ -673,7 +673,8 @@ (with-temp-buffer (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") (goto-char (point-min)) - (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) + (while (re-search-forward "^refs/\\(heads\\|tags\\|remotes\\)/\\(.*\\)$" + nil t) (push (match-string 2) table))) table))