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

[Juanma Barranquero]

Index: emacs/lisp/progmodes/f90.el
diff -c emacs/lisp/progmodes/f90.el:1.63 emacs/lisp/progmodes/f90.el:1.64
*** emacs/lisp/progmodes/f90.el:1.63    Fri Aug 23 21:06:52 2002
--- emacs/lisp/progmodes/f90.el Sat Aug 31 20:54:55 2002
***************
*** 156,165 ****
  
  ;;; Code:
  
! (eval-when-compile 
!   (defvar comment-auto-fill-only-comments)
!   (defvar font-lock-keywords)
!   (defvar imenu--index-alist))
  
  ;; User options
  
--- 156,163 ----
  
  ;;; Code:
  
! (defvar comment-auto-fill-only-comments)
! (defvar font-lock-keywords)
  
  ;; User options
  
***************
*** 477,484 ****
      ["Insert Block End"    f90-insert-end t]
      "--"
      ("Highlighting"
!      ["Toggle font-lock-mode" font-lock-mode :active t
!       :selected font-lock-mode :style toggle]
       "--"
       ["Light highlighting (level 1)"    f90-font-lock-1 t]
       ["Moderate highlighting (level 2)" f90-font-lock-2 t]
--- 475,482 ----
      ["Insert Block End"    f90-insert-end t]
      "--"
      ("Highlighting"
!      ["Toggle font-lock-mode" font-lock-mode :selected font-lock-mode
!       :style toggle]
       "--"
       ["Light highlighting (level 1)"    f90-font-lock-1 t]
       ["Moderate highlighting (level 2)" f90-font-lock-2 t]
***************
*** 496,508 ****
       ["Downcase Keywords (region)"   f90-downcase-region-keywords mark-active]
       )
      "--"
!     ["Toggle auto-fill"   auto-fill-mode :active t :selected 
auto-fill-function
!      :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)]
      ))
  
  (defun f90-font-lock-1 ()
--- 494,505 ----
       ["Downcase Keywords (region)"   f90-downcase-region-keywords mark-active]
       )
      "--"
!     ["Toggle auto-fill"   auto-fill-mode :selected auto-fill-function
       :style toggle]
+     ["Toggle abbrev-mode" abbrev-mode    :selected abbrev-mode :style toggle]
      ["Add imenu Menu" f90-add-imenu-menu
!      :active (not (lookup-key (current-local-map) [menu-bar index]))
!      :included (fboundp 'imenu-add-to-menubar)]
      ))
  
  (defun f90-font-lock-1 ()
***************
*** 603,609 ****
  (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))))
--- 600,606 ----
  (defun f90-add-imenu-menu ()
    "Add an imenu menu to the menubar."
    (interactive)
!   (if (lookup-key (current-local-map) [menu-bar index])
        (message "%s" "F90-imenu already exists.")
      (imenu-add-to-menubar "F90-imenu")
      (redraw-frame (selected-frame))))
***************
*** 1324,1330 ****
    (interactive)
    (let (indent no-line-number (pos (make-marker)) (case-fold-search t))
      (set-marker pos (point))
!     (beginning-of-line)                       ; digits after & \n are not 
line-nos
      (if (save-excursion (and (f90-previous-statement) (f90-line-continued)))
        (progn (setq no-line-number t) (skip-chars-forward " \t"))
        (f90-indent-line-no))
--- 1321,1327 ----
    (interactive)
    (let (indent no-line-number (pos (make-marker)) (case-fold-search t))
      (set-marker pos (point))
!     (beginning-of-line)                ; digits after & \n are not line-nos
      (if (save-excursion (and (f90-previous-statement) (f90-line-continued)))
        (progn (setq no-line-number t) (skip-chars-forward " \t"))
        (f90-indent-line-no))
***************
*** 1351,1357 ****
    (interactive)
    (let (string cont (case-fold-search t))
      (if abbrev-mode (expand-abbrev))
!     (beginning-of-line)                       ; reindent where likely to be 
needed
      (f90-indent-line-no)
      (f90-indent-line 'no-update)
      (end-of-line)
--- 1348,1354 ----
    (interactive)
    (let (string cont (case-fold-search t))
      (if abbrev-mode (expand-abbrev))
!     (beginning-of-line)                ; reindent where likely to be needed
      (f90-indent-line-no)
      (f90-indent-line 'no-update)
      (end-of-line)
***************
*** 1400,1407 ****
                       f90-if-indent)
                      ((setq struct (f90-looking-at-type-like))
                       f90-type-indent)
!                     ((or(setq struct (f90-looking-at-program-block-start))
!                         (looking-at "contains[ \t]*\\($\\|!\\)"))
                       f90-program-indent)))
      (if ind-b (setq ind-lev (+ ind-lev ind-b)))
      (if struct (setq block-list (cons struct block-list)))
--- 1397,1404 ----
                       f90-if-indent)
                      ((setq struct (f90-looking-at-type-like))
                       f90-type-indent)
!                     ((or (setq struct (f90-looking-at-program-block-start))
!                            (looking-at "contains[ \t]*\\($\\|!\\)"))
                       f90-program-indent)))
      (if ind-b (setq ind-lev (+ ind-lev ind-b)))
      (if struct (setq block-list (cons struct block-list)))