Mercurial > emacs

changeset 83094:8e5779acd195

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS HEAD Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-193 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-194 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-195 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-196 Remove RCS keywords * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-197 Stupid CVS keyword changes * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-198 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-199 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-134
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 10 Apr 2004 23:06:09 +0000
parents fd7beda03521 (current diff) ae50ef10fab5 (diff)
children b448166f5664
files lisp/ChangeLog lisp/allout.el lisp/calendar/todo-mode.el lisp/emacs-lisp/bytecomp.el lisp/emacs-lisp/cl-specs.el lisp/emacs-lisp/eldoc.el lisp/forms.el lisp/ldefs-boot.el lisp/mail/metamail.el lisp/net/rlogin.el lisp/obsolete/rsz-mini.el lisp/progmodes/ada-mode.el lisp/progmodes/ada-prj.el lisp/progmodes/ada-stmt.el lisp/progmodes/autoconf.el lisp/progmodes/delphi.el lisp/progmodes/idlw-shell.el lisp/progmodes/idlw-toolbar.el lisp/progmodes/idlwave.el lisp/progmodes/tcl.el lisp/progmodes/vhdl-mode.el lisp/recentf.el lisp/type-break.el lisp/url/url-about.el lisp/url/url-auth.el lisp/url/url-cache.el lisp/url/url-cid.el lisp/url/url-cookie.el lisp/url/url-dav.el lisp/url/url-dired.el lisp/url/url-expand.el lisp/url/url-file.el lisp/url/url-ftp.el lisp/url/url-gw.el lisp/url/url-handlers.el lisp/url/url-history.el lisp/url/url-http.el lisp/url/url-https.el lisp/url/url-imap.el lisp/url/url-irc.el lisp/url/url-ldap.el lisp/url/url-mailto.el lisp/url/url-methods.el lisp/url/url-misc.el lisp/url/url-news.el lisp/url/url-nfs.el lisp/url/url-ns.el lisp/url/url-parse.el lisp/url/url-privacy.el lisp/url/url-proxy.el lisp/url/url-util.el lisp/url/url-vars.el lisp/url/url.el lisp/url/vc-dav.el lisp/whitespace.el oldXMenu/Activate.c oldXMenu/AddPane.c oldXMenu/AddSel.c oldXMenu/ChgPane.c oldXMenu/ChgSel.c oldXMenu/Create.c oldXMenu/DelPane.c oldXMenu/DelSel.c oldXMenu/Destroy.c oldXMenu/Error.c oldXMenu/EvHand.c oldXMenu/FindPane.c oldXMenu/FindSel.c oldXMenu/InsPane.c oldXMenu/InsSel.c oldXMenu/Internal.c oldXMenu/Locate.c oldXMenu/Post.c oldXMenu/Recomp.c oldXMenu/SetAEQ.c oldXMenu/SetFrz.c oldXMenu/SetPane.c oldXMenu/SetSel.c oldXMenu/X10.h oldXMenu/XMenu.h oldXMenu/XMenuInt.h oldXMenu/copyright.h src/buffer.c src/xfaces.c
diffstat 102 files changed, 310 insertions(+), 356 deletions(-) [+]
line wrap: on
line diff
--- a/leim/ChangeLog	Thu Apr 08 15:09:37 2004 +0000
+++ b/leim/ChangeLog	Sat Apr 10 23:06:09 2004 +0000
@@ -1,3 +1,8 @@
+2004-04-09  Andrew Innes  <andrewi@gnu.org>
+
+	* makefile.w32-in (distclean clean): Remove nmake specific
+	stamp-subdir test.
+
 2004-02-28  Kenichi Handa  <handa@m17n.org>
 
 	* Makefile.in (all): Depends on ${WORLD} instead of ${TIT} and
--- a/leim/makefile.w32-in	Thu Apr 08 15:09:37 2004 +0000
+++ b/leim/makefile.w32-in	Sat Apr 10 23:06:09 2004 +0000
@@ -198,7 +198,7 @@
 	- $(DEL) leim-list.el
 
 distclean clean:
-	if exist stamp-subdir $(DELTREE) $(SUBDIRS)
+	- $(DELTREE) $(SUBDIRS)
 	- $(DEL) stamp-subdir
 
 maintainer-clean: distclean
--- a/lisp/ChangeLog	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/ChangeLog	Sat Apr 10 23:06:09 2004 +0000
@@ -1,3 +1,55 @@
+2004-04-11  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-confirm-unique-completion): New defcustom.
+	(ido-complete): Use it.
+	(ido-write-file): Set it to t unconditionally.
+
+2004-04-10  Miles Bader  <miles@gnu.org>
+
+	RCS keyword removal (only non-comment changes are enumerated here):
+
+	* emacs-lisp/bytecomp.el (byte-compile-version): Variable removed.
+	(byte-compile-insert-header): Don't use `byte-compile-version'.
+	* url/url-vars.el (url-version): Use the constant string "Emacs"
+	instead of calculating something from the RCS `State' keyword
+	[the latter is almost entirely useless anyway].
+	* forms.el (forms-version): Variable removed.
+	(forms-mode): Don't use `forms-version'.
+	* recentf.el (recentf-version): Variable removed.
+	* progmodes/delphi.el (delphi-version): Variable removed.
+	* progmodes/ada-mode.el (ada-mode): RCS keyword removed from docstring.
+
+2004-04-09  Jesper Harder  <harder@ifa.au.dk>
+
+	* info.el (info-apropos): Improve menu item regexp.
+
+2004-04-09  Simon Josefsson  <jas@extundo.com>
+
+	* mail/smtpmail.el: Add comment, based on report by
+	kdc@rcn.com (Kevin D. Clark).
+
+2004-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el (compilation-mode-font-lock-keywords):
+	Redo one more thing that I didn't notice Daniel had undone.
+
+2004-04-08  Nick Roberts  <nick@nick.uklinux.net>
+
+	* progmodes/gdb-ui.el (gdb-source-window): Remove variable
+	(gdb-goto-breakpoint, gdb-display-buffer)
+	(gdb-display-source-buffer, gdb-view-source-function)
+	(gdb-view-assembler, gdb-setup-windows, gdb-restore-windows)
+	(gdb-source-info, gdb-frame-handler): Don't specify a window
+	for display.
+	(gdb-info-breakpoints-custom): Remove superfluous update of
+	assembler buffer.
+	(gdb-many-windows): Make settable outside gdb.
+
+2004-04-08  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+	* calendar/diary-lib.el (diary-mode, fancy-diary-display-mode):
+	Derive from fundamental-mode rather than text-mode.
+
 2004-04-08  Juri Linkov  <juri@jurta.org>
 
 	* info.el (Info-history): Doc fix.
@@ -18,11 +70,11 @@
 	(Info-goto-node): Switch to *info* from *info-history* *info-toc*.
 	(Info-search-whitespace-regexp): New custom.
 	(Info-search-case-fold): New var.
