Merged in changes from CVS trunk.

Patches applied:

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

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

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


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

5 files changed, 75 insertions, 50 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 876646163e3..f0690a1fa44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2004-07-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Doc fix.
+
+2004-07-20  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * frame.el (modify-all-frames-parameters): Minor doc fix.
+
+2004-07-20  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/fill.el (fill-comment-paragraph): Handle indent-tabs-mode.
+        (fill-delete-newlines): Call sentence-end as function.
+        (fill-nobreak-p, canonically-space-region): Likewise.
+        (fill-nobreak-p): If this break point is at the end of the line,
+        don't consider the newline which follows as a reason to return t.
+
+2004-07-19  John Paul Wallington  <jpw@gnu.org>
+
+        * dired-aux.el (dired-file-set-difference): Don't use `caddr'.
+
+2004-07-18  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * dired-aux.el (dired-do-kill-lines): Expand docstring.
+        Delete irrelevant code.
+
 2004-07-17  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
         * net/tramp.el (tramp-handle-verify-visited-file-modtime): New
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index bf7c9c00d18..6c1a9ad36f0 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -163,8 +163,8 @@ condition.  Two file items are considered to match if they are equal
         (unless (let ((list list2))
                   (while (and list
                               (not (let* ((file2 (car list))
-                                          (fa1 (caddr file1))
-                                          (fa2 (caddr file2))
+                                          (fa1 (car (cddr file1)))
+                                          (fa2 (car (cddr file2)))
                                           (size1 (nth 7 fa1))
                                           (size2 (nth 7 fa2))
                                           (mtime1 (float-time (nth 5 fa1)))
@@ -627,9 +627,14 @@ the list of file names explicitly with the FILE-LIST argument."
 (defun dired-do-kill-lines (&optional arg fmt)
   "Kill all marked lines (not the files).
 With a prefix argument, kill that many lines starting with the current line.
-\(A negative argument kills lines before the current line.)
-To kill an entire subdirectory, go to its directory header line
-and use this command with a prefix argument (the value does not matter)."
+\(A negative argument kills backward.)
+If you use this command with a prefix argument to kill the line
+for a file that is a directory, which you have inserted in the
+Dired buffer as a subdirectory, then it deletes that subdirectory
+from the buffer as well.
+To kill an entire subdirectory \(without killing its line in the
+parent directory), go to its directory header line and use this
+command with a prefix argument (the value does not matter)."
   ;; Returns count of killed lines.  FMT="" suppresses message.
   (interactive "P")
   (if arg
@@ -638,23 +643,14 @@ and use this command with a prefix argument (the value does not matter)."
         (dired-kill-line arg))
     (save-excursion
       (goto-char (point-min))
-      (let (buffer-read-only (count 0))
-        (if (not arg)                   ; kill marked lines
-            (let ((regexp (dired-marker-regexp)))
-              (while (and (not (eobp))
-                          (re-search-forward regexp nil t))
-                (setq count (1+ count))
-                (delete-region (progn (beginning-of-line) (point))
-                               (progn (forward-line 1) (point)))))
-          ;; else kill unmarked lines
-          (while (not (eobp))
-            (if (or (dired-between-files)
-                    (not (looking-at "^  ")))
-                (forward-line 1)
-              (setq count (1+ count))
-              (delete-region (point) (save-excursion
-                                       (forward-line 1)
-                                       (point))))))
+      (let (buffer-read-only
+            (count 0)
+            (regexp (dired-marker-regexp)))
+        (while (and (not (eobp))
+                    (re-search-forward regexp nil t))
+          (setq count (1+ count))
+          (delete-region (progn (beginning-of-line) (point))
+                         (progn (forward-line 1) (point))))
         (or (equal "" fmt)
             (message (or fmt "Killed %d line%s.") count (dired-plural-s count)))
         count))))
diff --git a/lisp/frame.el b/lisp/frame.el
index 243ad71497d..d032dfa82ec 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
diff --git a/lisp/printing.el b/lisp/printing.el
index ae6e194d731..22a3f762ab6 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/07/12 21:10:35 vinicius>
+;; Time-stamp: <2004/07/20 21:44:43 vinicius>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.8
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
@@ -40,37 +40,22 @@ Please send all bug fixes and enhancements to
 ;; Introduction
 ;; ------------
 ;;
-;; This package provides an user interface to some printing utilities that
-;; includes previewing/printing a PostScript file, printing a text file and
-;; previewing/printing some major modes (like mh-folder-mode,
-;; rmail-summary-mode, gnus-summary-mode, etc).  It also includes a
-;; PostScript/text printer database.
+;; With `printing' you can preview or print a PostScript file.  You can also
+;; print a text file using PostScript, and preview or print buffers that use
+;; certain special modes like mh-folder-mode, rmail-summary-mode,
+;; gnus-summary-mode, etc.  This package also includes a PostScript/text
+;; printer database.
 ;;
-;; Indeed, there are two user interfaces:
+;; There are two user interfaces:
 ;;
 ;;    * Menu interface:
-;;      When `printing' is loaded, the menubar is modified to use `printing'
-;;      menu instead of the print options in menubar.
+;;      The `printing' menu replaces the usual print options in the menu bar.
 ;;      This is the default user interface.
 ;;
 ;;    * Buffer interface:
-;;      It is an option of `printing' menu, but it can be binded into another
-;;      key, so user can activate the buffer interface directly without using
-;;      a menu.  See `pr-interface' command.
-;;
-;; `printing' was inspired on:
-;;
-;;    print-nt.el             Frederic Corne <frederic.corne@erli.fr>
-;;       Special printing functions for Windows NT
-;;
-;;    mh-e-init.el            Tom Vogels <tov@ece.cmu.edu>
-;;       PS-print for mail messages
-;;
-;;    win32-ps-print.el       Matthew O. Persico <mpersico@erols.com>
-;;       PostScript printing with ghostscript
-;;
-;;    ps-print-interface.el   Volker Franz <volker.franz@tuebingen.mpg.de>
-;;       Graphical front end for ps-print and previewing
+;;      You can use a buffer interface instead of menus.  It looks like a
+;;      customization buffer.  Basically, it has the same options found in the
+;;      menu and some extra options, all this on a buffer.
 ;;
 ;; `printing' is prepared to run on GNU, Unix and NT systems.
 ;; On GNU or Unix system, `printing' depends on gs and gv utilities.
@@ -86,6 +71,20 @@ Please send all bug fixes and enhancements to
 ;; `http://www.cpqd.com.br/~vinicius/emacs/ps-print.tar.gz'.
 ;; Please, see README file for ps-print installation instructions.
 ;;
+;; `printing' was inspired on:
+;;
+;;    print-nt.el             Frederic Corne <frederic.corne@erli.fr>
+;;       Special printing functions for Windows NT
+;;
+;;    mh-e-init.el            Tom Vogels <tov@ece.cmu.edu>
+;;       PS-print for mail messages
+;;
+;;    win32-ps-print.el       Matthew O. Persico <mpersico@erols.com>
+;;       PostScript printing with ghostscript
+;;
+;;    ps-print-interface.el   Volker Franz <volker.franz@tuebingen.mpg.de>
+;;       Graphical front end for ps-print and previewing
+;;
 ;;
 ;; Log Messages
 ;; ------------
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a888003402d..dfd471a87c4 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -353,7 +353,12 @@ and `fill-nobreak-invisible'."
      ;; Don't split a line if the rest would look like a new paragraph.
      (unless use-hard-newlines
        (save-excursion
-         (skip-chars-forward " \t") (looking-at paragraph-start)))
+         (skip-chars-forward " \t")
+         ;; If this break point is at the end of the line,
+         ;; which can occur for auto-fill, don't consider the newline
+         ;; which follows as a reason to return t.
+         (and (not (eolp))
+              (looking-at paragraph-start))))
      (run-hook-with-args-until-success 'fill-nobreak-predicate)))))
 
 ;; Put `fill-find-break-point-function' property to charsets which