Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-394
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
   Tweak arch tagging to make build/install-in-place less annoying

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397
   Work around vc-arch problems when building eshell


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-197

34 files changed, 164 insertions, 117 deletions

diff --git a/.arch-inventory b/.arch-inventory
index 3733b7ed6e3..5f451d088a3 100644
--- a/.arch-inventory
+++ b/.arch-inventory
@@ -1,3 +1,9 @@
 precious ^(config\.status)$
 
+# Build-in-place makes these directories, so just ignore them
+precious ^(info)$
+
+# Install-in-place makes these directories, so just ignore them
+backup ^(bin|data|lock|site-lisp)$
+
 # arch-tag: 6eeeaa4e-cc7e-4b22-b3d7-1089e155da14
diff --git a/Makefile.in b/Makefile.in
index 7bfed3fd5ea..28c3ff81b25 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,7 +259,8 @@ epaths-force: FRC
           -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'             \
           -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
           -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
-          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&                \
+          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
+          -e 's;/[*] *arch-tag:.*;/*;') &&              \
         ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be build before leim.
@@ -753,5 +754,3 @@ bootstrap-clean-before: FRC
         -(cd lispref &&   $(MAKE) $(MFLAGS) clean)
         -(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
         (cd leim;     $(MAKE) $(MFLAGS) clean)
-
-# arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156
diff --git a/etc/.arch-inventory b/etc/.arch-inventory
index 2637a2d3d8e..f242618b2bd 100644
--- a/etc/.arch-inventory
+++ b/etc/.arch-inventory
@@ -1,4 +1,7 @@
 # Unlike most emacs dirs, etc has a simple non-autoconf-generated makefile
 source ^(Makefile)$
 
+# Install-in-place on NT makes this directory, so just ignore it
+backup ^(icons)$
+
 # arch-tag: 5a1d62e0-593a-48cd-8743-8d45dc58dfae
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 09595de261d..05c4549bee3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-10  Lars Hansen  <larsh@math.ku.dk>
+
+        * NEWS: Describe dired-omit-mode. Describe desktop package changes.
+
 2004-05-29  Steven Tamm  <steventamm@mac.com>
 
         * PROBLEMS: Document the workaround for the Mac OS X port not
diff --git a/etc/NEWS b/etc/NEWS
index e4c7033e0f3..18761ea1461 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -222,6 +222,37 @@ This is like `strokes-global-set-stroke', but it allows you to bind
 the stroke directly to a string to insert.  This is convenient for
 using strokes as an input method.
 
++++
+** Desktop package
+
+*** Desktop saving is now a minor mode, desktop-save-mode. Variable
+desktop-enable is obsolete. Customize desktop-save-mode to enable desktop
+saving.
+
+*** Buffers are saved in the desktop file in the same order as that in the
+buffer list.
+
+*** New commands:
+  - desktop-revert reverts to the last loaded desktop.
+  - desktop-change-dir kills current desktop and loads a new.
+  - desktop-save-in-desktop-dir saves desktop in the directory from which
+    it was loaded.
+
+*** New customizable variables:
+  - desktop-save. Determins whether the desktop should be saved when it is
+    killed.
+  - desktop-file-name-format.
+  - desktop-path. List of directories in which to lookup the desktop file.
+  - desktop-locals-to-save.
+  - desktop-globals-to-clear.
+  - desktop-clear-preserve-buffers-regexp.
+
+*** New command line option --no-desktop
+
+*** New hooks:
+  - desktop-after-read-hook run after a desktop is loaded.
+  - desktop-no-desktop-file-hook run when no desktop file is found.
+
 ---
 ** The saveplace.el package now filters out unreadable files.
 When you exit Emacs, the saved positions in visited files no longer
@@ -430,6 +461,14 @@ what external viewers to use and when.
 *** In Dired, the w command now copies the current line's file name
 into the kill ring.
 
++++
+** Dired-x:
+
+*** Omitting files is now a minor mode, dired-omit-mode. The mode toggling
+command is bound to M-o. A new command dired-mark-omitted, bound to M-O,
+marks omitted files. The variable dired-omit-files-p is obsoleted, use the
+mode toggling function instead.
+
 ** Info mode:
 +++
 *** Info now hides node names in menus and cross references by default.
@@ -1764,7 +1803,7 @@ depend on external libraries.  All of these libraries have been ported
 to Windows, and can be found in both source and binary form at
 http://gnuwin32.sourceforge.net/.  Note that libpng also depends on
 zlib, and tiff depends on the version of jpeg that it was compiled
-against.
+against.  For additional information, see nt/INSTALL.
 
 ---
 ** Sound is now supported on MS Windows.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 63ba1f54ae2..1c13ff0613b 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -241,5 +241,3 @@ maintainer-clean: distclean
 
 extraclean: maintainer-clean
         -rm -f *~ \#* m/?*~ s/?*~
-
-# arch-tag: f666a939-8145-4d64-a6a6-cc1f61bd32ca
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 7eea0b41b26..839d6129a31 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+# Copyright (C) 1997, 2004 Electrotechnical Laboratory, JAPAN.
 # Licensed to the Free Software Foundation.
 
 # This file is part of GNU Emacs.
@@ -203,5 +203,3 @@ distclean clean:
 
 maintainer-clean: distclean
         - $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
-
-# arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1da04d88b82..1d8c5e6c9ba 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -478,6 +478,3 @@ xveterm${EXEEXT}: ${srcdir}/emacstool.c
         $(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
           -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
           $(LOADLIBES)
-
-/* arch-tag: cc40144d-fbd2-436b-9a22-dcb5b5b6a2af
-   (do not change this comment) */
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 3b53a29889b..663d08e6f13 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -425,5 +425,3 @@ $(BLD)/timer.$(O) : \
 $(BLD)/yow.$(O) : \
         $(SRC)/yow.c \
         $(EMACS_ROOT)/lib-src/../src/paths.h
-
-# arch-tag: c051bc02-a6de-474b-889a-27f7b2fbbcea
diff --git a/lisp/.arch-inventory b/lisp/.arch-inventory
new file mode 100644
index 00000000000..5341c2d8fec
--- /dev/null
+++ b/lisp/.arch-inventory
@@ -0,0 +1,4 @@
+# Auto-generated lisp files, which ignore
+precious ^(loaddefs|finder-inf|cus-load)\.el$
+
+# arch-tag: fc62dc9f-3a91-455b-b8e7-d49df66beee0
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e04651a097..6dcc5c8fbbe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-06-10  Miles Bader  <miles@gnu.ai.mit.edu>
+
+        * eshell/esh-module.el (eshell-load-defgroups): Bind
+        `vc-handled-backends' to nil when opening files.
+
+2004-06-11  Juanma Barranquero  <lektu@terra.es>
+
+        * files.el (parse-colon-path, cd): Doc fixes (refer to
+        `path-separator', not colon).
+
+2004-06-10  Juanma Barranquero  <lektu@terra.es>
+
+        * newcomment.el (comment-search-forward)
+        (comment-search-backward): Fix typos in docstring.
+        (comment-region): Doc fix.
+
+2004-06-10  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * dired.el (dired-insert-old-subdirs): Adapt to fact that the R
+        switch is no longer stored in `dired-switches-alist'.
+
+        * dired-aux.el (dired-insert-subdir): Do not store R switch in
+        `dired-switches-alist'.
+
 2004-06-10  Kim F. Storm  <storm@cua.dk>
 
         * pcvs.el (cvs-mode-diff-yesterday): New command.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 8ccb03f69e3..5085d3b5b91 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -128,8 +128,7 @@ COMPILE_FIRST = \
         $(lisp)/emacs-lisp/bytecomp.el \
         $(lisp)/subr.el \
         $(lisp)/progmodes/cc-mode.el \
-        $(lisp)/progmodes/cc-vars.el \
-        $(lisp)/vc-arch.el
+        $(lisp)/progmodes/cc-vars.el
 
 # The actual Emacs command run in the targets below.
 
@@ -327,5 +326,4 @@ bootstrap-after: finder-data custom-deps
 distclean:
         -rm -f ./Makefile
 
-# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
 # Makefile ends here.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7e96f1673ed..a58b62498ca 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1812,10 +1812,10 @@ This function takes some pains to conform to `ls -lR' output."
         (push (cons dirname switches) dired-switches-alist)))
     (when switches-have-R
       (dired-build-subdir-alist switches)
+      (setq switches (dired-replace-in-string "R" "" switches))
       (dolist (cur-ass dired-subdir-alist)
         (let ((cur-dir (car cur-ass)))
           (and (dired-in-this-tree cur-dir dirname)
-               (not (string= cur-dir dirname))
                (let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
                  (if cur-cons
                      (setcdr cur-cons switches)
diff --git a/lisp/dired.el b/lisp/dired.el
index f206b03cd26..3d3fd34b5ac 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -970,14 +970,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
           (condition-case ()
               (progn
                 (dired-uncache dir)
-                (dired-insert-subdir dir)
-                (let ((switches (cdr (assoc-string dir dired-switches-alist))))
-                  (and switches
-                       (string-match "R" switches)
-                       (dolist (cur-ass (copy-sequence old-subdir-alist))
-                         (when (dired-in-this-tree (car cur-ass) dir)
-                           (setq old-subdir-alist
-                                 (delete cur-ass old-subdir-alist)))))))
+                (dired-insert-subdir dir))
             (error nil))))))
 
 (defun dired-uncache (dir)
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 4c8ffceef78..dcbf77364f4 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,6 +1,6 @@
 ;;; esh-module.el --- Eshell modules
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
@@ -41,32 +41,33 @@ customizing the variable `eshell-modules-list'."
 
 (defun eshell-load-defgroups (&optional directory)
   "Load `defgroup' statements from Eshell's module files."
-  (with-current-buffer
-      (find-file-noselect (expand-file-name "esh-groups.el" directory))
-    (erase-buffer)
-    (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
-    (let ((files (directory-files (or directory
-                                      (car command-line-args-left))
-                                  nil "\\`em-.*\\.el\\'")))
-      (while files
-        (message "Loading defgroup from `%s'" (car files))
-        (let (defgroup)
-          (catch 'handled
-            (with-current-buffer (find-file-noselect (car files))
-              (goto-char (point-min))
-              (while t
-                (forward-sexp)
-                (if (eobp) (throw 'handled t))
-                (backward-sexp)
-                (let ((begin (point))
-                      (defg (looking-at "(defgroup")))
+  (let ((vc-handled-backends nil)) ; avoid VC fucking things up
+    (with-current-buffer
+        (find-file-noselect (expand-file-name "esh-groups.el" directory))
+      (erase-buffer)
+      (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n")
+      (let ((files (directory-files (or directory
+                                        (car command-line-args-left))
+                                    nil "\\`em-.*\\.el\\'")))
+        (while files
+          (message "Loading defgroup from `%s'" (car files))
+          (let (defgroup)
+            (catch 'handled
+              (with-current-buffer (find-file-noselect (car files))
+                (goto-char (point-min))
+                (while t
                   (forward-sexp)
-                  (if defg
-                      (setq defgroup (buffer-substring begin (point))))))))
-          (if defgroup
-              (insert defgroup "\n\n")))
-        (setq files (cdr files))))
-    (save-buffer)))
+                  (if (eobp) (throw 'handled t))
+                  (backward-sexp)
+                  (let ((begin (point))
+                        (defg (looking-at "(defgroup")))
+                    (forward-sexp)
+                    (if defg
+                        (setq defgroup (buffer-substring begin (point))))))))
+            (if defgroup
+                (insert defgroup "\n\n")))
+          (setq files (cdr files))))
+      (save-buffer))))
 
 ;; load the defgroup's for the standard extension modules, so that
 ;; documentation can be provided when the user customize's
diff --git a/lisp/files.el b/lisp/files.el
index 81e014d2283..4ee6da4e544 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -526,8 +526,8 @@ the value of `default-directory'."
 Not actually set up until the first time you use it.")
 
 (defun parse-colon-path (cd-path)
-  "Explode a colon-separated search path into a list of directory names.
-\(For values of `colon' equal to `path-separator'.)"
+  "Explode a search path into a list of directory names.
+Directories are separated by occurrences of `path-separator'."
   ;; We could use split-string here.
   (and cd-path
        (let (cd-list (cd-start 0) cd-colon)
@@ -560,8 +560,9 @@ Not actually set up until the first time you use it.")
 
 (defun cd (dir)
   "Make DIR become the current buffer's default directory.
-If your environment includes a `CDPATH' variable, try each one of that
-colon-separated list of directories when resolving a relative directory name."
+If your environment includes a `CDPATH' variable, try each one of
+that list of directories (separated by occurrences of
+`path-separator') when resolving a relative directory name."
   (interactive
    (list (read-directory-name "Change default directory: "
                          default-directory default-directory
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index fe82e45c04f..71998d403e4 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -420,5 +420,3 @@ install:
 #
 clean:
                 - $(DEL) *~
-
-# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 924cf0ed8c4..2b9122a8eb9 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -356,7 +356,7 @@ in strings will not confuse Emacs.")
   "Find a comment start between point and LIMIT.
 Moves point to inside the comment and returns the position of the
 comment-starter.  If no comment is found, moves point to LIMIT
-and raises an error or returns nil of NOERROR is non-nil."
+and raises an error or returns nil if NOERROR is non-nil."
   (if (not comment-use-syntax)
       (if (re-search-forward comment-start-skip limit noerror)
           (or (match-end 1) (match-beginning 0))
@@ -392,7 +392,7 @@ and raises an error or returns nil of NOERROR is non-nil."
   "Find a comment start between LIMIT and point.
 Moves point to inside the comment and returns the position of the
 comment-starter.  If no comment is found, moves point to LIMIT
-and raises an error or returns nil of NOERROR is non-nil."
+and raises an error or returns nil if NOERROR is non-nil."
   ;; FIXME: If a comment-start appears inside a comment, we may erroneously
   ;; stop there.  This can be rather bad in general, but since
   ;; comment-search-backward is only used to find the comment-column (in
@@ -955,7 +955,7 @@ rather than at left margin."
 (defun comment-region (beg end &optional arg)
   "Comment or uncomment each line in the region.
 With just \\[universal-argument] prefix arg, uncomment each line in region BEG .. END.
-Numeric prefix arg ARG means use ARG comment characters.
+Numeric prefix ARG means use ARG comment characters.
 If ARG is negative, delete that many comment characters instead.
 By default, comments start at the left margin, are terminated on each line,
 even for syntax in which newline does not end the comment and blank lines
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 14c1b1c9ab9..88ac4975010 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -69,5 +69,3 @@ maintainer-clean: distclean
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# arch-tag: eb660994-cd29-4ab8-8043-5042e2dbde84
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index a67f262bbc0..87a8597ccad 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -69,5 +69,3 @@ maintainer-clean: distclean
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# arch-tag: d713164a-e683-4ce3-a39e-3bf82f2f82f4
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 79be5fc39af..e9d99de7d6a 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003
+# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003,2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -135,5 +135,3 @@ dist: elisp elisp.dvi
         (cd temp/$(manual); rm -f *~)
         (cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
         -rm -rf temp
-
-# arch-tag: f5a1a94d-62e1-4460-a2d1-f02e538ab554
diff --git a/lispref/display.texi b/lispref/display.texi
index addf66dd7a6..70f57632533 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3154,7 +3154,7 @@ specifies the actual color to use for displaying that name.
   For GIF images, specify image type @code{gif}.  Because of the patents
 in the US covering the LZW algorithm, the continued use of GIF format is
 a problem for the whole Internet; to end this problem, it is a good idea
-for everyone, even outside the US, to stop using GIFS right away
+for everyone, even outside the US, to stop using GIFs right away
 (@uref{http://www.burnallgifs.org/}).  But if you still want to use
 them, Emacs can display them.
 
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 7d8dd179a56..31be34100cc 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003
+# Copyright (C) 2003, 2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -119,5 +119,3 @@ distclean: clean
 
 maintainer-clean: clean
         - $(DEL) elisp elisp-* elisp.dvi elisp.oaux
-
-# arch-tag: da68f1c2-536d-4d41-9150-7b01434eda3f
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 1e545949ea2..11368819f4a 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -67,5 +67,3 @@ TAGS:
         ../lib-src/etags $(srcdir)/*.[ch]
 tags: TAGS
 .PHONY: tags
-
-# arch-tag: a881fa74-b56a-44c6-80b4-28a4c65d88ff
diff --git a/man/Makefile.in b/man/Makefile.in
index 99970c3c0ab..7c2f32e538f 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,6 @@
 #### Makefile for the Emacs Manual and other documentation.
 
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -312,5 +312,3 @@ maintainer-clean: distclean
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 19cdb89e-4acb-448e-b0cc-2ddc05948ee2
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index ece0c97175c..3422f158198 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -331,5 +331,3 @@ maintainer-clean: distclean
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 6e99da59-ad27-4816-82a0-cde9a101efae
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 6363904108e..adbb3fd57b8 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.

-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.

+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.

 #

 #  Top level makefile for building GNU Emacs on Windows NT

 #

@@ -281,5 +281,3 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
 

 realclean: cleanall

         - $(DEL_TREE) ../bin

-

-# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219

diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 82269282c03..e20a583514a 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -107,5 +107,3 @@ maintainer-clean: distclean
 
 tags::
         $(TAGS) -t *.[ch]
-
-# arch-tag: dbfc0b16-4e0c-4acb-a9c1-fc12ee76db06
diff --git a/src/.arch-inventory b/src/.arch-inventory
index 9f6d601a788..99b0d6cc539 100644
--- a/src/.arch-inventory
+++ b/src/.arch-inventory
@@ -1,3 +1,7 @@
+# Source files which don't match the usual naming conventions, mostly dot files
+source ^\.(gdbinit|dbxinit)$
+
+# Auto-generated files, which ignore
 precious ^(config\.stamp|config\.h|epaths\.h)$
 
 # arch-tag: 277cc7ae-b3f5-44af-abf1-84c073164543
diff --git a/src/ChangeLog b/src/ChangeLog
index d6750648fd5..04133ca728c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-11  Juanma Barranquero  <lektu@terra.es>
+
+        * keyboard.c (Fposn_at_point): Doc fix.
+
+2004-06-11  David Kastrup  <dak@gnu.org>
+
+        * search.c (match_limit): Don't flag an error if match-data
+        exceeding the allocated search_regs.num_regs gets requested, just
+        return Qnil.
+
 2004-06-08  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (push_named_merge_point): Return 0 when a cycle is detected.
diff --git a/src/Makefile.in b/src/Makefile.in
index 7d5f8c9d172..0d75221acfa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -699,7 +699,6 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 lisp= \
         ${lispsource}abbrev.elc \
         ${lispsource}buff-menu.elc \
-        ${lispsource}server.elc \
         ${lispsource}button.elc \
         ${lispsource}emacs-lisp/byte-run.elc \
         ${lispsource}cus-face.elc \
@@ -792,7 +791,6 @@ lisp= \
 shortlisp= \
         ../lisp/abbrev.elc \
         ../lisp/buff-menu.elc \
-        ../lisp/server.elc \
         ../lisp/button.elc \
         ../lisp/emacs-lisp/byte-run.elc \
         ../lisp/cus-face.elc \
@@ -886,9 +884,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
   ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
   ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
   ${dotdot}/lisp/international/ccl.elc \
-  ${dotdot}/lisp/international/codepage.elc \
-  ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
-  ${dotdot}/lisp/x-dnd.elc ${dotdot}/lisp/term/x-win.elc
+  ${dotdot}/lisp/international/codepage.elc
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -1061,8 +1057,8 @@ category.o: category.c category.h buffer.h charset.h $(config_h)
 ccl.o: ccl.c ccl.h charset.h coding.h $(config_h)
 charset.o: charset.c charset.h buffer.h coding.h composite.h disptab.h \
         $(config_h)
-coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h window.h frame.h termhooks.h $(config_h)
-cm.o: cm.c frame.h cm.h termhooks.h termchar.h $(config_h)
+coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h window.h $(config_h)
+cm.o: cm.c cm.h termhooks.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \
         msdos.h dispextern.h
 pre-crt0.o: pre-crt0.c
@@ -1070,7 +1066,7 @@ ecrt0.o: ecrt0.c $(config_h)
         CRT0_COMPILE ${srcdir}/ecrt0.c
 dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.h regex.h \
    systime.h
-dispnew.o: dispnew.c systime.h commands.h process.h frame.h \
+dispnew.o: dispnew.c  systty.h systime.h commands.h process.h frame.h \
    window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
    disptab.h \
    xterm.h blockinput.h atimer.h charset.h msdos.h composite.h keyboard.h \
@@ -1089,10 +1085,10 @@ filelock.o: filelock.c buffer.h systime.h epaths.h $(config_h)
 filemode.o: filemode.c  $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    blockinput.h atimer.h systime.h buffer.h charset.h fontset.h \
-   msdos.h dosfns.h dispextern.h termchar.h $(config_h)
-fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h)
+   msdos.h dosfns.h dispextern.h $(config_h)
+fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h)
 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \
-   keyboard.h termhooks.h $(config_h)
+   keyboard.h $(config_h)
 getloadavg.o: getloadavg.c $(config_h)
 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
    systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h)
@@ -1103,7 +1099,7 @@ insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \
    dispextern.h atimer.h systime.h $(config_h)
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
-   systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \
+   systty.h systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \
    atimer.h xterm.h puresize.h msdos.h $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    atimer.h systime.h puresize.h charset.h intervals.h $(config_h)
@@ -1117,7 +1113,7 @@ vm-limit.o: vm-limit.c mem-limits.h $(config_h)
 marker.o: marker.c buffer.h charset.h $(config_h)
 md5.o: md5.c md5.h $(config_h)
 minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
-   buffer.h commands.h charset.h msdos.h termhooks.h $(config_h)
+   buffer.h commands.h charset.h msdos.h $(config_h)
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \
@@ -1129,7 +1125,7 @@ process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
 regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h
 region-cache.o: region-cache.c buffer.h region-cache.h $(config_h)
 scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
-   termhooks.h $(config_h)
+   $(config_h)
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
    blockinput.h atimer.h systime.h category.h charset.h composite.h $(config_h)
 strftime.o: strftime.c $(config_h)
@@ -1137,7 +1133,7 @@ syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \
    composite.h $(config_h)
 sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
    process.h dispextern.h termhooks.h termchar.h termopts.h \
-   frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h $(config_h)
+   frame.h atimer.h window.h msdos.h dosfns.h keyboard.h  $(config_h)
 term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
    disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h
 termcap.o: termcap.c $(config_h)
@@ -1153,17 +1149,16 @@ w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
    $(srcdir)/../lwlib/lwlib.h $(config_h)
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
-   disptab.h keyboard.h dispextern.h msdos.h composite.h \
+   termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.h \
    $(config_h)
 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \
    termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \
    msdos.h composite.h fontset.h blockinput.h atimer.h systime.h keymap.h
 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
-   window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h \
-   termchar.h termhooks.h $(config_h)
+   window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h $(config_h)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
-   charset.h gtkutil.h termchar.h termhooks.h $(config_h)
+   charset.h gtkutil.h $(config_h)
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
    keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h \
    gtkutil.h msdos.h coding.h $(config_h)
@@ -1172,7 +1167,7 @@ xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
   keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \
   coding.h process.h gtkutil.h $(config_h)
 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
-  buffer.h atimer.h systime.h termhooks.h $(config_h)
+  buffer.h atimer.h systime.h $(config_h)
 xrdb.o: xrdb.c $(config_h) epaths.h
 xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \
   lisp.h termopts.h
@@ -1195,7 +1190,7 @@ floatfns.o: floatfns.c $(config_h)
 fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \
  frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \
-   $(config_h) dispextern.h msdos.h composite.h termchar.h intervals.h
+   $(config_h) dispextern.h msdos.h composite.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \
  termhooks.h coding.h msdos.h
 
@@ -1209,7 +1204,7 @@ composite.o: composite.c buffer.h  charset.h $(INTERVAL_SRC) $(config_h)
    OTHER_FILES and OBJECTS_MACHINE
    select which of these should be compiled.  */
 
-sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.h $(config_h)
+sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h)
 
 #ifdef HAVE_CARBON
 abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
@@ -1333,6 +1328,3 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
 #endif /* ! defined (HAVE_SHM) */
         mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */
-
-/* arch-tag: 8e915ae5-d15d-4617-8c41-c5c267a23b00
-   (do not change this comment) */
diff --git a/src/keyboard.c b/src/keyboard.c
index cd3b4f6704c..1c4e9fe0c4a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10672,7 +10672,7 @@ DEFUN ("posn-at-point", Fposn_at_point, Sposn_at_point, 0, 2, 0,
 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
 
 Return nil if position is not visible in window.  Otherwise,
-the return value is similar to that returned by event-start for
+the return value is similar to that returned by `event-start' for
 a mouse click at the upper left corner of the glyph corresponding
 to the given buffer position:
    (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 7056d43af5f..a7efcc4cae5 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -1471,5 +1471,3 @@ $(BLD)/w32bdf.$(O): \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
         $(SRC)/w32term.h
-
-# arch-tag: 9fd7aba8-f826-4111-b3c0-497a8e7db9a0
diff --git a/src/search.c b/src/search.c
index e5e4c3f867a..24f21f053a5 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2622,9 +2622,9 @@ match_limit (num, beginningp)
 
   CHECK_NUMBER (num);
   n = XINT (num);
-  if (n < 0 || n >= search_regs.num_regs)
+  if (n < 0 || search_regs.num_regs <= 0)
     args_out_of_range (num, make_number (search_regs.num_regs));
-  if (search_regs.num_regs <= 0
+  if (n >= search_regs.num_regs
       || search_regs.start[n] < 0)
     return Qnil;
   return (make_number ((beginningp) ? search_regs.start[n]