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

[Pavel Janík]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.205 emacs/lisp/menu-bar.el:1.206
*** emacs/lisp/menu-bar.el:1.205        Sat Mar 30 22:15:52 2002
--- emacs/lisp/menu-bar.el      Thu Apr 11 09:39:41 2002
***************
*** 285,290 ****
--- 285,298 ----
  (define-key menu-bar-adv-search-menu [re-search-forward]
    '(menu-item "Search Regexp..." nonincremental-re-search-forward
              :help "Search forward for a regular expression"))
+ (define-key menu-bar-adv-search-menu [separator-tag-isearch]
+   '(menu-item "--"))
+ (define-key menu-bar-adv-search-menu [isearch-backward]
+   '(menu-item "Incremental Search Backwards..." isearch-backward
+             :help "Incremental search backwards for a string"))
+ (define-key menu-bar-adv-search-menu [isearch-forward]
+   '(menu-item "Incremental Search..." isearch-forward
+             :help "Incremental search forward for a string"))
  (define-key menu-bar-search-menu [re-search]
    (list 'menu-item "Advanced Search/Replace" menu-bar-adv-search-menu
              :help "Regexp and Tags search and replace"))
***************
*** 530,536 ****
                (substring help 1) ".")
         (interactive)
         (if ,(if body `(progn . ,body)
!             `(progn 
                 (custom-load-symbol ',variable)
                 (let ((set (or (get ',variable 'custom-set) 'set-default))
                       (get (or (get ',variable 'custom-get) 'default-value)))
--- 538,544 ----
                (substring help 1) ".")
         (interactive)
         (if ,(if body `(progn . ,body)
!             `(progn
                 (custom-load-symbol ',variable)
                 (let ((set (or (get ',variable 'custom-set) 'set-default))
                       (get (or (get ',variable 'custom-get) 'default-value)))
***************
*** 543,549 ****
       ;; options the user have already set explicitly in his init
       ;; file.  Unfortunately, he could very likely call the function
       ;; defined above there.  So we put `customize-mark-as-set' in a
!      ;; lambda expression. 
       ;; -- Per Abrahamsen <address@hidden> 2002-02-11.
       '(menu-item ,doc (lambda ()
                        (interactive)
--- 551,557 ----
       ;; options the user have already set explicitly in his init
       ;; file.  Unfortunately, he could very likely call the function
       ;; defined above there.  So we put `customize-mark-as-set' in a
!      ;; lambda expression.
       ;; -- Per Abrahamsen <address@hidden> 2002-02-11.
       '(menu-item ,doc (lambda ()
                        (interactive)
***************
*** 616,622 ****
      (message "Display-time mode disabled.")))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
!   '(menu-item "Date and time" (lambda ()
                                (interactive)
                                (showhide-date-time)
                                (customize-mark-as-set 'display-time-mode))
--- 624,630 ----
      (message "Display-time mode disabled.")))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
!   '(menu-item "Date and Time" (lambda ()
                                (interactive)
                                (showhide-date-time)
                                (customize-mark-as-set 'display-time-mode))
***************
*** 632,644 ****
              :button (:toggle
                       . (and (boundp 'speedbar-frame)
                              (frame-live-p (symbol-value 'speedbar-frame))
!                             (frame-visible-p 
                               (symbol-value 'speedbar-frame))))))
  
  (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
  
  (define-key menu-bar-showhide-scroll-bar-menu [right]
!   '(menu-item "On the Right" 
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'right))
--- 640,652 ----
              :button (:toggle
                       . (and (boundp 'speedbar-frame)
                              (frame-live-p (symbol-value 'speedbar-frame))
!                             (frame-visible-p
                               (symbol-value 'speedbar-frame))))))
  
  (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
  
  (define-key menu-bar-showhide-scroll-bar-menu [right]
!   '(menu-item "On the Right"
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'right))
***************
*** 648,654 ****
                                               (frame-parameters))) 'right))))
  
  (define-key menu-bar-showhide-scroll-bar-menu [left]
!   '(menu-item "On the Left"      
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'left))
--- 656,662 ----
                                               (frame-parameters))) 'right))))
  
  (define-key menu-bar-showhide-scroll-bar-menu [left]
!   '(menu-item "On the Left"
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'left))
***************
*** 658,664 ****
                                               (frame-parameters))) 'left))))
  
  (define-key menu-bar-showhide-scroll-bar-menu [none]
!   '(menu-item "None" 
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode nil))
--- 666,672 ----
                                               (frame-parameters))) 'left))))
  
  (define-key menu-bar-showhide-scroll-bar-menu [none]
!   '(menu-item "None"
              (lambda ()
                (interactive)
                (customize-set-variable 'scroll-bar-mode nil))
***************
*** 668,674 ****
                                               (frame-parameters))) nil))))
  
  (define-key menu-bar-showhide-menu [showhide-scroll-bar]
!   (list 'menu-item "Scroll-Bar" menu-bar-showhide-scroll-bar-menu
        :visible 'window-system
        :help "Select scroll-bar mode"))
  
--- 676,682 ----
                                               (frame-parameters))) nil))))
  
  (define-key menu-bar-showhide-menu [showhide-scroll-bar]
!   (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu
        :visible 'window-system
        :help "Select scroll-bar mode"))
  
***************
*** 681,687 ****
      (message "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu 
bar appear.")))
  
  (define-key menu-bar-showhide-menu [showhide-menu-bar]
!   '(menu-item "Menu-bar" 
              (lambda ()
                (interactive)
                (showhide-menu-bar)
--- 689,695 ----
      (message "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu 
bar appear.")))
  
  (define-key menu-bar-showhide-menu [showhide-menu-bar]
!   '(menu-item "Menu-bar"
              (lambda ()
                (interactive)
                (showhide-menu-bar)
***************
*** 697,703 ****
      (message "Tool-bar mode disabled.")))
  
  (define-key menu-bar-showhide-menu [showhide-tool-bar]
!   '(menu-item "Tool-bar" 
              (lambda ()
                (interactive)
                (showhide-tool-bar)
--- 705,711 ----
      (message "Tool-bar mode disabled.")))
  
  (define-key menu-bar-showhide-menu [showhide-tool-bar]
!   '(menu-item "Tool-bar"
              (lambda ()
                (interactive)
                (showhide-tool-bar)
***************
*** 778,784 ****
                (interactive)
                (toggle-text-mode-auto-fill)
                ;; This is somewhat questionable, as `text-mode-hook'
!               ;; might have changed outside customize.  
                ;; -- Per Abrahamsen <address@hidden> 2002-02-11.
                (customize-mark-as-set 'text-mode-hook))
              :help "Automatically fill text between left and right margins"
--- 786,792 ----
                (interactive)
                (toggle-text-mode-auto-fill)
                ;; This is somewhat questionable, as `text-mode-hook'
!               ;; might have changed outside customize.
                ;; -- Per Abrahamsen <address@hidden> 2002-02-11.
                (customize-mark-as-set 'text-mode-hook))
              :help "Automatically fill text between left and right margins"
***************
*** 791,797 ****
                (interactive)
                (setq truncate-lines (not truncate-lines))
                (set-buffer-modified-p (buffer-modified-p))
!               (message "Truncate long lines %s" 
                         (if truncate-lines "enabled" "disabled")))
              :help "Truncate long lines on the screen"
              :button (:toggle . truncate-lines)))
--- 799,805 ----
                (interactive)
                (setq truncate-lines (not truncate-lines))
                (set-buffer-modified-p (buffer-modified-p))
!               (message "Truncate long lines %s"
                         (if truncate-lines "enabled" "disabled")))
              :help "Truncate long lines on the screen"
              :button (:toggle . truncate-lines)))