Move Visual Wrap menu to menu-bar.el

* lisp/menu-bar.el (menu-bar-line-wrapping-menu): Insert new
menu item controlling visual-wrap-prefix-mode.

* lisp/visual-wrap.el: Remove menu bar autoload.

(cherry picked from commit 55f0b3e561034a1ad4235770d1c0685439a64fe5)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1f63cf8966acdef12479eacd7ba9a824786db94c..722b2d6810a22f18e528a2d750ddf62ea22ea9bf 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1467,6 +1467,13 @@ mail status in mode line"))
                                   (not word-wrap)))
                   :visible (menu-bar-menu-frame-live-and-visible-p)
                   :enable (not (truncated-partial-width-window-p))))
+
+    (bindings--define-key menu [visual-wrap]
+      '(menu-item "Visual Wrap Prefix" visual-wrap-prefix-mode
+                  :help "Display continuation lines with contextual prefix"
+                  :visible (menu-bar-menu-frame-live-and-visible-p)
+                  :button (:toggle . (bound-and-true-p visual-wrap-prefix-mode))
+                  :enable t))
     menu))
 
 (defvar menu-bar-search-options-menu

diff --git a/lisp/visual-wrap.el b/lisp/visual-wrap.el
index 6e6e45a480c7897dcc4072c0e8e3efb5e77f8db6..f8e00b9c68547a866bdb869a0dbdb5310d1b7795 100644 (file)
--- a/lisp/visual-wrap.el
+++ b/lisp/visual-wrap.el
@@ -1,4 +1,4 @@
-;;; visual-wrap.el --- Smart line-wrapping with wrap-prefix
+;;; visual-wrap.el --- Smart line-wrapping with wrap-prefix -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2021, 2024 Free Software Foundation, Inc.
 
@@ -190,14 +190,5 @@ extra indent = 2
         (widen)
         (remove-text-properties (point-min) (point-max) '(wrap-prefix nil))))))
 
-;;;###autoload
-(define-key-after (lookup-key menu-bar-options-menu [line-wrapping])
-  [visual-wrap]
-  '(menu-item "Visual Wrap" visual-wrap-prefix-mode
-             :visible (menu-bar-menu-frame-live-and-visible-p)
-             :help "Display continuation lines with prefix derived from context"
-             :button (:toggle . (bound-and-true-p visual-wrap-prefix-mode)))
-  word-wrap)
-
 (provide 'visual-wrap)
 ;;; visual-wrap.el ends here