Re: diff ESC documentation

[Kevin Rodgers]

Dan Jacobson wrote:
> Clarify here if you mean ESC or ESC and C-c
>
>       Diff mode:
>       Major mode for viewing/editing context diffs.
>       ...
> ===>  When the buffer is read-only, the ESC prefix is not necessary.
>       ...
>       You can also switch between context diff and unified diff with
>       C-c C-u, or vice versa with C-c C-d and you can also reverse the
>       direction of a diff with C-c C-r.
>       key             binding
>       ---             -------
> ===>  C-c            Prefix Command
> ===>  ESC            Prefix Command

See the patch below, which generates this *Help* buffer:

,----[ C-h f diff-mode RET ]
| diff-mode is an interactive Lisp function in `diff-mode.el'.
| (diff-mode)
|
| Major mode for viewing/editing context diffs.
| Supports unified and context diffs as well as (to a lesser extent)
| normal diffs.  If you edit the buffer manually, diff-mode will try
| to update the hunk headers for you on-the-fly.
|
| You can also switch between context diff and unified diff with M-x 
diff-context->unified,
| or vice versa with M-x diff-unified->context and you can also reverse 
the direction of
| a diff with M-x diff-reverse-direction.
|
| When the buffer is read-only, the Meta- modifier is not necessary
| to run the diff- commands:
|
| key             binding
| ---             -------
|
| C-c           Prefix Command
| ESC           Prefix Command
|
| C-c C-a               diff-apply-hunk
| C-c C-c               diff-goto-source
| C-c C-d               diff-unified->context
| C-c C-e               diff-ediff-patch
| C-c C-f               next-error-follow-minor-mode
| C-c C-n               diff-restrict-view
| C-c C-r               diff-reverse-direction
| C-c C-s               diff-split-hunk
| C-c C-t               diff-test-hunk
| C-c C-u               diff-context->unified
| C-c C-w               diff-refine-hunk
|
| M-RET         diff-goto-source
| M-K           diff-file-kill
| M-N           diff-file-next
| M-P           diff-file-prev
| M-k           diff-hunk-kill
| M-n           diff-hunk-next
| M-o           diff-goto-source
| M-p           diff-hunk-prev
| M-q           quit-window
| M-{           diff-file-prev
| M-}           diff-file-next
| ESC <mouse-2>   diff-goto-source
|
|
|
| This mode runs the hook `diff-mode-hook', as the final step
| during initialization.
`----

> Also add/mention the command to "rerun the diff" / "run the diff again".

What command is that?

*** diff-mode.el~       Mon Nov 27 15:36:00 2006
--- diff-mode.el        Thu Mar  1 22:13:56 2007
***************
*** 985,998 ****
  (define-derived-mode diff-mode fundamental-mode "Diff"
    "Major mode for viewing/editing context diffs.
  Supports unified and context diffs as well as (to a lesser extent)
  ! normal diffs.
! When the buffer is read-only, the ESC prefix is not necessary.
! If you edit the buffer manually, diff-mode will try to update the hunk
! headers for you on-the-fly.

  You can also switch between context diff and unified diff with 
\\[diff-context->unified],
  or vice versa with \\[diff-unified->context] and you can also reverse 
the direction of
  a diff with \\[diff-reverse-direction].
  \\{diff-mode-map}"
    (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
    (set (make-local-variable 'outline-regexp) diff-outline-regexp)
--- 985,1000 ----
  (define-derived-mode diff-mode fundamental-mode "Diff"
    "Major mode for viewing/editing context diffs.
  Supports unified and context diffs as well as (to a lesser extent)
! normal diffs.  If you edit the buffer manually, diff-mode will try
! to update the hunk headers for you on-the-fly.

  You can also switch between context diff and unified diff with 
\\[diff-context->unified],
  or vice versa with \\[diff-unified->context] and you can also reverse 
the direction of
  a diff with \\[diff-reverse-direction].
+
+ When the buffer is read-only, the Meta- modifier is not necessary
+ to run the Diff mode commands:
+
  \\{diff-mode-map}"
    (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
    (set (make-local-variable 'outline-regexp) diff-outline-regexp)


--
Kevin Rodgers
Denver, Colorado, USA