# HG changeset patch # User Miles Bader # Date 1177562307 0 # Node ID 92c344270c8a11454f8ea3c2dffc7408e5b34d71 # Parent cc0ad0e60cfc0d4e94043f5b36aaae4458b350dd# Parent e082c4d6a1e162a1e787ecd78999add1914e1ce5 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 711-712) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-199 diff -r cc0ad0e60cfc -r 92c344270c8a ChangeLog --- a/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-26 Glenn Morris + + * README: Increase version to 22.1.50. + 2007-04-24 Juanma Barranquero * INSTALL (DETAILED BUILDING AND INSTALLATION): Fix typo. diff -r cc0ad0e60cfc -r 92c344270c8a README --- a/README Thu Apr 26 04:31:32 2007 +0000 +++ b/README Thu Apr 26 04:38:27 2007 +0000 @@ -3,7 +3,7 @@ See the end of the file for license conditions. -This directory tree holds version 22.0.98 of GNU Emacs, the extensible, +This directory tree holds version 22.1.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 -r cc0ad0e60cfc -r 92c344270c8a admin/ChangeLog --- a/admin/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/admin/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-25 Nick Roberts + + * make-tarball.txt: Add note about cutting the branch. + 2007-02-03 Eli Zaretskii * nt/makedist.bat: Change EOL format to DOS. Don't use diff -r cc0ad0e60cfc -r 92c344270c8a admin/make-tarball.txt --- a/admin/make-tarball.txt Thu Apr 26 04:31:32 2007 +0000 +++ b/admin/make-tarball.txt Thu Apr 26 04:38:27 2007 +0000 @@ -76,7 +76,22 @@ 14. For a pretest, let Richard Stallman know about the new pretest and tell him to announce it using the announcement you prepared. Remind him to set a Reply-to header to . - For a release, Richard should prepare the announcement himself, + +15. Shortly before the release, cut the branch with the following commands: + + cvs rtag EMACS_`NUMBER'_BASE + cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE + +where `NUMBER' is the major version number of the release. This makes it +easier to see what changes have been applied to the branch with: + + cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC + +or merge changes back to the trunk with "cvs update -j", if necessary. + +After doing this, increase the version number on the trunk as per step 4. + +16. For a release, Richard should prepare the announcement himself, possibly starting from a previous announcment. # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390 diff -r cc0ad0e60cfc -r 92c344270c8a admin/notes/copyright --- a/admin/notes/copyright Thu Apr 26 04:31:32 2007 +0000 +++ b/admin/notes/copyright Thu Apr 26 04:38:27 2007 +0000 @@ -591,8 +591,8 @@ *** These are copyright issues still to be addressed: -Need an assignment from Kevin Rodgers (rms), else several changes to -deal with. +python.el potential legal problem +http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html diff -r cc0ad0e60cfc -r 92c344270c8a etc/ChangeLog --- a/etc/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/etc/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,11 @@ +2007-04-25 Werner Lemberg + + * emacs.1: Replace -- with \(em. + +2007-04-25 Yavor Doganov (tiny change) + + * emacs.1, etags.1: Escape some minus signs. + 2007-04-22 Glenn Morris * NEWS: Change to EMACS env-var was reverted, so delete this entry. diff -r cc0ad0e60cfc -r 92c344270c8a etc/emacs.1 --- a/etc/emacs.1 Thu Apr 26 04:31:32 2007 +0000 +++ b/etc/emacs.1 Thu Apr 26 04:38:27 2007 +0000 @@ -157,7 +157,7 @@ .TP 8 .BI \-batch Edit in batch mode. The editor will send messages to stderr. This -option must be the first in the argument list. You must use -l and -f +option must be the first in the argument list. You must use \-l and \-f options to specify files to execute and functions to call. .TP .B \-kill @@ -399,12 +399,12 @@ T} .\" START DELETING HERE IF YOU'RE NOT USING X MENUS CTRL-SHIFT-left T{ -X buffer menu--hold the buttons and keys +X buffer menu \(em hold the buttons and keys down, wait for menu to appear, select buffer, and release. Move mouse out of menu and release to cancel. T} -CTRL-SHIFT-middle X help menu--pop up index card menu for Emacs help. +CTRL-SHIFT-middle X help menu \(em pop up index card menu for Emacs help. .\" STOP DELETING HERE IF YOU'RE NOT USING X MENUS CTRL-SHIFT-right T{ Select window with mouse, and delete all diff -r cc0ad0e60cfc -r 92c344270c8a etc/etags.1 --- a/etc/etags.1 Thu Apr 26 04:31:32 2007 +0000 +++ b/etc/etags.1 Thu Apr 26 04:38:27 2007 +0000 @@ -224,7 +224,7 @@ .br A regexp can be preceded by {\fIlang\fP}, thus restricting it to match -lines of files of the specified language. Use \fBetags --help\fP to obtain +lines of files of the specified language. Use \fBetags \-\-help\fP to obtain a list of the recognised languages. This feature is particularly useful inside \fBregex files\fP. A regex file contains one regex per line. Empty lines, and those lines beginning with space or tab are ignored. Lines beginning diff -r cc0ad0e60cfc -r 92c344270c8a lib-src/ChangeLog --- a/lib-src/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/lib-src/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-26 Glenn Morris + + * makefile.w32-in (VERSION): Increase to 22.1.50. + 2007-02-26 Francesco Potort,Al(B * Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs". diff -r cc0ad0e60cfc -r 92c344270c8a lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Thu Apr 26 04:31:32 2007 +0000 +++ b/lib-src/makefile.w32-in Thu Apr 26 04:38:27 2007 +0000 @@ -24,7 +24,7 @@ .PHONY: $(ALL) -VERSION = 22.0.98 +VERSION = 22.1.50 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff -r cc0ad0e60cfc -r 92c344270c8a lisp/ChangeLog --- a/lisp/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,31 @@ +2007-04-26 Luc Teirlinck + + * locate.el (locate-in-alternate-database): Doc fix. + +2007-04-26 Glenn Morris + + * button.el (button): Use underline if supported, else fall back + to color. + + * version.el (emacs-version): Increase to 22.1.50. + +2007-04-25 J.D. Smith + + * progmodes/idlwave.el (idlwave-beginning-of-subprogram, + idlwave-end-of-subprogram): Take optional NOMARK arg to prevent + pushing mark. + (idlwave-current-routine): Don't push mark. + +2007-04-25 Mathias Dahl + + * image-dired.el (image-dired-display-image): Derive image-type + from filename rather than assuming jpeg, in case no resizing was + needed. + +2007-04-25 Johan Bockg,Ae(Brd + + * custom.el (defface): Doc fix. + 2007-04-24 J.D. Smith * progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): Don't diff -r cc0ad0e60cfc -r 92c344270c8a lisp/button.el --- a/lisp/button.el Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/button.el Thu Apr 26 04:38:27 2007 +0000 @@ -52,11 +52,12 @@ ;; Globals ;; Use color for the MS-DOS port because it doesn't support underline. -;; Also for the linux console. +;; FIXME if MS-DOS correctly answers the (supports) question, it need +;; no longer be a special case. (defface button '((((type pc) (class color)) (:foreground "lightblue")) - (((type tty)) (:inherit link)) - (t :underline t)) + (((supports :underline t)) :underline t) + (t (:foreground "lightblue"))) "Default face used for buttons." :group 'basic-faces) diff -r cc0ad0e60cfc -r 92c344270c8a lisp/custom.el --- a/lisp/custom.el Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/custom.el Thu Apr 26 04:38:27 2007 +0000 @@ -331,7 +331,7 @@ SPEC should be an alist of the form ((DISPLAY ATTS)...). -In the first element, DISPLAY can be :default. The ATTS in that +In the first element, DISPLAY can be `default'. The ATTS in that element then act as defaults for all the following elements. Aside from that, DISPLAY specifies conditions to match some or @@ -341,7 +341,7 @@ elements are ignored, on that frame. In the last element, DISPLAY can be t. That element applies to a -frame if none of the previous elements (except the :default if +frame if none of the previous elements (except the `default' if any) did. ATTS is a list of face attributes followed by their values: @@ -351,7 +351,7 @@ `:slant', `:underline', `:overline', `:strike-through', `:box', `:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'. -DISPLAY can be `:default' (only in the first element), the symbol +DISPLAY can be `default' (only in the first element), the symbol t (only in the last element) to match all frames, or an alist of conditions of the form \(REQ ITEM...). For such an alist to match a frame, each of the conditions must be satisfied, meaning diff -r cc0ad0e60cfc -r 92c344270c8a lisp/image-dired.el --- a/lisp/image-dired.el Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/image-dired.el Thu Apr 26 04:38:27 2007 +0000 @@ -1774,7 +1774,8 @@ If optional argument ORIGINAL-SIZE is non-nil, display image in its original size." (let ((new-file (expand-file-name image-dired-temp-image-file)) - width height command ret) + width height command ret + (image-type 'jpeg)) (setq file (expand-file-name file)) (if (not original-size) (progn @@ -1793,12 +1794,13 @@ shell-command-switch command)) (if (not (= 0 ret)) (error "Could not resize image"))) + (setq image-type (image-type-from-file-name file)) (copy-file file new-file t)) (with-current-buffer (image-dired-create-display-image-buffer) (let ((inhibit-read-only t)) (erase-buffer) (clear-image-cache) - (image-dired-insert-image image-dired-temp-image-file 'jpeg 0 0) + (image-dired-insert-image image-dired-temp-image-file image-type 0 0) (goto-char (point-min)) (image-dired-update-property 'original-file-name file))))) diff -r cc0ad0e60cfc -r 92c344270c8a lisp/locate.el --- a/lisp/locate.el Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/locate.el Thu Apr 26 04:38:27 2007 +0000 @@ -669,7 +669,12 @@ ;; Only for GNU locate (defun locate-in-alternate-database (search-string database) - "Run the GNU locate command, using an alternate database." + "Run the GNU locate command, using an alternate database. + +This command only works if you use GNU locate. It does not work +properly if `locate-prompt-for-command' is set to t. In that +case, you can just run the regular `locate' command and specify +the database on the command line." (interactive (list (progn diff -r cc0ad0e60cfc -r 92c344270c8a lisp/progmodes/idlwave.el --- a/lisp/progmodes/idlwave.el Thu Apr 26 04:31:32 2007 +0000 +++ b/lisp/progmodes/idlwave.el Thu Apr 26 04:38:27 2007 +0000 @@ -2411,16 +2411,18 @@ ;; Reindent new line (idlwave-indent-line))) -(defun idlwave-beginning-of-subprogram () - "Moves point to the beginning of the current program unit." +(defun idlwave-beginning-of-subprogram (&optional nomark) + "Moves point to the beginning of the current program unit. +If NOMARK is non-nil, do not push mark." (interactive) - (idlwave-find-key idlwave-begin-unit-reg -1)) - -(defun idlwave-end-of-subprogram () - "Moves point to the start of the next program unit." + (idlwave-find-key idlwave-begin-unit-reg -1 nomark)) + +(defun idlwave-end-of-subprogram (&optional nomark) + "Moves point to the start of the next program unit. +If NOMARK is non-nil, do not push mark." (interactive) (idlwave-end-of-statement) - (idlwave-find-key idlwave-end-unit-reg 1)) + (idlwave-find-key idlwave-end-unit-reg 1 nomark)) (defun idlwave-mark-statement () "Mark current IDL statement." @@ -2535,7 +2537,7 @@ "Return (NAME TYPE CLASS) of current routine." (idlwave-routines) (save-excursion - (idlwave-beginning-of-subprogram) + (idlwave-beginning-of-subprogram 'nomark) (if (looking-at "[ \t]*\\<\\(pro\\|function\\)\\>\\s-+\\(\\([a-zA-Z0-9$_]+\\)::\\)?\\([a-zA-Z0-9$_]+\\)") (let* ((type (if (string= (downcase (match-string 1)) "pro") 'pro 'function)) diff -r cc0ad0e60cfc -r 92c344270c8a lispref/ChangeLog --- a/lispref/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/lispref/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,12 @@ +2007-04-26 Glenn Morris + + * elisp.texi (EMACSVER): Increase to 22.1.50. + +2007-04-25 Karl Berry + + * elisp.texi: Improve line breaks on copyright page, + similar layout to emacs manual, 8.5x11 by default. + 2007-04-22 Richard Stallman * keymaps.texi (Extended Menu Items): Move the info about diff -r cc0ad0e60cfc -r 92c344270c8a lispref/elisp.texi --- a/lispref/elisp.texi Thu Apr 26 04:31:32 2007 +0000 +++ b/lispref/elisp.texi Thu Apr 26 04:38:27 2007 +0000 @@ -7,15 +7,17 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.98 +@set EMACSVER 22.1.50 @dircategory Emacs @direntry * Elisp: (elisp). The Emacs Lisp Reference Manual. @end direntry -@c for full 8.5x11, comment this out. -@set smallbook +@c in general, keep the following line commented out, unless doing a +@c copy of this manual that will be published. the manual should go +@c onto the distribution in the full, 8.5 x 11" size. +@c set smallbook @ifset smallbook @smallbook @@ -41,8 +43,8 @@ @c @syncodeindex tp fn @copying -This is edition @value{VERSION} of the GNU Emacs Lisp -Reference Manual, corresponding to Emacs version @value{EMACSVER}. +This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* +corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software @@ -74,14 +76,14 @@ @vskip 0pt plus 1filll @insertcopying -@sp 1 +@sp 2 Published by the Free Software Foundation @* 51 Franklin St, Fifth Floor @* Boston, MA 02110-1301 @* USA @* ISBN 1-882114-74-4 -@sp 1 +@sp 2 Cover art by Etienne Suvasa. @end titlepage diff -r cc0ad0e60cfc -r 92c344270c8a mac/ChangeLog --- a/mac/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/mac/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,8 @@ +2007-04-26 Glenn Morris + + * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings: + * src/Emacs.r: Increase version to 22.1.50. + 2007-04-09 YAMAMOTO Mitsuharu * make-package (compver): Don't hardcode processor type. diff -r cc0ad0e60cfc -r 92c344270c8a mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Thu Apr 26 04:31:32 2007 +0000 +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Thu Apr 26 04:38:27 2007 +0000 @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.98"; -CFBundleGetInfoString = "22.0.98, Copyright (C) 2007 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.1.50"; +CFBundleGetInfoString = "22.1.50, Copyright (C) 2007 Free Software Foundation, Inc."; diff -r cc0ad0e60cfc -r 92c344270c8a mac/src/Emacs.r --- a/mac/src/Emacs.r Thu Apr 26 04:31:32 2007 +0000 +++ b/mac/src/Emacs.r Thu Apr 26 04:38:27 2007 +0000 @@ -219,12 +219,12 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ - 0x0, /* Minor revision in BCD */ - alpha, /* development, alpha, beta, or final (release) */ - 98, /* Non-final release # */ + 0x1, /* Minor revision in BCD */ + development, /* development, alpha, beta, or final (release) */ + 50, /* Non-final release # */ 0, /* Region code */ - "22.0.98", /* Short version number */ - "22.0.98, Copyright \0xa9 2007 " + "22.1.50", /* Short version number */ + "22.1.50, Copyright \0xa9 2007 " "Free Software Foundation, Inc." /* Long version number */ }; diff -r cc0ad0e60cfc -r 92c344270c8a man/ChangeLog --- a/man/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/man/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,14 @@ +2007-04-26 Glenn Morris + + * emacs.texi (EMACSVER): Increase to 22.1.50. + +2007-04-25 Karl Berry + + * emacs.texi: Improve line breaks on copyright page, + similar layout to lispref, 8.5x11 by default. + + * dired.texi (Image-Dired): Improve line break, fix typo. + 2007-04-23 Jay Belanger * calc.texi (Reporting bugs): Update maintainer's address. diff -r cc0ad0e60cfc -r 92c344270c8a man/dired.texi --- a/man/dired.texi Thu Apr 26 04:31:32 2007 +0000 +++ b/man/dired.texi Thu Apr 26 04:38:27 2007 +0000 @@ -1196,13 +1196,13 @@ You can also enter Image-Dired directly by typing @kbd{M-x image-dired}. This prompts for a directory; specify one that has -images files. This creates thumbnails for all the images in that +image files. This creates thumbnails for all the images in that directory, and displays them all in the ``thumbnail buffer.'' This takes a long time if the directory contains many image files, and it asks for confirmation if the number of image files exceeds @code{image-dired-show-all-from-dir-max-files}. - With point in the thumbnail buffer, type @kbd{RET} + With point in the thumbnail buffer, you can type @kbd{RET} (@code{image-dired-display-thumbnail-original-image}) to display a sized version of it in another window. This sizes the image to fit the window. Use the arrow keys to move around in the buffer. For diff -r cc0ad0e60cfc -r 92c344270c8a man/emacs.texi --- a/man/emacs.texi Thu Apr 26 04:31:32 2007 +0000 +++ b/man/emacs.texi Thu Apr 26 04:38:27 2007 +0000 @@ -5,10 +5,10 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.0.98 +@set EMACSVER 22.1.50 @copying -This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, +This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, @@ -39,7 +39,7 @@ @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. the manual should go @c onto the distribution in the full, 8.5 x 11" size. -@set smallbook +@c set smallbook @ifset smallbook @smallbook @@ -76,10 +76,10 @@ @insertcopying @sp 2 -ISBN 1-882114-86-8* Published by the Free Software Foundation @* 51 Franklin Street, Fifth Floor @* -Boston, MA 02110-1301 USA +Boston, MA 02110-1301 USA @* +ISBN 1-882114-86-8 @sp 2 Cover art by Etienne Suvasa. diff -r cc0ad0e60cfc -r 92c344270c8a nt/ChangeLog --- a/nt/ChangeLog Thu Apr 26 04:31:32 2007 +0000 +++ b/nt/ChangeLog Thu Apr 26 04:38:27 2007 +0000 @@ -1,3 +1,7 @@ +2007-04-26 Glenn Morris + + * emacs.rc: Increase version to 22.1.50. + 2007-03-31 Eli Zaretskii * INSTALL: Mention the VCVARS32.BAT batch file for VS.NET users. diff -r cc0ad0e60cfc -r 92c344270c8a nt/emacs.rc --- a/nt/emacs.rc Thu Apr 26 04:31:32 2007 +0000 +++ b/nt/emacs.rc Thu Apr 26 04:38:27 2007 +0000 @@ -6,8 +6,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,98,0 - PRODUCTVERSION 22,0,98,0 + FILEVERSION 22,1,50,0 + PRODUCTVERSION 22,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 98, 0\0" + VALUE "FileVersion", "22, 1, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 98, 0\0" + VALUE "ProductVersion", "22, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END