18 commits

Author	SHA1	Message	Date
Paul Eggert	7e09ef09a4	Update copyright year to 2015 ... Run admin/update-copyright.	2015-01-01 14:26:41 -08:00
Glenn Morris	a27e8c78c0	Doc and comment fixes re "online" help ... * doc/emacs/help.texi (Misc Help): * doc/emacs/trouble.texi (Checklist): * doc/lispintro/emacs-lisp-intro.texi (Note for Novices, Finding More) (Conclusion): * doc/lispref/help.texi (Help Functions): * doc/misc/info.texi, doc/misc/mh-e.texi: * etc/refcards/calccard.tex (section{Getting Help}): * lisp/cus-edit.el (help): * lisp/finder.el (finder-known-keywords): * lisp/help.el (help-for-help-internal): * lisp/vc/ediff-mult.el (ediff-meta-buffer-verbose-message) (ediff-redraw-registry-buffer): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): Doc fixes re "online" help. Fixes: debbugs:17803	2014-06-28 19:33:50 -07:00
Paul Eggert	ba3189039a	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
Glenn Morris	a5c7df1a4b	Silence ediff compilation ... * lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time. * lisp/vc/ediff-mult.el: Adjust requires. (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-patch-file-internal): Declare. * lisp/vc/ediff-ptch.el: Adjust requires. (ediff-use-last-dir, ediff-buffers-internal): Declare. (ediff-find-file): Autoload. * lisp/vc/ediff-util.el: No need to load ediff when compiling. (ediff-regions-internal): Declare. * lisp/vc/ediff-wind.el: Adjust requires. (ediff-compute-toolbar-width): Define when compiling. (ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare. * lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling. (dired-get-filename, dired-get-marked-files) (ediff-last-dir-patch, ediff-patch-default-directory) (ediff-get-patch-buffer, ediff-dispatch-file-patching-job) (ediff-patch-buffer-internal): Declare.	2013-05-23 00:10:05 -07:00
Paul Eggert	0877d0dc24	Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca	2013-01-02 08:13:04 -08:00
Paul Eggert	ab422c4d68	Update copyright notices for 2013.	2013-01-01 09:11:05 +00:00
Dmitry Antipov	87523aedc8	* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. ... Adjust comment.	2012-12-20 09:05:41 +04:00
Glenn Morris	acaf905b11	Add 2012 to FSF copyright years for Emacs files	2012-01-05 01:46:05 -08:00
Paul Eggert	fac916bfd7	Spelling fixes.	2011-12-14 13:05:20 -08:00
Paul Eggert	da6062e6ea	Spelling fixes.	2011-11-14 23:55:13 -08:00
Chong Yidong	84eb0351d8	Merge changes from emacs-23 branch	2011-02-12 18:40:43 -05:00
Glenn Morris	95df8112a0	Refill some long/short copyright headers.	2011-01-26 00:36:39 -08:00
Glenn Morris	73b0cd5003	Convert consecutive FSF copyright years to ranges.	2011-01-24 20:08:28 -08:00
Glenn Morris	e9bffc61f2	Refill some copyright headers.	2011-01-15 18:21:30 -08:00
Stefan Monnier	77ab81d054	Merge from emacs-23	2011-01-14 12:18:41 -05:00
Glenn Morris	24ac444fbe	Remove some tests for defunct system-types. ... * lisp/vc/ediff-wind.el (ediff-setup-control-frame): * lisp/vc/ediff-ptch.el (ediff-default-backup-extension): * lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options) (ediff-exec-process): Remove system-types emx, windows-95.	2010-10-08 00:51:19 -07:00
Chong Yidong	bd78fa1d54	Add "Package:" file headers to denote built-in packages.	2010-08-29 12:17:13 -04:00
Juri Linkov	56b2854f30	Move version control related files to the "vc" subdirectory. ... * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.	2010-06-11 21:51:00 +03:00

Renamed from lisp/ediff-ptch.el (Browse further)