/[emacs]/emacs/lisp/diff-mode.el
ViewVC logotype

Diff of /emacs/lisp/diff-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.70 by lute, Mon Apr 4 08:54:58 2005 UTC revision 1.71 by lektu, Thu May 19 19:06:18 2005 UTC
# Line 70  Line 70 
70  (defcustom diff-jump-to-old-file nil  (defcustom diff-jump-to-old-file nil
71    "*Non-nil means `diff-goto-source' jumps to the old file.    "*Non-nil means `diff-goto-source' jumps to the old file.
72  Else, it jumps to the new file."  Else, it jumps to the new file."
73    :type '(boolean))    :type 'boolean
74      :group 'diff-mode)
75    
76  (defcustom diff-update-on-the-fly t  (defcustom diff-update-on-the-fly t
77    "*Non-nil means hunk headers are kept up-to-date on-the-fly.    "*Non-nil means hunk headers are kept up-to-date on-the-fly.
# Line 79  need to be kept consistent with the actu Line 80  need to be kept consistent with the actu
80  either be done on the fly (but this sometimes interacts poorly with the  either be done on the fly (but this sometimes interacts poorly with the
81  undo mechanism) or whenever the file is written (can be slow  undo mechanism) or whenever the file is written (can be slow
82  when editing big diffs)."  when editing big diffs)."
83    :type '(boolean))    :type 'boolean
84      :group 'diff-mode)
85    
86  (defcustom diff-advance-after-apply-hunk t  (defcustom diff-advance-after-apply-hunk t
87    "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."    "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
88    :type 'boolean)    :type 'boolean
89      :group 'diff-mode)
90    
91    
92  (defcustom diff-mode-hook nil  (defcustom diff-mode-hook nil
93    "Run after setting up the `diff-mode' major mode."    "Run after setting up the `diff-mode' major mode."
94    :type 'hook    :type 'hook
95    :options '(diff-delete-empty-files diff-make-unified))    :options '(diff-delete-empty-files diff-make-unified)
96      :group 'diff-mode)
97    
98  (defvar diff-outline-regexp  (defvar diff-outline-regexp
99    "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")    "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
# Line 159  when editing big diffs)." Line 163  when editing big diffs)."
163    
164  (defcustom diff-minor-mode-prefix "\C-c="  (defcustom diff-minor-mode-prefix "\C-c="
165    "Prefix key for `diff-minor-mode' commands."    "Prefix key for `diff-minor-mode' commands."
166    :type '(choice (string "\e") (string "C-c=") string))    :type '(choice (string "\e") (string "C-c=") string)
167      :group 'diff-mode)
168    
169  (easy-mmode-defmap diff-minor-mode-map  (easy-mmode-defmap diff-minor-mode-map
170    `((,diff-minor-mode-prefix . ,diff-mode-shared-map))    `((,diff-minor-mode-prefix . ,diff-mode-shared-map))

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.71

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26