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

[Miles Bader]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.276.2.10 
emacs/lisp/progmodes/compile.el:1.276.2.11
*** emacs/lisp/progmodes/compile.el:1.276.2.10  Fri Nov 19 06:55:10 2004
--- emacs/lisp/progmodes/compile.el     Wed Dec  8 05:02:27 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)
***************
*** 1086,1099 ****
  
  (defvar compilation-mode-map
    (let ((map (make-sparse-keymap)))
!     (set-keymap-parent map compilation-minor-mode-map)
      (define-key map " " 'scroll-up)
      (define-key map "\^?" 'scroll-down)
      (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
  
      ;; Set up the menu-bar
!     (define-key map [menu-bar compilation]
!       (cons "Compile" (make-sparse-keymap "Compile")))
      (define-key map [menu-bar compilation compilation-separator2]
        '("----" . nil))
      (define-key map [menu-bar compilation compilation-grep]
--- 1080,1106 ----
  
  (defvar compilation-mode-map
    (let ((map (make-sparse-keymap)))
!     ;; Don't inherit from compilation-minor-mode-map,
!     ;; because that introduces a menu bar item we don't want.
!     ;; That confuses C-down-mouse-3.
!     (define-key map [mouse-2] 'compile-goto-error)
!     (define-key map "\C-c\C-c" 'compile-goto-error)
!     (define-key map "\C-m" 'compile-goto-error)
!     (define-key map "\C-c\C-k" 'kill-compilation)
!     (define-key map "\M-n" 'compilation-next-error)
!     (define-key map "\M-p" 'compilation-previous-error)
!     (define-key map "\M-{" 'compilation-previous-file)
!     (define-key map "\M-}" 'compilation-next-file)
! 
      (define-key map " " 'scroll-up)
      (define-key map "\^?" 'scroll-down)
      (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
  
      ;; Set up the menu-bar
!     (let ((submap (make-sparse-keymap "Compile")))
!       (define-key map [menu-bar compilation]
!       (cons "Compile" submap))
!       (set-keymap-parent submap compilation-menu-map))
      (define-key map [menu-bar compilation compilation-separator2]
        '("----" . nil))
      (define-key map [menu-bar compilation compilation-grep]