Lines Matching refs:unified
55 ;; - Handle `diff -b' output in context->unified.
99 :options '(diff-delete-empty-files diff-make-unified)
155 ("\C-c\C-u" . diff-context->unified)
157 ("\C-c\C-d" . diff-unified->context)
170 ["Context -> Unified" diff-context->unified t]
171 ["Unified -> Context" diff-unified->context t]
333 `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
378 ;; Especially important for unified (because headers are ambiguous).
379 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
382 ;; A `unified' header is ambiguous.
383 (unified (concat "^[^-+# \\]\\|"
495 "Split the current (unified diff) hunk at point into two hunks."
501 (error "diff-split-hunk only works on unified context diffs"))
648 (defun diff-unified->context (start end)
649 "Convert unified diffs to context diffs.
682 (progn (diff-end-of-hunk 'unified) (point)))
735 (defun diff-context->unified (start end &optional to-context)
736 "Convert context diffs to unified diffs.
739 With a prefix argument, convert unified format to context format."
744 (diff-unified->context start end)
855 ;; a unified-diff hunk header
987 Supports unified and context diffs as well as (to a lesser extent)
994 You can also switch between context diff and unified diff with \\[diff-context->unified],
995 or vice versa with \\[diff-unified->context] and you can also reverse the direction of
1065 (defun diff-make-unified ()
1066 "Turn context diffs into unified diffs if applicable."
1072 (diff-context->unified (point-min) (point-max))
1082 Only works for unified diffs."
1134 ;; A unified diff.
1138 (error "Unrecognized unified diff hunk header format")
1184 ;; unified diff
1235 ;; Remove line-prefix characters, and unneeded lines (unified diffs).
1533 ;; (diff-unified->context, diff-context->unified, diff-reverse-direction,