-	(Info-search): Add "case-sensitively" to the prompt.  Use
-	Info-search-whitespace-regexp.  Set Info-search-case-fold.
+	(Info-search): Add "case-sensitively" to the prompt.
+	Use Info-search-whitespace-regexp.  Set Info-search-case-fold.
 	(Info-search-case-sensitively, Info-search-next): New fun.
 	(Info-up): Move point to the menu item of the current node.
-	(Info-history): New fun.  Add *info-history* to same-window-buffer-names.
+	(Info-history): New fun. Add *info-history* to same-window-buffer-names.
 	(Info-toc): New fun.  Add *info-toc* to same-window-buffer-names.
 	(Info-insert-toc): New fun.
 	(Info-build-toc): New fun.
@@ -49,13 +101,39 @@
 	then fontify header line, titles, menu headers, http and ftp
 	references, refill paragraphs.  If not-fontified-p is t or
 	fontify-visited-p is t then fontify cross references, menu items.
-	Fontify menu headers.  Fontify http and ftp references.  Change
-	regexp for cross references to require whitespace after *Note, add
-	matching groups for file and node names.  Remove hack for quote.
+	Fontify menu headers.  Fontify http and ftp references.
+	Change regexp for cross references to require whitespace after *Note,
+	add matching groups for file and node names.  Remove hack for quote.
 	Use display property for Info-hide-note-references=t.  Use fifth
 	or fourth match for help-echo.  Display visited nodes in a
-	different face.  Unhide file names of external references.  Unhide
-	newlines.  Display visited menu items in a different face.
+	different face.  Unhide file names of external references.
+	Unhide newlines.  Display visited menu items in a different face.
+
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el: Require CL.
+	(compilation-mode-font-lock-keywords): Re-install the "line as
+	function" patch.
+
+	* help-fns.el (help-C-source-directory): New var.
+	(help-subr-name, help-C-file-name, help-find-C-source): New funs.
+	(describe-function-1, describe-variable): Use them.
+
+	* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
+	to C source files specially.
+
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el: Require CL.
+	(compilation-mode-font-lock-keywords): Re-install the "line as
+	function" patch.
+
+	* help-fns.el (help-C-source-directory): New var.
+	(help-subr-name, help-C-file-name, help-find-C-source): New funs.
+	(describe-function-1, describe-variable): Use them.
+
+	* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
+	to C source files specially.
 
 2004-04-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
@@ -67,8 +145,8 @@
 
 	* progmodes/compile.el (compilation-warning-face)
 	(compilation-info-face, compilation-skip-threshold)
-	(compilation-skip-visited, compilation-context-lines): Declare
-	:version when added to Emacs.
+	(compilation-skip-visited, compilation-context-lines):
+	Declare :version when added to Emacs.
 	(compilation-error-regexp-alist-alist): Extend caml and irix.
 	(compilation-setup): Fix if font-locked w/o font-lock-defaults.
 	(compilation-mode-font-lock-keywords): Temporarily undo line as
@@ -82,8 +160,8 @@
 
 2004-04-06  Kenichi Handa  <handa@m17n.org>
 
-	* language/ethio-util.el (ethio-sera-being-called-by-w3): New
-	variable.
+	* language/ethio-util.el (ethio-sera-being-called-by-w3):
+	New variable.
 	(ethio-sera-to-fidel-ethio): Check ethio-sera-being-called-by-w3
 	instead of sera-being-called-by-w3.
 	(ethio-fidel-to-sera-buffer): Likewise.
@@ -111,11 +189,10 @@
 
 2004-04-05  Per Abrahamsen  <abraham@dina.kvl.dk>
 
-	* cus-edit.el (custom-add-parent-links): Changed unbound variable
+	* cus-edit.el (custom-add-parent-links): Change unbound variable
 	`symbol' to `name'.
 
 2004-04-05  Jesper Harder  <harder@ifa.au.dk>
-
 	* info.el (info-apropos): New function.
 	(Info-mode-menu): Add it.
 	(Info-find-node, Info-find-node-2): Grok apropos virtual file.
@@ -125,6 +202,31 @@
 
 	* play/gamegrid.el (gamegrid-add-score-insecure): Use sort-fields.
 
