Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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


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

9 files changed, 104 insertions, 77 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7aedbbe57e..7d12a911b31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,35 @@
+2004-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * type-break.el (type-break-emacs-variant): Remove.
+        (type-break-run-at-time, type-break-cancel-function-timers):
+        Use fboundp rather than version name and number.
+
+2004-03-09  Masatake YAMATO  <jet@gyve.org>
+
+        * hexl.el (hexl-mode): Use `make-local-variable' instead of
+        `make-variable-buffer-local'.
+
+2004-03-08  Michael Albinus  <Michael.Albinus@alcatel.de>
+
+        * find-dired.el (find-dired): Call `shell-command' instead of
+        `start-process-shell-command'.  By this, Tramp takes over
+        handling of remote directories.
+
+2004-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cus-edit.el (fill) <defgroup>: Move to fill.el.
+
+        * textmodes/fill.el (fill) <defgroup>: Move from cus-edit.el.
+        (enable-kinsoku): Make it a defcustom.
+        (fill-comment-paragraph): Don't rely on fill-prefix to bound the
+        paragraph to same-comment-start-marker.
+
 2004-03-07  Dave Love  <fx@gnu.org>
 
         * net/browse-url.el (rfc2368-parse-mailto-url): Autoload.
         (browse-url-mail): Use it.
 
-        * mail/rfc2368.el (rfc2368-unhexify-char): Deleted.
+        * mail/rfc2368.el (rfc2368-unhexify-char): Delete.
         (rfc2368-unhexify-string): Use replace-regexp-in-string.
 
 2004-03-07  Francis J. Wright  <F.J.Wright@qmul.ac.uk>
@@ -21,14 +47,17 @@
         * gdb-ui.el (gdb-overlay-arrow-position): Add defvar.
         (gdb-reset): Reset gdb-overlay-arrow-position marker and remove it
         from overlay-arrow-variable-list.
-        (gdb-assembler-mode): Use add-to-list for
-        gdb-overlay-arrow-position.
+        (gdb-assembler-mode): Use add-to-list for gdb-overlay-arrow-position.
 
 2004-03-06  Nick Roberts  <nick@nick.uklinux.net>
 
         * gdb-ui.el (gdb-assembler-mode, gdb-assembler-custom): Set up
         overlay arrow string properly for the assembler buffer.
 
+2004-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mail/sendmail.el (mail-mode): Fix last change.
+
 2004-03-05  Nick Roberts  <nick@nick.uklinux.net>
 
         * gdb-ui.el (gdb-assembler-mode): Create a second overlay arrow
@@ -38,6 +67,11 @@
 
 2004-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * progmodes/sh-script.el (sh-font-lock-paren): Add @ in case patterns.
+
+        * pcvs-info.el (cvs-fileinfo->backup-file): Use a more constraining
+        regexp to distinguish .#ChangeLog.9.1.400 and .#ChangeLog.1.400.
+
         * mail/sendmail.el (mail-mode): Set comment-start-skip.
 
         * newcomment.el (uncomment-region): Allow non-terminated comment.
@@ -98,6 +132,11 @@
 
 2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * Makefile.in (setwins, setwins_almost): Skip .arch-ids and other
