[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.50 emacs/lisp/progmodes/f90.el:1.51
*** emacs/lisp/progmodes/f90.el:1.50    Sun May 19 17:46:23 2002
--- emacs/lisp/progmodes/f90.el Sun May 19 18:25:25 2002
***************
*** 911,920 ****
    (save-excursion
      (when (f90-in-comment)
        (beginning-of-line)
!       (re-search-forward "[!]+" (line-end-position))
        (while (f90-in-string)
!         (re-search-forward "[!]+" (line-end-position))
!         (match-string 0)))))
  
  (defsubst f90-equal-symbols (a b)
    "Compare strings A and B neglecting case and allowing for nil value."
--- 911,920 ----
    (save-excursion
      (when (f90-in-comment)
        (beginning-of-line)
!       (re-search-forward "!+" (line-end-position))
        (while (f90-in-string)
!         (re-search-forward "!+" (line-end-position)))
!       (match-string 0))))
  
  (defsubst f90-equal-symbols (a b)
    "Compare strings A and B neglecting case and allowing for nil value."
***************
*** 1008,1014 ****
  Used for `comment-indent-function' by F90 mode.
  \"!!!\", `f90-directive-comment-re', variable `f90-comment-region' return 0.
  `f90-indented-comment-re' (if not trailing code) calls `f90-calculate-indent'.
! Any other type return `comment-column', leaving at least one space after 
code."
    (cond ((looking-at "!!!") 0)
        ((and f90-directive-comment-re
              (looking-at f90-directive-comment-re)) 0)
--- 1008,1014 ----
  Used for `comment-indent-function' by F90 mode.
  \"!!!\", `f90-directive-comment-re', variable `f90-comment-region' return 0.
  `f90-indented-comment-re' (if not trailing code) calls `f90-calculate-indent'.
! All others return `comment-column', leaving at least one space after code."
    (cond ((looking-at "!!!") 0)
        ((and f90-directive-comment-re
              (looking-at f90-directive-comment-re)) 0)
***************
*** 1464,1480 ****
  Unless in a string or comment, or if the optional argument NO-UPDATE
  is non-nil, call `f90-update-line' after inserting the continuation marker."
    (interactive)
!   (let (ctype)
!     (cond ((f90-in-string)
!          (insert "&") (newline 1) (insert "&"))
!         ((f90-in-comment)
!          (setq ctype (f90-get-present-comment-type))
!          (newline 1)
!          (insert ctype))
!         (t (insert "&")
!            (if (not no-update) (f90-update-line))
!            (newline 1)
!            (if f90-beginning-ampersand (insert "&")))))
    (indent-according-to-mode))
  
  (defun f90-find-breakpoint ()
--- 1464,1477 ----
  Unless in a string or comment, or if the optional argument NO-UPDATE
  is non-nil, call `f90-update-line' after inserting the continuation marker."
    (interactive)
!   (cond ((f90-in-string)
!          (insert "&\n&"))
!         ((f90-in-comment)
!          (insert "\n" (f90-get-present-comment-type)))
!         (t (insert "&")
!            (or no-update (f90-update-line))
!            (newline 1)
!            (if f90-beginning-ampersand (insert "&"))))
    (indent-according-to-mode))
  
  (defun f90-find-breakpoint ()