[Emacs-diffs] Changes to emacs/lisp/menu-bar.el [lexbind]

[Miles Bader]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.221.2.7 emacs/lisp/menu-bar.el:1.221.2.8
*** emacs/lisp/menu-bar.el:1.221.2.7    Fri Nov 12 04:21:11 2004
--- emacs/lisp/menu-bar.el      Wed Dec  8 23:36:16 2004
***************
*** 634,645 ****
    "Save current values of Options menu items using Custom."
    (interactive)
    (let ((need-save nil))
      ;; These are set with `customize-set-variable'.
!     (dolist (elt '(line-number-mode column-number-mode 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
                   display-time-mode auto-compression-mode
                   current-language-environment default-input-method
                   ;; Saving `text-mode-hook' is somewhat questionable,
--- 634,650 ----
    "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 '(scroll-bar-mode
                   debug-on-quit debug-on-error menu-bar-mode tool-bar-mode
                   save-place uniquify-buffer-name-style fringe-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,715 ****
--- 715,801 ----
                              (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,732 ****
--- 813,823 ----
    (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)