• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.10/emacs-93/emacs/lisp/

Lines Matching defs:patch

1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
34 ;; Apply patch interactively!
50 ;; In addition, Ediff can apply a patch to a file and then let you step
52 ;; difference-by-difference. You can even apply a patch right out of a
56 ;; region from file_orig to file, thereby undoing any particular patch that
113 (defvar ediff-last-dir-patch)
114 (defvar ediff-patch-default-directory)
139 "A comprehensive visual interface to diff & patch."
161 ;; Used as a startup hook to set `_orig' patch file read-only.
1320 ;;; Apply patch
1323 (defun ediff-patch-file (&optional arg patch-buf)
1325 If optional PATCH-BUF is given, use the patch in that buffer
1327 If prefix argument, then: if even argument, assume that the patch is in a
1332 (setq patch-buf
1333 (ediff-get-patch-buffer
1334 (if arg (prefix-numeric-value arg)) patch-buf))
1335 (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
1336 ((and (not ediff-patch-default-directory)
1337 (buffer-file-name patch-buf))
1340 (buffer-file-name patch-buf))))
1344 "File to patch (directory, if multifile patch): "
1347 (ediff-dispatch-file-patching-job patch-buf source-file)))
1350 (defun ediff-patch-buffer (&optional arg patch-buf)
1352 Without the optional prefix ARG, asks if the patch is in some buffer and
1354 With ARG=1, assumes the patch is in a file and prompts for the file.
1355 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1357 patch. If not given, the user is prompted according to the prefix argument."
1360 (setq patch-buf
1361 (ediff-get-patch-buffer
1362 (if arg (prefix-numeric-value arg)) patch-buf))
1363 (ediff-patch-buffer-internal
1364 patch-buf
1366 "Which buffer to patch? "
1367 (ediff-other-buffer patch-buf))))
1371 (defalias 'epatch 'ediff-patch-file)
1373 (defalias 'epatch-buffer 'ediff-patch-buffer)
1486 "^The patch buffer wasn't found$"