summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Collapse)AuthorAgeFilesLines
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Spelling fixes.Paul Eggert2011-12-041-1/+1
|
* Spelling fixes.Paul Eggert2011-11-131-1/+1
|
* Make vc-toggle-read-only an alias for toggle-read-only.Chong Yidong2011-10-231-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | It hasn't worked in a VC sense since 2008-05-02T07:12:59Z!esr@snark.thyrsus.com, though this was not documented at the time (grr). * lisp/vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias for toggle-read-only. Note that this hasn't called vc-next-action since 2008-05-02, though it wasn't documented at the time. * lisp/files.el (toggle-read-only): Remove obsolete comment about version control. * doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only. * lisp/cedet/ede.el (ede-maybe-checkout): Function deleted; vc-toggle-read-only does not do version control now. * lisp/cedet/ede/project-am.el (project-remove-file, project-add-file) (project-new-target): Don't call ede-maybe-checkout. * lisp/cedet/ede/util.el (ede-make-buffer-writable): Don't use vc-toggle-read-only. * lisp/vc/ediff-init.el (ediff-toggle-read-only-function): Use toggle-read-only.
* ediff-init.el fix for bug#1821. (tiny change)David Abrahams2011-03-031-2/+2
| | | | | | | | Tiny change; note that author said he placed it in the public domain. (If this wasn't a tiny change, we would still need paperwork.) * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): Move ediff-defvar-local calls after defcustoms.
* 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
|
* Remove some functions, variables and aliases obsolete since at least 21.1.Glenn Morris2010-10-011-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/misc/misc.texi (Shell Mode): Remove reference to old function name. * src/character.c (Fchar_bytes): Remove obsolete function. (syms_of_character): Remove Schar_bytes. * lisp/subr.el (char-bytes): Remove obsolete function. * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias. * lisp/isearch.el (isearch-return-char): Remove obsolete function. * lisp/mouse.el: No longer provide mldrag. (mldrag-drag-mode-line, mldrag-drag-vertical-line): Remove obsolete aliases. * lisp/comint.el (comint-kill-output): Remove obsolete alias. * lisp/shell.el: Comment fix. * lisp/composite.el (decompose-composite-char): Remove obsolete function. * lisp/ps-def.el (decompose-composite-char): Remove unused function. * lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function. * lisp/outline.el (outline-visible): Remove obsolete function. * lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight): * lisp/faces.el (internal-find-face, internal-get-face) (frame-update-faces, frame-update-face-colors) (x-frob-font-weight, x-frob-font-slant) (internal-frob-font-weight, internal-frob-font-slant) (x-make-font-bold, x-make-font-demibold, x-make-font-unbold) (x-make-font-italic, x-make-font-oblique, x-make-font-unitalic) (x-make-font-bold-italic): Remove functions and aliases, obsolete since Emacs 21.1. * lisp/emulation/viper-util.el (viper-get-face): * lisp/obsolete/lucid.el (find-face, get-face): Use facep. * lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face): Remove unused functions. * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix. * etc/NEWS: Mention above changes.
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-0/+1
|
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1821
* 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.