Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
   Update from CVS: lisp/progmodes/make-mode.el: Fix comments.

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

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

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


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

14 files changed, 128 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0690a1fa44..3f1f6ed7363 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-07-23  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * frame.el (modify-all-frames-parameters): Minor doc fix.
+        (set-frame-configuration): Doc fix.
+
+2004-07-23  Matt Hodges  <matt@stchem.bham.ac.uk>  (tiny change)
+
+        * simple.el (completion-setup-function): Compute the common parts
+        and the first difference place correctly when
+        partial-completion-mode is on.
+
+2004-07-22  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el: Doc fix.  Improve the DSC compliance of the generated
+        PostScript.  Suggested by Michael Piotrowski <mxp@dynalabs.de>.
+        (ps-print-version): New version 6.6.5.
+        (ps-printing-region): Doc fix.
+        (ps-generate-string-list): Comment fix.
+        (ps-message-log-max, ps-begin-file): Code fix.
+
+2004-07-22  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/make-mode.el: Fix comments.
+
 2004-07-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * printing.el: Doc fix.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index ef438eb4b97..796ebaa27c8 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -1,6 +1,6 @@
 ;;; autorevert.el --- revert buffers when files on disk change
 
-;; Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: convenience
diff --git a/lisp/frame.el b/lisp/frame.el
index d032dfa82ec..385af2e130e 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -532,7 +532,7 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
 ;;;; Creation of additional frames, and other frame miscellanea
 
 (defun modify-all-frames-parameters (alist)
-  "Modify all current and future frames parameters according to ALIST.
+  "Modify all current and future frames' parameters according to ALIST.
 This changes `default-frame-alist' and possibly `initial-frame-alist'.
 See help of `modify-frame-parameters' for more information."
   (let (element)                        ;; temp
@@ -856,6 +856,8 @@ where
   "Restore the frames to the state described by CONFIGURATION.
 Each frame listed in CONFIGURATION has its position, size, window
 configuration, and other parameters set as specified in CONFIGURATION.
+However, this function does not restore deleted frames.
+
 Ordinarily, this function deletes all existing frames not
 listed in CONFIGURATION.  But if optional second argument NODELETE
 is given and non-nil, the unwanted frames are iconified instead."
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 826cf89bfec..b2694bc2b78 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -209,7 +209,7 @@ loaddefs.el-CMD:
         echo (autoload 'define-derived-mode "derived")>> $@
         echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
         echo (defvar cvs-global-menu nil)>> $@
-        echo.>> $@
+        echo ;;; >> $@
         echo ;;; Local Variables:>> $@
         echo ;;; version-control: never>> $@
         echo ;;; no-byte-compile: t>> $@
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 5130ca9bfef..c887b144965 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -8,11 +8,6 @@
 ;; Adapted-By: ESR
 ;; Keywords: unix, tools
 
-;; RMS:
-;; This needs work.
-;; Also, the doc strings need fixing: the first line doesn't stand alone,
-;; and other usage is not high quality.  Symbol names don't have `...'.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -63,6 +58,7 @@
 ;;
 ;; To Do:
 ;;
+;; * Add missing doc strings, improve terse doc strings.
 ;; * Eliminate electric stuff entirely.
 ;; * It might be nice to highlight targets differently depending on
 ;;   whether they are up-to-date or not.  Not sure how this would
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 72ba4c24eed..9dca7986e7c 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -10,12 +10,12 @@
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript
-;; Time-stamp: <2004/03/10 18:57:00 vinicius>
-;; Version: 6.6.4
+;; Time-stamp: <2004/07/21 23:12:05 vinicius>
+;; Version: 6.6.5
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
-(defconst ps-print-version "6.6.4"
-  "ps-print.el, v 6.6.4 <2004/03/10 vinicius>
+(defconst ps-print-version "6.6.5"
+  "ps-print.el, v 6.6.5 <2004/07/21 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -1353,6 +1353,9 @@ Please send all bug fixes and enhancements to
 ;; Acknowledgments
 ;; ---------------
 ;;
+;; Thanks to Michael Piotrowski <mxp@dynalabs.de> for improving the DSC
+;; compliance of the generated PostScript.
+;;
 ;; Thanks to Adam Doppelt <adoppelt@avogadro.com> for face mapping suggestion
 ;; for black/white PostScript printers.
 ;;
@@ -1424,7 +1427,7 @@ Please send all bug fixes and enhancements to
 ;; initial port to Emacs 19.  His code is no longer part of ps-print, but his
 ;; work is still appreciated.
 ;;
-;; Thanks to Remi Houdaille and Michel Train, michel@metasoft.fdn.org, for
+;; Thanks to Remi Houdaille and Michel Train <michel@metasoft.fdn.org> for
 ;; adding underline support.  Their code also is no longer part of ps-print,
 ;; but their efforts are not forgotten.
 ;;
@@ -4162,6 +4165,7 @@ If EXTENSION is any other symbol, it is ignored."
 
 (defun ps-message-log-max ()
   (and (not (string= (buffer-name) "*Messages*"))
+       (boundp 'message-log-max)
        message-log-max))
 
 
@@ -4210,7 +4214,7 @@ If EXTENSION is any other symbol, it is ignored."
 
 
 (defvar ps-printing-region nil
-  "Variable used to indicate if the region that ps-print is printing.
+  "Variable used to indicate the region that ps-print is printing.
 It is a cons, the car of which is the line number where the region begins, and
 its cdr is the total number of lines in the buffer.  Formatting functions can
 use this information to print the original line number (and not the number of
@@ -4729,12 +4733,16 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
   (let (str)
     (while content
       (setq str (cons (cond
+                       ;; string
                        ((stringp (car content))
                         (car content))
+                       ;; function symbol
                        ((and (symbolp (car content)) (fboundp (car content)))
                         (concat "(" (funcall (car content)) ")"))
+                       ;; variable symbol
                        ((and (symbolp (car content)) (boundp (car content)))
                         (concat "(" (symbol-value (car content)) ")"))
+                       ;; otherwise, empty string
                        (t
                         ""))
                       str)
@@ -5424,9 +5432,9 @@ XSTART YSTART are the relative position for the first page in a sheet.")
      ps-adobe-tag
      "%%Title: " (buffer-name)          ; Take job name from name of
                                         ; first buffer printed
-     "\n%%Creator: " (user-full-name)
-     " (using ps-print v" ps-print-version
-     ")\n%%CreationDate: " (format-time-string "%T %b %d %Y")
+     "\n%%Creator: ps-print v" ps-print-version
+     "\n%%For: " (user-full-name)
+     "\n%%CreationDate: " (format-time-string "%T %b %d %Y")
      "\n%%Orientation: "
      (if ps-landscape-mode "Landscape" "Portrait")
      "\n%%DocumentNeededResources: font Times-Roman Times-Italic\n%%+ font "
@@ -5434,8 +5442,11 @@ XSTART YSTART are the relative position for the first page in a sheet.")
                 (ps-remove-duplicates
                  (append (ps-fonts 'ps-font-for-text)
                          (list (ps-font 'ps-font-for-header 'normal)
-                               (ps-font 'ps-font-for-header 'bold))))
+                               (ps-font 'ps-font-for-header 'bold)
+                               (ps-font 'ps-font-for-footer 'normal)
+                               (ps-font 'ps-font-for-footer 'bold))))
                 "\n%%+ font ")
+     "\n%%DocumentSuppliedResources: procset PSPrintUserDefinedPrologue-" (user-login-name) " 0 0"
      "\n%%DocumentMedia: " (ps-page-dimensions-get-media dimensions)
      (format " %d" (round (ps-page-dimensions-get-width dimensions)))
      (format " %d" (round (ps-page-dimensions-get-height dimensions)))
@@ -5455,11 +5466,11 @@ XSTART YSTART are the relative position for the first page in a sheet.")
                                        ps-error-handler-alist))
                            1))          ; send to paper
                ps-print-prologue-0
-               "\n%%BeginProcSet: UserDefinedPrologue\n\n")
+               "\n%%BeginResource: procset PSPrintUserDefinedPrologue-" (user-login-name) " 0 0\n\n")
 
     (ps-insert-string ps-user-defined-prologue)
 
