From 9db13baf0c3c16e92861cc98467e6fb0e92c769d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Oct 2013 20:32:36 -0400 Subject: [PATCH] * lisp/menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill, now that text mode has a menu with the same entry. (menu-bar-text-mode-auto-fill): Remove now unused func. * lisp/textmodes/text-mode.el (text-mode-map): Use auto-fill help text from menu-bar.el. --- lisp/ChangeLog | 8 ++++++++ lisp/menu-bar.el | 18 ------------------ lisp/textmodes/text-mode.el | 5 ++--- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dcdff90d1b6..fa3319c7a67 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2013-10-10 Glenn Morris + + * menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill, + now that text mode has a menu with the same entry. + (menu-bar-text-mode-auto-fill): Remove now unused func. + * textmodes/text-mode.el (text-mode-map): + Use auto-fill help text from menu-bar.el. + 2013-10-10 John Anthony (tiny change) * textmodes/text-mode.el (text-mode-map): Add a menu. (Bug#15562) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 557c24d6128..ab2cb001ce6 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1102,15 +1102,6 @@ mail status in mode line")) 'tool-bar-lines)))))) menu)) -(defun menu-bar-text-mode-auto-fill () - (interactive) - (toggle-text-mode-auto-fill) - ;; This is somewhat questionable, as `text-mode-hook' - ;; might have changed outside customize. - ;; -- Per Abrahamsen 2002-02-11. - (customize-mark-as-set 'text-mode-hook)) - - (defvar menu-bar-line-wrapping-menu (let ((menu (make-sparse-keymap "Line Wrapping"))) @@ -1275,15 +1266,6 @@ mail status in mode line")) "Case-Insensitive Search %s" "Ignore letter-case in search commands")) - (bindings--define-key menu [auto-fill-mode] - '(menu-item - "Auto Fill in Text Modes" - menu-bar-text-mode-auto-fill - :help "Automatically fill text while typing (Auto Fill mode)" - :button (:toggle . (if (listp text-mode-hook) - (member 'turn-on-auto-fill text-mode-hook) - (eq 'turn-on-auto-fill text-mode-hook))))) - (bindings--define-key menu [line-wrapping] `(menu-item "Line Wrapping in This Buffer" ,menu-bar-line-wrapping-menu)) diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 8ffa8202e72..a045af8522f 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,7 +1,6 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1992, 1994, 2001-2013 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985, 1992, 1994, 2001-2013 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp @@ -56,7 +55,7 @@ Use (derived-mode-p 'text-mode) instead.") (bindings--define-key map [menu-bar text toggle-text-mode-auto-fill] '(menu-item "Auto Fill" toggle-text-mode-auto-fill :button (:toggle . (memq 'turn-on-auto-fill text-mode-hook)) - :help "Toggle auto fill within text modes")) + :help "Automatically fill text while typing in text modes (Auto Fill mode)")) (bindings--define-key map [menu-bar text paragraph-indent-minor-mode] '(menu-item "Paragraph Indent" paragraph-indent-minor-mode :button (:toggle . (bound-and-true-p paragraph-indent-minor-mode)) -- 2.39.2