summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* (diff-add-change-log-entries-other-window): Document in the code a bug.Stefan Monnier2009-10-281-0/+1
|
* (diff-hunk-kill): Fix the search of the next hunk (bug#4368).Stefan Monnier2009-09-091-1/+2
|
* Mark face aliases with "-face" suffix as obsolete.Glenn Morris2009-09-011-22/+12
|
* (diff-find-source-location): Avoid goto-line.Stefan Monnier2009-08-241-1/+1
|
* Fix bug number in comment.Martin Rudalics2009-04-211-1/+1
|
* (diff-find-source-location): Don't callMartin Rudalics2009-04-211-1/+3
| | | | diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030)
* Fix last change to use bound-and-true-p.Chong Yidong2009-01-131-1/+1
|
* (diff-mode-menu): Do not assume whitespace-mode is loaded.Chong Yidong2009-01-131-1/+1
|
* (whitespace-style, whitespace-trailing-regexp): Silence compiler.Glenn Morris2009-01-111-0/+3
|
* (diff-show-trailing-whitespaces): Remove function.Dan Nicolaescu2009-01-101-7/+9
| | | | | | Move setting up whitepace-mode ... (diff-mode): ... here. (diff-mode-menu): Add a menu entry for showing trailing whitespace.
* Remove spurious backspace.Stefan Monnier2009-01-031-2/+2
|
* * align.el:Lute Kamstra2008-12-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* (diff-find-file-name): Rename `batch' to `noprompt' andStefan Monnier2008-09-141-36/+40
| | | | | | | | 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.
* (diff-show-trailing-whitespaces): Fix typo.Dan Nicolaescu2008-08-061-1/+1
|
* Rename diff-show-trailing-blanks to diff-show-trailing-whitespaces.Vinicius Jose Latorre2008-07-261-2/+2
|
* New function diff-show-trailing-blanks in diff-mode.el.Vinicius Jose Latorre2008-07-251-0/+7
|
* (diff-auto-refine-mode): Remove lighter, since it'sStefan Monnier2008-07-221-1/+1
| | | | otherwise displayed in every buffer.
* Make auto-refining a minor mode, and diff- and smerge- use it.Thien-Thi Nguyen2008-07-211-6/+8
| | | | | | | | | * 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.
* * add-log.el (add-change-log-entry): Add new arg to force each newDan Nicolaescu2008-06-241-1/+1
| | | | | entry to be on a new line. * diff-mode.el (diff-add-change-log-entries-other-window): Use it.
* (diff-context-mid-hunk-header-re): New const.Stefan Monnier2008-05-261-25/+35
| | | | | | | (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.
* (diff-current-defun): Use `buffer-local-value'.John Paul Wallington2008-05-151-1/+1
|
* (diff-hunk-header-re): Refine the regexp.Stefan Monnier2008-05-111-1/+1
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Merge from emacs--rel--22Miles Bader2008-04-261-13/+12
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
| * (diff-hunk-header-re-unified): Allow elided line counts.Stefan Monnier2008-04-251-9/+13
| | | | | | | | | | (diff-end-of-hunk, diff-unified->context, diff-fixup-modifs) (diff-sanity-check-hunk): Adjust code accordingly.
* | Merge from emacs--rel--22Miles Bader2008-04-051-3/+14
|\| | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
| * (diff-end-of-hunk): Be careful not to overlook trailingStefan Monnier2008-03-181-3/+14
| | | | | | | | "+" lines not accounted for by counting "-" and context lines.
* | * diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-051-2/+3
| | | | | | | | new files, deleted files and for changing permissions.
* | * diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-051-2/+3
| | | | | | | | new files and for changing permissions.
* | (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-041-1/+7
| | | | | | | | | | new files. (diff-mode): Set beginning-of-defun-function and
* | (diff-remembered-defdir): New var.Stefan Monnier2008-03-251-0/+5
| | | | | | | | (diff-find-file-name): Use it to flush diff-remembered-files-alist.
* | (diff-header): Make the color louder.Dan Nicolaescu2008-03-191-2/+2
| | | | | | | | (diff-refine-change): Tone the color down.
* | (diff-refine-change): Adjust colors to be more visible.Dan Nicolaescu2008-03-121-2/+2
| |
* | (diff-mode-menu): Add :help.Dan Nicolaescu2008-03-091-16/+33
| |
* | (diff-ignore-whitespace-hunk): BindDan Nicolaescu2008-03-081-1/+1
| | | | | | | | inhibit-read-only before trying to change the buffer.
* | Merge from emacs--rel--22Miles Bader2008-03-011-1/+2
|\| | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
| * (diff-sanity-check-hunk): Only accept an empty line ifStefan Monnier2008-02-291-1/+2
| | | | | | | | we still expect more lines.
| * (diff-file-junk-re): New const.Stefan Monnier2008-02-191-5/+21
| | | | | | | | | | (diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff.
| * Make it more robust in the presence of empty context lines in unified hunks.Stefan Monnier2008-02-191-40/+80
| | | | | | | | | | | | | | | | | | | | | | (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-beginning-of-file-and-junk): If we're on theStefan Monnier2008-02-101-0/+1
| | | | | | | | Index: line, don't search backward for the previous one.
| * (diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris2008-01-151-5/+1
| |
| * (diff-end-of-hunk): Don't match empty lines in unified format.Glenn Morris2008-01-081-1/+5
| |
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
* | * diff-mode.el (diff-file-junk-re): New const.Stefan Monnier2008-02-251-50/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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.
* | (diff-add-change-log-entries-other-window): UseDan Nicolaescu2008-02-101-4/+1
| | | | | | | | add-change-log-entry.
* | (diff-add-change-log-entries-other-window): Avoid theStefan Monnier2008-02-081-1/+8
| | | | | | | | splitter in context hunks.
* | (diff-add-change-log-entries-other-window):Stefan Monnier2008-02-051-19/+20
| | | | | | | | | | | | Rename from diff-create-changelog. Change users. Minor change to hopefully work with plain diffs. (diff-mode-map): Add binding for it.
* | Add new TODO entry.Dan Nicolaescu2008-02-041-0/+33
| | | | | | | | | | (diff-create-changelog): New function. (diff-mode-menu): Bind it.
* | (diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris2008-01-151-5/+1
| |
* | (diff-end-of-hunk): Don't match empty lines in unified format.Glenn Morris2008-01-081-2/+6
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-21 00:06:26 +0000