[Emacs-diffs] Changes to emacs/lisp/diff-mode.el

[Stefan Monnier]

Index: emacs/lisp/diff-mode.el
diff -c emacs/lisp/diff-mode.el:1.47 emacs/lisp/diff-mode.el:1.48
*** emacs/lisp/diff-mode.el:1.47        Thu Sep 12 17:44:23 2002
--- emacs/lisp/diff-mode.el     Fri Sep 13 15:45:36 2002
***************
*** 878,893 ****
    ;;   (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
    ;; compile support
  
!   ;;;; compile support is not good enough yet.  Also it can be annoying
!   ;; and should thus only be enabled conditionally.
!   ;; (set (make-local-variable 'compilation-file-regexp-alist)
!   ;;      diff-file-regexp-alist)
!   ;; (set (make-local-variable 'compilation-error-regexp-alist)
!   ;;      diff-error-regexp-alist)
!   ;; (when (string-match "\\.rej\\'" (or buffer-file-name ""))
!   ;;   (set (make-local-variable 'compilation-current-file)
!   ;;   (substring buffer-file-name 0 (match-beginning 0))))
!   ;; (compilation-shell-minor-mode 1)
  
    (when (and (> (point-max) (point-min)) diff-default-read-only)
      (toggle-read-only t))
--- 878,896 ----
    ;;   (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
    ;; compile support
  
!   ;;;; compile support is not good enough yet.  It should be merged
!   ;;;; with diff.el's support.
!   (set (make-local-variable 'compilation-file-regexp-alist)
!        diff-file-regexp-alist)
!   (set (make-local-variable 'compilation-error-regexp-alist)
!        diff-error-regexp-alist)
!   (when (string-match "\\.rej\\'" (or buffer-file-name ""))
!     (set (make-local-variable 'compilation-current-file)
!        (substring buffer-file-name 0 (match-beginning 0))))
!   ;; Be careful not to change compilation-last-buffer when we're just
!   ;; doing a C-x v = (for example).
!   (let ((compilation-last-buffer compilation-last-buffer))
!     (compilation-shell-minor-mode 1))
  
    (when (and (> (point-max) (point-min)) diff-default-read-only)
      (toggle-read-only t))