[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.49 emacs/lisp/diff-mode.el:1.50
*** emacs/lisp/diff-mode.el:1.49        Tue Sep 17 22:35:50 2002
--- emacs/lisp/diff-mode.el     Wed Sep 18 08:09:07 2002
***************
*** 889,898 ****
         (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
!        (and (boundp '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))
--- 889,902 ----
         (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).
!   (if (boundp 'compilation-last-buffer)
!       (let ((compilation-last-buffer compilation-last-buffer))
!       (compilation-minor-mode 1))
!     (compilation-minor-mode 1))
!   ;; M-RET and RET should be done by diff-mode because the `compile'
!   ;; support is significantly less good.
!   (add-to-list 'minor-mode-overriding-map-alist
!              (cons 'compilation-minor-mode (make-sparse-keymap)))
  
    (when (and (> (point-max) (point-min)) diff-default-read-only)
      (toggle-read-only t))
***************
*** 903,909 ****
      (add-hook 'after-change-functions 'diff-after-change-function nil t)
      (add-hook 'post-command-hook 'diff-post-command-hook nil t))
    ;; Neat trick from Dave Love to add more bindings in read-only mode:
!   (add-to-list (make-local-variable 'minor-mode-overriding-map-alist)
               (cons 'buffer-read-only diff-mode-shared-map))
    ;; add-log support
    (set (make-local-variable 'add-log-current-defun-function)
--- 907,913 ----
      (add-hook 'after-change-functions 'diff-after-change-function nil t)
      (add-hook 'post-command-hook 'diff-post-command-hook nil t))
    ;; Neat trick from Dave Love to add more bindings in read-only mode:
!   (add-to-list 'minor-mode-overriding-map-alist
               (cons 'buffer-read-only diff-mode-shared-map))
    ;; add-log support
    (set (make-local-variable 'add-log-current-defun-function)