+        hidden files/directories.
+
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * textmodes/fill.el (fill-paragraph): Don't check comment-start-skip,
         only comment-start (in case the mode hasn't set it).
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index fc5e7ecb8af..04570b1512e 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,6 +1,6 @@
 ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
 ;;
-;; Copyright (C) 1996,97,1999,2000,01,02,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,1999,2000,01,02,03,2004  Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -286,11 +286,6 @@
   "Content of the modeline."
   :group 'environment)
 
-(defgroup fill nil
-  "Indenting and filling text."
-  :link '(custom-manual "(emacs)Filling Text")
-  :group 'editing)
-
 (defgroup editing-basics nil
   "Most basic editing facilities."
   :group 'editing)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c2dc3e6a16c..6b50318d3e6 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,6 +1,6 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
 
-;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,86,1999,2000,01,03,2004  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
@@ -197,6 +197,8 @@
   (setq comment-column 40)
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'lisp-comment-indent)
+  ;; Don't get confused by `;' in doc strings when paragraph-filling.
+  (set (make-local-variable 'comment-use-global-state) t)
   (make-local-variable 'imenu-generic-expression)
   (setq imenu-generic-expression lisp-imenu-generic-expression)
   (make-local-variable 'multibyte-syntax-as-symbol)
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 9407afc3862..5bef4d6bf3a 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -121,6 +121,8 @@ as the final argument."
                            ""
                          (concat "\\( " args " \\) "))
                        (car find-ls-option)))
+    ;; Start the find process.
+    (shell-command (concat args "&") (current-buffer))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
     (dired-mode dir (cdr find-ls-option))
     (let ((map (make-sparse-keymap)))
@@ -149,8 +151,7 @@ as the final argument."
     ;; ``wildcard'' line.
     (insert "  " args "\n")
     (setq buffer-read-only t)
-    ;; Start the find process.
-    (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
+    (let ((proc (get-buffer-process (current-buffer))))
       (set-process-filter proc (function find-dired-filter))
       (set-process-sentinel proc (function find-dired-sentinel))
       ;; Initialize the process marker; it is used by the filter.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7fa3fb61ce5..43be1e84e43 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-mode): Fix last change.
+
 2004-03-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * message.el (message-mode): Set comment-start-skip.
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 40e3c929c59..9fd21824f26 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -239,7 +239,7 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
 
     ;; Set a callback function for eldoc.
-    (set (make-variable-buffer-local 'eldoc-print-current-symbol-info-function)
+    (set (make-local-variable 'eldoc-print-current-symbol-info-function)
          'hexl-print-current-point-info)
     (eldoc-add-command-completions "hexl-")
     (eldoc-remove-command "hexl-save-buffer" 
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 1c9c0dfd4b6..924cf0ed8c4 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -345,6 +345,13 @@ If UNP is non-nil, unquote nested comment markers."
 ;;;; Navigation
 ;;;;
 
+(defvar comment-use-global-state nil
+  "Non-nil means that the global syntactic context is used.
+More specifically, it means that `syntax-ppss' is used to find out whether
+point is within a string or not.  Major modes whose syntax is faithfully
+described by the syntax-tables can set this to non-nil so comment markers
+in strings will not confuse Emacs.")
+
 (defun comment-search-forward (limit &optional noerror)
   "Find a comment start between point and LIMIT.
 Moves point to inside the comment and returns the position of the
@@ -357,8 +364,10 @@ and raises an error or returns nil of NOERROR is non-nil."
         (unless noerror (error "No comment")))
     (let* ((pt (point))
            ;; Assume (at first) that pt is outside of any string.
-           (s (parse-partial-sexp pt (or limit (point-max)) nil nil nil t)))
-      (when (and (nth 8 s) (nth 3 s))
+           (s (parse-partial-sexp pt (or limit (point-max)) nil nil
+                                  (if comment-use-global-state (syntax-ppss pt))
+                                  t)))
+      (when (and (nth 8 s) (nth 3 s) (not comment-use-global-state))
           ;; The search ended inside a string.  Try to see if it
           ;; works better when we assume that pt is inside a string.
           (setq s (parse-partial-sexp
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 7a794d67c5e..57ba513cd7f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -30,6 +30,11 @@
 
 ;;; Code:
 
+(defgroup fill nil
+  "Indenting and filling text."
+  :link '(custom-manual "(emacs)Filling Text")
+  :group 'editing)
+
 (defcustom fill-individual-varying-indent nil
   "*Controls criterion for a new paragraph in `fill-individual-paragraphs'.
 Non-nil means changing indent doesn't end a paragraph.
@@ -49,13 +54,14 @@ A value of nil means that any change in indentation starts a new paragraph."
 If the function returns nil, then `fill-paragraph' does its normal work.")
 
 (defvar fill-paragraph-handle-comment t
-  "If non-nil, paragraph filling will try to pay attention to comments.")
+  "Non-nil means paragraph filling will try to pay attention to comments.")
 
-(defvar enable-kinsoku t
-  "*Non-nil means enable \"kinsoku\" processing on filling paragraph.
+(defcustom enable-kinsoku t
+  "*Non-nil means enable \"kinsoku\" processing on filling paragraphs.
 Kinsoku processing is designed to prevent certain characters from being
 placed at the beginning or end of a line by filling.
-See the documentation of `kinsoku' for more information.")
+See the documentation of `kinsoku' for more information."
+  :type 'boolean)
 
 (defun set-fill-prefix ()
   "Set the fill prefix to the current line up to point.
@@ -317,7 +323,7 @@ be tested.  If it returns t, fill commands do not break the line there."
   :options '(fill-french-nobreak-p fill-single-word-nobreak-p))
 
 (defcustom fill-nobreak-invisible nil
-  "Non-nil means that fill command do not break lines in invisible text."
+  "Non-nil means that fill commands do not break lines in invisible text."
   :type 'boolean
   :group 'fill)
 
@@ -365,7 +371,7 @@ and `fill-nobreak-invisible'."
 Don't move back past the buffer position LIMIT.
 
 This function is called when we are going to break the current line
-after or before a non-ascii character.  If the charset of the
+after or before a non-ASCII character.  If the charset of the
 character has the property `fill-find-break-point-function', this
 function calls the property value as a function with one arg LINEBEG.
 If the charset has no such property, do nothing."
@@ -428,7 +434,7 @@ Point is moved to just past the fill prefix on the first line."
          (string-to-list sentence-end-without-space)))
     (while (re-search-forward eol-double-space-re to t)
       (or (>= (point) to) (memq (char-before) '(?\t ?\ ))
-          (memq (char-after (match-beginning 0)) 
+          (memq (char-after (match-beginning 0))
                 sentence-end-without-space-list)
           (insert-and-inherit ?\ ))))
 
@@ -844,8 +850,13 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                     (concat paragraph-start "\\|[ \t]*\\(?:"
                             comment-start-skip "\\)\\(?:"
                             (default-value 'paragraph-start) "\\)"))
-                   (paragraph-ignore-fill-prefix nil)
-                   (fill-prefix comment-fill-prefix)
+                   ;; We used to reply on fill-prefix to break paragraph at
+                   ;; comment-starter changes, but it did not work for the
+                   ;; first line (mixed comment&code).
+                   ;; We now use comment-re instead to "manually" make sure
+                   ;; we treat comment-marker changes as paragraph boundaries.
+                   ;; (paragraph-ignore-fill-prefix nil)
+                   ;; (fill-prefix comment-fill-prefix)
                    (after-line (if has-code-and-comment
                                    (line-beginning-position 2))))
               (setq end (progn (forward-paragraph) (point)))
@@ -892,7 +903,7 @@ as specified by its text properties.
 The fourth arg NOSQUEEZE non-nil means to leave
 whitespace other than line breaks untouched, and fifth arg TO-EOP
 non-nil means to keep filling to the end of the paragraph (or next
-hard newline, if `use-hard-newlines' is on).
+hard newline, if variable `use-hard-newlines' is on).
 
 Return the fill-prefix used for filling the last paragraph.
 
@@ -976,8 +987,8 @@ beginning and end of the region are not at paragraph breaks, they are
 moved to the beginning and end \(respectively) of the paragraphs they
 are in.
 
-If `use-hard-newlines' is true, all hard newlines are taken to be paragraph
-breaks.
+If variable `use-hard-newlines' is true, all hard newlines are
+taken to be paragraph breaks.
 
 When calling from a program, operates just on region between BEGIN and END,
 unless optional fourth arg WHOLE-PAR is non-nil.  In that case bounds are
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 83e6a4cebff..d7d74fd887b 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1,6 +1,6 @@
 ;;; type-break.el --- encourage rests from typing at appropriate intervals
 
-;; Copyright (C) 1994, 95, 97, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 97, 2000, 2004 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
@@ -8,7 +8,7 @@
 ;; Status: Works in GNU Emacs 19.25 or later, some versions of XEmacs
 ;; Created: 1994-07-13
 
-;; $Id: type-break.el,v 1.29 2003/09/01 15:45:17 miles Exp $
+;; $Id: type-break.el,v 1.30 2004/03/09 15:27:06 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -277,39 +277,6 @@ It will be either \"seconds\" or \"keystrokes\".")
 (defvar type-break-current-keystroke-warning-interval nil)
 (defvar type-break-time-warning-count 0)
 (defvar type-break-keystroke-warning-count 0)
-
-;; Constant indicating emacs variant.
-;; This can be one of `xemacs', `lucid', `epoch', `mule', etc.
-(defconst type-break-emacs-variant
-  (let ((data (match-data))
-        (version (cond
-                  ((fboundp 'nemacs-version)
-                   (nemacs-version))
-                  (t
-                   (emacs-version))))
-        (alist '(("\\bXEmacs\\b"  . xemacs)
-                 ("\\bLucid\\b"   . lucid)
-                 ("^Nemacs\\b"    . nemacs)
-                 ("^GNU Emacs 19" . standard19)
-                 ("^GNU Emacs 20" . standard19)
-                 ("^GNU Emacs 18" . emacs18)))
-        result)
-    (while alist
-      (cond
-       ((string-match (car (car alist)) version)
-        (setq result (cdr (car alist)))
-        (setq alist nil))
-       (t
-        (setq alist (cdr alist)))))
-    (set-match-data data)
-    (cond ((eq result 'lucid)
-           (and (string= emacs-version "19.8 Lucid")
-                (setq result 'lucid-19-8)))
-          ((memq result '(nemacs emacs18))
-           (signal 'error
-                   "type-break not supported in this version of emacs.")))
-    result))
-
 
 ;;;###autoload
 (defun type-break-mode (&optional prefix)
@@ -954,38 +921,37 @@ With optional non-nil ALL, force redisplay of all mode-lines."
 ;;; for different versions of emacs.
 
 (defun type-break-run-at-time (time repeat function)
-  (cond ((eq type-break-emacs-variant 'standard19)
-         (require 'timer)
-         (funcall 'run-at-time time repeat function))
-        ((eq type-break-emacs-variant 'lucid-19-8)
+  (condition-case nil (or (require 'timer) (require 'itimer)) (error nil))
+  (cond ((fboundp 'run-at-time)
+         (run-at-time time repeat function))
+        ((fboundp 'start-timer)
          (let ((name (if (symbolp function)
                          (symbol-name function)
                        "type-break")))
-           (require 'timer)
-           (funcall 'start-timer name function time repeat)))
-        ((memq type-break-emacs-variant '(xemacs lucid))
+           (start-timer name function time repeat)))
+        ((fboundp 'start-itimer)
          (let ((name (if (symbolp function)
                          (symbol-name function)
                        "type-break")))
-           (require 'itimer)
-           (funcall 'start-itimer name function time repeat)))))
+           (start-itimer name function time repeat)))))
 
+(defvar timer-dont-exit)
 (defun type-break-cancel-function-timers (function)
-  (cond ((eq type-break-emacs-variant 'standard19)
+  (cond ((fboundp 'cancel-function-timers)
          (let ((timer-dont-exit t))
-           (funcall 'cancel-function-timers function)))
-        ((eq type-break-emacs-variant 'lucid-19-8)
+           (cancel-function-timers function)))
+        ((fboundp 'delete-timer)
          (let ((list timer-list))
            (while list
              (and (eq (funcall 'timer-function (car list)) function)
-                  (funcall 'delete-timer (car list)))
+                  (delete-timer (car list)))
              (setq list (cdr list)))))
-        ((memq type-break-emacs-variant '(xemacs lucid))
+        ((fboundp 'delete-itimer)
          (with-no-warnings
           (let ((list itimer-list))
             (while list
               (and (eq (funcall 'itimer-function (car list)) function)
-                   (funcall 'delete-itimer (car list)))
+                   (delete-itimer (car list)))
               (setq list (cdr list))))))))