summaryrefslogtreecommitdiff
path: root/lisp/vc/diff-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* * vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-onlyIvan Shmakov2013-11-221-1/+2
| | | | | | Only allow diff-default-read-only to set buffer-read-only to t, never to nil. Fixes: debbugs:15938
* * lisp/vc/diff-mode.el (diff-mode-shared-map): Unbind "/".Dmitry Gutov2013-03-231-1/+0
| | | | Fixes: debbugs:14034
* * lisp/vc/diff-mode.el (diff-hunk-file-names): Handle filenames with spaces.Sam Steingold2013-02-281-3/+6
| | | | See <http://stackoverflow.com/questions/14720205>.
* 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/diff-mode.el (diff-post-command-hook): Don't ignore changes at theStefan Monnier2012-12-191-1/+1
| | | | | | | | very beginning of a hunk (e.g. killing the first line).
* | * lisp/vc/diff-mode.el (diff-hunk): Don't make useless timers.Stefan Monnier2012-11-191-13/+15
|/
* Rewrite and rename diff-delete-trailing-whitespace.Chong Yidong2012-11-091-30/+66
| | | | | | | | * lisp/vc/diff-mode.el (diff-delete-trailing-whitespace): Rewrite, and rename from diff-remove-trailing-whitespace (Bug#12831). * files.texi (Diff Mode): Doc fixes for diff-delete-trailing-whitespace.
* Document diff-remove-trailing-whitespaceGlenn Morris2012-11-081-6/+6
| | | | | | | | * doc/emacs/files.texi (Diff Mode): Trailing whitespace updates. * lisp/vc/diff-mode.el (diff-remove-trailing-whitespace): Doc fix. * etc/NEWS: Related markup.
* * lisp/vc/diff-mode.el (diff-context->unified): Don't get confused by "hunkStefan Monnier2012-10-291-6/+8
| | | | | | header comments". (diff-unified->context, diff-context->unified) (diff-reverse-direction, diff-fixup-modifs): Use `use-region-p'.
* * lisp/vc/diff-mode.el (diff-end-of-hunk): Also skip potential "no LF at eol".Stefan Monnier2012-10-261-7/+16
| | | | | | (diff-refine-hunk): Similarly, handle the "no LF at eol". Fixes: debbugs:12584
* * lisp/vc/diff-mode.el (diff-hunk): `save-excursion' while refining.Stefan Monnier2012-10-231-2/+3
| | | | Fixes: debbugs:12671
* * lisp/vc/diff-mode.el (diff--auto-refine-data): New var.Stefan Monnier2012-10-011-2/+20
| | | | | (diff-hunk): Use it to delay refinement. (diff-mode): Remove overlays when we turn off font-lock.
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-301-1/+1
| | | | | | | | | | | (list-colors-sort-key): Implement it. * lisp/vc/diff-mode.el (diff-refine-removed): * lisp/vc/ediff-init.el (ediff-fine-diff-A): * lisp/vc/smerge-mode.el (smerge-refined-removed): Change background color "#ffaaaa" to "#ffbbbb". Fixes: debbugs:10181
* * vc/diff-mode.el (diff-mode-menu): diff-remove-trailing-whitespace.Dan Nicolaescu2012-09-101-0/+2
|
* Replace version 24.2 with 24.3 where appropriate (hopefully)Glenn Morris2012-08-151-2/+2
|
* * lisp/color.el (color-xyz-to-lab, color-lab-to-xyz, color-cie-de2000):Stefan Monnier2012-08-131-30/+19
| | | | | | | Prefer pcase-let over destructuring-bind. * lisp/vc/diff-mode.el (diff-remove-trailing-whitespace): Same. Also, remove whitespace as we go, rather than after accumulating the various places.
* * vc/diff-mode.el (diff-remove-trailing-whitespace): New function.Oscar Fuentes2012-08-081-0/+41
|
* Reduce use of (require 'cl).Stefan Monnier2012-07-101-92/+99
| | | | | | | | | | | | | | | | | | | | | | | | * admin/bzrmerge.el: Use cl-lib. * leim/quail/hangul.el: Don't require CL. * leim/quail/ipa.el: Use cl-lib. * vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el: * vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el: * register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el: * msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el: * international/quail.el, info-xref.el, imenu.el, image-mode.el: * font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el: * battery.el, avoid.el, abbrev.el: Use cl-lib. * vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el: * vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el: * jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el: * emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el: * calculator.el, autorevert.el, apropos.el: Don't require CL. * emacs-bytecomp.el (byte-recompile-directory, display-call-tree) (byte-compile-unfold-bcf, byte-compile-check-variable): * emacs-byte-opt.el (byte-compile-trueconstp) (byte-compile-nilconstp): * emacs-autoload.el (make-autoload): Use pcase. * face-remap.el (text-scale-adjust): Simplify pcase patterns.
* Use the same diff color scheme as in modern VCSes (bug#10181).Juri Linkov2012-05-251-26/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-header, diff-file-header): Remove "green" to avoid confusion with `diff-added' that now uses green colors. (diff-removed): Use shades of red. (diff-added): Use shades of green. (diff-changed): Leave just the yellow color. (diff-use-changed-face): New variable. (diff-font-lock-keywords): Use `diff-use-changed-face' to decide how to highlight context diff changes. (diff-refine-change): Use shades of yellow. (diff-refine-removed): New face that uses shades of red. (diff-refine-added): New face that uses shades of green. (diff-refine-hunk): Use `diff-refine-change', `diff-refine-added', `diff-refine-removed' in the call to `smerge-refine-subst' depending on the value of `diff-use-changed-face'. * lisp/vc/ediff-init.el (ediff-current-diff-A, ediff-fine-diff-A): Add face condition `min-colors 88' with shades of red. (ediff-current-diff-B, ediff-fine-diff-B): Add face condition `min-colors 88' with shades of green. (ediff-current-diff-C, ediff-fine-diff-C): Add face condition `min-colors 88' with shades of yellow. * lisp/vc/smerge-mode.el (smerge-mine): Use shades of red. (smerge-other): Use shades of green. (smerge-base): Use shades of yellow. (smerge-refined-change): Empty face. (smerge-refined-removed): New face that uses shades of red. (smerge-refined-added): New face that uses shades of green. (smerge-refine-subst): Rename arg `props' to `props-c'. Add new args `props-r' and `props-a', and use them. Doc fix. (smerge-refine): Evaluate `smerge-use-changed-face' and depending on its value use different faces `smerge-refined-change', `smerge-refined-removed', `smerge-refined-added' in the call to `smerge-refine-subst'.
* Fixes for diff-hunk-kill.Chong Yidong2012-04-261-47/+71
| | | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-beginning-of-hunk): Return a meaningful value, for symmetry with diff-end-of-hunk. (diff-split-hunk, diff-find-source-location) (diff-ignore-whitespace-hunk, diff-refine-hunk): Use it. (diff-bounds-of-hunk, diff-bounds-of-file): New functions. (diff-restrict-view, diff-hunk-kill, diff-file-kill): Use them to compute the relevant hunk or file properly. (diff-file-junk-re): Add bzr's "modified file" tag. Fixes: debbugs:6041 debbugs:6005
* Allow undoing in read-only diff-mode buffers.Chong Yidong2012-04-261-17/+11
| | | | | | | * lisp/vc/diff-mode.el (diff-undo): New command. (diff-mode-shared-map): Bind it to / and [remap undo]. Fixes: debbugs:5302
* Fix whitespace highlighting of context diffs.Chong Yidong2012-04-251-5/+17
| | | | | | | | | | | * lisp/vc/diff-mode.el (diff-setup-whitespace): New function. (diff-mode): Use it. * lisp/vc/diff.el (diff-sentinel): * lisp/vc/vc.el (vc-diff-finish): Call diff-setup-whitespace to assign Whitespace mode variables based on diff style. Fixes: debbugs:8612
* * lisp/vc/diff-mode.el (diff-file-prev/next): Fix typo.Leo Liu2012-04-141-1/+1
|
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-3/+3
| | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
* Rename condition-case-no-debug to condition-case-unless-debugLeo Liu2012-02-101-2/+2
|
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'Michael Albinus2011-11-291-3/+5
| | | | aware of remote file names. (Bug#10124)
* Prevent Diff Mode from stealing M-z binding.Eli Zaretskii2011-11-281-1/+1
| | | | | lisp/vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from special-mode-map.
* Fix more minor mode docstrings.Chong Yidong2011-10-191-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emulation/cua-base.el (cua-mode): * lisp/mail/footnote.el (footnote-mode): * lisp/mail/mailabbrev.el (mail-abbrevs-mode): * lisp/net/xesam.el (xesam-minor-mode): * lisp/progmodes/bug-reference.el (bug-reference-mode): * lisp/progmodes/cap-words.el (capitalized-words-mode): * lisp/progmodes/compile.el (compilation-minor-mode) (compilation-shell-minor-mode): * lisp/progmodes/gud.el (gud-tooltip-mode): * lisp/progmodes/hideif.el (hide-ifdef-mode): * lisp/progmodes/idlw-shell.el (idlwave-shell-electric-debug-mode): * lisp/progmodes/subword.el (subword-mode): * lisp/progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode): * lisp/progmodes/which-func.el (which-function-mode): * lisp/term/tvi970.el (tvi970-set-keypad-mode): * lisp/term/vt100.el (vt100-wide-mode): * lisp/textmodes/flyspell.el (flyspell-mode): * lisp/textmodes/ispell.el (ispell-minor-mode): * lisp/textmodes/nroff-mode.el (nroff-electric-mode): * lisp/textmodes/paragraphs.el (use-hard-newlines): * lisp/textmodes/refill.el (refill-mode): * lisp/textmodes/reftex.el (reftex-mode): * lisp/textmodes/rst.el (rst-minor-mode): * lisp/textmodes/sgml-mode.el (html-autoview-mode) (sgml-electric-tag-pair-mode): * lisp/textmodes/tex-mode.el (latex-electric-env-pair-mode): * lisp/vc/diff-mode.el (diff-auto-refine-mode, diff-minor-mode): * lisp/emulation/crisp.el (crisp-mode): * lisp/emacs-lisp/eldoc.el (eldoc-mode): * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-mode): Doc fixes for new minor mode behavior. * lisp/erc/erc-fill.el (erc-fill-mode): * lisp/erc/erc-track.el (erc-track-minor-mode): Doc fix. * lisp/erc/erc.el (define-erc-module): Fix autogenerated docstring to reflect Emacs 24 minor mode changes. * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, calling a minor mode from Lisp with nil arg enables it, so we have to make the working a bit ambiguous here).
* Fix diff-changed face definition.Chong Yidong2011-05-221-2/+7
| | | | | * lisp/vc/diff-mode.el (diff-changed): Don't use terminal specs for defface (Bug#8144).
* Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.Glenn Morris2011-05-161-40/+40
|
* * lisp/vc/diff-mode.el: Fix paren typo.Glenn Morris2011-05-151-41/+41
|
* Fix minor bug of diff-fixup-modifs on small diffs (Bug#8672).Chong Yidong2011-05-151-39/+41
| | | | | * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for hunk-end tags.
* Silence diff-mode.el compilation.Glenn Morris2011-05-051-1/+4
| | | | | * lisp/vc/diff-mode.el (smerge-refine-subst): Declare. (diff-refine-hunk): Don't require smerge-mode when compiling.
* Merge from trunkStefan Monnier2011-03-211-9/+12
|\
| * * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings fromStefan Monnier2011-03-181-9/+12
| | | | | | | | | | | | | | diff-mode-shared-map. (diff-mode-shared-map): Re-introduce some bindings that were problematic. Fixes: debbugs:8284
* | Misc fixes, and use lexical-binding in more files.Stefan Monnier2011-03-111-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/subr.el (letrec): New macro. (with-wrapper-hook): Move from lisp/simple.el and don't use CL. * simple.el (with-wrapper-hook): Move with-wrapper-hook to subr.el. * lisp/help-fns.el (help-function-arglist): Handle subroutines as well. (describe-variable): Use special-variable-p to filter completions. * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't expand `declare' in defmacros. * lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Handle `declare'. * lisp/emacs-lisp/cl.el (pushnew): Silence unfixable warning. * lisp/emacs-lisp/cl-macs.el (defstruct, define-compiler-macro): Mark unused arg as unused. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Use memq. * lisp/emacs-lisp/autoload.el (make-autoload): Don't assume the macro's first sexp is a list. (autoload-generate-file-autoloads): Improve error message. * lisp/emacs-lisp/advice.el (ad-arglist): Use help-function-arglist to understand the new byte-code arg format. * lisp/vc/smerge-mode.el: * lisp/vc/log-view.el: * lisp/vc/log-edit.el: * lisp/vc/cvs-status.el: * lisp/uniquify.el: * lisp/textmodes/css-mode.el: * lisp/textmodes/bibtex-style.el: * lisp/reveal.el: * lisp/newcomment.el: * lisp/emacs-lisp/smie.el: * lisp/abbrev.el: Use lexical-binding. * src/eval.c (Fprog1, Fprog2): Simplify and use XCDR/XCAR. (Fdefvar): Remove redundant SYMBOLP check. (Ffunctionp): Don't signal an error for undefined aliases. * doc/lispref/variables.texi (Converting to Lexical Binding): New node.
* | Merge from trunkStefan Monnier2011-03-061-1/+1
|\|
| * * lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139)Leo Liu2011-03-041-1/+1
| |
* | Compute freevars in cconv-analyse.Stefan Monnier2011-02-261-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/cconv.el: Compute freevars in cconv-analyse. (cconv-mutated, cconv-captured): Remove. (cconv-captured+mutated, cconv-lambda-candidates): Don't give them a global value. (cconv-freevars-alist): New var. (cconv-freevars): Remove. (cconv--lookup-let): Remove. (cconv-closure-convert-function): Extract from cconv-closure-convert-rec. (cconv-closure-convert-rec): Adjust to above changes. (fboundp): New function. (cconv-analyse-function, form): Rewrite. * lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment): Handle declare-function here. (byte-compile-obsolete): Remove. (byte-compile-arglist-warn): Check late defsubst here. (byte-compile-file-form): Simplify. (byte-compile-file-form-defsubst): Remove. (byte-compile-macroexpand-declare-function): Rename from byte-compile-declare-function, turn it into a macro-expander. (byte-compile-normal-call): Check obsolescence. (byte-compile-quote-form): Remove. (byte-compile-defmacro): Revert to trunk's definition which seems to work just as well and handles `declare'. * lisp/emacs-lisp/byte-run.el (make-obsolete): Don't modify byte-compile. * lisp/Makefile.in (BIG_STACK_DEPTH): Increase to 1200. (compile-onefile): Pass $(BIG_STACK_OPTS) before "-l bytecomp". * lisp/emacs-lisp/macroexp.el: Use lexbind. (macroexpand-all-1): Check macro obsolescence. * lisp/vc/diff-mode.el: Use lexbind. * lisp/follow.el (follow-calc-win-end): Simplify.
* * lisp/simple.el (special-mode-map): Bind "h" to `describe-mode';Sam Steingold2011-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bind "z" to `kill-this-buffer'. (completion-list-mode-map): Bind "z" to `kill-this-buffer'. * lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'. (apropos-mode): Inherit from `special-mode'. * lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'. * lisp/bookmark.el (bookmark-bmenu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'. * lisp/image-mode.el (image-mode-map): Ditto. * lisp/replace.el (occur-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/tar-mode.el (tar-mode): Inherit from `special-mode'. * lisp/calendar/diary-lib.el (diary-fancy-display-mode): Inherit from `special-mode-map'. * lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode): Inherit from `special-mode'. * lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from `special-mode-map'. (package-menu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'. * lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'. (xesam-mode-map): Define separately. * lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'. * lisp/progmodes/compile.el (compilation-minor-mode-map) (compilation-mode-map): Inherit from `special-mode-map'. * lisp/vc/diff-mode.el (diff-mode-shared-map): Inherit from `special-mode-map'. * lisp/vc/log-view.el (log-view-mode-map): Add a comment.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
|
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
|
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|
* Merge from emacs-23Stefan Monnier2010-12-131-2/+5
|
* * lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer.Dan Nicolaescu2010-08-051-0/+1
|
* Allow global VC ops like `C-x v D' in Diff and Log-View buffers.Chong Yidong2010-06-291-0/+3
| | | | | | | | | * vc/diff-mode.el (diff-vc-backend): New var. * vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers. (vc-root-diff, vc-print-root-log, vc-log-incoming) (vc-log-outgoing): Use it. (vc-diff-internal): Set diff-vc-backend.
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-111-1/+1
| | | | | | | | | for version control. * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el, * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el, * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el, * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-26 23:26:32 +0000