(mouse-drag-region): Bind mouse-autoselect-window.

[gnu-emacs] / lisp / menu-bar.el

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 597e77b6165f8b2a4726890d657d7d7e4f70a40d..3fbc728f487a5b0ad565ffd1b6ec156ceb797762 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -634,12 +634,17 @@ by \"Save Options\" in Custom buffers.")
   "Save current values of Options menu items using Custom."
   (interactive)
   (let ((need-save nil))
+    ;; These are set with menu-bar-make-mm-toggle, which does not
+    ;; put on a customized-value property.
+    (dolist (elt '(line-number-mode column-number-mode cua-mode show-paren-mode
+                  transient-mark-mode global-font-lock-mode))
+      (and (customize-mark-to-save elt)
+          (setq need-save t)))
     ;; These are set with `customize-set-variable'.
-    (dolist (elt '(line-number-mode column-number-mode scroll-bar-mode
+    (dolist (elt '(scroll-bar-mode
                   debug-on-quit debug-on-error menu-bar-mode tool-bar-mode
                   save-place uniquify-buffer-name-style fringe-mode
-                  case-fold-search cua-mode show-paren-mode
-                  transient-mark-mode global-font-lock-mode
+                  fringe-indicators case-fold-search
                   display-time-mode auto-compression-mode
                   current-language-environment default-input-method
                   ;; Saving `text-mode-hook' is somewhat questionable,
@@ -710,6 +715,87 @@ by \"Save Options\" in Custom buffers.")
                              (frame-visible-p
                               (symbol-value 'speedbar-frame))))))
 
+
+(defvar menu-bar-showhide-fringe-ind-menu (make-sparse-keymap "Indicators"))
+
+;; The real definition is in fringe.el.
+;; This is to prevent errors in the :radio conditions below.
+(setq fringe-indicators nil)
+
+(defun menu-bar-showhide-fringe-ind-empty ()
+  "Display empty line indicators in the left or right fringe."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators 'empty))
+
+(define-key menu-bar-showhide-fringe-ind-menu [empty]
+  '(menu-item "Empty lines only" menu-bar-showhide-fringe-ind-empty
+             :help "Show empty line indicators in fringe"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators 'empty))))
+
+(defun menu-bar-showhide-fringe-ind-mixed ()
+  "Display top and bottom indicators in opposite fringes, arrow in right."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators 'mixed))
+
+(define-key menu-bar-showhide-fringe-ind-menu [mixed]
+  '(menu-item "Opposite, arrows right" menu-bar-showhide-fringe-ind-mixed
+             :help "Show top/bottom indicators in opposite fringes, arrows in right"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators 'mixed))))
+
+(defun menu-bar-showhide-fringe-ind-box ()
+  "Display top and bottom indicators in opposite fringes."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators 'box))
+
+(define-key menu-bar-showhide-fringe-ind-menu [box]
+  '(menu-item "Opposite, no arrows" menu-bar-showhide-fringe-ind-box
+             :help "Show top/bottom indicators in opposite fringes, no arrows"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators 'box))))
+
+(defun menu-bar-showhide-fringe-ind-right ()
+  "Display fringe indicators in the right fringe."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators 'right))
+
+(define-key menu-bar-showhide-fringe-ind-menu [right]
+  '(menu-item "In right fringe" menu-bar-showhide-fringe-ind-right
+             :help "Show indicators in right fringe"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators 'right))))
+
+(defun menu-bar-showhide-fringe-ind-left ()
+  "Display fringe indicators in the left fringe."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators 'left))
+
+(define-key menu-bar-showhide-fringe-ind-menu [left]
+  '(menu-item "In left fringe" menu-bar-showhide-fringe-ind-left
+             :help "Show indicators in left fringe"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators 'left))))
+
+(defun menu-bar-showhide-fringe-ind-none ()
+  "Do not display any fringe indicators."
+  (interactive)
+  (require 'fringe)
+  (customize-set-variable 'fringe-indicators nil))
+
+(define-key menu-bar-showhide-fringe-ind-menu [none]
+  '(menu-item "No indicators" menu-bar-showhide-fringe-ind-none
+             :help "Hide all fringe indicators"
+             :visible (display-graphic-p)
+             :button (:radio . (eq fringe-indicators nil))))
+
+
+
 (defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe"))
 
 (defun menu-bar-showhide-fringe-menu-customize ()
@@ -727,6 +813,11 @@ by \"Save Options\" in Custom buffers.")
   (interactive)
   (customize-set-variable 'fringe-mode nil))
 
+(define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
+  (list 'menu-item "Indicators" menu-bar-showhide-fringe-ind-menu
+       :visible `(display-graphic-p)
+       :help "Select fringe mode"))
+
 ;; The real definition is in fringe.el.
 ;; This is to prevent errors in the :radio conditions below.
 (setq fringe-mode nil)