summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-diff.el
AgeCommit message (Expand)Author
2023-05-13; * lisp/vc/ediff-diff.el (ediff-auto-refine): Fix last change.Eli Zaretskii
2023-05-13Always default ediff-auto-refine to 'onPeter Oliver
2023-01-01; Add 2023 to copyright years.Eli Zaretskii
2022-11-17ediff: Merges with ancestor: Fix computation of hunks and proposed mergeOlivier Certner
2022-02-07Improve the ediff-diff-options documentationLars Ingebrigtsen
2022-01-01; Add 2022 to copyright years.Eli Zaretskii
2021-09-18; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas
2021-09-14; More minor docfixes found by checkdocStefan Kangas
2021-05-31Remove messaging in ediff-make-diff2-bufferLars Ingebrigtsen
2021-05-27Fix ediff message parsing in non-English localesLars Ingebrigtsen
2021-02-26lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier
2021-01-31Prefer defvar-local in vc/*.elStefan Kangas
2021-01-01Update copyright year to 2021Paul Eggert
2020-12-19Shorten over-wide docstrings in variablesStefan Kangas
2020-08-20Fix problem with non-ASCII characters in ediff error messagesLars Ingebrigtsen
2020-01-01Update copyright year to 2020Paul Eggert
2019-10-05Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen
2019-10-04Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen
2019-06-21* lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier
2019-06-18Disable lexical-binding in ediffGlenn Morris
2019-06-09Use lexical binding for ediffAlex Branham
2019-01-01Update copyright year to 2019Paul Eggert
2018-03-23; Use GNU not Gnu in docsGlenn Morris
2018-01-01Update copyright year to 2018Paul Eggert
2017-09-13Prefer HTTPS to FTP and HTTP in documentationPaul Eggert
2017-04-17ediff: use user-error rather than debug-ignored-errorsGlenn Morris
2017-04-07Check that file argument is a stringKaushal Modi
2017-04-04Make ediff handle remote and quoted file namesPhilipp Stephani
2017-01-01Merge from origin/emacs-25Paul Eggert
2016-12-31Update copyright year to 2017Paul Eggert
2016-11-20Add file-local-nameMichael Albinus
2016-01-01Update copyright year to 2016Paul Eggert
2015-09-17Backslash cleanup in Elisp source filesPaul Eggert
2015-08-28Fix minor text quoting in calc, calendar, vcPaul Eggert
2015-08-24Prefer directed to neutral quotesPaul Eggert
2015-01-01Update copyright year to 2015Paul Eggert
2014-05-02* lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier
2014-04-14Fix application of dolist to a vector (Bug#17257).YAMAMOTO Mitsuharu
2014-04-10Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier
2014-01-01Update copyright year to 2014 by running admin/update-copyright.Paul Eggert
2013-09-04* lisp/dired-x.el:Daniel Hackney
2013-05-23Silence ediff compilationGlenn Morris
2013-01-02Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert
2013-01-01Update copyright notices for 2013.Paul Eggert
2012-12-04Obsolete longlines.el.Chong Yidong
2012-07-16* vc/ediff.el (ediff-directories): Add trailing space to prompts.Michael Albinus
2012-07-03* vc/ediff-diff.el (ediff-same-file-contents): Fix it for remoteMichael Albinus
2012-04-09Remove * characters from the front of variable docstrings.Chong Yidong
2012-01-05Add 2012 to FSF copyright years for Emacs filesGlenn Morris
2011-11-20Fix typos.Juanma Barranquero
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-23 12:19:48 +0000