[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/menu-bar.el
From: |
Luc Teirlinck |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/menu-bar.el |
Date: |
Sat, 06 Aug 2005 17:51:38 -0400 |
Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.261 emacs/lisp/menu-bar.el:1.262
*** emacs/lisp/menu-bar.el:1.261 Mon Jul 4 23:08:56 2005
--- emacs/lisp/menu-bar.el Sat Aug 6 21:51:38 2005
***************
*** 649,656 ****
debug-on-quit debug-on-error
tooltip-mode 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,
;; as we might get more than we bargain for, if
--- 649,656 ----
debug-on-quit debug-on-error
tooltip-mode menu-bar-mode tool-bar-mode
save-place uniquify-buffer-name-style fringe-mode
! indicate-empty-lines indicate-buffer-boundaries
! case-fold-search display-time-mode auto-compression-mode
current-language-environment default-input-method
;; Saving `text-mode-hook' is somewhat questionable,
;; as we might get more than we bargain for, if
***************
*** 717,804 ****
(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 ()
"Show customization buffer for `fringe-mode'."
--- 717,808 ----
(frame-visible-p
(symbol-value 'speedbar-frame))))))
+ (defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe"))
! (defvar menu-bar-showhide-fringe-ind-menu
! (make-sparse-keymap "Buffer boundaries"))
! (defun menu-bar-showhide-fringe-ind-customize ()
! "Show customization buffer for `indicate-buffer-boundaries'."
(interactive)
! (customize-variable 'indicate-buffer-boundaries))
! (define-key menu-bar-showhide-fringe-ind-menu [customize]
! '(menu-item "Other (customize)"
! menu-bar-showhide-fringe-ind-customize
! :help "Additional choices available through Custom buffer"
! :visible (display-graphic-p)))
(defun menu-bar-showhide-fringe-ind-mixed ()
! "Display top and bottom indicators in opposite fringes, arrows in right."
(interactive)
! (customize-set-variable 'indicate-buffer-boundaries
! '((t . right) (top . left))))
(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 indicate-buffer-boundaries
! '((t . right) (top . left))))))
(defun menu-bar-showhide-fringe-ind-box ()
"Display top and bottom indicators in opposite fringes."
(interactive)
! (customize-set-variable 'indicate-buffer-boundaries
! '((top . left) (bottom . right))))
(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 indicate-buffer-boundaries
! '((top . left) (bottom . right))))))
(defun menu-bar-showhide-fringe-ind-right ()
! "Display buffer boundaries and arrows in the right fringe."
(interactive)
! (customize-set-variable 'indicate-buffer-boundaries 'right))
(define-key menu-bar-showhide-fringe-ind-menu [right]
'(menu-item "In right fringe" menu-bar-showhide-fringe-ind-right
! :help "Show buffer boundaries and arrows in right fringe"
:visible (display-graphic-p)
! :button (:radio . (eq indicate-buffer-boundaries 'right))))
(defun menu-bar-showhide-fringe-ind-left ()
! "Display buffer boundaries and arrows in the left fringe."
(interactive)
! (customize-set-variable 'indicate-buffer-boundaries 'left))
(define-key menu-bar-showhide-fringe-ind-menu [left]
'(menu-item "In left fringe" menu-bar-showhide-fringe-ind-left
! :help "Show buffer boundaries and arrows in left fringe"
:visible (display-graphic-p)
! :button (:radio . (eq indicate-buffer-boundaries 'left))))
(defun menu-bar-showhide-fringe-ind-none ()
! "Do not display any buffer boundary indicators."
(interactive)
! (customize-set-variable 'indicate-buffer-boundaries nil))
(define-key menu-bar-showhide-fringe-ind-menu [none]
'(menu-item "No indicators" menu-bar-showhide-fringe-ind-none
! :help "Hide all buffer boundary indicators and arrows"
:visible (display-graphic-p)
! :button (:radio . (eq indicate-buffer-boundaries nil))))
+ (define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
+ (list 'menu-item "Buffer boundaries" menu-bar-showhide-fringe-ind-menu
+ :visible `(display-graphic-p)
+ :help "Indicate buffer boundaries in fringe"))
! (define-key menu-bar-showhide-fringe-menu [indicate-empty-lines]
! (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
! "Empty line indicators"
! "Indicating of empty lines %s"
! "Indicate trailing empty lines in fringe"))
(defun menu-bar-showhide-fringe-menu-customize ()
"Show customization buffer for `fringe-mode'."
***************
*** 806,812 ****
(customize-variable 'fringe-mode))
(define-key menu-bar-showhide-fringe-menu [customize]
! '(menu-item "Customize" menu-bar-showhide-fringe-menu-customize
:help "Detailed customization of fringe"
:visible (display-graphic-p)))
--- 810,816 ----
(customize-variable 'fringe-mode))
(define-key menu-bar-showhide-fringe-menu [customize]
! '(menu-item "Customize fringe" menu-bar-showhide-fringe-menu-customize
:help "Detailed customization of fringe"
:visible (display-graphic-p)))
***************
*** 814,828 ****
"Reset the fringe mode: display fringes on both sides of a window."
(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)
(define-key menu-bar-showhide-fringe-menu [default]
'(menu-item "Default" menu-bar-showhide-fringe-menu-customize-reset
--- 818,823 ----
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Thien-Thi Nguyen, 2005/08/06
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el,
Luc Teirlinck <=
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Richard M . Stallman, 2005/08/09
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Juri Linkov, 2005/08/09
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Luc Teirlinck, 2005/08/09
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Luc Teirlinck, 2005/08/10
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Luc Teirlinck, 2005/08/11
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Richard M . Stallman, 2005/08/25
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Juri Linkov, 2005/08/25
- [Emacs-diffs] Changes to emacs/lisp/menu-bar.el, Eli Zaretskii, 2005/08/26