summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2007-10-20 06:30:18 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2007-10-20 06:30:18 +0000
commit975460179e149d602524496a58ecf4702f12f8ba (patch)
treeef9858e76ed34d0d534313f4107ae564aa143bdf /lisp/diff-mode.el
parentfbd80e28b7dfdd0a59e63b4a742392e0ca9dab88 (diff)
downloademacs-975460179e149d602524496a58ecf4702f12f8ba.tar.gz
emacs-975460179e149d602524496a58ecf4702f12f8ba.tar.bz2
emacs-975460179e149d602524496a58ecf4702f12f8ba.zip
* term/x-win.el (x-gtk-stock-map, icon-map-list)
(x-gtk-map-stock): Delete duplicated definitions from merge. * progmodes/octave-mod.el: Require octave-inf at compile time * progmodes/compile.el (compilation-skip-to-next-location) (compilation-skip-threshold, compilation-skip-visited): Move definitions earlier. * play/zone.el (zone-fall-through-ws): * play/landmark.el (lm-move-down, lm-move-up): * play/handwrite.el (handwrite): * mail/mspools.el (mspools-visit-spool): * wdired.el (wdired-next-line, wdired-previous-line): * tar-mode.el (tar-subfile-save-buffer): * scroll-lock.el (scroll-lock-next-line) (scroll-lock-previous-line): * image-dired.el (image-dired-next-line) (image-dired-previous-line): * ediff-help.el (ediff-help-message-line-length): Use forward-line. * smerge-mode.el (smerge-auto-refine): * diff-mode.el (diff-auto-refine): Add :group. * play/yow.el: Require doctor at compile time. * vmsproc.el: Provide vmsproc. (command-send-input): Use forward-line. * vms-patch.el: Require ps-print and vmsproc at compile time. * vc-mtn.el (log-view-message-re, log-view-file-re) (log-view-font-lock-keywords): Pacify byte-compiler. * vc-hg.el: Require log-view at compile time.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 0208660c1a9..34b116d92c8 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -92,7 +92,8 @@ when editing big diffs)."
(defcustom diff-auto-refine t
"Automatically highlight changes in detail as the user visits hunks."
- :type 'boolean)
+ :type 'boolean
+ :group 'diff-mode)
(defcustom diff-mode-hook nil
"Run after setting up the `diff-mode' major mode."