From cb69c3d009779b979f87b9b74457930a599bedce Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 25 Apr 2007 01:26:05 +0000 Subject: [PATCH 01/20] Add note about cutting the branch. --- admin/make-tarball.txt | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index e56c26571d9..1aca63bb843 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -76,7 +76,24 @@ For each step, check for possible errors. 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, + +> If no major problems with the April 16 pretest come to light, we +> should cut the Emacs 22 CVS branch on Friday, April 20, and release +> Emacs 22.1 on Monday, April 23. + +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. + +16. For a release, Richard should prepare the announcement himself, possibly starting from a previous announcment. # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390 From 017f0417b3587c58f912e45e30e8c921f10571b5 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 25 Apr 2007 01:32:35 +0000 Subject: [PATCH 02/20] *** empty log message *** --- admin/ChangeLog | 4 ++++ admin/make-tarball.txt | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 3de9ca32484..b036ea11c33 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -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 --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 1aca63bb843..0f05e7d82e4 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -77,10 +77,6 @@ For each step, check for possible errors. tell him to announce it using the announcement you prepared. Remind him to set a Reply-to header to . -> If no major problems with the April 16 pretest come to light, we -> should cut the Emacs 22 CVS branch on Friday, April 20, and release -> Emacs 22.1 on Monday, April 23. - 15. Shortly before the release, cut the branch with the following commands: cvs rtag EMACS_`NUMBER'_BASE From d497fd17a15ea0b3d84016f03178c9d3a7b63748 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 04:43:51 +0000 Subject: [PATCH 03/20] *** empty log message *** --- lisp/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 510cc48f46a..8d6f6104f54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +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 From ebdaed17f4b48e115c49c9eac5bbc85631172be4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 04:44:28 +0000 Subject: [PATCH 04/20] =?UTF-8?q?Johan=20Bockg=EF=BF=BD=20=20:=20(defface):=20Doc=20fix.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lisp/custom.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/custom.el b/lisp/custom.el index d53951793d2..f5028ddc0d5 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -331,7 +331,7 @@ For a list of valid keywords, see the common keywords listed in 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 @@ frame. The ATTRs in this element take effect, and the following 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 @@ The possible attributes are `:family', `:width', `:height', `:weight', `: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 From e0717d738dcdfb9f87d421048d5c1a1db97e2c84 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 04:58:14 +0000 Subject: [PATCH 05/20] Mathias Dahl : (image-dired-display-image): Derive image-type from filename rather than assuming jpeg, in case no resizing was needed. --- lisp/image-dired.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/image-dired.el b/lisp/image-dired.el index ed330410d88..49c9832cbcf 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1774,7 +1774,8 @@ should feel snappy enough. 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 @@ original size." 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))))) From 93b39f7b1304151d25900b2d66a8b46abbe94db7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 05:44:37 +0000 Subject: [PATCH 06/20] *** empty log message *** --- etc/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/ChangeLog b/etc/ChangeLog index cbe51839529..74512fa6979 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +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. From 95aa963f9a12b6dd84bc3713f797d7cbcbde8aef Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 05:45:30 +0000 Subject: [PATCH 07/20] Yavor Doganov (tiny change) Escape some minus signs. --- etc/emacs.1 | 2 +- etc/etags.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/emacs.1 b/etc/emacs.1 index 7d90d5a4410..b5240847498 100644 --- a/etc/emacs.1 +++ b/etc/emacs.1 @@ -157,7 +157,7 @@ as a batch editor: .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 diff --git a/etc/etags.1 b/etc/etags.1 index 561ba55e5c1..04b67f389f4 100644 --- a/etc/etags.1 +++ b/etc/etags.1 @@ -224,7 +224,7 @@ Tag TCL files (this last example shows the usage of a \fItagregexp\fP): .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 From 8fedd5cb89499657ef339996f28d0c9333984127 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 05:51:56 +0000 Subject: [PATCH 08/20] Werner LEMBERG : Replace -- with \(em. --- etc/emacs.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/emacs.1 b/etc/emacs.1 index b5240847498..ef945420de2 100644 --- a/etc/emacs.1 +++ b/etc/emacs.1 @@ -399,12 +399,12 @@ two windows. Same as typing CTRL-x 2. 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 From e28f9ad3c609d67a29649bea5e29da0432e502a2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Apr 2007 05:53:17 +0000 Subject: [PATCH 09/20] *** empty log message *** --- etc/ChangeLog | 6 +++++- lisp/ChangeLog | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 74512fa6979..1c9de0ac3e7 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,4 +1,8 @@ -2007-04-25 Yavor Doganov (tiny change) +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. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d6f6104f54..1b3245e90f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +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. From 77ae614b7687bfc7998216258be0571023f7f2f8 Mon Sep 17 00:00:00 2001 From: "J.D. Smith" Date: Wed, 25 Apr 2007 20:44:54 +0000 Subject: [PATCH 10/20] (idlwave-beginning-of-subprogram, idlwave-end-of-subprogram): Take optional NOMARK arg to prevent pushing mark. (idlwave-current-routine): Don't push mark. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/idlwave.el | 16 +++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b3245e90f1..2016d242ab5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +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 diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index d29e56ce75d..0556c87b43d 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -2411,16 +2411,18 @@ non-nil." ;; 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)) + (idlwave-find-key idlwave-begin-unit-reg -1 nomark)) -(defun idlwave-end-of-subprogram () - "Moves point to the start of the next program unit." +(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 @@ The marks are pushed." "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)) From b8e5a12939f7f847668a39a2d972232a74156b21 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Apr 2007 23:23:33 +0000 Subject: [PATCH 11/20] last-minute better break --- man/ChangeLog | 4 ++++ man/dired.texi | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/man/ChangeLog b/man/ChangeLog index 3981e0c7d25..14961e07d02 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2007-04-25 Karl Berry + + * dired.texi (Image-Dired): Improve line break, fix typo. + 2007-04-23 Jay Belanger * calc.texi (Reporting bugs): Update maintainer's address. diff --git a/man/dired.texi b/man/dired.texi index 922914a123f..edd4e0652c4 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -1196,13 +1196,13 @@ buffer containing image-dired, corresponding to the marked files. 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 From 7cc4ec2966fbe138147b7483a02324a39c11cf68 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Apr 2007 00:10:22 +0000 Subject: [PATCH 12/20] better breaks on copyright page, 8.5x11 by default --- lispref/ChangeLog | 5 +++++ lispref/elisp.texi | 14 ++++++++------ man/ChangeLog | 3 +++ man/emacs.texi | 8 ++++---- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 7326f9cd8b2..b4458e7fa30 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +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 --git a/lispref/elisp.texi b/lispref/elisp.texi index 546f1ca4f97..984bbf1d7a0 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -14,8 +14,10 @@ * 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 @@ Software Foundation raise funds for GNU development.'' @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 --git a/man/ChangeLog b/man/ChangeLog index 14961e07d02..7f987a8e35d 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,5 +1,8 @@ 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 diff --git a/man/emacs.texi b/man/emacs.texi index bf18bfb6f02..973a0495b48 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -8,7 +8,7 @@ @set EMACSVER 22.0.98 @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 @@ Software Foundation raise funds for GNU development.'' @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 @@ Software Foundation raise funds for GNU development.'' @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. From 4f54692cb2b894a51540a928677461edfa5d6152 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:18:37 +0000 Subject: [PATCH 13/20] *** empty log message *** --- lisp/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2016d242ab5..d38f92f6477 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-04-26 Glenn Morris + + * button.el (button): Use underline if supported, else fall back + to color. + 2007-04-25 J.D. Smith * progmodes/idlwave.el (idlwave-beginning-of-subprogram, From 5eabdf0fe8c13c5a25f139e2254638e94c2f5bf9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:19:13 +0000 Subject: [PATCH 14/20] (button): Use underline if supported, else fall back to color. --- lisp/button.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/button.el b/lisp/button.el index 8c3681854e7..ebc078f8193 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -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) From 0da470a0b92c870674123f2ffc7cd710fa0ba5f8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:28:30 +0000 Subject: [PATCH 15/20] (EMACSVER): Increase to 22.1.50. --- lispref/elisp.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 984bbf1d7a0..c6e58fcb820 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -7,7 +7,7 @@ @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 From f5430f7f5b703bd7cea76e875ed5fd1804274d37 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:32:40 +0000 Subject: [PATCH 16/20] *** empty log message *** --- lisp/ChangeLog | 2 ++ mac/ChangeLog | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d38f92f6477..832beea86c1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * 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, diff --git a/mac/ChangeLog b/mac/ChangeLog index d427a71e5c5..2f3249c001b 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,8 @@ +2007-04-26 Glenn Morris + + * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings: + Increase version to 22.1.50. + 2007-04-09 YAMAMOTO Mitsuharu * make-package (compver): Don't hardcode processor type. From 5ba76e083b381f9d669552adc87c623762a22602 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:32:48 +0000 Subject: [PATCH 17/20] Increase version to 22.1.50. --- README | 2 +- lib-src/makefile.w32-in | 2 +- lisp/version.el | 2 +- .../Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- mac/src/Emacs.r | 10 +++++----- man/emacs.texi | 2 +- nt/emacs.rc | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index 32e5b7bd924..a0bc92d58d2 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 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 --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 3ae5220c5f1..953fa7ae6be 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .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 --git a/lisp/version.el b/lisp/version.el index 371963daa43..0ed3927d0fc 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "22.0.98" "\ +(defconst emacs-version "22.1.50" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index c9f8190c883..fc069b9bb47 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -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 --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 0a17e379168..27d91b59ea0 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -219,12 +219,12 @@ resource 'FREF' (129) { 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 --git a/man/emacs.texi b/man/emacs.texi index 973a0495b48..61c732677ad 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -5,7 +5,7 @@ @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},@* diff --git a/nt/emacs.rc b/nt/emacs.rc index 99427cc5742..cf72b88a8ea 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico #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 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 From 3d2a7c53b65b413f9491541905f701e9d3eca73e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:34:46 +0000 Subject: [PATCH 18/20] Mention increasing trunk version number after branching. --- admin/make-tarball.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 0f05e7d82e4..2c6ccf95c40 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -89,6 +89,8 @@ easier to see what changes have been applied to the branch with: 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. From 169bac43653a350c4a59d49cbcb62e5ae2fd44f8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:43:32 +0000 Subject: [PATCH 19/20] Luc Teirlinck : (locate-in-alternate-database): Doc fix. --- lisp/locate.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/locate.el b/lisp/locate.el index 74a76fa4889..e00c68029cb 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -669,7 +669,12 @@ locate database using the shell command in `locate-update-command'." ;; 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 From 0701603152f1f0c1961e589a6cf0c84bfa367f8c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2007 03:44:07 +0000 Subject: [PATCH 20/20] *** empty log message *** --- ChangeLog | 4 ++++ admin/notes/copyright | 4 ++-- lib-src/ChangeLog | 4 ++++ lisp/ChangeLog | 4 ++++ lispref/ChangeLog | 4 ++++ mac/ChangeLog | 2 +- man/ChangeLog | 4 ++++ nt/ChangeLog | 4 ++++ 8 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 058e3a0ad38..08eebb6f29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/admin/notes/copyright b/admin/notes/copyright index d7f12bd8ad4..b366be2a2c7 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -591,8 +591,8 @@ REMOVED src/unexhp9k800.c *** 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 --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 04657225ab0..e91b99e98af 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog index 832beea86c1..b8c8ca22550 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/lispref/ChangeLog b/lispref/ChangeLog index b4458e7fa30..eb4fa2e7c4d 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,7 @@ +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, diff --git a/mac/ChangeLog b/mac/ChangeLog index 2f3249c001b..9f2d2af2664 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,7 +1,7 @@ 2007-04-26 Glenn Morris * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings: - Increase version to 22.1.50. + * src/Emacs.r: Increase version to 22.1.50. 2007-04-09 YAMAMOTO Mitsuharu diff --git a/man/ChangeLog b/man/ChangeLog index 7f987a8e35d..dbb804580c4 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +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, diff --git a/nt/ChangeLog b/nt/ChangeLog index c5ad2555bbe..e41f31dcac7 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -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.