summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
AgeCommit message (Collapse)Author
2010-06-11Move version control related files to the "vc" subdirectory.Juri Linkov
* 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-03-12Add .dir-locals.el support for file-less buffers.Dan Nicolaescu
* files.el (hack-local-variables): Split out code to apply local variable settings ... (hack-local-variables-apply): ... here. New function. (hack-dir-local-variables): Use the default directory for when the buffer does not have an associated file. (hack-dir-local-variables-non-file-buffer): New function. * diff-mode.el (diff-mode): * vc-annotate.el (vc-annotate-mode): * vc-dir.el (vc-dir-mode): * log-edit.el (log-edit-mode): * log-view.el (log-view-mode): Call hack-dir-local-variables-non-file-buffer.
2010-01-13Add 2010 to copyright years.Glenn Morris
2009-10-28(diff-add-change-log-entries-other-window): Document in the code a bug.Stefan Monnier
2009-09-09(diff-hunk-kill): Fix the search of the next hunk (bug#4368).Stefan Monnier
2009-09-01Mark face aliases with "-face" suffix as obsolete.Glenn Morris
2009-08-24(diff-find-source-location): Avoid goto-line.Stefan Monnier
2009-04-21Fix bug number in comment.Martin Rudalics
2009-04-21(diff-find-source-location): Don't callMartin Rudalics
diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030)
2009-01-13Fix last change to use bound-and-true-p.Chong Yidong
2009-01-13(diff-mode-menu): Do not assume whitespace-mode is loaded.Chong Yidong
2009-01-11(whitespace-style, whitespace-trailing-regexp): Silence compiler.Glenn Morris
2009-01-10(diff-show-trailing-whitespaces): Remove function.Dan Nicolaescu
Move setting up whitepace-mode ... (diff-mode): ... here. (diff-mode-menu): Add a menu entry for showing trailing whitespace.
2009-01-03Remove spurious backspace.Stefan Monnier
2008-12-03* align.el:Lute Kamstra
* allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-09-14(diff-find-file-name): Rename `batch' to `noprompt' andStefan Monnier
be more honest when we don't know. (diff-tell-file-name): Don't prompt before the actual prompt. (diff-mode): Don't prompt in add-log-buffer-file-name-function. (diff-find-source-location): Add `noprompt' argument. (diff-current-defun): Don't prompt.
2008-08-06(diff-show-trailing-whitespaces): Fix typo.Dan Nicolaescu
2008-07-26Rename diff-show-trailing-blanks to diff-show-trailing-whitespaces.Vinicius Jose Latorre
2008-07-25New function diff-show-trailing-blanks in diff-mode.el.Vinicius Jose Latorre
2008-07-22(diff-auto-refine-mode): Remove lighter, since it'sStefan Monnier
otherwise displayed in every buffer.
2008-07-21Make auto-refining a minor mode, and diff- and smerge- use it.Thien-Thi Nguyen
* diff-mode.el (diff-auto-refine): Delete defcustom. (diff-auto-refine-mode): New func/var via define-minor-mode. Update var ref to use diff-auto-refine-mode. * smerge-mode.el (diff-mode): Require when compiling. (smerge-auto-refine): Delete defcustom. Update smerge-auto-refine ref to use diff-auto-refine-mode.
2008-06-24* add-log.el (add-change-log-entry): Add new arg to force each newDan Nicolaescu
entry to be on a new line. * diff-mode.el (diff-add-change-log-entries-other-window): Use it.
2008-05-26(diff-context-mid-hunk-header-re): New const.Stefan Monnier
(diff-font-lock-keywords, diff-context->unified) (diff-reverse-direction, diff-fixup-modifs, diff-sanity-check-hunk) (diff-hunk-text, diff-find-source-location): Use it. (diff-post-command-hook): Let the user edit the hunk headers.
2008-05-15(diff-current-defun): Use `buffer-local-value'.John Paul Wallington
2008-05-11(diff-hunk-header-re): Refine the regexp.Stefan Monnier
2008-05-06Switch to recommended form of GPLv3 permissions notice.Glenn Morris
2008-04-26Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
2008-04-25(diff-hunk-header-re-unified): Allow elided line counts.Stefan Monnier
(diff-end-of-hunk, diff-unified->context, diff-fixup-modifs) (diff-sanity-check-hunk): Adjust code accordingly.
2008-04-05Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
2008-04-05* diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu
new files, deleted files and for changing permissions.
2008-04-05* diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu
new files and for changing permissions.
2008-04-04(diff-file-junk-re): Recognize the git format forDan Nicolaescu
new files. (diff-mode): Set beginning-of-defun-function and
2008-03-25(diff-remembered-defdir): New var.Stefan Monnier
(diff-find-file-name): Use it to flush diff-remembered-files-alist.
2008-03-19(diff-header): Make the color louder.Dan Nicolaescu
(diff-refine-change): Tone the color down.
2008-03-18(diff-end-of-hunk): Be careful not to overlook trailingStefan Monnier
"+" lines not accounted for by counting "-" and context lines.
2008-03-12(diff-refine-change): Adjust colors to be more visible.Dan Nicolaescu
2008-03-09(diff-mode-menu): Add :help.Dan Nicolaescu
2008-03-08(diff-ignore-whitespace-hunk): BindDan Nicolaescu
inhibit-read-only before trying to change the buffer.
2008-03-01Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
2008-02-29(diff-sanity-check-hunk): Only accept an empty line ifStefan Monnier
we still expect more lines.
2008-02-25* diff-mode.el (diff-file-junk-re): New const.Stefan Monnier
(diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff. * diff-mode.el: Make it more robust in the presence of empty context lines in unified hunks. (diff-valid-unified-empty-line): New var. (diff-unified->context, diff-sanity-check-hunk): Obey it. (diff-end-of-hunk): Obey it. New arg `donttrustheader'. (diff-fixup-modifs, diff-post-command-hook): Use this new arg. (diff-hunk-header-re-unified): New const. (diff-font-lock-keywords, diff-hunk-header-re, diff-split-hunk) (diff-fixup-modifs, diff-unified->context, diff-next-complex-hunk) (diff-sanity-check-hunk): Use it. * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the Index: line, don't search backward for the previous one.
2008-02-19(diff-file-junk-re): New const.Stefan Monnier
(diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff.
2008-02-19Make it more robust in the presence of empty context lines in unified hunks.Stefan Monnier
(diff-valid-unified-empty-line): New var. (diff-unified->context, diff-sanity-check-hunk): Obey it. (diff-end-of-hunk): Obey it. New arg `donttrustheader'. (diff-fixup-modifs, diff-post-command-hook): Use this new arg. (diff-hunk-header-re-unified): New const. (diff-font-lock-keywords, diff-hunk-header-re, diff-split-hunk) (diff-fixup-modifs, diff-unified->context, diff-next-complex-hunk) (diff-sanity-check-hunk): Use it.
2008-02-10(diff-add-change-log-entries-other-window): UseDan Nicolaescu
add-change-log-entry.
2008-02-10(diff-beginning-of-file-and-junk): If we're on theStefan Monnier
Index: line, don't search backward for the previous one.
2008-02-08(diff-add-change-log-entries-other-window): Avoid theStefan Monnier
splitter in context hunks.
2008-02-05(diff-add-change-log-entries-other-window):Stefan Monnier
Rename from diff-create-changelog. Change users. Minor change to hopefully work with plain diffs. (diff-mode-map): Add binding for it.
2008-02-04Add new TODO entry.Dan Nicolaescu
(diff-create-changelog): New function. (diff-mode-menu): Bind it.
2008-01-15(diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris
2008-01-15(diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris