[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.195 emacs/lisp/menu-bar.el:1.196
*** emacs/lisp/menu-bar.el:1.195        Thu Feb  7 12:32:18 2002
--- emacs/lisp/menu-bar.el      Sat Feb  9 08:56:42 2002
***************
*** 550,556 ****
                   case-fold-search truncate-lines show-paren-mode
                   transient-mark-mode global-font-lock-mode
                   current-language-environment default-input-method
!                  default-frame-alist display-time-mode))
        (when (customize-mark-to-save elt)
        (setq need-save t)))
      ;; We only want to save text-mode-hook after adding or removing auto fill.
--- 550,557 ----
                   case-fold-search truncate-lines show-paren-mode
                   transient-mark-mode global-font-lock-mode
                   current-language-environment default-input-method
!                  default-frame-alist display-time-mode
!                  line-number-mode column-number-mode))
        (when (customize-mark-to-save elt)
        (setq need-save t)))
      ;; We only want to save text-mode-hook after adding or removing auto fill.
***************
*** 563,571 ****
      (and (featurep 'saveplace)
         (customize-mark-to-save 'save-place)
         (setq need-save t))
!     (and(featurep 'uniquify)
!       (customize-mark-to-save 'uniquify-buffer-name-style)
!       (setq need-save t))
      ;; Save if we changed anything.
      (when need-save
        (custom-save-all))))
--- 564,572 ----
      (and (featurep 'saveplace)
         (customize-mark-to-save 'save-place)
         (setq need-save t))
!     (and (featurep 'uniquify)
!        (customize-mark-to-save 'uniquify-buffer-name-style)
!        (setq need-save t))
      ;; Save if we changed anything.
      (when need-save
        (custom-save-all))))
***************
*** 580,585 ****
--- 581,599 ----
  ;; The "Show/Hide" submenu of menu "Options"
  
  (defvar menu-bar-showhide-menu (make-sparse-keymap "Show/Hide"))
+ 
+ (define-key menu-bar-showhide-menu [column-number-mode]
+   (menu-bar-make-toggle column-number-mode column-number-mode
+                       "Show Column Number" "Column number mode %s"
+                       "Show the current column number in the mode-line"))
+ 
+ (define-key menu-bar-showhide-menu [line-number-mode]
+   (menu-bar-make-toggle line-number-mode line-number-mode
+                       "Show Line Number" "Line number mode %s"
+                       "Show the current line number in the mode-line"))
+ 
+ (define-key menu-bar-showhide-menu [linecolumn-separator]
+   '("--"))
  
  (defun showhide-date-time ()
    "Toggle whether to show date and time in the mode-line."