+2004-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/fill.el (fill-comment-paragraph): Obey indent-tabs-mode.
+
+	* progmodes/compile.el (font-lock): Don't require any more.
+	(compilation-error-properties, compilation-start, compilation-sentinel)
+	(compilation-filter, next-error): Use with-current-buffer.
+	(compilation-skip-to-next-location, compilation-skip-threshold)
+	(compilation-skip-visited): Move to silence the byte-compiler.
+	(compilation-setup): Simplify.
+	(compilation-next-error): Use line-(beginning|end)-position.
+	Make sure `pt' is non-nil before using compilation-loop.
+	(compile-goto-error): Add optional event arg.  Use it.
+	(compile-mouse-goto-error): Make it an alias of compile-goto-error.
+	(compilation-minor-mode-map, compilation-shell-minor-mode-map):
+	Update the binding for mouse-2.
+	(first-error): Set compilation-current-error to nil rather than bob.
+	(compilation-parsing-end, compilation-parse-errors-function)
+	(compilation-error-list, compilation-old-error-list):
+	"New" compatibility variables.
+	(compile-buffer-substring, compilation-compat-error-properties)
+	(compilation-compat-parse-errors, compilation-forget-errors):
+	New compatibility functions.
+	(compilation-mode-font-lock-keywords): Use them.
+
 2004-04-04  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* autorevert.el (auto-revert-handler): If point (or a window
@@ -140,31 +242,23 @@
 	* progmodes/ebnf2ps.el: Doc fix.
 	(ebnf-version): New version number (4.2).
 	(ebnf-syntax): Customization and docstring fix.
-	(ebnf-eliminate-empty-rules, ebnf-optimize, ebnf-otz-initialize): Put
-	autoloaded funs before first use.
+	(ebnf-eliminate-empty-rules, ebnf-optimize, ebnf-otz-initialize):
+	Put autoloaded funs before first use.
 	(ebnf-style-database): Add dtd entry.
 	(ebnf-syntax-alist): Add dtd initialization.
 	(ebnf-token-sequence): New fun.
 	(ebnf-comment-table): Add new comment action character.
-	(ebnf-dtd-parser, ebnf-dtd-initialize): Autoloaded funs from ebnf-dtd.
+	(ebnf-dtd-parser, ebnf-dtd-initialize): Autoload funs from ebnf-dtd.
 
 	* progmodes/ebnf-dtd.el: New file, implement a parser for DTD (Data
 	Type Definition for XML).
 
-	* progmodes/ebnf-abn.el (ebnf-abn-concatenation): Code simplification:
-	call ebnf-token-sequence.
-
-	* progmodes/ebnf-bnf.el (ebnf-sequence): Code simplification: call
-	ebnf-token-sequence.
-
-	* progmodes/ebnf-ebx.el (ebnf-ebx-concatenation): Code simplification:
-	call ebnf-token-sequence.
-
-	* progmodes/ebnf-iso.el (ebnf-iso-single-definition): Code
-	simplification: call ebnf-token-sequence.
-
-	* progmodes/ebnf-yac.el (ebnf-yac-sequence): Code simplification: call
-	ebnf-token-sequence.
+	* progmodes/ebnf-abn.el (ebnf-abn-concatenation):
+	* progmodes/ebnf-bnf.el (ebnf-sequence):
+	* progmodes/ebnf-ebx.el (ebnf-ebx-concatenation):
+	* progmodes/ebnf-iso.el (ebnf-iso-single-definition):
+	* progmodes/ebnf-yac.el (ebnf-yac-sequence):
+	Code simplification: call ebnf-token-sequence.
 
 2004-04-04  Eli Zaretskii  <eliz@gnu.org>
 
@@ -178,6 +272,9 @@
 
 	* url: Import the URL package from its repository.
 
+	* url/url-methods.el:
+	* url/url-parse.el: Don't require url-auto.
+
 2004-04-03  Andreas Schwab  <schwab@suse.de>
 
 	* diff-mode.el (diff-mode): Fix missing quote.
@@ -303,7 +400,7 @@
 	(ebnf-syntax): Adjust customization.
 	(ebnf-style-database): Add ebnfx entry.
 	(ebnf-syntax-alist): Add ebnfx initialization.
-	(ebnf-ebx-parser, ebnf-ebx-initialize): Autoloaded funs from ebnf-ebx.
+	(ebnf-ebx-parser, ebnf-ebx-initialize): Autoload funs from ebnf-ebx.
 
 	* printing.el: Doc fix.
 	(pr-version): New version number (6.7.3).
@@ -483,6 +580,10 @@
 
 	* gdb-ui.el: Moved to progmodes.
 
+2004-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* diff-mode.el (diff-font-lock-keywords): Disable yank-handler.
+
 2004-03-24  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* calendar/appt.el (appt-check): Remove superfluous progn.
--- a/lisp/allout.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/allout.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;; Author: Ken Manheimer <klm@zope.com>
 ;; Maintainer: Ken Manheimer <klm@zope.com>
 ;; Created: Dec 1991 - first release to usenet
-;; Version: $Id: allout.el,v 1.47 2004/03/21 15:21:38 lektu Exp $||
 ;; Keywords: outlines mode wp languages
 
 ;; This file is part of GNU Emacs.
@@ -508,7 +507,7 @@
 ;;;_  : Version
 ;;;_   = allout-version
 (defvar allout-version
-  (let ((rcs-rev "$Revision: 1.47 $"))
+  (let ((rcs-rev "$Revision: 1.48 $"))
     (condition-case err
 	(save-match-data
 	  (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
--- a/lisp/calendar/diary-lib.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/calendar/diary-lib.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1727,13 +1727,13 @@
      arg)))
 
 ;;;###autoload
-(define-derived-mode diary-mode text-mode
+(define-derived-mode diary-mode fundamental-mode
   "Diary"
   "Major mode for editing the diary file."
   (set (make-local-variable 'font-lock-defaults)
        '(diary-font-lock-keywords t)))
 
-(define-derived-mode fancy-diary-display-mode text-mode
+(define-derived-mode fancy-diary-display-mode fundamental-mode
   "Diary"
   "Major mode used while displaying diary entries using Fancy Display."
   (set (make-local-variable 'font-lock-defaults)
--- a/lisp/calendar/todo-mode.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/calendar/todo-mode.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;; Author: Oliver Seidel <os10000@seidel-space.de>
 ;;   [Not clear the above works, July 2000]
 ;; Created: 2 Aug 1997
-;; Version: $Id: todo-mode.el,v 1.51 2003/09/01 15:45:19 miles Exp $
 ;; Keywords: calendar, todo
 
 ;; This file is part of GNU Emacs.
@@ -93,12 +92,6 @@
 ;;      extensions that are not explicitly listed in the above quick
 ;;      installation.
 ;;
-;;  Version
-;;
-;;      Which version of todo-mode.el does this documentation refer to?
-;;
-;;      $Id: todo-mode.el,v 1.51 2003/09/01 15:45:19 miles Exp $
-;;
 ;;  Pre-Requisites
 ;;
 ;;      This package will require the following packages to be
--- a/lisp/emacs-lisp/bytecomp.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Sat Apr 10 23:06:09 2004 +0000
@@ -8,10 +8,6 @@
 ;; Maintainer: FSF
 ;; Keywords: lisp
 
-;;; This version incorporates changes up to version 2.10 of the
-;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.144 $")
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -1860,10 +1856,7 @@
 	    " on "
 	    (current-time-string) "\n;;; from file " filename "\n")
     (insert ";;; in Emacs version " emacs-version "\n")
-    (insert ";;; with bytecomp version "
-	    (progn (string-match "[0-9.]+" byte-compile-version)
-		   (match-string 0 byte-compile-version))
-	    "\n;;; "
+    (insert ";;; "
 	    (cond
 	     ((eq byte-optimize 'source) "with source-level optimization only")
 	     ((eq byte-optimize 'byte) "with byte-level optimization only")
--- a/lisp/emacs-lisp/cl-specs.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/emacs-lisp/cl-specs.el	Sat Apr 10 23:06:09 2004 +0000
@@ -7,7 +7,6 @@
 ;; LCD Archive Entry:
 ;; cl-specs.el|Daniel LaLiberte|liberte@holonexus.org
 ;; |Edebug specs for cl.el
-;; |$Date: 2003/09/01 15:45:20 $|1.1|
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/emacs-lisp/easymenu.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/emacs-lisp/easymenu.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,6 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu
 
-;; Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1994,96,98,1999,2000,2004  Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
@@ -478,7 +478,9 @@
   (when easy-menu-precalculate-equivalent-keybindings
     (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
 	(setq menu (symbol-value menu)))
-    (if (keymapp menu) (x-popup-menu nil menu))))
+    ;; x-popup-menu does not exist on tty-only Emacs.
+    ;; (if (keymapp menu) (x-popup-menu nil menu))
+    ))
 
 (defun add-submenu (menu-path submenu &optional before in-menu)
   "Add submenu SUBMENU in the menu at MENU-PATH.
--- a/lisp/emacs-lisp/eldoc.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/emacs-lisp/eldoc.el	Sat Apr 10 23:06:09 2004 +0000
@@ -7,8 +7,6 @@
 ;; Keywords: extensions
 ;; Created: 1995-10-06
 
-;; $Id: eldoc.el,v 1.27 2003/09/06 17:32:31 fx Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/forms.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/forms.el	Sat Apr 10 23:06:09 2004 +0000
@@ -301,11 +301,6 @@
 (provide 'forms)			;;; official
 (provide 'forms-mode)			;;; for compatibility
 
-(defconst forms-version (substring "$Revision: 2.49 $" 11 -2)
-  "The version number of forms-mode (as string).  The complete RCS id is:
-
-  $Id: forms.el,v 2.49 2003/09/01 15:45:12 miles Exp $")
-
 (defcustom forms-mode-hook nil
   "Hook run upon entering Forms mode."
   :group 'forms
@@ -694,7 +689,7 @@
       ;;(message "forms: proceeding setup (new file)...")
       (progn
 	(insert
-	 "GNU Emacs Forms Mode version " forms-version "\n\n"
+	 "GNU Emacs Forms Mode\n\n"
 	 (if (file-exists-p forms-file)
 	     (concat "No records available in file `" forms-file "'\n\n")
 	   (format "Creating new file `%s'\nwith %d field%s per record\n\n"
--- a/lisp/ido.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/ido.el	Sat Apr 10 23:06:09 2004 +0000
@@ -489,6 +489,13 @@
   :type 'boolean
   :group 'ido)
 
+(defcustom ido-confirm-unique-completion nil
+  "*Non-nil means that even a unique completion must be confirmed.
+This means that \\[ido-complete] must always be followed by \\[ido-exit-minibuffer]
+even when there is only one unique completion."
+  :type 'boolean
+  :group 'ido)
+
 (defcustom ido-cannot-complete-command 'ido-completion-help
   "*Command run when `ido-complete' can't complete any more.
 The most useful values are `ido-completion-help', which pops up a
@@ -1899,7 +1906,7 @@
 
 	 ((and ido-use-filename-at-point
 	       (setq fn (ffap-string-at-point))
-	       (not (string-match "^http:/" fn)) 
+	       (not (string-match "^http:/" fn))
 	       (setq d (file-name-directory fn))
 	       (file-directory-p d))
 	  (setq ido-current-directory d)
@@ -2056,7 +2063,11 @@
 		     (string-equal ido-current-directory "/")
 		     (string-match "..[@:]\\'" (car ido-matches)))))
       ;; only one choice, so select it.
-      (exit-minibuffer))
+      (if (not ido-confirm-unique-completion)
+	  (exit-minibuffer)
+	(setq ido-rescan (not ido-enable-prefix))
+	(delete-region (minibuffer-prompt-end) (point))
+	(insert (car ido-matches))))
 
      (t ;; else there could be some completions
       (setq res ido-common-match-string)
@@ -3396,6 +3407,7 @@
 	(ido-work-directory-match-only nil)
 	(ido-ignore-files (cons "[^/]\\'" ido-ignore-files))
 	(ido-report-no-match nil)
+	(ido-confirm-unique-completion t)
 	(ido-auto-merge-work-directories-length -1))
     (ido-file-internal 'write 'write-file nil "Write file: ")))
 
@@ -3544,7 +3556,7 @@
 	    (setq refresh t))
 	   ((and ido-directory-nonreadable
 		 (file-directory-p (concat ido-current-directory (file-name-directory contents))))
-	    (ido-set-current-directory 
+	    (ido-set-current-directory
 	     (concat ido-current-directory (file-name-directory contents)))
 	    (setq refresh t))
 	   (t
--- a/lisp/info.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/info.el	Sat Apr 10 23:06:09 2004 +0000
@@ -2441,7 +2441,7 @@
 	(message "Searching indices...")
 	(goto-char (point-min))
 	(re-search-forward "\\* Menu: *\n" nil t)
-	(while (re-search-forward "\\*.*: (\\([^)]+\\))" nil t)
+	(while (re-search-forward "\\*.*: *(\\([^)]+\\))" nil t)
 	  (add-to-list 'manuals (match-string 1)))
 	(dolist (manual manuals)
 	  (message "Searching %s" manual)
--- a/lisp/ldefs-boot.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/ldefs-boot.el	Sat Apr 10 23:06:09 2004 +0000
@@ -78,7 +78,6 @@
 
 (autoload (quote ada-mode) "ada-mode" "\
 Ada mode is the major mode for editing Ada code.
-This version was built on $Date: 2003/11/17 19:02:52 $.
 
 Bindings are as follows: (Note: 'LFD' is control-j.)
 \\{ada-mode-map}
--- a/lisp/mail/metamail.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/mail/metamail.el	Sat Apr 10 23:06:09 2004 +0000
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1996  Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Version: $Id: metamail.el,v 1.16 2003/09/01 15:45:30 miles Exp $
 ;; Keywords: mail, news, mime, multimedia
 
 ;; This file is part of GNU Emacs.
--- a/lisp/mail/smtpmail.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/mail/smtpmail.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,7 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
-;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004
+;;   Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
@@ -44,6 +45,8 @@
 ;;      '(("YOUR SMTP HOST" 25 "username" "password")))
 ;;(setq smtpmail-starttls-credentials
 ;;      '(("YOUR SMTP HOST" 25 "~/.my_smtp_tls.key" "~/.my_smtp_tls.cert")))
+;; Where the 25 equals the value of `smtpmail-smtp-service', it can be an
+;; integer or a string, just as long as they match (eq).
 
 ;; To queue mail, set smtpmail-queue-mail to t and use
 ;; smtpmail-send-queued-mail to send.
--- a/lisp/net/rlogin.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/net/rlogin.el	Sat Apr 10 23:06:09 2004 +0000
@@ -6,8 +6,6 @@
 ;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: unix, comm
 
-;; $Id: rlogin.el,v 1.5 2003/09/01 15:45:33 miles Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/obsolete/rsz-mini.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/obsolete/rsz-mini.el	Sat Apr 10 23:06:09 2004 +0000
@@ -7,8 +7,6 @@
 ;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: minibuffer, window, frame, display
 
-;; $Id: rsz-mini.el,v 1.2 2003/09/01 15:45:33 miles Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/progmodes/ada-mode.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/ada-mode.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1071,7 +1071,6 @@
 ;;;###autoload
 (defun ada-mode ()
   "Ada mode is the major mode for editing Ada code.
-This version was built on $Date: 2003/09/30 12:54:32 $.
 
 Bindings are as follows: (Note: 'LFD' is control-j.)
 \\{ada-mode-map}
--- a/lisp/progmodes/ada-prj.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/ada-prj.el	Sat Apr 10 23:06:09 2004 +0000
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 99, 2000-2003 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.13 $
 ;; Keywords: languages, ada, project file
 
 ;; This file is part of GNU Emacs.
--- a/lisp/progmodes/ada-stmt.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/ada-stmt.el	Sat Apr 10 23:06:09 2004 +0000
@@ -3,8 +3,6 @@
 ;; Copyright(C) 1987, 93, 94, 96, 97, 98, 99, 2000
 ;;   Free Software Foundation, Inc.
 
-;; Ada Core Technologies's version:   $Revision: 1.17 $
-
 ;; This file is part of GNU Emacs.
 
 ;; Authors: Daniel Pfeiffer, Markus Heritsch, Rolf Ebert <ebert@waporo.muc.de>
--- a/lisp/progmodes/autoconf.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/autoconf.el	Sat Apr 10 23:06:09 2004 +0000
@@ -4,7 +4,6 @@
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
-;; $Revision: 1.6 $
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/progmodes/compile.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/compile.el	Sat Apr 10 23:06:09 2004 +0000
@@ -650,72 +650,76 @@
 
 (defun compilation-mode-font-lock-keywords ()
   "Return expressions to highlight in Compilation mode."
-  (nconc
-   ;; make directory tracking
-   (if compilation-directory-matcher
-       `((,(car compilation-directory-matcher)
-	  ,@(mapcar (lambda (elt)
-		      `(,(car elt)
-			(compilation-directory-properties
-			 ,(car elt) ,(cdr elt))
-			t))
-		    (cdr compilation-directory-matcher)))))
+  (if compilation-parse-errors-function
+      ;; An old package!  Try the compatibility code.
+      '((compilation-compat-parse-errors))
+    (append
+     ;; make directory tracking
+     (if compilation-directory-matcher
+	 `((,(car compilation-directory-matcher)
+	    ,@(mapcar (lambda (elt)
+			`(,(car elt)
+			  (compilation-directory-properties
+			   ,(car elt) ,(cdr elt))
+			  t))
+		      (cdr compilation-directory-matcher)))))
 
