(fill) <defgroup>: Move to fill.el.

2 files changed, 26 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7aedbbe57e..672ca187c09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,18 @@
+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 +30,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 +50,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 +115,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)