[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114601: * lisp/menu-bar.el (menu-bar-options-menu):
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114601: * lisp/menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill, |
Date: |
Thu, 10 Oct 2013 00:32:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114601
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-09 20:32:36 -0400
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/menu-bar.el menubar.el-20091113204419-o5vbwnq5f7feedwu-546
lisp/textmodes/text-mode.el textmode.el-20091113204419-o5vbwnq5f7feedwu-90
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-10 00:24:12 +0000
+++ b/lisp/ChangeLog 2013-10-10 00:32:36 +0000
@@ -1,3 +1,11 @@
+2013-10-10 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden> (tiny change)
* textmodes/text-mode.el (text-mode-map): Add a menu. (Bug#15562)
=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el 2013-10-08 15:11:29 +0000
+++ b/lisp/menu-bar.el 2013-10-10 00:32:36 +0000
@@ -1102,15 +1102,6 @@
'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 <address@hidden> 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 @@
"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))
=== modified file 'lisp/textmodes/text-mode.el'
--- a/lisp/textmodes/text-mode.el 2013-10-10 00:24:12 +0000
+++ b/lisp/textmodes/text-mode.el 2013-10-10 00:32:36 +0000
@@ -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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114601: * lisp/menu-bar.el (menu-bar-options-menu): Remove text-mode auto-fill,,
Glenn Morris <=