diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-29 09:19:51 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-29 09:19:51 -0700 |
| commit | 502a00b8b91d68ee6cbd0dfec40ac409ec08e67a (patch) | |
| tree | ab5aa1deae3279dd50888561b2de2b741025668c /lisp | |
| parent | 288e8bba81d9921a9b34627e6641afa74e41b49d (diff) | |
| parent | 7e2b973d60cfd30f1828fabd8d9f33127f24e54a (diff) | |
| download | emacs-502a00b8b91d68ee6cbd0dfec40ac409ec08e67a.tar.gz emacs-502a00b8b91d68ee6cbd0dfec40ac409ec08e67a.tar.bz2 emacs-502a00b8b91d68ee6cbd0dfec40ac409ec08e67a.zip | |
Merge from origin/emacs-28
7e2b973d60 * lisp/textmodes/text-mode.el (text-mode-context-menu): Re...
da6d889e90 ; * etc/NEWS: Use active voice for 'repeat-mode', etc.
e3171e7e86 Allow automatic use of color fonts for emoji on macOS
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/textmodes/text-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 3243bd31c4c..478cf62268f 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -95,7 +95,7 @@ inherit all the commands defined in this map.") :style toggle :selected (memq 'turn-on-auto-fill text-mode-hook)])) -(defun text-mode-menu (menu click) +(defun text-mode-context-menu (menu click) "Populate MENU with text selection commands at CLICK." (when (thing-at-mouse click 'word) @@ -127,7 +127,7 @@ You can thus get the full benefit of adaptive filling Turning on Text mode runs the normal hook `text-mode-hook'." (setq-local text-mode-variant t) (setq-local require-final-newline mode-require-final-newline) - (add-hook 'context-menu-functions 'text-mode-menu 10 t)) + (add-hook 'context-menu-functions 'text-mode-context-menu 10 t)) (define-derived-mode paragraph-indent-text-mode text-mode "Parindent" "Major mode for editing text, with leading spaces starting a paragraph. |