-   ;; Compiler warning/error lines.
-   (mapcar (lambda (item)
-	     (if (symbolp item)
-		 (setq item (cdr (assq item
-				       compilation-error-regexp-alist-alist))))
-	     (let ((file (nth 1 item))
-		   (line (nth 2 item))
-		   (col (nth 3 item))
-		   (type (nth 4 item))
-		   end-line end-col fmt)
-	       (if (consp file) (setq fmt (cdr file)	  file (car file)))
-	       (if (consp line) (setq end-line (cdr line) line (car line)))
-	       (if (consp col)	(setq end-col (cdr col)	  col (car col)))
+     ;; Compiler warning/error lines.
+     (mapcar
+      (lambda (item)
+	(if (symbolp item)
+	    (setq item (cdr (assq item
+				  compilation-error-regexp-alist-alist))))
+	(let ((file (nth 1 item))
+	      (line (nth 2 item))
+	      (col (nth 3 item))
+	      (type (nth 4 item))
+	      end-line end-col fmt)
+	  (if (consp file) (setq fmt (cdr file)	  file (car file)))
+	  (if (consp line) (setq end-line (cdr line) line (car line)))
+	  (if (consp col)	(setq end-col (cdr col)	  col (car col)))
 	  
-	       (if (symbolp line)
-		   ;; The old compile.el had here an undocumented hook that
-		   ;; allowed `line' to be a function that computed the actual
-		   ;; error location.  Let's do our best.
-		   `(,(car item)
-		     (0 (compilation-compat-error-properties
-			 (funcall ',line (list* (match-string ,file)
-						default-directory
-						',(nthcdr 4 item))
-				  ,(if col `(match-string ,col)))))
-		     (,file compilation-error-face t))
+	  (if (symbolp line)
+	      ;; The old compile.el had here an undocumented hook that
+	      ;; allowed `line' to be a function that computed the actual
+	      ;; error location.  Let's do our best.
+	      `(,(car item)
+		(0 (compilation-compat-error-properties
+		    (funcall ',line (list* (match-string ,file)
+					   default-directory
+					   ',(nthcdr 4 item))
+			     ,(if col `(match-string ,col)))))
+		(,file compilation-error-face t))
 		    
-		 `(,(nth 0 item)
+	    `(,(nth 0 item)
 
-		   ,@(when (integerp file)
-		       `((,file ,(if (consp type)
-				     `(compilation-face ',type)
-				   (aref [compilation-info-face
-					  compilation-warning-face
-					  compilation-error-face]
-					 (or type 2))))))
+	      ,@(when (integerp file)
+		  `((,file ,(if (consp type)
+				`(compilation-face ',type)
+			      (aref [compilation-info-face
+				     compilation-warning-face
+				     compilation-error-face]
+				    (or type 2))))))
 
-		   ,@(when line
-		       `((,line compilation-line-face nil t)))
-		   ,@(when end-line
-		       `((,end-line compilation-line-face nil t)))
+	      ,@(when line
+		  `((,line compilation-line-face nil t)))
+	      ,@(when end-line
+		  `((,end-line compilation-line-face nil t)))
 
-		   ,@(when col
-		       `((,col compilation-column-face nil t)))
-		   ,@(when end-col
-		       `((,end-col compilation-column-face nil t)))
+	      ,@(when col
+		  `((,col compilation-column-face nil t)))
+	      ,@(when end-col
+		  `((,end-col compilation-column-face nil t)))
 
-		   ,@(nthcdr 6 item)
-		   (,(or (nth 5 item) 0)
-		    (compilation-error-properties ',file ,line ,end-line
-						  ,col ,end-col ',(or type 2)
-						  ',fmt)
-		    append)))))		; for compilation-message-face
-	   compilation-error-regexp-alist)
+	      ,@(nthcdr 6 item)
+	      (,(or (nth 5 item) 0)
+	       (compilation-error-properties ',file ,line ,end-line
+					     ,col ,end-col ',(or type 2)
+					     ',fmt)
+	       append)))))		; for compilation-message-face
+      compilation-error-regexp-alist)
 
