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

[Juanma Barranquero]

Index: emacs/lisp/diff-mode.el
diff -c emacs/lisp/diff-mode.el:1.70 emacs/lisp/diff-mode.el:1.71
*** emacs/lisp/diff-mode.el:1.70        Mon Apr  4 08:54:58 2005
--- emacs/lisp/diff-mode.el     Thu May 19 19:06:18 2005
***************
*** 70,76 ****
  (defcustom diff-jump-to-old-file nil
    "*Non-nil means `diff-goto-source' jumps to the old file.
  Else, it jumps to the new file."
!   :type '(boolean))
  
  (defcustom diff-update-on-the-fly t
    "*Non-nil means hunk headers are kept up-to-date on-the-fly.
--- 70,77 ----
  (defcustom diff-jump-to-old-file nil
    "*Non-nil means `diff-goto-source' jumps to the old file.
  Else, it jumps to the new file."
!   :type 'boolean
!   :group 'diff-mode)
  
  (defcustom diff-update-on-the-fly t
    "*Non-nil means hunk headers are kept up-to-date on-the-fly.
***************
*** 79,95 ****
  either be done on the fly (but this sometimes interacts poorly with the
  undo mechanism) or whenever the file is written (can be slow
  when editing big diffs)."
!   :type '(boolean))
  
  (defcustom diff-advance-after-apply-hunk t
    "*Non-nil means `diff-apply-hunk' will move to the next hunk after 
applying."
!   :type 'boolean)
  
  
  (defcustom diff-mode-hook nil
    "Run after setting up the `diff-mode' major mode."
    :type 'hook
!   :options '(diff-delete-empty-files diff-make-unified))
  
  (defvar diff-outline-regexp
    "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
--- 80,99 ----
  either be done on the fly (but this sometimes interacts poorly with the
  undo mechanism) or whenever the file is written (can be slow
  when editing big diffs)."
!   :type 'boolean
!   :group 'diff-mode)
  
  (defcustom diff-advance-after-apply-hunk t
    "*Non-nil means `diff-apply-hunk' will move to the next hunk after 
applying."
!   :type 'boolean
!   :group 'diff-mode)
  
  
  (defcustom diff-mode-hook nil
    "Run after setting up the `diff-mode' major mode."
    :type 'hook
!   :options '(diff-delete-empty-files diff-make-unified)
!   :group 'diff-mode)
  
  (defvar diff-outline-regexp
    "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
***************
*** 159,165 ****
  
  (defcustom diff-minor-mode-prefix "\C-c="
    "Prefix key for `diff-minor-mode' commands."
!   :type '(choice (string "\e") (string "C-c=") string))
  
  (easy-mmode-defmap diff-minor-mode-map
    `((,diff-minor-mode-prefix . ,diff-mode-shared-map))
--- 163,170 ----
  
  (defcustom diff-minor-mode-prefix "\C-c="
    "Prefix key for `diff-minor-mode' commands."
!   :type '(choice (string "\e") (string "C-c=") string)
!   :group 'diff-mode)
  
  (easy-mmode-defmap diff-minor-mode-map
    `((,diff-minor-mode-prefix . ,diff-mode-shared-map))