summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-ptch.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Make ediff offer to create files it's inferringLars Ingebrigtsen2020-12-091-0/+3
* Use null-device where appropriateMichael Albinus2020-11-251-7/+7
* Revert "Use format-prompt in read-file-name calls that have a default"Lars Ingebrigtsen2020-09-131-4/+8
* Use format-prompt in read-file-name calls that have a defaultLars Ingebrigtsen2020-09-071-8/+4
* Remove subsumed repetitions in regexpsMattias EngdegÄrd2020-02-201-1/+1
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-50/+36
* Disable lexical-binding in ediffGlenn Morris2019-06-181-1/+1
* Use lexical binding for ediffAlex Branham2019-06-091-1/+1
* * lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Remove Git prefixes.Juri Linkov2019-05-051-9/+22
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Use "file name handler" consequentlyMichael Albinus2018-12-221-2/+2
* | Replace insignificant backquotesMichael Heerdegen2018-11-251-5/+5
|/
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
* Fix concatenation of "^" with diff-file-junk-reTino Calancha2017-05-241-1/+1
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-171-1/+1
* epatch: Save right backups in Git multipatchesTino Calancha2017-03-211-7/+6
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | ; Spelling fixesPaul Eggert2016-12-221-4/+4
* | ediff-fixup-patch-map: Improve promptTino Calancha2016-12-081-4/+17
* | ediff-context-diff-label-regexp: Detect the end of second fileTino Calancha2016-12-071-5/+6
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-2/+2
* Fix minor quoting problems in diagnosticsPaul Eggert2015-09-171-2/+2
* Fix some more docstring etc. quoting problemsPaul Eggert2015-09-031-1/+1
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-1/+1
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* Doc and comment fixes re "online" helpGlenn Morris2014-06-281-1/+1
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* Silence ediff compilationGlenn Morris2013-05-231-5/+8
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* | * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.Dmitry Antipov2012-12-201-3/+3
|/
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Spelling fixes.Paul Eggert2011-12-141-1/+1
* Spelling fixes.Paul Eggert2011-11-141-1/+1
* Merge changes from emacs-23 branchChong Yidong2011-02-121-1/+1
* Refill some long/short copyright headers.Glenn Morris2011-01-261-2/+1
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Refill some copyright headers.Glenn Morris2011-01-151-2/+3
* Merge from emacs-23Stefan Monnier2011-01-141-3/+2
* Remove some tests for defunct system-types.Glenn Morris2010-10-081-4/+4
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-0/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+844