summaryrefslogtreecommitdiff
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2006-05-31 17:28:58 +0000
committerSam Steingold <sds@gnu.org>2006-05-31 17:28:58 +0000
commit09fd8197ffbbd7e7fe6339f86a3477531d20ab27 (patch)
treeb08f6e364620fe1f7492faaf4bc829bc5cc11588 /lisp/ediff-diff.el
parentd3b87ec4947322eb1d6e8a71790c9fe6c392923d (diff)
downloademacs-09fd8197ffbbd7e7fe6339f86a3477531d20ab27.tar.gz
(ediff-diff-options): fixed the doc string
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r--lisp/ediff-diff.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 013ed9073db..57456367522 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -128,10 +128,10 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
(defcustom ediff-diff-options ""
"*Options to pass to `ediff-diff-program'.
-If Unix diff is used as `ediff-diff-program', then a useful option is
-`-w', to ignore space, and `-i', to ignore case of letters.
-Options `-c' and `-i' are not allowed. Case sensitivity can be toggled
-interactively using [ediff-toggle-ignore-case]"
+If Unix diff is used as `ediff-diff-program',
+ then a useful option is `-w', to ignore space.
+Options `-c' and `-i' are not allowed. Case sensitivity can be
+ toggled interactively using \\[ediff-toggle-ignore-case]."
:set 'ediff-reset-diff-options
:type 'string
:group 'ediff-diff)
@@ -399,7 +399,7 @@ one optional arguments, diff-number to refine.")
(c-prev-pt nil)
diff-list shift-A shift-B
)
-
+
;; diff list contains word numbers, unless changed later
(setq diff-list (cons (if word-mode 'words 'points)
diff-list))
@@ -411,7 +411,7 @@ one optional arguments, diff-number to refine.")
shift-B
(ediff-overlay-start
(ediff-get-value-according-to-buffer-type 'B bounds))))
-
+
;; reset point in buffers A/B/C
(ediff-with-current-buffer A-buffer
(goto-char (if shift-A shift-A (point-min))))
@@ -1525,7 +1525,7 @@ affects only files whose names match the expression."
(ediff-barf-if-not-control-buffer)
(setq ediff-ignore-case (not ediff-ignore-case))
(cond (ediff-ignore-case
- (setq ediff-actual-diff-options
+ (setq ediff-actual-diff-options
(concat ediff-diff-options " " ediff-ignore-case-option)
ediff-actual-diff3-options
(concat ediff-diff3-options " " ediff-ignore-case-option3))