aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-02-14 01:31:21 +0000
committerRichard M. Stallman2002-02-14 01:31:21 +0000
commitebda95a20c9fb82667af576e72676bde324fde75 (patch)
tree574e5b30e29885a069d7de955c2802d3adf26bde
parentf788be92aea47838c86f3f41eea7b50ea15355e5 (diff)
downloademacs-ebda95a20c9fb82667af576e72676bde324fde75.tar.gz
emacs-ebda95a20c9fb82667af576e72676bde324fde75.zip
(text-mode-hook-identify): Restore previous definition.
Add to text-mode-hook again.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/text-mode.el10
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea88f416b59..56fc5bcf6c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
5 5
62002-02-13 Richard M. Stallman <rms@gnu.org> 62002-02-13 Richard M. Stallman <rms@gnu.org>
7 7
8 * textmodes/text-mode.el (text-mode-hook-identify): Restore
9 previous definition. Add to text-mode-hook again.
10
8 * mail/mailabbrev.el (define-mail-abbrev): Define as system abbrev. 11 * mail/mailabbrev.el (define-mail-abbrev): Define as system abbrev.
9 (mail-abbrev-in-expansion-header-p): Copy the code of mail-header-end 12 (mail-abbrev-in-expansion-header-p): Copy the code of mail-header-end
10 to avoid needing sendmail.el at run time. 13 to avoid needing sendmail.el at run time.
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 2fe9efecdbd..ad39b6f896e 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -95,8 +95,14 @@ Turning on Paragraph-Indent minor mode runs the normal hook
95 95
96(defalias 'indented-text-mode 'text-mode) 96(defalias 'indented-text-mode 'text-mode)
97 97
98;; No-op, defined because some user customizations use it. 98;; This can be made a no-op once all modes that use text-mode-hook
99(defun text-mode-hook-identify () nil) 99;; are "derived" from text-mode.
100(defun text-mode-hook-identify ()
101 "Mark that this mode has run `text-mode-hook'.
102This is how `toggle-text-mode-auto-fill' knows which buffers to operate on."
103 (set (make-local-variable 'text-mode-variant) t))
104
105(add-hook 'text-mode-hook 'text-mode-hook-identify)
100 106
101(defun toggle-text-mode-auto-fill () 107(defun toggle-text-mode-auto-fill ()
102 "Toggle whether to use Auto Fill in Text mode and related modes. 108 "Toggle whether to use Auto Fill in Text mode and related modes.