# HG changeset patch # User Karoly Lorentey # Date 1086943339 0 # Node ID 33be94fa36950733b22a7b05ee029d7ee49dec92 # Parent 8e09aff3715aff2995280ee4923d680644b75fdb# Parent a10d964838a71e9f33c266cd3631cc35c740f6ba 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 diff -r 8e09aff3715a -r 33be94fa3695 .arch-inventory --- a/.arch-inventory Thu Jun 10 17:17:08 2004 +0000 +++ b/.arch-inventory Fri Jun 11 08:42:19 2004 +0000 @@ -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 -r 8e09aff3715a -r 33be94fa3695 Makefile.in --- a/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -259,7 +259,8 @@ -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 @@ -(cd lispref && $(MAKE) $(MFLAGS) clean) -(cd lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) - -# arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156 diff -r 8e09aff3715a -r 33be94fa3695 etc/.arch-inventory --- a/etc/.arch-inventory Thu Jun 10 17:17:08 2004 +0000 +++ b/etc/.arch-inventory Fri Jun 11 08:42:19 2004 +0000 @@ -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 -r 8e09aff3715a -r 33be94fa3695 etc/ChangeLog --- a/etc/ChangeLog Thu Jun 10 17:17:08 2004 +0000 +++ b/etc/ChangeLog Fri Jun 11 08:42:19 2004 +0000 @@ -1,3 +1,7 @@ +2004-06-10 Lars Hansen + + * NEWS: Describe dired-omit-mode. Describe desktop package changes. + 2004-05-29 Steven Tamm * PROBLEMS: Document the workaround for the Mac OS X port not diff -r 8e09aff3715a -r 33be94fa3695 etc/NEWS --- a/etc/NEWS Thu Jun 10 17:17:08 2004 +0000 +++ b/etc/NEWS Fri Jun 11 08:42:19 2004 +0000 @@ -222,6 +222,37 @@ 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 @@ *** 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 @@ 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 -r 8e09aff3715a -r 33be94fa3695 leim/Makefile.in --- a/leim/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/leim/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -241,5 +241,3 @@ extraclean: maintainer-clean -rm -f *~ \#* m/?*~ s/?*~ - -# arch-tag: f666a939-8145-4d64-a6a6-cc1f61bd32ca diff -r 8e09aff3715a -r 33be94fa3695 leim/makefile.w32-in --- a/leim/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/leim/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ maintainer-clean: distclean - $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR) - -# arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b diff -r 8e09aff3715a -r 33be94fa3695 lib-src/Makefile.in --- a/lib-src/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/lib-src/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -478,6 +478,3 @@ $(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 -r 8e09aff3715a -r 33be94fa3695 lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/lib-src/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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)/yow.$(O) : \ $(SRC)/yow.c \ $(EMACS_ROOT)/lib-src/../src/paths.h - -# arch-tag: c051bc02-a6de-474b-889a-27f7b2fbbcea diff -r 8e09aff3715a -r 33be94fa3695 lisp/.arch-inventory --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/.arch-inventory Fri Jun 11 08:42:19 2004 +0000 @@ -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 -r 8e09aff3715a -r 33be94fa3695 lisp/ChangeLog --- a/lisp/ChangeLog Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/ChangeLog Fri Jun 11 08:42:19 2004 +0000 @@ -1,3 +1,27 @@ +2004-06-10 Miles Bader + + * eshell/esh-module.el (eshell-load-defgroups): Bind + `vc-handled-backends' to nil when opening files. + +2004-06-11 Juanma Barranquero + + * files.el (parse-colon-path, cd): Doc fixes (refer to + `path-separator', not colon). + +2004-06-10 Juanma Barranquero + + * newcomment.el (comment-search-forward) + (comment-search-backward): Fix typos in docstring. + (comment-region): Doc fix. + +2004-06-10 Luc Teirlinck + + * 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 * pcvs.el (cvs-mode-diff-yesterday): New command. diff -r 8e09aff3715a -r 33be94fa3695 lisp/Makefile.in --- a/lisp/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -128,8 +128,7 @@ $(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 @@ distclean: -rm -f ./Makefile -# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7 # Makefile ends here. diff -r 8e09aff3715a -r 33be94fa3695 lisp/dired-aux.el --- a/lisp/dired-aux.el Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/dired-aux.el Fri Jun 11 08:42:19 2004 +0000 @@ -1812,10 +1812,10 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lisp/dired.el --- a/lisp/dired.el Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/dired.el Fri Jun 11 08:42:19 2004 +0000 @@ -970,14 +970,7 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lisp/eshell/esh-module.el --- a/lisp/eshell/esh-module.el Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/eshell/esh-module.el Fri Jun 11 08:42:19 2004 +0000 @@ -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 ;; Keywords: processes @@ -41,32 +41,33 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lisp/files.el --- a/lisp/files.el Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/files.el Fri Jun 11 08:42:19 2004 +0000 @@ -526,8 +526,8 @@ 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 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lisp/makefile.w32-in --- a/lisp/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -420,5 +420,3 @@ # clean: - $(DEL) *~ - -# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0 diff -r 8e09aff3715a -r 33be94fa3695 lisp/newcomment.el --- a/lisp/newcomment.el Thu Jun 10 17:17:08 2004 +0000 +++ b/lisp/newcomment.el Fri Jun 11 08:42:19 2004 +0000 @@ -356,7 +356,7 @@ "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 @@ "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 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lispintro/Makefile.in --- a/lispintro/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/lispintro/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -69,5 +69,3 @@ # 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 -r 8e09aff3715a -r 33be94fa3695 lispintro/makefile.w32-in --- a/lispintro/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/lispintro/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ # 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 -r 8e09aff3715a -r 33be94fa3695 lispref/Makefile.in --- a/lispref/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/lispref/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ (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 -r 8e09aff3715a -r 33be94fa3695 lispref/display.texi --- a/lispref/display.texi Thu Jun 10 17:17:08 2004 +0000 +++ b/lispref/display.texi Fri Jun 11 08:42:19 2004 +0000 @@ -3154,7 +3154,7 @@ 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 -r 8e09aff3715a -r 33be94fa3695 lispref/makefile.w32-in --- a/lispref/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/lispref/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ maintainer-clean: clean - $(DEL) elisp elisp-* elisp.dvi elisp.oaux - -# arch-tag: da68f1c2-536d-4d41-9150-7b01434eda3f diff -r 8e09aff3715a -r 33be94fa3695 lwlib/Makefile.in --- a/lwlib/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/lwlib/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -67,5 +67,3 @@ ../lib-src/etags $(srcdir)/*.[ch] tags: TAGS .PHONY: tags - -# arch-tag: a881fa74-b56a-44c6-80b4-28a4c65d88ff diff -r 8e09aff3715a -r 33be94fa3695 man/Makefile.in --- a/man/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/man/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ # 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 -r 8e09aff3715a -r 33be94fa3695 man/makefile.w32-in --- a/man/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/man/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -331,5 +331,3 @@ # 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 -r 8e09aff3715a -r 33be94fa3695 nt/makefile.w32-in --- a/nt/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/nt/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ realclean: cleanall - $(DEL_TREE) ../bin - -# arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219 diff -r 8e09aff3715a -r 33be94fa3695 oldXMenu/Makefile.in --- a/oldXMenu/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/oldXMenu/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -107,5 +107,3 @@ tags:: $(TAGS) -t *.[ch] - -# arch-tag: dbfc0b16-4e0c-4acb-a9c1-fc12ee76db06 diff -r 8e09aff3715a -r 33be94fa3695 src/.arch-inventory --- a/src/.arch-inventory Thu Jun 10 17:17:08 2004 +0000 +++ b/src/.arch-inventory Fri Jun 11 08:42:19 2004 +0000 @@ -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 -r 8e09aff3715a -r 33be94fa3695 src/ChangeLog --- a/src/ChangeLog Thu Jun 10 17:17:08 2004 +0000 +++ b/src/ChangeLog Fri Jun 11 08:42:19 2004 +0000 @@ -1,3 +1,13 @@ +2004-06-11 Juanma Barranquero + + * keyboard.c (Fposn_at_point): Doc fix. + +2004-06-11 David Kastrup + + * 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 * xfaces.c (push_named_merge_point): Return 0 when a cycle is detected. diff -r 8e09aff3715a -r 33be94fa3695 src/Makefile.in --- a/src/Makefile.in Thu Jun 10 17:17:08 2004 +0000 +++ b/src/Makefile.in Fri Jun 11 08:42:19 2004 +0000 @@ -699,7 +699,6 @@ 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 @@ 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 @@ ${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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #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 -r 8e09aff3715a -r 33be94fa3695 src/keyboard.c --- a/src/keyboard.c Thu Jun 10 17:17:08 2004 +0000 +++ b/src/keyboard.c Fri Jun 11 08:42:19 2004 +0000 @@ -10672,7 +10672,7 @@ 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 -r 8e09aff3715a -r 33be94fa3695 src/makefile.w32-in --- a/src/makefile.w32-in Thu Jun 10 17:17:08 2004 +0000 +++ b/src/makefile.w32-in Fri Jun 11 08:42:19 2004 +0000 @@ -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 @@ $(SRC)/w32bdf.h \ $(SRC)/w32gui.h \ $(SRC)/w32term.h - -# arch-tag: 9fd7aba8-f826-4111-b3c0-497a8e7db9a0 diff -r 8e09aff3715a -r 33be94fa3695 src/search.c --- a/src/search.c Thu Jun 10 17:17:08 2004 +0000 +++ b/src/search.c Fri Jun 11 08:42:19 2004 +0000 @@ -2622,9 +2622,9 @@ 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]