From 22770c84d5acd892c6a3302790f92f37f600c93e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 28 Feb 2011 22:29:00 -0500 Subject: [PATCH 01/14] Release logs for 23.3 release. Regenerate configure and other release files. --- 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/AUTHORS | 14 +++---- etc/ChangeLog | 4 ++ leim/ChangeLog | 4 ++ lib-src/ChangeLog | 4 ++ lib-src/makefile.w32-in | 2 +- lisp/ChangeLog | 4 ++ lisp/cedet/ChangeLog | 4 ++ lisp/erc/ChangeLog | 4 ++ lisp/ldefs-boot.el | 42 +++++++++---------- 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 ++ 43 files changed, 155 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index a58004ec2be..0c70bf296a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-01-27 Chong Yidong * configure.in: Test existence of xaw3d library, not just the diff --git a/README b/README index db6104b0e06..a1cdd4e2bfc 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.2.94 of GNU Emacs, the extensible, +This directory tree holds version 23.3 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 d0e7b78f2e8..741902d3249 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-22 Juanma Barranquero * notes/bugtracker (bugtracker_debbugs_url): Fix typo. diff --git a/configure b/configure index e87e7a184a6..8fbd738517f 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.67 for emacs 23.2.94. +# Generated by GNU Autoconf 2.67 for emacs 23.3. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.2.94' -PACKAGE_STRING='emacs 23.2.94' +PACKAGE_VERSION='23.3' +PACKAGE_STRING='emacs 23.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 23.2.94 to adapt to many kinds of systems. +\`configure' configures emacs 23.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1394,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.2.94:";; + short | recursive ) echo "Configuration of emacs 23.3:";; esac cat <<\_ACEOF @@ -1540,7 +1540,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.2.94 +emacs configure 23.3 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2091,7 +2091,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 23.2.94, which was +It was created by emacs $as_me 23.3, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -14056,7 +14056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 23.2.94, which was +This file was extended by emacs $as_me 23.3, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14122,7 +14122,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -emacs config.status 23.2.94 +emacs config.status 23.3 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index a89d6d596de..275e8125ab3 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.2.94) +AC_INIT(emacs, 23.3) 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 fe3e17a2c91..73e2aca30f0 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-25 Eli Zaretskii * search.texi (Regexp Search): Move index entries about regexps to the diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index ec2d00e3c31..34a604f7654 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.2.94 +@set EMACSVER 23.3 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 19bb3195d66..50566340701 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-18 Eli Zaretskii * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 2bb357cf8a1..e91cf93e3f0 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-25 Glenn Morris * variables.texi (Directory Local Variables): Mention the optional diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo index 9a6f549dc49..3a8aa1c0705 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.2.94 +@center Emacs Version 23.3 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index cfc02a07068..2093806fa49 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.2.94 +@set EMACSVER 23.3 @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 9d6bb7da68c..392bfc5b5e9 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.2.94 +@set EMACSVER 23.3 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 18027ee362f..63f35b7e531 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.2.94 +@set EMACSVER 23.3 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 98b04de4177..0c7079b2913 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-12-29 Jari Aalto (tiny change) * emacsclient.1: Arrange options alphabetically (Bug#7620). diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 8f01e4a2165..0baf3abe5e3 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.2.94" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.3" . . .SH NAME diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c8d981125d2..122a9ae2920 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-23 Glenn Morris * dbus.texi (Type Conversion): Grammar fix. diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index adacecbabd1..d3acccf1693 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.2.94 +@set VER 23.3 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd diff --git a/etc/AUTHORS b/etc/AUTHORS index ad9142931a6..56efcaa0ea5 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -442,7 +442,7 @@ and co-wrote longlines.el and changed xdisp.c simple.el files.el display.texi files.texi frames.texi emacs.texi xterm.c keyboard.c cus-edit.el faces.el Makefile.in font.c xfaces.c image.c misc.texi xfns.c startup.el - text.texi compile.el configure.in and 664 other files + text.texi compile.el configure.in and 665 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -882,8 +882,8 @@ Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote rxvt.el tty-colors.el and changed msdos.c makefile.w32-in Makefile.in files.el info.el fileio.c rmail.el mainmake.v2 pc-win.el simple.el startup.el config.bat msdos.h - w32.c dired.c frame.c menu-bar.el process.c INSTALL internal.el xdisp.c - and 606 other files + w32.c dired.c frame.c menu-bar.el process.c INSTALL files.texi + internal.el and 642 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el gnus.el @@ -1150,7 +1150,7 @@ Glenn Morris: wrote check-declare.el and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi - files.el cal-china.el simple.el rmailsum.el cal-tex.el + files.el simple.el cal-china.el rmailsum.el cal-tex.el and 1012 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1662,7 +1662,7 @@ and changed files.el perl-mode.el Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el w32fns.c bs.el help-fns.el server.el org.el simple.el emacsclient.c buffer.c desktop.el mule-cmds.el ido.el window.c xdisp.c allout.el - keyboard.c replace.el eval.c and 939 other files + keyboard.c replace.el eval.c and 942 other files Juergen Kreileder: changed imap.el nnimap.el @@ -2212,8 +2212,8 @@ Michael Albinus: wrote dbus.el tramp-cmds.el tramp-compat.el tramp-fish.el tramp-ftp.el tramp-gvfs.el tramp-gw.el tramp-smb.el xesam.el zeroconf.el and co-wrote tramp-cache.el tramp.el -and changed tramp.texi dbusbind.c dbus.texi trampver.el ange-ftp.el - trampver.texi files.el files.texi tramp-vc.el Makefile.in tramp-util.el +and changed tramp.texi dbusbind.c dbus.texi trampver.el trampver.texi + ange-ftp.el files.el files.texi tramp-vc.el Makefile.in tramp-util.el tramp-imap.el tramp-uu.el dired-aux.el compile.el configure.in em-unix.el grep.el simple.el vc.el dired.el and 51 other files diff --git a/etc/ChangeLog b/etc/ChangeLog index 82020dc3c9c..24e6e9cfc53 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-01-18 Glenn Morris * PROBLEMS: Add note about svn+ssh. (Bug#7791) diff --git a/leim/ChangeLog b/leim/ChangeLog index 292097559fa..c9d7b437f27 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-23 Juanma Barranquero * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 58c37c493ae..c6d9fa73e53 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-02 Eli Zaretskii * makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 139fd64406c..396060a3d75 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.2.94 +VERSION = 23.3 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 a11cb793648..20ed72b2ce6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-26 Eli Zaretskii * international/mule-cmds.el (set-default-coding-systems): Use the diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 580667f0ce6..2f34afdb112 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-10-29 Glenn Morris * mode-local.el (mode-local-augment-function-help): diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index fb05e6f9d1f..000d48e5198 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-01-31 Antoine Levitt (tiny change) * erc-track.el (track): Don't reset erc-modified-channels-object diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 0e3564d9664..77e95cbf74a 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -494,7 +494,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (19752 41642)) +;;;;;; (19813 16320)) ;;; Generated autoloads from allout.el (put 'allout-use-hanging-indents 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) @@ -4504,7 +4504,7 @@ Update copyright notice for all files in DIRECTORY matching MATCH. ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19752 41642)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19813 16320)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -10995,7 +10995,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19752 41642)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19806 64998)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11048,7 +11048,7 @@ prompt the user for the name of an NNTP server to use. ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (19752 41642)) +;;;;;; "gnus/gnus-agent.el" (19813 16320)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11590,7 +11590,7 @@ If picons are already displayed, remove them. ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (19752 41642)) +;;;;;; "gnus/gnus-range.el" (19813 16320)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -11734,8 +11734,8 @@ Update the format specification near point. ;;;*** ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news -;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (19752 -;;;;;; 41642)) +;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (19813 +;;;;;; 16320)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -13550,7 +13550,7 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (19752 41642)) +;;;;;; (19813 16320)) ;;; Generated autoloads from progmodes/idlwave.el (autoload 'idlwave-mode "idlwave" "\ @@ -14357,7 +14357,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" (19752 41642)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19806 64998)) ;;; 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) @@ -15993,7 +15993,7 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (19752 41642)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (19806 64998)) ;;; Generated autoloads from log-edit.el (autoload 'log-edit "log-edit" "\ @@ -18350,7 +18350,7 @@ symbol in the alist. ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (19752 41642)) +;;;;;; (19802 41007)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -18660,7 +18660,7 @@ including a reproducible test case and send the message. ;;;;;; org-map-entries org-open-link-from-string org-open-at-point-global ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle -;;;;;; org-mode) "org" "org/org.el" (19752 41642)) +;;;;;; org-mode) "org" "org/org.el" (19813 31420)) ;;; Generated autoloads from org/org.el (autoload 'org-mode "org" "\ @@ -18873,7 +18873,7 @@ Call the customize function with org as argument. ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19752 41642)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19813 31420)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -19573,7 +19573,7 @@ that uses these same face definitions. ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el" -;;;;;; (19752 41642)) +;;;;;; (19813 31420)) ;;; Generated autoloads from org/org-icalendar.el (autoload 'org-export-icalendar-this-file "org-icalendar" "\ @@ -19921,7 +19921,7 @@ See also the variable `org-reverse-note-order'. ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (19752 41642)) +;;;;;; "org-table" "org/org-table.el" (19813 31420)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -22864,8 +22864,8 @@ variable. ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19761 -;;;;;; 5822)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19813 +;;;;;; 31420)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -28448,7 +28448,7 @@ You might need to set `uce-mail-reader' before using this. ;;;;;; ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string ;;;;;; ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region ;;;;;; ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize" -;;;;;; "international/ucs-normalize.el" (19752 41642)) +;;;;;; "international/ucs-normalize.el" (19813 31420)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -29895,7 +29895,7 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (19752 41642)) +;;;;;; (19813 16320)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -32014,8 +32014,8 @@ Zone out, completely. ;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" ;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" ;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19801 -;;;;;; 62231 520663)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19820 +;;;;;; 23317 611837)) ;;;*** diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 9c1fbc0ddf5..a983bca8e7a 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-05-07 Chong Yidong * Version 23.2 released. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 80f63a1ee78..db2d0e009c0 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-23 Juanma Barranquero * org.el (org-maybe-keyword-time-regexp): diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index de0f57d073c..3b049a07a50 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-12-04 Chong Yidong * url-cookie.el (url-cookie-retrieve): Handle null LOCALPART. diff --git a/lisp/version.el b/lisp/version.el index aa5016960cb..92eb56440aa 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.2.94" "\ +(defconst emacs-version "23.3" "\ 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 6244a9b04d6..febd45b37f1 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-01-23 Werner Meisner * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 10b7056b5c6..1718bdeb0c1 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-05-07 Chong Yidong * Version 23.2 released. diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 5d2f1fe6f2a..cbdb559f7a5 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-01-02 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 6ed6a9a2359..c18c2267473 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.2.94 Copyright (C) 2011 Free Software Foundation, Inc. + Emacs 23.3 Copyright (C) 2011 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.2.94 + 23.3 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 02ad5911e8d..a2e48d47741 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.2.94"; -CFBundleGetInfoString = "Emacs version 23.2.94, NS Windowing"; +CFBundleShortVersionString = "Version 23.3"; +CFBundleGetInfoString = "Emacs version 23.3, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index cf38bab8282..431106a0fa5 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.2.94 +Version=23.3 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 45472835d85..26847cced89 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.2.94"; + ApplicationRelease = "23.3"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.2.94, NS Windowing"; + FullVersionID = "Emacs 23.3, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/ChangeLog b/nt/ChangeLog index 84fc6001461..fe1fc62f46f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-12-31 Eli Zaretskii * configure.bat (end): Unset environment variables used by this diff --git a/nt/emacs.rc b/nt/emacs.rc index d370bff1633..540781c2b8e 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,2,94,0 - PRODUCTVERSION 23,2,94,0 + FILEVERSION 23,3,0,0 + PRODUCTVERSION 23,3,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, 2, 94, 0\0" + VALUE "FileVersion", "23, 3, 0, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 2, 94, 0\0" + VALUE "ProductVersion", "23, 3, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index fc1e6b12b2b..42e0d422956 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,2,94,0 - PRODUCTVERSION 23,2,94,0 + FILEVERSION 23,3,0,0 + PRODUCTVERSION 23,3,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, 2, 94, 0\0" + VALUE "FileVersion", "23, 3, 0, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 2, 94, 0\0" + VALUE "ProductVersion", "23, 3, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 58d76eabe39..f831e71c001 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-11-01 Elias Pipping (tiny change) Make Emacs compile with clang (bug#7309). diff --git a/src/ChangeLog b/src/ChangeLog index 0fdc151e540..7a46109c9b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2011-02-22 Kenichi Handa * font.c (font_open_entity): Be sure to set scaled_pixel_size. diff --git a/test/ChangeLog b/test/ChangeLog index 0b0f88f45c9..284054fdf8e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Chong Yidong + + * Version 23.3 released. + 2010-05-07 Chong Yidong * Version 23.2 released. From c6678f2916c22cd3b16232dc941f318c894ef56e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 7 Mar 2011 00:20:23 -0500 Subject: [PATCH 02/14] Revert 2010-05-25T15:54:53Z!juri@jurta.org; regenerate release logs. * lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Revert 2011-01-31 change. --- ChangeLog | 2 +- admin/ChangeLog | 2 +- doc/emacs/ChangeLog | 2 +- doc/lispintro/ChangeLog | 2 +- doc/lispref/ChangeLog | 2 +- doc/man/ChangeLog | 2 +- doc/misc/ChangeLog | 2 +- etc/ChangeLog | 2 +- leim/ChangeLog | 2 +- lib-src/ChangeLog | 2 +- lisp/ChangeLog | 7 ++++++- lisp/cedet/ChangeLog | 2 +- lisp/erc/ChangeLog | 2 +- lisp/mh-e/ChangeLog | 2 +- lisp/org/ChangeLog | 2 +- lisp/progmodes/cc-cmds.el | 31 +++++++++++-------------------- lisp/url/ChangeLog | 2 +- lwlib/ChangeLog | 2 +- msdos/ChangeLog | 2 +- nextstep/ChangeLog | 2 +- nt/ChangeLog | 2 +- oldXMenu/ChangeLog | 2 +- src/ChangeLog | 2 +- test/ChangeLog | 2 +- 24 files changed, 39 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c70bf296a8..4b3dcc3af64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/admin/ChangeLog b/admin/ChangeLog index 741902d3249..39a8a8f57d5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 73e2aca30f0..69d3e03209c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 50566340701..70accbc0669 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e91cf93e3f0..a52a8e73dd1 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 0c7079b2913..394d580c1c9 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 122a9ae2920..c0bd2f2778c 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/etc/ChangeLog b/etc/ChangeLog index 24e6e9cfc53..6e5bb392cc8 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/leim/ChangeLog b/leim/ChangeLog index c9d7b437f27..03ffab98220 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c6d9fa73e53..73a63eeaec4 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20ed72b2ce6..6d711568fea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. +2011-03-07 Chong Yidong + + * progmodes/cc-cmds.el (c-beginning-of-statement): Revert + 2011-01-31 change. + 2011-02-26 Eli Zaretskii * international/mule-cmds.el (set-default-coding-systems): Use the diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 2f34afdb112..2d0cbb8159b 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 000d48e5198..9e467f4cc25 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index a983bca8e7a..1c07be301b1 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index db2d0e009c0..7b5f9fc6a15 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 3f719aedb62..4deb5ca6afe 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2458,15 +2458,13 @@ function does not require the declaration to contain a brace block." (goto-char last) (throw 'done '(nil . nil))) - ;; Stop if we encounter a preprocessor line. Continue if we - ;; hit a naked # - ((and c-opt-cpp-prefix - (not macro-end) + ;; Stop if we encounter a preprocessor line. + ((and (not macro-end) (eq (char-after) ?#) (= (point) (c-point 'boi))) - (if (= (point) here) ; Not a macro, therefore naked #. - (forward-char) - (throw 'done '(t . macro-boundary)))) + (goto-char last) + ;(throw 'done (cons (eq (point) here) 'macro-boundary))) ; Changed 2003/3/26 + (throw 'done '(t . macro-boundary))) ;; Stop after a ';', '}', or "};" ((looking-at ";\\|};?") @@ -2582,19 +2580,12 @@ be more \"DWIM:ey\"." ;; Are we about to move backwards into or out of a ;; preprocessor command? If so, locate its beginning. (when (eq (cdr res) 'macro-boundary) - (setq macro-fence - (save-excursion - (if macro-fence - (progn - (end-of-line) - (and (not (eobp)) - (progn (c-skip-ws-forward) - (c-beginning-of-macro)) - (progn (c-end-of-macro) - (point)))) - (and (not (eobp)) - (c-beginning-of-macro) - (progn (c-end-of-macro) (point))))))) + (save-excursion + (beginning-of-line) + (setq macro-fence + (and (not (bobp)) + (progn (c-skip-ws-backward) (c-beginning-of-macro)) + (point))))) ;; Are we about to move backwards into a literal? (when (memq (cdr res) '(macro-boundary literal)) (setq range (c-ascertain-preceding-literal))) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 3b049a07a50..dc98640960b 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index febd45b37f1..5aa35f71446 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 1718bdeb0c1..deec1a604f5 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index cbdb559f7a5..c0a08f844ba 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/nt/ChangeLog b/nt/ChangeLog index fe1fc62f46f..8e812addf02 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index f831e71c001..db1979e7e41 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/src/ChangeLog b/src/ChangeLog index 7a46109c9b1..12ea037ee91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/test/ChangeLog b/test/ChangeLog index 284054fdf8e..d20abc3ce87 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,4 +1,4 @@ -2011-02-28 Chong Yidong +2011-03-07 Chong Yidong * Version 23.3 released. From 1df1040bf8549ea4c3ae08007a347736adf2fe99 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 7 Mar 2011 15:05:53 -0500 Subject: [PATCH 03/14] Fix 2011-01-31 change; patch supplied by acm was applied incorrectly. * lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix 2011-01-31 change; patch supplied by Alan Mackenzie was applied incorrectly. --- lisp/ChangeLog | 4 ++-- lisp/progmodes/cc-cmds.el | 33 ++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d711568fea..1b8a7641b35 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,8 +4,8 @@ 2011-03-07 Chong Yidong - * progmodes/cc-cmds.el (c-beginning-of-statement): Revert - 2011-01-31 change. + * progmodes/cc-cmds.el (c-beginning-of-statement): Fix 2011-01-31 + change; patch supplied by Alan Mackenzie was applied incorrectly. 2011-02-26 Eli Zaretskii diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 4deb5ca6afe..bd047e89435 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2458,13 +2458,15 @@ function does not require the declaration to contain a brace block." (goto-char last) (throw 'done '(nil . nil))) - ;; Stop if we encounter a preprocessor line. - ((and (not macro-end) + ;; Stop if we encounter a preprocessor line. Continue if we + ;; hit a naked # + ((and c-opt-cpp-prefix + (not macro-end) (eq (char-after) ?#) (= (point) (c-point 'boi))) - (goto-char last) - ;(throw 'done (cons (eq (point) here) 'macro-boundary))) ; Changed 2003/3/26 - (throw 'done '(t . macro-boundary))) + (if (= (point) here) ; Not a macro, therefore naked #. + (forward-char) + (throw 'done '(t . macro-boundary)))) ;; Stop after a ';', '}', or "};" ((looking-at ";\\|};?") @@ -2663,14 +2665,19 @@ sentence motion in or near comments and multiline strings." ;; Are we about to move forward into or out of a ;; preprocessor command? (when (eq (cdr res) 'macro-boundary) - (save-excursion - (end-of-line) - (setq macro-fence - (and (not (eobp)) - (progn (c-skip-ws-forward) - (c-beginning-of-macro)) - (progn (c-end-of-macro) - (point)))))) + (setq macro-fence + (save-excursion + (if macro-fence + (progn + (end-of-line) + (and (not (eobp)) + (progn (c-skip-ws-forward) + (c-beginning-of-macro)) + (progn (c-end-of-macro) + (point)))) + (and (not (eobp)) + (c-beginning-of-macro) + (progn (c-end-of-macro) (point))))))) ;; Are we about to move forward into a literal? (when (memq (cdr res) '(macro-boundary literal)) (setq range (c-ascertain-following-literal))) From c47cbdfd2e29e350b3b7736cc1a66fcae8a99830 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 11 Mar 2011 10:43:49 +0900 Subject: [PATCH 04/14] * src/unexmacosx.c (copy_data_segment): Also copy __got section. (Bug#8223) --- src/ChangeLog | 5 +++++ src/unexmacosx.c | 1 + 2 files changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 12ea037ee91..1d974876c52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-03-11 YAMAMOTO Mitsuharu + + * unexmacosx.c (copy_data_segment): Also copy __got section. + (Bug#8223) + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index df4c0da4cb1..d6f170c9127 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -822,6 +822,7 @@ copy_data_segment (struct load_command *lc) } else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__got", 16) == 0 || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0 || strncmp (sectp->sectname, "__dyld", 16) == 0 || strncmp (sectp->sectname, "__const", 16) == 0 From 126bc0dcacb6704b8db9e82c4af3eedd1b239715 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 11 Mar 2011 12:56:20 +0900 Subject: [PATCH 05/14] * src/fringe.c (update_window_fringes): Remove unused variables. --- src/ChangeLog | 2 ++ src/fringe.c | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1d974876c52..a4a80cbf9f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-11 YAMAMOTO Mitsuharu + * fringe.c (update_window_fringes): Remove unused variables. + * unexmacosx.c (copy_data_segment): Also copy __got section. (Bug#8223) diff --git a/src/fringe.c b/src/fringe.c index 4a6d898d97f..861aa6e9487 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -991,18 +991,10 @@ update_window_fringes (w, keep_current_p) y < yb && rn < nrows; y += row->height, ++rn) { - unsigned indicate_bob_p, indicate_top_line_p; - unsigned indicate_eob_p, indicate_bottom_line_p; - row = w->desired_matrix->rows + rn; if (!row->enabled_p) row = w->current_matrix->rows + rn; - indicate_bob_p = row->indicate_bob_p; - indicate_top_line_p = row->indicate_top_line_p; - indicate_eob_p = row->indicate_eob_p; - indicate_bottom_line_p = row->indicate_bottom_line_p; - row->indicate_bob_p = row->indicate_top_line_p = 0; row->indicate_eob_p = row->indicate_bottom_line_p = 0; From 69cc79e9e067543c5b20adcea1d756f1dd9569dc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 11 Mar 2011 13:17:24 +0200 Subject: [PATCH 06/14] Fix bug #8221 with description of how HOME is set on Windows. doc/emacs/msdog.texi (Windows HOME): Fix the wording to clarify how Emacs sets HOME on Windows and where it looks for init files. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/msdog.texi | 49 ++++++++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 69d3e03209c..6fa1941c53e 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-03-11 Eli Zaretskii + + * msdog.texi (Windows HOME): Fix the wording to clarify how Emacs sets + HOME on Windows and where it looks for init files. (Bug#8221) + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index caa1bbccd19..53f46d08d7c 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -404,36 +404,45 @@ names, which might cause misalignment of columns in Dired display. @dfn{user-specific application data directory}. The actual location depends on your Windows version and system configuration; typical values are @file{C:\Documents and Settings\@var{username}\Application Data} on -Windows 2K/XP and later, and either @file{C:\WINDOWS\Application Data} +Windows 2K/XP/2K3, @file{C:\Users\@var{username}\AppData\Roaming} on +Windows Vista/7/2K8, and either @file{C:\WINDOWS\Application Data} or @file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the -older Windows 9X/ME systems. +older Windows 9X/ME systems. If this directory does not exist or +cannot be accessed, Emacs falls back to @file{C:\} as the default +value of @code{HOME}. - @code{HOME} can also be set in the system registry, for details see + You can override this default value of @code{HOME} by explicitly +setting the environment variable @env{HOME} to point to any directory +on your system. @env{HOME} can be set either from the command shell +prompt or from the @samp{My Computer}s @samp{Properties} dialog. +@code{HOME} can also be set in the system registry, for details see @ref{MS-Windows Registry}. -@cindex init file @file{.emacs} on MS-Windows - The home directory is where your init file @file{.emacs} is stored. -When Emacs starts, it first checks whether the environment variable -@env{HOME} is set. If it is, it looks for the init file in the -directory pointed by @env{HOME}. If @env{HOME} is not defined, Emacs -checks for an existing @file{.emacs} file in @file{C:\}, the root -directory of drive @file{C:}@footnote{ -The check in @file{C:\} is for compatibility with older versions of Emacs, -which didn't check the application data directory. -}. If there's no such file in @file{C:\}, Emacs next uses the Windows -system calls to find out the exact location of your application data -directory. If that system call fails, Emacs falls back to @file{C:\}. + For compatibility with older versions of Emacs@footnote{ +Older versions of Emacs didn't check the application data directory. +}, if there is a file named @file{.emacs} in @file{C:\}, the root +directory of drive @file{C:}, and @env{HOME} is set neither in the +environment nor in the Registry, Emacs will treat @file{C:\} as the +default @code{HOME} location, and will not look in the application +data directory, even if it exists. Note that only @file{.emacs} is +looked for in @file{C:\}; the older name @file{_emacs} (see below) is +not. This use of @file{C:\.emacs} to define @code{HOME} is +deprecated. - Whatever the final place is, Emacs sets the value of the @env{HOME} -environment variable to point to it, and it will use that location for -other files and directories it normally creates in the user's home -directory. + Whatever the final place is, Emacs sets the internal value of the +@env{HOME} environment variable to point to it, and it will use that +location for other files and directories it normally looks for or +creates in the user's home directory. You can always find out where Emacs thinks is your home directory's location by typing @kbd{C-x d ~/ @key{RET}}. This should present the list of files in the home directory, and show its full name on the first line. Likewise, to visit your init file, type @kbd{C-x C-f -~/.emacs @key{RET}}. +~/.emacs @key{RET}} (assuming the file's name is @file{.emacs}). + +@cindex init file @file{.emacs} on MS-Windows + The home directory is where your init file is stored. It can have +any name mentioned in @ref{Init File}. @cindex @file{_emacs} init file, MS-Windows Because MS-DOS does not allow file names with leading dots, and From 2920e68d73e0009f368e817207964efaff751f85 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 11 Mar 2011 14:19:08 +0200 Subject: [PATCH 07/14] Fix comparisons of file ownership on MS-Windows for the Administrator user. lisp/files.el (file-ownership-preserved-p): Pass `integer' as an explicit 2nd argument to `file-attributes'. If the file's owner is the Administrators group on Windows, and the current user is Administrator, consider that a match. lisp/server.el (server-ensure-safe-dir): Consider server directory safe on MS-Windows if its owner is the Administrators group while the current Emacs user is Administrator. Use `=' to compare numerical UIDs, since they could be integers or floats. --- lisp/ChangeLog | 12 ++++++++++++ lisp/files.el | 10 ++++++++-- lisp/server.el | 8 +++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b8a7641b35..6685e355360 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2011-03-11 Eli Zaretskii + + * files.el (file-ownership-preserved-p): Pass `integer' as an + explicit 2nd argument to `file-attributes'. If the file's owner + is the Administrators group on Windows, and the current user is + Administrator, consider that a match. + + * server.el (server-ensure-safe-dir): Consider server directory + safe on MS-Windows if its owner is the Administrators group while + the current Emacs user is Administrator. Use `=' to compare + numerical UIDs, since they could be integers or floats. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lisp/files.el b/lisp/files.el index 88063aed2b9..91fed0d1274 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3752,11 +3752,17 @@ we do not remove backup version numbers, only true file version numbers." (let ((handler (find-file-name-handler file 'file-ownership-preserved-p))) (if handler (funcall handler 'file-ownership-preserved-p file) - (let ((attributes (file-attributes file))) + (let ((attributes (file-attributes file 'integer))) ;; Return t if the file doesn't exist, since it's true that no ;; information would be lost by an (attempted) delete and create. (or (null attributes) - (= (nth 2 attributes) (user-uid))))))) + (= (nth 2 attributes) (user-uid)) + ;; Files created on Windows by Administrator (RID=500) + ;; have the Administrators group (RID=544) recorded as + ;; their owner. Rewriting them will still preserve the + ;; owner. + (and (eq system-type 'windows-nt) + (= (user-uid) 500) (= (nth 2 attributes) 544))))))) (defun file-name-sans-extension (filename) "Return FILENAME sans final \"extension\". diff --git a/lisp/server.el b/lisp/server.el index f62a7c73abc..816a072bf75 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -474,7 +474,13 @@ See variable `server-auth-dir' for details." (file-name-as-directory dir)) :warning) (throw :safe t)) - (unless (eql uid (user-uid)) ; is the dir ours? + (unless (or (= uid (user-uid)) ; is the dir ours? + (and w32 + ;; Files created on Windows by + ;; Administrator (RID=500) have + ;; the Administrators (RID=544) + ;; group recorded as the owner. + (= uid 544) (= (user-uid) 500))) (throw :safe nil)) (when w32 ; on NTFS? (throw :safe t)) From 6dbf95e5b3cf85fce57a5cdd67e7e50b8acb8787 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Mar 2011 15:05:31 +0100 Subject: [PATCH 08/14] Backport 2011-03-11T00:33:57Z!lekktu@gmail.com from trunk. * lisp/help-fns.el (describe-variable): Don't complete keywords. --- lisp/ChangeLog | 6 ++++++ lisp/help-fns.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6685e355360..d84f98a1322 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-11 Juanma Barranquero + + Backport revno:103622 from trunk. + * help-fns.el (describe-variable): Don't complete keywords. + Suggested by Teodor Zlatanov . + 2011-03-11 Eli Zaretskii * files.el (file-ownership-preserved-p): Pass `integer' as an diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ba8565f5e1e..e0cfb7039f9 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -585,9 +585,10 @@ it is displayed along with the global value." "Describe variable (default %s): " v) "Describe variable: ") obarray - '(lambda (vv) - (or (boundp vv) - (get vv 'variable-documentation))) + (lambda (vv) + (and (not (keywordp vv)) + (or (boundp vv) + (get vv 'variable-documentation)))) t nil nil (if (symbolp v) (symbol-name v)))) (list (if (equal val "") From 9c5047fb4e78dfc1d8667e06947f5660dcf234eb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Mar 2011 16:34:07 +0100 Subject: [PATCH 09/14] Backport 2011-03-01T03:59:31Z!lekktu@gmail.com from trunk. *lisp/emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/cl-loaddefs.el | 4 ++-- lisp/emacs-lisp/cl-macs.el | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d84f98a1322..e368e660fe2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-03-11 Juanma Barranquero + Backport revno:103463 from trunk. + * emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring. + Backport revno:103622 from trunk. * help-fns.el (describe-variable): Don't complete keywords. Suggested by Teodor Zlatanov . diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 835d26ed585..2fb7c0434b5 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -282,7 +282,7 @@ Not documented ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "75e86ac663887b54bf1778f2dd028463") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "12451ac01f94f10d30cf7a8f92625c42") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -505,7 +505,7 @@ lexical closures as in Common Lisp. (autoload 'lexical-let* "cl-macs" "\ Like `let*', but lexically scoped. The main visible difference is that lambdas inside BODY, and in -successive bindings within BINDINGS, will create lexical closures +successive bindings within VARLIST, will create lexical closures as in Common Lisp. This is similar to the behavior of `let*' in Common Lisp. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 4061e570cef..3e9d7c27258 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1455,7 +1455,7 @@ lexical closures as in Common Lisp. (defmacro lexical-let* (bindings &rest body) "Like `let*', but lexically scoped. The main visible difference is that lambdas inside BODY, and in -successive bindings within BINDINGS, will create lexical closures +successive bindings within VARLIST, will create lexical closures as in Common Lisp. This is similar to the behavior of `let*' in Common Lisp. \n(fn VARLIST BODY)" From 1e048ad1a60374ff026f021fe836c4f77a3fca60 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Mar 2011 16:42:12 +0100 Subject: [PATCH 10/14] Backport 2011-03-08T01:52:20Z!lekktu@gmail.com from trunk. * src/w32xfns.c (select_palette): Check success of RealizePalette against GDI_ERROR, not zero. --- src/ChangeLog | 6 ++++++ src/w32xfns.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a4a80cbf9f5..75958169951 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-03-11 Juanma Barranquero + + Backport revno:103582 from trunk. + * w32xfns.c (select_palette): Check success of RealizePalette against + GDI_ERROR, not zero. + 2011-03-11 YAMAMOTO Mitsuharu * fringe.c (update_window_fringes): Remove unused variables. diff --git a/src/w32xfns.c b/src/w32xfns.c index 83ffc1c8b5f..0472138e117 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -98,7 +98,7 @@ select_palette (FRAME_PTR f, HDC hdc) else f->output_data.w32->old_palette = NULL; - if (RealizePalette (hdc)) + if (RealizePalette (hdc) != GDI_ERROR) { Lisp_Object frame, framelist; FOR_EACH_FRAME (framelist, frame) From 5ef342304deceb61037a9eec17d6b0eb7ac978dd Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 11 Mar 2011 12:17:33 -0500 Subject: [PATCH 11/14] Bump version to 23.3.50 --- README | 2 +- configure.in | 2 +- doc/emacs/emacs.texi | 2 +- doc/lispref/book-spine.texinfo | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/vol1.texi | 2 +- doc/lispref/vol2.texi | 2 +- doc/man/emacs.1 | 2 +- doc/misc/faq.texi | 2 +- lib-src/makefile.w32-in | 2 +- lisp/version.el | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 ++-- .../Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | 2 +- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 4 ++-- nt/emacs.rc | 8 ++++---- nt/emacsclient.rc | 8 ++++---- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README b/README index a1cdd4e2bfc..efb8fb99a38 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.3 of GNU Emacs, the extensible, +This directory tree holds version 23.3.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 diff --git a/configure.in b/configure.in index 275e8125ab3..cfb2a2eb7dc 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.3) +AC_INIT(emacs, 23.3.50) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 34a604f7654..72483afef1e 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.3 +@set EMACSVER 23.3.50 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo index 3a8aa1c0705..d5785811dc9 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.3 +@center Emacs Version 23.3.50 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 2093806fa49..9b2b4817e27 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.3 +@set EMACSVER 23.3.50 @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 392bfc5b5e9..8454e633c78 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.3 +@set EMACSVER 23.3.50 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 63f35b7e531..f481523b981 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.3 +@set EMACSVER 23.3.50 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 0baf3abe5e3..fddef64571c 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.3" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.3.50" . . .SH NAME diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index d3acccf1693..ae2d0867fd3 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.3 +@set VER 23.3.50 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 396060a3d75..3f74064c785 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.3 +VERSION = 23.3.50 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff --git a/lisp/version.el b/lisp/version.el index 92eb56440aa..424c681c083 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.3" "\ +(defconst emacs-version "23.3.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))) "\ diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index c18c2267473..14a543bc278 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.3 Copyright (C) 2011 Free Software Foundation, Inc. + Emacs 23.3.50 Copyright (C) 2011 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.3 + 23.3.50 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 a2e48d47741..fe99acec153 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.3"; -CFBundleGetInfoString = "Emacs version 23.3, NS Windowing"; +CFBundleShortVersionString = "Version 23.3.50"; +CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 431106a0fa5..32388dd01a8 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.3 +Version=23.3.50 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 26847cced89..b72854f7600 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.3"; + ApplicationRelease = "23.3.50"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.3, NS Windowing"; + FullVersionID = "Emacs 23.3.50, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index 540781c2b8e..4c376eca811 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,3,0,0 - PRODUCTVERSION 23,3,0,0 + FILEVERSION 23,3,50,0 + PRODUCTVERSION 23,3,50,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, 3, 0, 0\0" + VALUE "FileVersion", "23, 3, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 3, 0, 0\0" + VALUE "ProductVersion", "23, 3, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 42e0d422956..d29a5ce6889 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,3,0,0 - PRODUCTVERSION 23,3,0,0 + FILEVERSION 23,3,50,0 + PRODUCTVERSION 23,3,50,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, 3, 0, 0\0" + VALUE "FileVersion", "23, 3, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 3, 0, 0\0" + VALUE "ProductVersion", "23, 3, 50, 0\0" VALUE "OLESelfRegister", "\0" END END From bb0bd45af0817b2dfad40187a20effac4d49da06 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 11 Mar 2011 21:49:29 -0500 Subject: [PATCH 12/14] * lisp/ebuff-menu.el (electric-buffer-menu-mode-map): Move initialization into declaration. Remove redundant and harmful binding. --- lisp/ChangeLog | 5 +++ lisp/ebuff-menu.el | 101 +++++++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e368e660fe2..bf3775b3852 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-12 Stefan Monnier + + * ebuff-menu.el (electric-buffer-menu-mode-map): Move initialization + into declaration. Remove redundant and harmful binding. + 2011-03-11 Juanma Barranquero Backport revno:103463 from trunk. diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 7b4c07f74f5..9f9129919da 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -35,7 +35,56 @@ ;; this depends on the format of list-buffers (from src/buffer.c) and ;; on stuff in lisp/buff-menu.el -(defvar electric-buffer-menu-mode-map nil) +(defvar electric-buffer-menu-mode-map + (let ((map (make-keymap))) + (fillarray (car (cdr map)) 'Electric-buffer-menu-undefined) + (define-key map "\e" nil) + (define-key map "\C-z" 'suspend-frame) + (define-key map "v" 'Electric-buffer-menu-mode-view-buffer) + (define-key map (char-to-string help-char) 'Helper-help) + (define-key map "?" 'Helper-describe-bindings) + (define-key map "\C-c" nil) + (define-key map "\C-c\C-c" 'Electric-buffer-menu-quit) + (define-key map "\C-]" 'Electric-buffer-menu-quit) + (define-key map "q" 'Electric-buffer-menu-quit) + (define-key map " " 'Electric-buffer-menu-select) + (define-key map "\C-m" 'Electric-buffer-menu-select) + (define-key map "\C-l" 'recenter) + (define-key map "s" 'Buffer-menu-save) + (define-key map "d" 'Buffer-menu-delete) + (define-key map "k" 'Buffer-menu-delete) + (define-key map "\C-d" 'Buffer-menu-delete-backwards) + ;; (define-key map "\C-k" 'Buffer-menu-delete) + (define-key map "\177" 'Buffer-menu-backup-unmark) + (define-key map "~" 'Buffer-menu-not-modified) + (define-key map "u" 'Buffer-menu-unmark) + (let ((i ?0)) + (while (<= i ?9) + (define-key map (char-to-string i) 'digit-argument) + (define-key map (concat "\e" (char-to-string i)) 'digit-argument) + (setq i (1+ i)))) + (define-key map "-" 'negative-argument) + (define-key map "\e-" 'negative-argument) + (define-key map "m" 'Buffer-menu-mark) + (define-key map "\C-u" 'universal-argument) + (define-key map "\C-p" 'previous-line) + (define-key map "\C-n" 'next-line) + (define-key map "p" 'previous-line) + (define-key map "n" 'next-line) + (define-key map "\C-v" 'scroll-up) + (define-key map "\ev" 'scroll-down) + (define-key map ">" 'scroll-right) + (define-key map "<" 'scroll-left) + (define-key map "\e\C-v" 'scroll-other-window) + (define-key map "\e>" 'end-of-buffer) + (define-key map "\e<" 'beginning-of-buffer) + (define-key map "\e\e" nil) + (define-key map "\e\e\e" 'Electric-buffer-menu-quit) + ;; This binding prevents the "escape => ESC" function-key-map mapping from + ;; kicking in! + ;; (define-key map [escape escape escape] 'Electric-buffer-menu-quit) + (define-key map [mouse-2] 'Electric-buffer-menu-mouse-select) + map)) (defvar electric-buffer-menu-mode-hook nil "Normal hook run by `electric-buffer-list'.") @@ -168,55 +217,7 @@ Entry to this mode via command `electric-buffer-list' calls the value of ;; generally the same as Buffer-menu-mode-map ;; (except we don't indirect to global-map) (put 'Electric-buffer-menu-undefined 'suppress-keymap t) -(if electric-buffer-menu-mode-map - nil - (let ((map (make-keymap))) - (fillarray (car (cdr map)) 'Electric-buffer-menu-undefined) - (define-key map "\e" nil) - (define-key map "\C-z" 'suspend-frame) - (define-key map "v" 'Electric-buffer-menu-mode-view-buffer) - (define-key map (char-to-string help-char) 'Helper-help) - (define-key map "?" 'Helper-describe-bindings) - (define-key map "\C-c" nil) - (define-key map "\C-c\C-c" 'Electric-buffer-menu-quit) - (define-key map "\C-]" 'Electric-buffer-menu-quit) - (define-key map "q" 'Electric-buffer-menu-quit) - (define-key map " " 'Electric-buffer-menu-select) - (define-key map "\C-m" 'Electric-buffer-menu-select) - (define-key map "\C-l" 'recenter) - (define-key map "s" 'Buffer-menu-save) - (define-key map "d" 'Buffer-menu-delete) - (define-key map "k" 'Buffer-menu-delete) - (define-key map "\C-d" 'Buffer-menu-delete-backwards) - ;(define-key map "\C-k" 'Buffer-menu-delete) - (define-key map "\177" 'Buffer-menu-backup-unmark) - (define-key map "~" 'Buffer-menu-not-modified) - (define-key map "u" 'Buffer-menu-unmark) - (let ((i ?0)) - (while (<= i ?9) - (define-key map (char-to-string i) 'digit-argument) - (define-key map (concat "\e" (char-to-string i)) 'digit-argument) - (setq i (1+ i)))) - (define-key map "-" 'negative-argument) - (define-key map "\e-" 'negative-argument) - (define-key map "m" 'Buffer-menu-mark) - (define-key map "\C-u" 'universal-argument) - (define-key map "\C-p" 'previous-line) - (define-key map "\C-n" 'next-line) - (define-key map "p" 'previous-line) - (define-key map "n" 'next-line) - (define-key map "\C-v" 'scroll-up) - (define-key map "\ev" 'scroll-down) - (define-key map ">" 'scroll-right) - (define-key map "<" 'scroll-left) - (define-key map "\e\C-v" 'scroll-other-window) - (define-key map "\e>" 'end-of-buffer) - (define-key map "\e<" 'beginning-of-buffer) - (define-key map "\e\e" nil) - (define-key map "\e\e\e" 'Electric-buffer-menu-quit) - (define-key map [escape escape escape] 'Electric-buffer-menu-quit) - (define-key map [mouse-2] 'Electric-buffer-menu-mouse-select) - (setq electric-buffer-menu-mode-map map))) + (defun Electric-buffer-menu-exit () (interactive) From 1e08a4a15654e2b3c6c75a8f252d9047ad3c0479 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 12 Mar 2011 14:17:54 +0100 Subject: [PATCH 13/14] Remove arch-tag. * trampver.texi: Update release number. --- doc/misc/ChangeLog | 4 ++++ doc/misc/tramp.texi | 4 ---- doc/misc/trampver.texi | 10 +++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c0bd2f2778c..6c9557cb0ee 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-03-12 Michael Albinus + + * trampver.texi: Update release number. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index f76df61335c..542e649aeab 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3660,7 +3660,3 @@ for @value{emacsothername}. @c * Use `filename' resp. `file name' consistently. @c * Use `host' resp. `machine' consistently. @c * Consistent small or capitalized words especially in menues. - -@ignore - arch-tag: f96dd66e-6dd3-4c92-8d77-9c56205ba808 -@end ignore diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 1cfcba637ae..6e0674c4cb3 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -2,14 +2,14 @@ @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c This is part of the Emacs manual. -@c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, -@c 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +@c 2011 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.1.20 +@set trampver 2.1.21-pre @c Other flags from configuration @set instprefix /usr/local @@ -75,7 +75,3 @@ @set emacsotherfilename tramp-emacs.html @set japanesemanual tramp_ja-xemacs.html @end ifset - -@ignore - arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c -@end ignore From 6efb972c00a9ea8ffa84118199aa59c2d3a3b50e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 12 Mar 2011 14:26:19 +0100 Subject: [PATCH 14/14] * net/tramp.el (tramp-progress-reporter-update): Use `tramp-compat-funcall'. (tramp-handle-start-file-process): Use `tramp-compat-process-get'. (tramp-handle-insert-file-contents): Make `file-remote-p' call compatible. (tramp-open-connection-setup-interactive-shell): Use `tramp-compat-process-put'. * net/tramp-compat.el (tramp-compat-process-get) (tramp-compat-process-put): New defuns. * net/trampver.el: Update release number. Please do not merge with the trunk. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/net/tramp-compat.el | 12 ++++++++++++ lisp/net/tramp.el | 11 +++++++---- lisp/net/trampver.el | 8 ++++---- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf3775b3852..b232ea61ee8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2011-03-12 Michael Albinus + + * net/tramp.el (tramp-progress-reporter-update): Use + `tramp-compat-funcall'. + (tramp-handle-start-file-process): Use `tramp-compat-process-get'. + (tramp-handle-insert-file-contents): Make `file-remote-p' call + compatible. + (tramp-open-connection-setup-interactive-shell): Use + `tramp-compat-process-put'. + + * net/tramp-compat.el (tramp-compat-process-get) + (tramp-compat-process-put): New defuns. + + * net/trampver.el: Update release number. + 2011-03-12 Stefan Monnier * ebuff-menu.el (electric-buffer-menu-mode-map): Move initialization diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 3170e5aba06..beb380d5e6f 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -438,6 +438,18 @@ element is not omitted." (setenv "UNIX95" unix95) result))))) +;; The following functions do not exist in XEmacs. We ignore this; +;; they are used for checking a remote tty. +(defun tramp-compat-process-get (process propname) + "Return the value of PROCESS' PROPNAME property. +This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'." + (ignore-errors (tramp-compat-funcall 'process-get process propname))) + +(defun tramp-compat-process-put (process propname value) + "Change PROCESS' PROPNAME property to VALUE. +It can be retrieved with `(process-get PROCESS PROPNAME)'." + (ignore-errors (tramp-compat-funcall 'process-put process propname value))) + (provide 'tramp-compat) ;;; TODO: diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c40d65ca913..c80420eb17c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2313,7 +2313,7 @@ FILE must be a local file name on a connection identified via VEC." (let* ((parameters (cdr reporter)) (message (aref parameters 3))) (when (string-match message (or (current-message) "")) - (funcall 'progress-reporter-update reporter value)))) + (tramp-compat-funcall 'progress-reporter-update reporter value)))) (defmacro with-progress-reporter (vec level message &rest body) "Executes BODY, spinning a progress reporter with MESSAGE. @@ -4570,7 +4570,7 @@ beginning of local filename are not substituted." (tramp-send-command v command nil t) ; nooutput ;; Check, whether a pty is associated. (tramp-maybe-open-connection v) - (unless (process-get + (unless (tramp-compat-process-get (tramp-get-connection-process v) 'remote-tty) (tramp-error v 'file-error @@ -5025,7 +5025,9 @@ coding system might not be determined. This function repairs it." (set-visited-file-modtime) (set-buffer-modified-p nil) ;; For root, preserve owner and group when editing files. - (when (string-equal (file-remote-p filename 'user) "root") + (when (string-equal + (tramp-file-name-handler 'file-remote-p filename 'user) + "root") (set (make-local-variable 'backup-by-copying-when-mismatch) t))) (when (and (stringp local-copy) (or remote-copy (null tramp-temp-buffer-file-name))) @@ -7111,7 +7113,8 @@ process to set up. VEC specifies the connection." ;; Set `remote-tty' process property. (ignore-errors (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\""))) - (unless (zerop (length tty)) (process-put proc 'remote-tty tty)))) + (unless (zerop (length tty)) + (tramp-compat-process-put proc 'remote-tty tty)))) ;; Dump stty settings in the traces. (when (>= tramp-verbose 9) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 80e06121f83..0fc0cd3657b 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -1,8 +1,8 @@ ;;; trampver.el --- Transparent Remote Access, Multiple Protocol ;;; lisp/trampver.el. Generated from trampver.el.in by configure. -;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, -;; 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +;; 2011 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Keywords: comm, processes @@ -30,14 +30,14 @@ ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4; ;; should be changed only there. -(defconst tramp-version "2.1.20" +(defconst tramp-version "2.1.21-pre" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" "Email address to send bug reports to.") ;; Check for (X)Emacs version. -(let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.20 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) +(let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.21-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) (provide 'trampver)