[Emacs-diffs] Changes to emacs/lisp/progmodes/f90.el

[Glenn Morris]

Index: emacs/lisp/progmodes/f90.el
diff -c emacs/lisp/progmodes/f90.el:1.62 emacs/lisp/progmodes/f90.el:1.63
*** emacs/lisp/progmodes/f90.el:1.62    Fri Aug 23 20:47:17 2002
--- emacs/lisp/progmodes/f90.el Fri Aug 23 21:06:52 2002
***************
*** 158,164 ****
  
  (eval-when-compile 
    (defvar comment-auto-fill-only-comments)
!   (defvar font-lock-keywords))
  
  ;; User options
  
--- 158,165 ----
  
  (eval-when-compile 
    (defvar comment-auto-fill-only-comments)
!   (defvar font-lock-keywords)
!   (defvar imenu--index-alist))
  
  ;; User options
  
***************
*** 499,505 ****
       :style toggle]
      ["Toggle abbrev-mode" abbrev-mode    :active t :selected abbrev-mode
       :style toggle]
!     ["Add imenu Menu" f90-add-imenu-menu :active (not f90-imenu-flag)
       :visible (fboundp 'imenu-add-to-menubar)]
      ))
  
--- 500,507 ----
       :style toggle]
      ["Toggle abbrev-mode" abbrev-mode    :active t :selected abbrev-mode
       :style toggle]
!     ["Add imenu Menu" f90-add-imenu-menu
!      :active (or (not (boundp 'imenu--index-alist)) (not imenu--index-alist))
       :visible (fboundp 'imenu-add-to-menubar)]
      ))
  
***************
*** 570,579 ****
    "Temporary position used to speed up region operations.")
  (make-variable-buffer-local 'f90-cache-position)
  
- (defvar f90-imenu-flag nil
-   "Non-nil means this buffer already has an imenu.")
- (make-variable-buffer-local 'f90-imenu-flag)
- 
  
  ;; Imenu support.
  (defvar f90-imenu-generic-expression
--- 572,577 ----
***************
*** 605,617 ****
  (defun f90-add-imenu-menu ()
    "Add an imenu menu to the menubar."
    (interactive)
!   (if f90-imenu-flag
        (message "%s" "F90-imenu already exists.")
      (imenu-add-to-menubar "F90-imenu")
!     (redraw-frame (selected-frame))
!     (setq f90-imenu-flag t)))
! 
! (put 'f90-add-imenu-menu 'menu-enable '(not f90-imenu-flag))
  
  
  ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.
--- 603,612 ----
  (defun f90-add-imenu-menu ()
    "Add an imenu menu to the menubar."
    (interactive)
!   (if (and (boundp 'imenu--index-alist) imenu--index-alist)
        (message "%s" "F90-imenu already exists.")
      (imenu-add-to-menubar "F90-imenu")
!     (redraw-frame (selected-frame))))
  
  
  ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.