summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-171-15/+15
* Remove references to OS/2 in code, doc, and commentsGlenn Morris2017-04-081-10/+8
* Show ancestor buffer in 3way mergesTino Calancha2017-03-141-55/+100
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ \ | |/
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\ \ | |/
| * ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)Eli Zaretskii2016-12-021-1/+1
| * * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)Eli Zaretskii2016-12-021-0/+2
* | Prevent to apply funcall on tStefan Monnier2016-07-121-1/+3
* | * lisp/vc/ediff-util.el: Use lexical-binding.Stefan Monnier2016-05-041-12/+16
* | No need to test for jka-comprLars Ingebrigtsen2016-04-301-5/+2
* | Be more verbose when changing frame mode in ediffTino Calancha2016-02-231-3/+5
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Avoid redisplay error in ediff-regions-wordwiseEli Zaretskii2015-09-281-0/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-9/+9
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-8/+10
* Prefer "this" to “this” in doc stringsPaul Eggert2015-05-191-1/+1
* Fix minor quoting problems in doc stringsPaul Eggert2015-05-191-1/+1
* Fix selective diff browsing in EdiffEli Zaretskii2015-05-141-0/+2
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* ediff: Replace obsolete toggle-read-only with read-only-modeGlenn Morris2014-07-251-5/+5
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-021-3/+3
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-101-2/+0
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-3/+3
* Do not call to `selected-window' where it is assumed by default.Dmitry Antipov2013-08-051-2/+2
* Do not call to `selected-frame' where it is assumed by default.Dmitry Antipov2013-08-051-2/+2
* Silence ediff compilationGlenn Morris2013-05-231-3/+3
* Add bug-gnu-emacs to some specialized bug report addressesGlenn Morris2013-02-231-1/+1
* * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'Juri Linkov2013-02-131-1/+6
* Add more keymaps where S-SPC scrolls in the opposite direction to SPC.Juri Linkov2013-02-131-0/+1
* 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
* | * lisp/vc/ediff-util.el (ediff-buffer-type): New function.Dave Abrahams2012-12-141-7/+15
|/
* * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.Stefan Monnier2012-09-291-2/+2
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-1/+1
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Spelling fixes.Paul Eggert2011-11-241-2/+2
* Spelling fixes.Paul Eggert2011-11-221-1/+1
* Fix typos.Juanma Barranquero2011-11-201-1/+1
* * vc/ediff-util.el (ediff-calc-command-time): Use time-sincePaul Eggert2011-06-301-9/+3
* Don't quote lambda expressions with `quote'.Stefan Monnier2011-05-231-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
* Use run-mode-hooks for major mode hooks.Stefan Monnier2011-01-131-1/+2
View Lorry Controller Status