-   compilation-mode-font-lock-keywords))
+     compilation-mode-font-lock-keywords)))
 
 
 ;;;###autoload
--- a/lisp/progmodes/delphi.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/delphi.el	Sat Apr 10 23:06:09 2004 +0000
@@ -64,12 +64,6 @@
 
 (provide 'delphi)
 
-(defconst delphi-version
-  (let ((revision "$Revision: 3.11 $"))
-    (string-match ": \\([^ ]+\\)" revision)
-    (match-string 1 revision))
-  "Version of this delphi mode.")
-
 (eval-and-compile
   ;; Allow execution on pre Emacs 20 versions.
   (or (fboundp 'when)
--- a/lisp/progmodes/gdb-ui.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/gdb-ui.el	Sat Apr 10 23:06:09 2004 +0000
@@ -76,8 +76,10 @@
 other with the source file with the main routine of the debugee.
 
 If `gdb-many-windows' is t the layout below will appear
-regardless of the value of `gdb-show-main'. Keybindings are given
-in relevant buffer.
+regardless of the value of `gdb-show-main' unless
+`gdb-use-inferior-io-buffer' is nil when the source buffer
+occupies the full width of the frame. Keybindings are given in
+relevant buffer.
 
 ---------------------------------------------------------------------
                                GDB Toolbar
@@ -1110,8 +1112,7 @@
 			  (save-excursion
 			    (goto-line (string-to-number line))
 			    (gdb-put-breakpoint-icon (eq flag ?y)))))))))
