From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sascha Wilde Newsgroups: gmane.emacs.devel Subject: fix: auto-fill-mode converted to proper minor-mode Date: Tue, 15 Mar 2005 20:16:52 +0100 Message-ID: <20050315191652.GA30525@kenny.sha-bang.local> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1110974507 13409 80.91.229.2 (16 Mar 2005 12:01:47 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 16 Mar 2005 12:01:47 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 16 13:01:47 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DBXDY-0005YI-Jh for ged-emacs-devel@m.gmane.org; Wed, 16 Mar 2005 13:01:41 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DBXTc-0005ja-4x for ged-emacs-devel@m.gmane.org; Wed, 16 Mar 2005 07:18:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DBWss-0001ze-KK for emacs-devel@gnu.org; Wed, 16 Mar 2005 06:40:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DBWrR-0001oC-Eh for emacs-devel@gnu.org; Wed, 16 Mar 2005 06:38:59 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DBWnZ-0001G0-1b for emacs-devel@gnu.org; Wed, 16 Mar 2005 06:34:51 -0500 Original-Received: from [62.141.58.119] (helo=km1136.keymachine.de) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1DBVzV-000122-62 for emacs-devel@gnu.org; Wed, 16 Mar 2005 05:43:05 -0500 Original-Received: from kenny.sha-bang.de (xdslh049.osnanet.de [212.95.107.49]) (authenticated bits=0) by km1136.keymachine.de (8.12.11/8.12.10) with ESMTP id j2GAgvbU014316 for ; Wed, 16 Mar 2005 11:42:58 +0100 Original-Received: from wilde by kenny.sha-bang.de with local (Kenny MUA v.0409034.42) ID 1DBHXA-00080R-Kf for emacs-devel@gnu.org; Tue, 15 Mar 2005 20:16:52 +0100 Original-To: emacs-devel@gnu.org Content-Disposition: inline User-Agent: Mutt/1.5.6i X-wieners-gbr-MailScanner-Information: MailScanner presented by www.wieners-gbr.de X-wieners-gbr-MailScanner: Nachricht wurde nicht auf Viren und Spam untersucht, sprechen Sie uns an: www.wieners-gbr.de. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: news.gmane.org gmane.emacs.devel:34628 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:34628 Hi, I enclosed a small patch to make auto-fill-mode a proper minor-mode. Without this patch describe-mode won't work when auto-fill-mode is used. It's my first emacs patch, so I hope its not to worse... ps: I send this pathch to bug-gnu-emacs@gnu.org a few hours ago, because of the Information on http://directory.fsf.org/emacs.html but I think it fits better here. I added a Changelog Entry and put everything in one unified diff since than... cheers sascha diff -au emacs/lisp/ChangeLog emacs-patched20050315/lisp/ChangeLog --- emacs/lisp/ChangeLog 2005-03-15 15:39:40.000000000 +0000 +++ emacs-patched20050315/lisp/ChangeLog 2005-03-15 19:03:28.000000000 +0000 @@ -1,3 +1,14 @@ +2005-03-15 Sascha Wilde + + * simple.el (auto-fill-mode): converted to a proper minor-mode. + + * subr.el (minor-mode-list): removed auto-fill-mode + + * bindings.el (minor-mode-alist): removed auto-fill-function, its + no langer neede with auto-fill-mode being defind using + define-minor-mode. + (mode-line-mode-menu): changed auto-fill-function to auto-fill-mode. + 2005-03-15 Juri Linkov * isearch.el (isearch-error): New variable. Only in emacs-patched20050315/lisp: ChangeLog.~1.7100.~ diff -au emacs/lisp/bindings.el emacs-patched20050315/lisp/bindings.el --- emacs/lisp/bindings.el 2005-03-15 18:48:45.000000000 +0000 +++ emacs-patched20050315/lisp/bindings.el 2005-03-15 16:26:22.000000000 +0000 @@ -430,7 +430,7 @@ :button (:toggle . (bound-and-true-p auto-revert-mode)))) (define-key mode-line-mode-menu [auto-fill-mode] `(menu-item ,(purecopy "Auto fill (Fill)") auto-fill-mode - :button (:toggle . auto-fill-function))) + :button (:toggle . auto-fill-mode))) (define-key mode-line-mode-menu [abbrev-mode] `(menu-item ,(purecopy "Abbrev (Abbrev)") abbrev-mode :button (:toggle . abbrev-mode))) @@ -485,7 +485,6 @@ (list (list 'abbrev-mode " Abbrev") '(overwrite-mode overwrite-mode) - (list 'auto-fill-function " Fill") ;; not really a minor mode... '(defining-kbd-macro " Def"))) diff -au emacs/lisp/simple.el emacs-patched20050315/lisp/simple.el --- emacs/lisp/simple.el 2005-03-15 18:48:46.000000000 +0000 +++ emacs-patched20050315/lisp/simple.el 2005-03-15 17:12:05.000000000 +0000 @@ -3933,9 +3933,9 @@ "The function to use for `auto-fill-function' if Auto Fill mode is turned on. Some major modes set this.") -;; FIXME: turn into a proper minor mode. +;; FIXME: ;; Add a global minor mode version of it. -(defun auto-fill-mode (&optional arg) +(define-minor-mode auto-fill-mode "Toggle Auto Fill mode. With arg, turn Auto Fill mode on if and only if arg is positive. In Auto Fill mode, inserting a space at a column beyond `current-fill-column' @@ -3943,14 +3943,12 @@ The value of `normal-auto-fill-function' specifies the function to use for `auto-fill-function' when turning Auto Fill mode on." - (interactive "P") - (prog1 (setq auto-fill-function - (if (if (null arg) - (not auto-fill-function) - (> (prefix-numeric-value arg) 0)) - normal-auto-fill-function - nil)) - (force-mode-line-update))) + nil " Fill" nil + :group 'editing-basics + (setq auto-fill-function + (if auto-fill-mode + normal-auto-fill-function + nil))) ;; This holds a document string used to document auto-fill-mode. (defun auto-fill-function () diff -au emacs/lisp/subr.el emacs-patched20050315/lisp/subr.el --- emacs/lisp/subr.el 2005-03-15 18:48:46.000000000 +0000 +++ emacs-patched20050315/lisp/subr.el 2005-03-15 16:24:38.000000000 +0000 @@ -2424,7 +2424,7 @@ ;; add it here explicitly. ;; isearch-mode is deliberately excluded, since you should ;; not call it yourself. -(defvar minor-mode-list '(auto-save-mode auto-fill-mode abbrev-mode +(defvar minor-mode-list '(auto-save-mode abbrev-mode overwrite-mode view-mode hs-minor-mode) "List of all minor mode functions.")