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

[Daniel Pfeiffer]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.339 
emacs/lisp/progmodes/compile.el:1.340
*** emacs/lisp/progmodes/compile.el:1.339       Tue Nov 16 04:52:19 2004
--- emacs/lisp/progmodes/compile.el     Mon Nov 22 23:31:28 2004
***************
*** 181,195 ****
      (epc
       "^Error [0-9]+ at (\\([0-9]+\\):\\([^)\n]+\\))" 2 1)
  
!     (ftnchek-file
!      "^File \\(.+\\.f\\):$"
!      1 nil nil 0)
!     (ftnchek-line-file
!      "\\(^Warning .* \\)?line \\([0-9]+\\)\\(?: col \\([0-9]+\\)\\)? file 
\\(.+\\.f\\)"
!      4 2 3 (1) nil (1 'default nil t))
!     (ftnchek-line
!      "\\(?:^\\(Warning\\) .* \\)?line \\([0-9]+\\)\\(?: col \\([0-9]+\\)\\)?"
!      nil 2 3 (1) nil (1 (compilation-face '(1)) nil t))
  
      (iar
       
"^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:"
--- 181,189 ----
      (epc
       "^Error [0-9]+ at (\\([0-9]+\\):\\([^)\n]+\\))" 2 1)
  
!     (ftnchek
!      "\\(^Warning .*\\)? line[ \n]\\([0-9]+\\)[ \n]\\(?:col \\([0-9]+\\)[ 
\n]\\)?file \\([^ :;\n]+\\)"
!      4 2 3 (1))
  
      (iar
       
"^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:"
***************
*** 916,922 ****
        ;; would do it again through the shell: (cd "..") AND sh -c "cd ..; 
make"
        (cd (if (string-match "^\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]" 
command)
                (if (match-end 1)
!                   (match-string 1 command)
                  "~")
              default-directory))
        (erase-buffer)
--- 910,916 ----
        ;; would do it again through the shell: (cd "..") AND sh -c "cd ..; 
make"
        (cd (if (string-match "^\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]" 
command)
                (if (match-end 1)
!                   (substitute-env-vars (match-string 1 command))
                  "~")
              default-directory))
        (erase-buffer)