summaryrefslogtreecommitdiff
path: root/lisp/diff.el
Commit message (Collapse)AuthorAgeFilesLines
* * emulation/pc-select.el (next-line-mark, next-line-nomark)Dan Nicolaescu2007-10-261-0/+4
| | | | | | | | | | | | | (previous-line-mark, previous-line-nomark): Wrap with-no-warnings around uses of previous-line and next-line. * diff.el (diff-old-file, diff-new-file, diff-extra-args): New defvars. * textmodes/css-mode.el (comment-continue): * net/browse-url.el (url-handler-regexp): * progmodes/idlw-help.el (idlwave-system-routines): Pacify byte-compiler.
* Merge from emacs--rel--22Miles Bader2007-08-131-1/+2
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
| * Replace `iff' in doc-strings and comments.Glenn Morris2007-08-081-1/+2
| |
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
| |
* | (diff): Use buffer-local vars diff-old-file and diff-new-fileStefan Monnier2007-05-051-3/+7
|/ | | | rather than storing their value in the revert-buffer function.
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* * diff-mode.el (diff-mode): Set buffer-read-only to t whenChong Yidong2006-06-061-8/+24
| | | | | | | | | diff-default-read-only is non-nill. * diff.el (diff-sentinel, diff): Set inhibit-read-only to t when modifying the *Diff* buffer. (diff-process-filter): New filter function for diff process that sets inhibit-read-only to t when modifying the *Diff* buffer.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* 2005-09-24 Emilio C. Lopes <eclig@gmx.net>Romain Francoise2005-09-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * woman.el (woman-file-name): * wid-edit.el (widget-file-prompt-value) (widget-coding-system-prompt-value): * w32-fns.el (set-w32-system-coding-system): * vc.el (vc-version-diff, vc-annotate): * textmodes/reftex-auc.el (reftex-arg-cite) (reftex-arg-index-tag): * textmodes/refer.el (refer-get-bib-files): * textmodes/artist.el (artist-figlet-choose-font): * terminal.el (terminal-emulator): * replace.el (occur-read-primary-args): * rect.el (string-rectangle, string-insert-rectangle): * ps-print.el (ps-print-preprint): * progmodes/pascal.el (pascal-goto-defun): * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer): * progmodes/compile.el (compilation-find-file): * printing.el (pr-interactive-n-up): * play/animate.el (animate-birthday-present): * net/rcompile.el (remote-compile): * man.el (man, Man-goto-section, Man-follow-manual-reference): * mail/rmailsum.el (rmail-summary-search-backward) (rmail-summary-search): * mail/rmailout.el (rmail-output-read-rmail-file-name) (rmail-output-read-file-name): * mail/rmail.el (rmail-search, rmail-search-backwards): * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs): * locate.el (locate): * international/quail.el (quail-show-keyboard-layout): * international/mule.el (set-buffer-file-coding-system) (revert-buffer-with-coding-system, set-file-name-coding-system) (set-terminal-coding-system, set-keyboard-coding-system) (set-next-selection-coding-system): * international/mule-diag.el (describe-coding-system) (describe-font, describe-fontset): * international/mule-cmds.el (universal-coding-system-argument) (search-unencodable-char, describe-input-method) (set-language-environment, describe-language-environment): * international/codepage.el (codepage-setup): * international/code-pages.el (codepage-setup): * info.el (Info-search, Info-follow-reference) (Info-search-backward): * emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-clear-cache, ad-activate) (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name) (ad-enable-advice, ad-disable-advice, ad-remove-advice) (ad-read-regexp): * ediff-util.el (ediff-toggle-regexp-match): * ediff-ptch.el (ediff-prompt-for-patch-file): * dired-aux.el (dired-diff): * diff.el (diff): * cus-edit.el (custom-variable-prompt): * calendar/timeclock.el (timeclock-ask-for-project): * calc/calcalg3.el (calc-get-fit-variables): * calc/calc-store.el (calc-edit-variable) (calc-permanent-variable): * vc-mcvs.el (vc-mcvs-register): * shadowfile.el (shadow-define-literal-group): * woman.el (woman-file-name): * vc.el (vc-version-diff, vc-merge): * textmodes/reftex-index.el (reftex-index-complete-tag): * format.el (format-decode-buffer, format-decode-region): * emulation/viper-cmd.el (viper-read-string-with-history): * emacs-lisp/debug.el (cancel-debug-on-entry): * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * ediff.el (ediff-merge-revisions) (ediff-merge-revisions-with-ancestor, ediff-revision): * completion.el (interactive-completion-string-reader): * calc/calc-prog.el (calc-user-define-formula): Follow convention for reading with the minibuffer.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (diff-switches): Fix typo in docstring.Juanma Barranquero2004-04-301-1/+1
|
* (diff): Set default-directory in diff buffer.Andreas Schwab2004-04-241-0/+2
|
* Don't use compile any more, use diff-mode instead.Stefan Monnier2004-02-111-170/+49
| | | | | | | | (diff-regexp-alist, diff-old-file, diff-new-file) (diff-parse-differences, diff-process-setup): Remove. (diff-sentinel): New fun. (diff): Use it. Run the process ourselves. Use diff-mode for the rest of the processing.
* (diff): Simplify code handling `switch'.Stefan Monnier2004-02-111-8/+3
|
* (diff): Add a revert-buffer function.Stefan Monnier2004-02-101-0/+3
|
* (diff-switches): New fun.Stefan Monnier2004-02-101-51/+44
| | | | | | (diff, diff-backup): Use it. (diff): Clean up the args construction. Use backquote. Use listp instead of consp to avoid putting a nil arg.
* (diff-parse-differences): Don't visit the files now;Richard M. Stallman2003-10-201-11/+7
| | | | instead, just record the error locus.
* Add arch taglinesMiles Bader2003-09-011-0/+1
|
* (diff): Doc fix.Markus Rost2002-09-091-1/+1
|
* (diff): Add optional argument no-async, and use the above argument.Colin Walters2002-09-071-3/+5
|
* (diff-latest-backup-file): Replace the main code by a call ofMarkus Rost2002-05-221-24/+1
| | | | file-newest-backup.
* (diff-regexp-alist): Doc fix.Richard M. Stallman2002-05-081-5/+9
|
* (diff): Display default values in prompts as `(default ...)', not `(...)'.Miles Bader2001-10-111-3/+3
|
* Keyword added and FSF specified as Maintainer.Pavel Janík2001-08-061-0/+1
|
* Some fixes to follow coding conventions.Pavel Janík2001-07-151-1/+1
|
* (diff-parse-differences):Richard M. Stallman1999-08-281-5/+5
| | | | Use a marker instead of an integer for `compilation-parsing-end'.
* (diff group): Remove autoload cookie.Richard M. Stallman1997-09-091-1/+0
|
* (diff-command): Fix previous change.Richard M. Stallman1997-06-061-1/+1
|
* Customize.Richard M. Stallman1997-06-041-5/+15
| | | | (diff-switches, diff-command): Add autoload cookies.
* (diff-latest-backup-file):Richard M. Stallman1997-05-101-2/+2
| | | | Rename bv-length to backup-extract-version-start.
* * (diff-process-setup): New function, sets up theEli Zaretskii1997-02-091-13/+21
| | | | | | | | compilation-exit-message-function so that it works with both asynchronous and synchronous sub-processes. (diff): Bind compilation-exit-message-function. Run compilation-finish-function when compile-internal returns if async processes aren't supported.
* (diff): Don't pop to *diff* buffer. Change bogusRichard M. Stallman1996-08-261-2/+2
| | | | unwind-protect to save-excursion.
* Update FSF's address.Erik Naggum1996-01-141-2/+3
|
* (diff): Fix local compilation-exit-message-function to take the properRoland McGrath1996-01-101-13/+12
| | | | | arguments; remove gratuitous use of if around cond; return useful mode line messages for normal completion.
* (diff): Set compilation-exit-message-function.Karl Heuer1996-01-091-0/+13
|
* (diff-command): New variable.Richard M. Stallman1994-10-281-1/+4
| | | | (diff): Use it.
* (diff-latest-backup-file): Cope with backups storedRichard M. Stallman1994-07-111-2/+6
| | | | in a different directory.
* Pass operation to Ffind_file_name_handler.Karl Heuer1994-04-221-1/+1
|
* (diff-latest-backup-file): Call file name handler properly.Richard M. Stallman1994-03-131-1/+1
|
* (diff-latest-backup-file): Check for a file-name-handler and run it.Roland McGrath1994-03-021-21/+24
|
* (diff): Select the differences buffer.Richard M. Stallman1994-01-091-12/+11
|
* (diff-latest-backup-file): Call file-chase-links.Richard M. Stallman1994-01-091-1/+1
|
* (diff): Call shell-quote-argument.Richard M. Stallman1993-12-311-2/+4
|
* (diff): Doc fix.Brian Fox1993-09-211-1/+1
|
* * diff.el (diff-parse-differences): Preserve the match dataJim Blandy1993-06-221-1/+2
| | | | across the call to find-file-noselect.
* (diff): Really do use arg SWITCHES.Richard M. Stallman1993-06-021-3/+8
|
* Comment fix.Richard M. Stallman1993-05-091-0/+1
|
* (diff-parse-differences): Small robustification --- don't lose if weEric S. Raymond1993-04-161-1/+3
| | | | call this with compilation-parsing-end nil
View Lorry Controller Status