procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill,

Browse source 
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.
This commit is contained in:
Glenn Morris 2013-10-09 20:32:36 -04:00
parent a066720cb7
commit 9db13baf0c
3 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2013-10-10 Glenn Morris <rgm@gnu.org>
* 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 <john@jo.hnanthony.com> (tiny change)
* textmodes/text-mode.el (text-mode-map): Add a menu. (Bug#15562)

18
lisp/menu-bar.el
View file

@ -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 <abraham@dina.kvl.dk> 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))

5
lisp/textmodes/text-mode.el
View file

@ -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))