-	  (end-of-line)))))
-  (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
+	  (end-of-line))))))
 
 (defun gdb-mouse-toggle-breakpoint (event)
   "Toggle breakpoint with mouse click in left margin."
@@ -1193,8 +1194,6 @@
     (gdb-enqueue-input
      (list (concat "server delete " (match-string 1) "\n") 'ignore))))
 
-(defvar gdb-source-window nil)
-
 (defun gdb-goto-breakpoint ()
   "Display the file in the source buffer at the breakpoint specified on the
 current line."
@@ -1207,11 +1206,10 @@
       (let ((line (match-string 2))
 	    (file (match-string 1)))
 	(save-selected-window
-	  (select-window gdb-source-window)
-	  (switch-to-buffer (find-file-noselect
-			     (if (file-exists-p file)
-				 file
-			       (expand-file-name file gdb-cdir))))
+	  (gdb-display-buffer (find-file-noselect
+			       (if (file-exists-p file)
+				   file
+				 (expand-file-name file gdb-cdir))))
 	  (goto-line (string-to-number line))))))
 
 (defun gdb-mouse-goto-breakpoint (event)
@@ -1510,8 +1508,7 @@
 	(progn
 	  (walk-windows
 	   #'(lambda (win)
-	      (if (or (eq gud-comint-buffer (window-buffer win))
-		      (eq gdb-source-window win))
+	      (if (eq gud-comint-buffer (window-buffer win))
 		  (set-window-dedicated-p win t))))
 	  (setq answer (get-buffer-window buf))
 	  (if (not answer)
@@ -1523,8 +1520,7 @@
 		  (setq must-split t)))))
       (walk-windows
        #'(lambda (win)
-	  (if (or (eq gud-comint-buffer (window-buffer win))
-		  (eq gdb-source-window win))
+	  (if (eq gud-comint-buffer (window-buffer win))
 	      (set-window-dedicated-p win nil)))))
     (if must-split
 	(let* ((largest (get-largest-window))
@@ -1537,17 +1533,9 @@
 (defun gdb-display-source-buffer (buffer)
   (if (eq gdb-selected-view 'source)
       (progn
-	(if (window-live-p gdb-source-window)
-	    (set-window-buffer gdb-source-window buffer)
-	  (gdb-display-buffer buffer)
-	  (setq gdb-source-window (get-buffer-window buffer)))
-	      gdb-source-window)
-    (if (window-live-p gdb-source-window)
-	(set-window-buffer gdb-source-window
-			   (gdb-get-buffer 'gdb-assembler-buffer))
-      (let ((buf (gdb-get-buffer 'gdb-assembler-buffer)))
-	(gdb-display-buffer buf)
-	(setq gdb-source-window (get-buffer-window buf))))
+	(gdb-display-buffer buffer)
+	(get-buffer-window buffer))
+    (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer))
     nil))
 
 
@@ -1615,25 +1603,15 @@
 (defun gdb-view-source-function ()
   (interactive)
   (if gdb-view-source
-      (if (window-live-p gdb-source-window)
-	      (set-window-buffer gdb-source-window
-		     (if gud-last-last-frame
-			 (gud-find-file (car gud-last-last-frame))
-		       (gud-find-file gdb-main-file)))
-	(setq gdb-source-window
-	      (display-buffer
-	       (if gud-last-last-frame
-		   (gud-find-file (car gud-last-last-frame))
-		 (gud-find-file gdb-main-file))))))
+      (gdb-display-buffer
+       (if gud-last-last-frame
+	   (gud-find-file (car gud-last-last-frame))
+	 (gud-find-file gdb-main-file))))
   (setq gdb-selected-view 'source))
 
 (defun gdb-view-assembler()
   (interactive)
-  (if (window-live-p gdb-source-window)
-      (set-window-buffer gdb-source-window
-			 (gdb-get-create-buffer 'gdb-assembler-buffer))
-    (setq gdb-source-window 
-	  (display-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))))
+  (gdb-display-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
   (setq gdb-selected-view 'assembler))
 
 ;(defun gdb-view-both()
@@ -1666,7 +1644,6 @@
 	   (gud-find-file (car gud-last-last-frame))
 	 (gud-find-file gdb-main-file))
      (gdb-get-create-buffer 'gdb-assembler-buffer)))
-  (setq gdb-source-window (get-buffer-window (current-buffer)))
   (when gdb-use-inferior-io-buffer
     (split-window-horizontally)
     (other-window 1)
@@ -1679,8 +1656,11 @@
   (other-window 1))
 
 (defcustom gdb-many-windows nil
-  "Nil means that gdb starts with just two windows : the GUD and
-the source buffer."
+  "Nil (the default value) means just pops up the GUD buffer
+unless `gdb-show-main' is t. In this case it starts with two
+windows: one displaying the GUD buffer and the other with the
+source file with the main routine of the debugee. Non-nil means
+display the layout shown for `gdba'."
   :type 'boolean
   :group 'gud)
 
@@ -1691,7 +1671,9 @@
 	(if (null arg)
 	    (not gdb-many-windows)
 	  (> (prefix-numeric-value arg) 0)))
-  (gdb-restore-windows))
+  (condition-case nil
+      (gdb-restore-windows)
+    (error nil)))
 
 (defun gdb-restore-windows ()
   "Restore the basic arrangement of windows used by gdba.
@@ -1713,7 +1695,6 @@
 	     (gud-find-file (car gud-last-last-frame))
 	   (gud-find-file gdb-main-file))
        (gdb-get-create-buffer 'gdb-assembler-buffer)))
-    (setq gdb-source-window (get-buffer-window (current-buffer)))
     (other-window 1)))
 
 (defun gdb-reset ()
@@ -1760,7 +1741,6 @@
        (if gdb-view-source
 	   (gud-find-file gdb-main-file)
 	 (gdb-get-create-buffer 'gdb-assembler-buffer)))
-      (setq gdb-source-window (get-buffer-window (current-buffer)))
       (other-window 1))))
 
 ;;from put-image
@@ -1997,8 +1977,7 @@
 		      (progn (setq gdb-view-source nil) t))
 		  (eq gdb-selected-view 'assembler))
 	      (progn
-		(set-window-buffer
-		 gdb-source-window
+		(gdb-display-buffer
 		 (gdb-get-create-buffer 'gdb-assembler-buffer))
 		;;update with new frame for machine code if necessary
 		(gdb-invalidate-assembler))))))
--- a/lisp/progmodes/idlw-shell.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/idlw-shell.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;;         Chris Chase <chase@att.com>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 4.15
-;; Date: $Date: 2003/09/01 15:45:35 $
 ;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
--- a/lisp/progmodes/idlw-toolbar.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/idlw-toolbar.el	Sat Apr 10 23:06:09 2004 +0000
@@ -4,7 +4,6 @@
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 4.15
-;; Date: $Date: 2003/09/01 15:45:35 $
 ;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
--- a/lisp/progmodes/idlwave.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/idlwave.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;;         Chris Chase <chase@att.com>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 4.15
-;; Date: $Date: 2004/01/03 12:09:15 $
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
--- a/lisp/progmodes/tcl.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/tcl.el	Sat Apr 10 23:06:09 2004 +0000
@@ -6,7 +6,6 @@
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
 ;; Keywords: languages tcl modes
-;; Version: $Revision: 1.76 $
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/progmodes/vhdl-mode.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
 ;; Maintainer:  Reto Zimmermann <reto@gnu.org>
-;; RCS:         $Id: vhdl-mode.el,v 1.21 2003/09/01 15:45:35 miles Exp $
 ;; Keywords:    languages vhdl
 ;; WWW:         http://opensource.ethz.ch/emacs/vhdl-mode.html
 
--- a/lisp/recentf.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/recentf.el	Sat Apr 10 23:06:09 2004 +0000
@@ -8,8 +8,6 @@
 ;; Maintainer: FSF
 ;; Keywords: files
 
-(defconst recentf-version "$Revision: 1.28 $")
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/type-break.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/type-break.el	Sat Apr 10 23:06:09 2004 +0000
@@ -8,8 +8,6 @@
 ;; Status: Works in GNU Emacs 19.25 or later, some versions of XEmacs
 ;; Created: 1994-07-13
 
-;; $Id: type-break.el,v 1.30 2004/03/09 15:27:06 monnier Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/url/url-about.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-about.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-about.el --- Show internal URLs
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-auth.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-auth.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-cache.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-cache.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-cid.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-cid.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-cid.el --- Content-ID URL loader
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-cookie.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-cookie.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-cookie.el --- Netscape Cookie support
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-dav.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-dav.el	Sat Apr 10 23:06:09 2004 +0000
@@ -4,7 +4,6 @@
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.2 $
 ;; Keywords: url, vc
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/url/url-dired.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-dired.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-dired.el --- URL Dired minor mode
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, files
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-expand.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-expand.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-expand.el --- expand-file-name for URLs
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-file.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-file.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-file.el --- File retrieval code
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-ftp.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-ftp.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-ftp.el --- FTP wrapper
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-gw.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-gw.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,5 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-handlers.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-handlers.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-history.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-history.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-history.el --- Global history tracking for URL package
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-http.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-http.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 ;;; url-http.el --- HTTP retrieval routines
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-https.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-https.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-https.el --- HTTP over SSL routines
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-imap.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-imap.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,5 @@
 ;;; url-imap.el --- IMAP retrieval routines
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-irc.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-irc.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-irc.el --- IRC URL interface
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-ldap.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-ldap.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-mailto.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-mailto.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-methods.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-methods.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-methods.el --- Load URL schemes as needed
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.3 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-misc.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-misc.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-news.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-news.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-nfs.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-nfs.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-nfs.el --- NFS URL interface
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-ns.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-ns.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-parse.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-parse.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.3 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-privacy.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-privacy.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-privacy.el --- Global history tracking for URL package
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-proxy.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-proxy.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-proxy.el --- Proxy server support
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-util.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-util.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,5 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/url-vars.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url-vars.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,7 +1,4 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
-;; Author: $Author: miles $
-;; Created: $Date: 2004/04/04 04:44:10 $
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -29,10 +26,7 @@
 (require 'mm-util)
 (eval-when-compile (require 'cl))
 
-(defconst url-version (let ((x "$State: Exp $"))
-			(if (string-match "State: \\([^ \t\n]+\\)" x)
-			    (substring x (match-beginning 1) (match-end 1))
-			  x))
+(defconst url-version "Emacs"
   "Version number of URL package.")
 
 (defgroup url nil
--- a/lisp/url/url.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/url.el	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/url/vc-dav.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/url/vc-dav.el	Sat Apr 10 23:06:09 2004 +0000
@@ -4,7 +4,6 @@
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
-;; Version: $Revision: 1.2 $
 ;; Keywords: url, vc
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/whitespace.el	Thu Apr 08 15:09:37 2004 +0000
+++ b/lisp/whitespace.el	Sat Apr 10 23:06:09 2004 +0000
@@ -5,7 +5,6 @@
 ;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
 ;; Keywords: convenience
 
-;; $Id: whitespace.el,v 1.27 2003/09/29 18:05:31 rv Exp $
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/man/ses.texi	Thu Apr 08 15:09:37 2004 +0000
+++ b/man/ses.texi	Sat Apr 10 23:06:09 2004 +0000
@@ -385,11 +385,11 @@
 @code{ses-mode-hook} is a normal mode hook (list of functions to
 execute when starting SES mode for a buffer).
 
-The variable @code{safe-functions} is a a list of possibly-unsafe
+The variable @code{safe-functions} is a list of possibly-unsafe
 functions to be treated as safe when analysing formulas and printers.
 @xref{Virus protection}.  Before customizing @code{safe-functions},
 think about how much you trust the person who's suggesting this
-change.  The value t turns off all anti-virus protection.  A
+change.  The value @code{t} turns off all anti-virus protection.  A
 list-of-functions value might enable a ``gee whiz'' spreadsheet, but it
 also creates trapdoors in your anti-virus armor.  In order for virus
 protection to work, you must always press @kbd{n} when presented with
--- a/nt/ChangeLog	Thu Apr 08 15:09:37 2004 +0000
+++ b/nt/ChangeLog	Sat Apr 10 23:06:09 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-10  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>
+
+	* runemacs.c (WinMain): Let emacs environment default to parent.
+
 2004-03-11  Jason Rumney  <jasonr@gnu.org>
 
 	* paths.h: Remove PATH_LOCK, add PATH_BITMAPS.
--- a/nt/runemacs.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/nt/runemacs.c	Sat Apr 10 23:06:09 2004 +0000
@@ -126,7 +126,7 @@
   sec_attrs.bInheritHandle = FALSE;
 
   if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, priority_class,
-		     GetEnvironmentStrings (), NULL, &start, &child))
+		     NULL, NULL, &start, &child))
     {
       if (wait_for_child)
 	{
--- a/oldXMenu/Activate.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Activate.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Activate.c,v 1.6 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
--- a/oldXMenu/AddPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/AddPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddPane.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/AddSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/AddSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddSel.c,v 1.4 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/ChgPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/ChgPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgPane.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/ChgSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/ChgSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgSel.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Create.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Create.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Create.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
--- a/oldXMenu/DelPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/DelPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelPane.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/DelSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/DelSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelSel.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Destroy.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Destroy.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Error.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Error.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Error.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/EvHand.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/EvHand.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/EvHand.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/FindPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/FindPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindPane.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/FindSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/FindSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindSel.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/InsPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/InsPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsPane.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/InsSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/InsSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsSel.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Internal.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Internal.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Internal.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Locate.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Locate.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Locate.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Post.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Post.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Post.c,v 1.4 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/Recomp.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/Recomp.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Recomp.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/SetAEQ.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/SetAEQ.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetAEQ.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/SetFrz.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/SetFrz.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetFrz.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/SetPane.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/SetPane.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetPane.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/SetSel.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/SetSel.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetSel.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/X10.h	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/X10.h	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/X10.h,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /*
  * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
  *
--- a/oldXMenu/XCrAssoc.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XCrAssoc.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $XConsortium: XCrAssoc.c,v 10.17 91/01/06 12:04:57 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XDelAssoc.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XDelAssoc.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $XConsortium: XDelAssoc.c,v 10.19 91/01/06 12:06:39 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XDestAssoc.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XDestAssoc.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $XConsortium: XDestAssoc.c,v 10.17 91/02/08 13:11:50 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XLookAssoc.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XLookAssoc.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $XConsortium: XLookAssoc.c,v 10.16 91/01/06 12:09:24 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XMakeAssoc.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XMakeAssoc.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $XConsortium: XMakeAssoc.c,v 10.18 91/01/06 12:09:28 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XMenu.h	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XMenu.h	Sat Apr 10 23:06:09 2004 +0000
@@ -1,6 +1,5 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenu.h,v 1.4 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/XMenuInt.h	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/XMenuInt.h	Sat Apr 10 23:06:09 2004 +0000
@@ -1,5 +1,4 @@
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenuInt.h,v 1.3 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
--- a/oldXMenu/copyright.h	Thu Apr 08 15:09:37 2004 +0000
+++ b/oldXMenu/copyright.h	Sat Apr 10 23:06:09 2004 +0000
@@ -1,4 +1,3 @@
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/copyright.h,v 1.2 2003/09/01 15:45:47 miles Exp $ */
 /*
 
 Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
--- a/src/ChangeLog	Thu Apr 08 15:09:37 2004 +0000
+++ b/src/ChangeLog	Sat Apr 10 23:06:09 2004 +0000
@@ -1,3 +1,8 @@
+2004-04-11  Masatake YAMATO  <jet@gyve.org>
+
+	* buffer.c (fix_start_end_in_overlays): make overlays 
+	empty if they are backwards.
+
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* doc.c (Fsnarf_documentation): Ignore new file name entries.
--- a/src/buffer.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/src/buffer.c	Sat Apr 10 23:06:09 2004 +0000
@@ -3290,8 +3290,7 @@
    endpoint in this range will need to be unlinked from the overlay
    list and reinserted in its proper place.
    Such an overlay might even have negative size at this point.
-   If so, we'll reverse the endpoints.  Can you think of anything
-   better to do in this situation?  */
+   If so, we'll make the overlay empty. */
 void
 fix_start_end_in_overlays (start, end)
      register int start, end;
@@ -3318,23 +3317,24 @@
   for (parent = NULL, tail = current_buffer->overlays_before; tail;)
     {
       XSETMISC (overlay, tail);
+
       endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+
+      /* If the overlay is backwards, make it empty.  */
+      if (endpos < startpos)
+	{
+	  startpos = endpos;
+	  Fset_marker (OVERLAY_START (overlay), make_number (startpos),
+		       Qnil);
+	}
+
       if (endpos < start)
 	break;
-      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+      
       if (endpos < end
 	  || (startpos >= start && startpos < end))
 	{
-	  /* If the overlay is backwards, fix that now.  */
-	  if (startpos > endpos)
-	    {
-	      int tem;
-	      Fset_marker (OVERLAY_START (overlay), make_number (endpos),
-			   Qnil);
-	      Fset_marker (OVERLAY_END (overlay), make_number (startpos),
-			   Qnil);
-	      tem = startpos; startpos = endpos; endpos = tem;
-	    }
 	  /* Add it to the end of the wrong list.  Later on,
 	     recenter_overlay_lists will move it to the right place.  */
 	  if (endpos < current_buffer->overlay_center)
@@ -3365,22 +3365,24 @@
   for (parent = NULL, tail = current_buffer->overlays_after; tail;)
     {
       XSETMISC (overlay, tail);
+
       startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+
+      /* If the overlay is backwards, make it empty.  */
+      if (endpos < startpos)
+	{
+	  startpos = endpos;
+	  Fset_marker (OVERLAY_START (overlay), make_number (startpos),
+		       Qnil);	  
+	}
+
       if (startpos >= end)
 	break;
-      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+
       if (startpos >= start
 	  || (endpos >= start && endpos < end))
 	{
-	  if (startpos > endpos)
-	    {
-	      int tem;
-	      Fset_marker (OVERLAY_START (overlay), make_number (endpos),
-			   Qnil);
-	      Fset_marker (OVERLAY_END (overlay), make_number (startpos),
-			   Qnil);
-	      tem = startpos; startpos = endpos; endpos = tem;
-	    }
 	  if (endpos < current_buffer->overlay_center)
 	    {
 	      if (!afterp)
--- a/src/xfaces.c	Thu Apr 08 15:09:37 2004 +0000
+++ b/src/xfaces.c	Sat Apr 10 23:06:09 2004 +0000
@@ -1,5 +1,5 @@
 /* xfaces.c -- "Face" primitives.
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -1508,15 +1508,19 @@
   XColor not_used;
 
   XSETFRAME (frame, f);
-  return (FRAME_WINDOW_P (f)
-	  ? (!NILP (Fxw_display_color_p (frame))
-	     || xstricmp (color_name, "black") == 0
-	     || xstricmp (color_name, "white") == 0
-	     || (background_p
-		 && face_color_gray_p (f, color_name))
-	     || (!NILP (Fx_display_grayscale_p (frame))
-		 && face_color_gray_p (f, color_name)))
-	  : tty_defined_color (f, color_name, &not_used, 0));
+  return
+#ifdef HAVE_X_WINDOWS
+    FRAME_WINDOW_P (f)
+    ? (!NILP (Fxw_display_color_p (frame))
+       || xstricmp (color_name, "black") == 0
+       || xstricmp (color_name, "white") == 0
+       || (background_p
+	   && face_color_gray_p (f, color_name))
+       || (!NILP (Fx_display_grayscale_p (frame))
+	   && face_color_gray_p (f, color_name)))
+    :
+#endif
+    tty_defined_color (f, color_name, &not_used, 0);
 }