Merged in changes from CVS HEAD

Patches applied:

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

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

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

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


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

5 files changed, 156 insertions, 97 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c64f0d17698..1f5aece0510 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2004-01-25  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * progmodes/fortran.el (fortran-break-before-delimiters): Doc fix. 
+        (fortran-break-delimiters-re, fortran-no-break-re): New defconsts.
+        (fortran-fill): When filling a string, adjust re-search-backward
+        argument for special case of string just on fill-column.
+        When filling non-string, allow one extra char if
+        fortran-break-before-delimiters is non-nil.  Suggested by
+        Michael Hagemann <michael.hagemann@unibas.ch>. 
+        Use fortran-break-delimiters-re and fortran-no-break-re to
+        correctly handle cases such as "**".
+
+        * progmodes/f90.el (f90-break-delimiters): Doc fix.
+        (f90-no-break-re): Add some extra tokens.  Doc fix.
+
+2004-01-24  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * mail/rmail-spam-filter.el:
+        Use two semicolons as Commentary line prefix.
+        Add ";;; Code:" stylized comment.
+        Delete end-of-line whitespace.
+        Wrap (require 'cl) with `eval-when-compile'.
+
 2004-01-23  Benjamin Rutt  <brutt@bloomington.in.us>
 
         * vc.el (vc-annotate): Fix improper use of `make-local-variable'
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index bb13eac55db..d5a45fe5d87 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -1,6 +1,6 @@
-;;; rmail-spam-filter.el  --- spam filter for rmail, the emacs mail reader.
+;;; rmail-spam-filter.el --- spam filter for RMAIL
 
-;; Copyright (C) 2002 
+;; Copyright (C) 2002
 ;;              Free Software Foundation, Inc.
 ;; Keywords: email, spam, filter, rmail
 ;; Author: Eli Tziperman <eli@beach.weizmann.ac.il>
@@ -23,62 +23,64 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
-;;; -----------
 
-;;; Automatically recognize and delete junk email before it is
-;;; displayed in rmail/rmail-summary.  Spam emails are defined by
-;;; specifying one or more of the sender, subject and contents.
-;;; URL: http://www.weizmann.ac.il/~eli/Downloads/rmail-spam-filter/
+;; Automatically recognize and delete junk email before it is
+;; displayed in rmail/rmail-summary.  Spam emails are defined by
+;; specifying one or more of the sender, subject and contents.
+;; URL: http://www.weizmann.ac.il/~eli/Downloads/rmail-spam-filter/
 
-;;; Usage:
-;;; ------
+;; Usage:
+;; ------
 
-;;; put in your .emacs:
+;; put in your .emacs:
 
-;;; (load "rmail-spam-filter.el")
+;; (load "rmail-spam-filter.el")
 
-;;; and use customize (in rmail-spam-filter group) to:
+;; and use customize (in rmail-spam-filter group) to:
 
-;;; (*) turn on the variable rmail-use-spam-filter,
+;; (*) turn on the variable rmail-use-spam-filter,
 
-;;; (*) specify in variable rmail-spam-definitions-alist what sender,
-;;; subject and contents make an email be considered spam.
+;; (*) specify in variable rmail-spam-definitions-alist what sender,
+;; subject and contents make an email be considered spam.
 
-;;; in addition, you may:
+;; in addition, you may:
 
-;;; (*) Block future mail with the subject or sender of a message
-;;; while reading it in RMAIL: just click on the "Spam" item on the
-;;; menubar, and add the subject or sender to the list of spam
-;;; definitions using the mouse and the appropriate menu item. Â  You
-;;; need to later also save the list of spam definitions using the
-;;; same menu item, or alternatively, see variable
-;;; `rmail-spam-filter-autosave-newly-added-spam-definitions'.
+;; (*) Block future mail with the subject or sender of a message
+;; while reading it in RMAIL: just click on the "Spam" item on the
+;; menubar, and add the subject or sender to the list of spam
+;; definitions using the mouse and the appropriate menu item. Â  You
+;; need to later also save the list of spam definitions using the
+;; same menu item, or alternatively, see variable
+;; `rmail-spam-filter-autosave-newly-added-spam-definitions'.
 
-;;; (*) specify if blind-cc'ed mail (no "To:" header field) is to be
-;;; treated as spam (variable rmail-spam-no-blind-cc; Thanks to Ethan
-;;; Brown <ethan@gso.saic.com> for this).
+;; (*) specify if blind-cc'ed mail (no "To:" header field) is to be
+;; treated as spam (variable rmail-spam-no-blind-cc; Thanks to Ethan
+;; Brown <ethan@gso.saic.com> for this).
 
-;;; (*) specify if rmail-spam-filter should ignore case of spam
-;;; definitions (variable rmail-spam-filter-ignore-case; Thanks to
-;;; Ethan Brown <ethan@gso.saic.com> for the suggestion).
+;; (*) specify if rmail-spam-filter should ignore case of spam
+;; definitions (variable rmail-spam-filter-ignore-case; Thanks to
+;; Ethan Brown <ethan@gso.saic.com> for the suggestion).
 
-;;; (*) Specify a "white-list" of trusted senders. If any
-;;; rmail-spam-white-list string matches a substring of the "From"
-;;; header, the message is flagged as a valid, non-spam message (Ethan
-;;; Brown <ethan@gso.saic.com>).
+;; (*) Specify a "white-list" of trusted senders. If any
+;; rmail-spam-white-list string matches a substring of the "From"
+;; header, the message is flagged as a valid, non-spam message (Ethan
+;; Brown <ethan@gso.saic.com>).
 
-;;; (*) rmail spam filter also works with bbdb to prevent spam senders
-;;; from entering into the .bbdb file.  See variable
-;;; "rmail-spam-filter-auto-delete-spam-bbdb-entries".  This is done
-;;; in two ways: (a) bbdb is made not to auto-create entries for
-;;; messages that are deleted by the rmail-spam-filter, (b) when a
-;;; message is deleted in rmail, the user is offered to delete the
-;;; sender's bbdb entry as well _if_ it was created at the same day.
+;; (*) rmail spam filter also works with bbdb to prevent spam senders
+;; from entering into the .bbdb file.  See variable
+;; "rmail-spam-filter-auto-delete-spam-bbdb-entries".  This is done
+;; in two ways: (a) bbdb is made not to auto-create entries for
+;; messages that are deleted by the rmail-spam-filter, (b) when a
+;; message is deleted in rmail, the user is offered to delete the
+;; sender's bbdb entry as well _if_ it was created at the same day.
+
+;;; Code:
 
 (require 'rmail)
 
 ;; For find-if and other cool common lisp functions we may want to use. (EDB)
-(require 'cl)                           
+(eval-when-compile
+  (require 'cl))
 
 (defgroup rmail-spam-filter nil
   "Spam filter for RMAIL, the mail reader for Emacs."
@@ -120,7 +122,7 @@ spam, as one of the fields of `rmail-spam-definitions-alist'"
   "*Seconds to wait after display of message that spam was found."
   :type 'number
   :group 'rmail-spam-filter )
-  
+
 (defcustom rmail-spam-filter-auto-delete-spam-bbdb-entries nil
   "*Non-nil to make sure no entries are made in bbdb for spam emails.
 This is done in two ways: (1) bbdb is made not to auto-create entries
@@ -161,7 +163,7 @@ of the spam definitions.  The strings that specify spam subject,
 sender, etc, may be regexp.  For example, to specify that the subject
 may be either 'this is spam' or 'another spam', use the regexp: 'this
 is spam\|another spam' (without the single quotes)."
-  :type '(repeat 
+  :type '(repeat
           (list :format "%v"
            (cons :format "%v" :value (from . "")
                  (const :format ""  from)
@@ -177,7 +179,7 @@ is spam\|another spam' (without the single quotes)."
                  (string :tag "Contents"  ""))
            (cons :format "%v" :value (action . output-and-delete)
                  (const :format "" action)
-                 (choice :tag "Action selection" 
+                 (choice :tag "Action selection"
                   (const :tag "output to spam folder and delete" output-and-delete)
                   (const :tag "delete spam" delete-spam)
                   ))
@@ -208,7 +210,7 @@ it from rmail file.  Called for each new message retrieved by
         (save-current-msg)
         (rmail-spam-filter-saved-bbdb/mail_auto_create_p nil)
         )
-    
+
     ;; make sure bbdb does not create entries for messages while spam
     ;; filter is scanning the rmail file:
     (setq rmail-spam-filter-saved-bbdb/mail_auto_create_p 'bbdb/mail_auto_create_p)
@@ -236,7 +238,7 @@ it from rmail file.  Called for each new message retrieved by
 
         ;;; do we want to ignore case in spam definitions:
           (setq case-fold-search rmail-spam-filter-ignore-case)
-        
+
         ;; Check for blind CC condition.  Set vars such that while
         ;; loop will be bypassed and spam condition will trigger (EDB)
         (if (and rmail-spam-no-blind-cc
@@ -245,7 +247,7 @@ it from rmail file.  Called for each new message retrieved by
               (setq exit-while-loop t)
               (setq maybe-spam t)
               (setq this-is-a-spam-email t)))
-        
+
           ;; Check white list, and likewise cause while loop
           ;;  bypass. (EDB)
           (if (find-if '(lambda (white-str)
@@ -255,7 +257,7 @@ it from rmail file.  Called for each new message retrieved by
                 (setq exit-while-loop t)
                 (setq maybe-spam nil)
                 (setq this-is-a-spam-email nil)))
-            
+
         ;; scan all elements of the list rmail-spam-definitions-alist
         (while (and
                 (< num-element num-spam-definition-elements)
@@ -277,7 +279,7 @@ it from rmail file.  Called for each new message retrieved by
 
             ;; start scanning incoming message:
             ;;---------------------------------
-            
+
             ;; if sender field is not specified in message being
             ;; scanned, AND if "from" field does not appear in spam
             ;; definitions for this element, this may still be spam
@@ -585,7 +587,7 @@ it from rmail file.  Called for each new message retrieved by
 
 (defun rmail-bbdb-auto-delete-spam-entries ()
   "When deleting a message in RMAIL, check to see if the bbdb entry
-was created today, and if it was, prompt to delete it too.  This function 
+was created today, and if it was, prompt to delete it too.  This function
 needs to be called via the `rmail-delete-message-hook' like this:
 \(add-hook 'rmail-delete-message-hook 'rmail-bbdb-auto-delete-spam-entries)"
   (interactive)
@@ -604,14 +606,14 @@ needs to be called via the `rmail-delete-message-hook' like this:
   "Make sure senderes of rmail messages marked as deleted are not added to bbdb.
 Need to add this as a hook like this:
 \(setq bbdb/mail-auto-create-p 'rmail-spam-filter-bbdb-dont-create-entries-for-spam)
-and this is also used in conjunction with rmail-bbdb-auto-delete-spam-entries. 
-More doc: rmail-bbdb-auto-delete-spam-entries will delete newly created bbdb 
-entries of mail that is deleted.  However, if one scrolls back to the deleted 
-messages, then the sender is again added to the bbdb.  This function 
+and this is also used in conjunction with rmail-bbdb-auto-delete-spam-entries.
+More doc: rmail-bbdb-auto-delete-spam-entries will delete newly created bbdb
+entries of mail that is deleted.  However, if one scrolls back to the deleted
+messages, then the sender is again added to the bbdb.  This function
 prevents this.  Also, don't create entries for messages in the `rmail-spam-file'."
   (interactive)
   (not
-   ;; don't create a bbdb entry if one of the following conditions is satisfied: 
+   ;; don't create a bbdb entry if one of the following conditions is satisfied:
    (or
     ;; 1) looking at a deleted message:
     (rmail-message-deleted-p rmail-current-message)
@@ -631,4 +633,4 @@ prevents this.  Also, don't create entries for messages in the `rmail-spam-file'
 (provide 'rmail-spam-filter)
 
 ;;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
-;;; rmail-spam-filter ends here
+;;; rmail-spam-filter.el ends here
diff --git a/lisp/man.el b/lisp/man.el
index 61131db20be..faf153bc4c4 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -801,7 +801,7 @@ Same for the ANSI bold and normal escape sequences."
   ;; Try to recognize common forms of cross references.
   (Man-highlight-references)
   (Man-softhyphen-to-minus)
-  (message "%s man page made up" Man-arguments))
+  (message "%s man page formatted" Man-arguments))
 
 (defun Man-highlight-references ()
   "Highlight the references on mouse-over.
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index a3f44743514..11553a1fdb6 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1,6 +1,6 @@
 ;;; f90.el --- Fortran-90 mode (free format)
 
-;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2004 Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
 ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
@@ -224,7 +224,10 @@ whether to blink the matching beginning."
   :group 'f90)
 
 (defcustom f90-break-delimiters "[-+\\*/><=,% \t]"
-  "*Regexp holding list of delimiters at which lines may be broken."
+  "*Regexp matching delimiter characters at which lines may be broken.
+There are certain tokens comprised entirely of characters
+matching this regexp that should not be split, and these are
+specified by the constant `f90-no-break-re'."
   :type  'regexp
   :group 'f90)
 
@@ -574,8 +577,12 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
   "Regexp matching the definition of a derived type.")
 
 (defconst f90-no-break-re
-  (regexp-opt '("**" "//" "=>") 'paren)
-  "Regexp specifying where not to break lines when filling.")
+  (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=") 'paren)
+  "Regexp specifying where not to break lines when filling.
+This regexp matches certain tokens comprised entirely of
+characters matching the regexp `f90-break-delimiters' that should
+not be split by filling.  Each element is assumed to be two
+characters long.")
 
 (defvar f90-cache-position nil
   "Temporary position used to speed up region operations.")
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 39e74a8dc1f..f23eabe6e9c 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1,6 +1,6 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
-;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000, 01, 2003
+;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000, 01, 03, 04
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
@@ -237,10 +237,25 @@ See the variable `fortran-column-ruler-fixed' for fixed format mode."
 
 (defcustom fortran-break-before-delimiters t
   "*Non-nil causes filling to break lines before delimiters.
-Delimiters are whitespace, commas, quotes, and operators."
+Delimiters are characters matching the regexp `fortran-break-delimiters-re'."
   :type  'boolean
   :group 'fortran)
 
+(defconst fortran-break-delimiters-re "[-+*/><=, \t]"
+  "Regexp matching delimiter characters at which lines may be broken.
+There are certain tokens comprised entirely of characters
+matching this regexp that should not be split, and these are
+specified by the constant `fortran-no-break-re'.")
+
+;; The ">=", etc F77 extensions are supported by g77.
+(defconst fortran-no-break-re
+  (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=") 'paren)
+  "Regexp specifying where not to break lines when filling.
+This regexp matches certain tokens comprised entirely of
+characters matching the regexp `fortran-break-delimiters-re' that should
+not be split by filling.  Each element is assumed to be two
+characters long.")
+
 (defcustom fortran-mode-hook nil
   "Hook run when entering Fortran mode."
   :type  'hook
@@ -1646,56 +1661,68 @@ If ALL is nil, only match comments that start in column > 0."
          (bol (line-beginning-position))
          (eol (line-end-position))
          (bos (min eol (+ bol (fortran-current-line-indentation))))
+         ;; If in a string at fill-column, break it either before the
+         ;; initial quote, or at fill-col (if string is too long).
          (quote
           (save-excursion
             (goto-char bol)
             ;; OK to break quotes on comment lines.
             (unless (looking-at fortran-comment-line-start-skip)
               (let (fcpoint start)
-              (move-to-column fill-column)
-              (when (fortran-is-in-string-p (setq fcpoint (point)))
-                (save-excursion
-                  (re-search-backward "\\S\"\\s\"\\S\"" bol t)
-                  (setq start
-                        (if fortran-break-before-delimiters
-                            (point)
-                          (1+ (point)))))
-                (if (re-search-forward "\\S\"\\s\"\\S\"" eol t)
-                    (backward-char 2))
-                ;; If the current string is longer than 72 - 6 chars,
-                ;; break it at the fill column (else infinite loop).
-                (if (> (- (point) start)
-                       (- fill-column 6 fortran-continuation-indent))
-                    fcpoint
-                  start))))))
+                (move-to-column fill-column)
+                (when (fortran-is-in-string-p (setq fcpoint (point)))
+                  (save-excursion
+                    (re-search-backward "\\S\"\\s\"\\S\"?" bol t)
+                    (setq start
+                          (if fortran-break-before-delimiters
+                              (point)
+                            (1+ (point)))))
+                  (if (re-search-forward "\\S\"\\s\"\\S\"" eol t)
+                      (backward-char 2))
+                  ;; If the current string is longer than 72 - 6 chars,
+                  ;; break it at the fill column (else infinite loop).
+                  (if (> (- (point) start)
+                         (- fill-column 6 fortran-continuation-indent))
+                      fcpoint
+                    start))))))
          ;; Decide where to split the line. If a position for a quoted
          ;; string was found above then use that, else break the line
-         ;; before the last delimiter.
-         ;; Delimiters are whitespace, commas, and operators.
-         ;; Will break before a pair of *'s.
+         ;; before/after the last delimiter.
          (fill-point
           (or quote
               (save-excursion
-                (move-to-column (1+ fill-column))
-                ;; GM Make this a defcustom as in f90-mode? Add ", (?
-                (skip-chars-backward "^ \t\n,'+-/*=)"
-;;;              (if fortran-break-before-delimiters
-;;;                  "^ \t\n,'+-/*=" "^ \t\n,'+-/*=)")
-                 )
-                (when (<= (point) (1+ bos))
+                ;; If f-b-b-d is t, have an extra column to play with,
+                ;; since delimiter gets shifted to new line.
+                (move-to-column (if fortran-break-before-delimiters
+                                    (1+ fill-column)
+                                  fill-column))
+                (let ((repeat t))
+                  (while repeat
+                    (setq repeat nil)
+                    ;; Adapted from f90-find-breakpoint.
+                    (re-search-backward fortran-break-delimiters-re
+                                        (line-beginning-position))
+                    (if (not fortran-break-before-delimiters)
+                        (if (looking-at fortran-no-break-re)
+                            ;; Deal with cases such as "**" split over
+                            ;; fill-col. Simpler alternative would be
+                            ;; to start from (1- fill-column) above.
+                            (if (> (+ 2 (current-column)) fill-column)
+                                (setq repeat t)
+                              (forward-char 2))
+                          (forward-char 1))
+                      (backward-char)
+                      (or (looking-at fortran-no-break-re)
+                          (forward-char)))))
+                ;; Line indented beyond fill-column?
+                (when (<= (point) bos)
                   (move-to-column (1+ fill-column))
                   ;; What is this doing???
                   (or (re-search-forward "[\t\n,'+-/*)=]" eol t)
                       (goto-char bol)))
                 (if (bolp)
-                    (re-search-forward "[ \t]" opoint t)
-                  (backward-char)
-                  (if (looking-at "\\s\"")
-                      (forward-char)
-                    (skip-chars-backward " \t\*")))
-                (if fortran-break-before-delimiters
-                    (point)
-                  (1+ (point)))))))
+                    (re-search-forward "[ \t]" opoint t))
+                (point)))))
     ;; If we are in an in-line comment, don't break unless the
     ;; line of code is longer than it should be. Otherwise
     ;; break the line at the column computed above.