-    (ps-output "\n%%EndProcSet\n\n")
+    (ps-output "\n%%EndResource\n\n")
 
     (ps-output-boolean "LandscapeMode      "
                        (or ps-landscape-mode
@@ -5571,6 +5582,21 @@ XSTART YSTART are the relative position for the first page in a sheet.")
     (mapcar 'ps-output ps-background-all-pages)
     (ps-output "}def\n/printLocalBackground{\n}def\n")
 
+    (ps-output "\n%%EndProlog\n\n%%BeginSetup\n")
+
+    (ps-output
+     "\n%%IncludeResource: font Times-Roman"
+     "\n%%IncludeResource: font Times-Italic\n%%IncludeResource: font "
+     (mapconcat 'identity
+                (ps-remove-duplicates
+                 (append (ps-fonts 'ps-font-for-text)
+                         (list (ps-font 'ps-font-for-header 'normal)
+                               (ps-font 'ps-font-for-header 'bold)
+                               (ps-font 'ps-font-for-footer 'normal)
+                               (ps-font 'ps-font-for-footer 'bold))))
+                "\n%%IncludeResource: font ")
+     "\n")
+
     ;; Header/line number fonts
     (ps-output (format "/h0 %s(%s)cvn DefFont\n" ; /h0 14/Helvetica-Bold DefFont
                        ps-header-title-font-size-internal
@@ -5614,7 +5640,6 @@ XSTART YSTART are the relative position for the first page in a sheet.")
       (ps-output (format "/SpaceWidthRatio %f def\n"
                          (/ (ps-lookup 'space-width) (ps-lookup 'size)))))
 
-    (ps-output "\n%%EndProlog\n\n%%BeginSetup\n")
     (unless (eq ps-spool-config 'lpr-switches)
       (ps-output "\n%%BeginFeature: *Duplex "
                  (ps-boolean-capitalized ps-spool-duplex)
diff --git a/lisp/simple.el b/lisp/simple.el
index bf57c41b1c1..9a7b7f245d0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4317,6 +4317,13 @@ of the differing parts is, by contrast, slightly highlighted."
     (if minibuffer-completing-file-name
         (with-current-buffer mainbuf
           (setq default-directory (file-name-directory mbuf-contents))))
+    ;; If partial-completion-mode is on, point might not be after the
+    ;; last character in the minibuffer.
+    ;; FIXME: This still doesn't work if the text to be completed
+    ;; starts with a `-'.
+    (when (and partial-completion-mode (not (eobp)))
+      (setq mbuf-contents
+            (substring mbuf-contents 0 (- (point) (point-max)))))
     (with-current-buffer standard-output
       (completion-list-mode)
       (make-local-variable 'completion-reference-buffer)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 14b0fcb4606..f21788d526d 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-23  John Paul Wallington  <jpw@gnu.org>
+
+        * macros.texi (Defining Macros): Declaration keyword for setting
+        Edebug spec is `debug' not `edebug'.
+
 2004-07-19  Luc Teirlinck  <teirllm@auburn.edu>
 
         * windows.texi: Various small changes in addition to:
diff --git a/lispref/macros.texi b/lispref/macros.texi
index e903a159c27..e28ab80ac6b 100644
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -239,7 +239,7 @@ additional information about it.  Two kinds of specification are
 currently supported:
 
 @table @code
-@item (edebug @var{edebug-form-spec})
+@item (debug @var{edebug-form-spec})
 Specify how to step through macro calls for Edebug.
 @xref{Instrumenting Macro Calls}, for more details.
 
diff --git a/lispref/windows.texi b/lispref/windows.texi
index a01dc79d1f1..0fdc6734181 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004
 @c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/windows
@@ -1089,6 +1089,7 @@ presumably the window was previously made by this function.
 @end defun
 
 @defopt special-display-frame-alist
+@anchor{Definition of special-display-frame-alist}
 This variable holds frame parameters for
 @code{special-display-popup-frame} to use when it creates a frame.
 @end defopt
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index adbb3fd57b8..ec30853ed29 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -111,10 +111,10 @@ maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE)
 doit:

 

 maybe-bootstrap-CMD:    doit

-        @echo.

+        @echo .

         @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing.  You should either

         @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow

-        @echo.

+        @echo .

         @if not EXIST ..\lisp\abbrev.elc exit -1

 

 maybe-bootstrap-SH: doit

diff --git a/src/ChangeLog b/src/ChangeLog
index e51cdf554ce..8d9d72de9d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Richard M. Stallman  <rms@gnu.org>
+
+        * xfns.c (x_icon_verify): New function.
+        (Fx_create_frame): Use it.
+
 2004-07-22  Barry Fishman <barry_fishman@att.net>  (tiny change)
 
         * s/gnu-linux.h: Use GC_MARK_STACK if __amd64__ is defined.
diff --git a/src/frame.c b/src/frame.c
index 9a0563c6f76..1935df35508 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,5 +1,5 @@
 /* Generic frame functions.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003
+   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -911,7 +911,12 @@ DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
 Subsequent editing commands apply to its selected window.
 The selection of FRAME lasts until the next time the user does
 something to select a different frame, or until the next time this
-function is called.  */)
+function is called.  If you are using a window system, the previously
+selected frame may be restored as the selected frame after return to
+the command loop, because it still may have the window system's input
+focus.  On a text-only terminal, the next redisplay will display FRAME.
+
+This function returns FRAME, or nil if FRAME has been deleted.  */)
   (frame, no_enter)
     Lisp_Object frame, no_enter;
 {
@@ -1039,6 +1044,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
 DEFUN ("set-frame-selected-window", Fset_frame_selected_window,
        Sset_frame_selected_window, 2, 2, 0,
        doc: /* Set the selected window of frame object FRAME to WINDOW.
+Return WINDOW.
 If FRAME is nil, the selected frame is used.
 If FRAME is the selected frame, this makes WINDOW the selected window.  */)
      (frame, window)
@@ -1937,7 +1943,11 @@ DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p,
        doc: /* Return t if FRAME is now \"visible\" (actually in use for display).
 A frame that is not \"visible\" is not updated and, if it works through
 a window system, it may not show at all.
-Return the symbol `icon' if frame is visible only as an icon.  */)
+Return the symbol `icon' if frame is visible only as an icon.
+
+On a text-only terminal, all frames are considered visible, whether
+they are currently being displayed or not, and this function returns t
+for all frames.  */)
      (frame)
      Lisp_Object frame;
 {
@@ -1977,7 +1987,7 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list,
 
 DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "",
        doc: /* Bring FRAME to the front, so it occludes any frames it overlaps.
-If FRAME is invisible, make it visible.
+If FRAME is invisible or iconified, make it visible.
 If you don't specify a frame, the selected frame is used.
 If Emacs is displaying on an ordinary terminal or some other device which
 doesn't support multiple overlapping frames, this function does nothing.  */)
diff --git a/src/xfns.c b/src/xfns.c
index 3f82966a4be..7963a910d14 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2643,6 +2643,28 @@ x_window (f)
 #endif /* not USE_GTK */
 #endif /* not USE_X_TOOLKIT */
 
+/* Verify that the icon position args for this window are valid.  */
+
+static void
+x_icon_verify (f, parms)
+     struct frame *f;
+     Lisp_Object parms;
+{
+  Lisp_Object icon_x, icon_y;
+
+  /* Set the position of the icon.  Note that twm groups all
+     icons in an icon window.  */
+  icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
+  icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
+  if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
+    {
+      CHECK_NUMBER (icon_x);
+      CHECK_NUMBER (icon_y);
+    }
+  else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
+    error ("Both left and top icon corners of icon must be specified");
+}
+
 /* Handle the icon stuff for this window.  Perhaps later we might
    want an x_set_icon_position which can be called interactively as
    well.  */
@@ -3132,6 +3154,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
   tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
   f->no_split = minibuffer_only || EQ (tem, Qt);
 
+  x_icon_verify (f, parms);
+
   /* Create the X widget or window.  */
 #ifdef USE_X_TOOLKIT
   x_window (f, window_prompting, minibuffer_only);