1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 22:40:51 -08:00
emacs/etc
Chong Yidong 98cfec0d69 Backport VC improvements from trunk.
* vc/log-edit.el (log-edit-rewrite-fixes): New var.
(log-edit-author): New dynamic var.
(log-edit-changelog-ours-p, log-edit-insert-changelog-entries):
Use it to return the author if different from committer.
(log-edit-insert-changelog): Use them to add Author: and Fixes headers.

* vc/vc-hooks.el (vc-default-mode-line-string): Doc fix.

* 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.

* vc/diff-mode.el (diff-vc-backend): New var.

* vc/vc.el (vc-diff-internal): Set `revert-buffer-function'
buffer-locally to lambda that re-runs the vc diff command.
(Bug#6447)

* vc/log-view.el (log-view-mode-map): Bind revert-buffer.

Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and
log-outgoing commands.
* vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.

Improve VC create/retrieve tag/branch.
* vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity.  Adjust the tag/branch
prompt.  Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity.  Reset VC properties.

Add optional support for resetting VC properties.
* vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.

Improve support for special markup in the VC commit message.
* vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup.
* vc-hg.el (vc-hg-checkin): Add support for Date:.
* vc-git.el (vc-git-checkin):
* vc-bzr.el (vc-bzr-checkin): Likewise.

Add support for vc-log-incoming, improve vc-log-outgoing for Git.
* vc-git.el (vc-git-log-view-mode): Fix font lock for
incoming/outgoing logs.
(vc-git-log-outgoing, vc-git-log-incoming): New functions.

* vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise.  Run "git fetch" before the log
command

Add bindings for vc-log-incoming and vc-log-outgoing.
* vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.

Improve state updating for VC tag commands.
* vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer
to update the state of all buffers in the directory.

* vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)

* vc.el (vc-checkin, vc-modify-change-comment):
Adjust to new vc-start/finish-logentry.
(vc-find-conflicted-file): New command.
(vc-transfer-file): Adjust to new vc-checkin.
(vc-next-action): Improve scoping.

* vc-git.el (vc-git-checkin): Use log-edit-extract-headers.
(vc-git-commits-coding-system): Rename from git-commits-coding-system.

* vc-dispatcher.el (vc-log-edit): Shorten names for
log-edit-show-files.

* vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers.
(vc-bzr-conflicted-files): New function.

* log-edit.el (log-edit-summary, log-edit-header)
(log-edit-unknown-header): New faces.
(log-edit-headers-alist): New var.
(log-edit-header-contents-regexp): New const.
(log-edit-match-to-eoh): New function.
(log-edit-font-lock-keywords): Use them.
(log-edit): Insert a "Summary:" header as default.
(log-edit-mode): Mark font-lock rules as case-insensitive.
(log-edit-done): Cleanup headers.
(log-edit-extract-headers): New function to replace it.

* vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with
the windows/frames.

* vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*.

* vc-dir.el (vc-dir-kill-line): New command.
(vc-dir-mode-map): Bind it to C-k.
(vc-dir-headers): Abbreviate the working dir.

* vc-git.el (vc-git-revision-table): Include remote branches.

New VC methods: vc-log-incoming and vc-log-outgoing.
* vc.el (vc-print-log-setup-buttons, vc-log-internal-common)
(vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing):
New functions.
(vc-print-log-internal): Just call vc-log-internal-common.
(vc-log-view-type): New permanent local variable.

* vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing.

* vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.
(vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions.

* vc-git.el (vc-git-log-outgoing): New function.
(vc-git-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.

* vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of
the dynamic bound vc-short-log.  Highlight the tag.
(vc-hg-log-incoming, vc-hg-log-outgoing): New functions.
(vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode):
(vc-hg-incoming-mode): Remove.
(vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing.

Fix default-directory for vc-root-diff.
* vc.el (vc-root-diff): Bind default-directory to the root
directory for the diff command.

* vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling
`vc-hg-command' with a list of flags.

* vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to
log-edit-before-checkin-process.

* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.

* vc-bzr.el, vc-hg.el (log-edit-mode): Declare.

* vc-dispatcher.el (vc-start-logentry): Doc fix.
(log-view-process-buffer, log-edit-extra-flags): Declare.

Add special markup processing for commit logs.
* log-edit.el (log-edit): Add new argument MODE.  Use that mode
when non-nil instead of the log-view-mode.

* vc.el (vc-default-log-edit-mode): New function.

* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
log-edit.

Support for shelving snapshots and for showing shelves.
* vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point)
(vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot):
New functions.
(vc-bzr-shelve-map, vc-bzr-shelve-menu-map)
(vc-bzr-extra-menu-map): Map them.
2010-10-31 23:13:42 -04:00
..
charsets Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
e * term.el (term-handle-ansi-escape): Add comments with the 2009-08-07 07:04:02 +00:00
gnus Update Gnus to No Gnus 0.7 from the Gnus CVS trunk 2007-10-28 09:18:39 +00:00
images Fix for Bug#5790. 2010-03-28 15:09:21 -04:00
nxml Move here from lisp/nxml. Rename from "test." to "test-" for doschk. 2008-02-16 22:44:58 +00:00
refcards Fix orgcard.tex pdf landscape format. 2010-03-04 19:01:38 -08:00
schema Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
srecode Synch SRecode to CEDET 1.0. 2010-09-21 18:11:23 -04:00
tutorials Fix typos in docstrings, comments and ChangeLogs. 2010-10-13 01:25:19 +02:00
.arch-inventory Fix up multi-tty merge 2007-10-12 21:06:27 +00:00
.gitignore Add arch tagline 2009-03-04 06:02:06 +00:00
AUTHORS Bump version to 23.1.97. 2010-05-03 21:31:59 -04:00
BABYL Add an introductory comment. 2009-01-26 02:48:23 +00:00
celibacy.1
CENSORSHIP
ChangeLog * etc/DISTRIB: Update donation section. 2010-10-19 21:03:16 -07:00
compilation.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
condom.1
CONTRIBUTE CONTRIBUTE: Various minor updates and changes. 2010-02-17 21:39:06 -08:00
COOKIES Fix typo. 2007-04-13 03:01:45 +00:00
COPYING Change to GPLv3. 2007-07-25 07:00:38 +00:00
copying.paper
DEBUG Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
DEVEL.HUMOR Fix typo. 2008-01-22 15:28:56 +00:00
DISTRIB * etc/DISTRIB: Update donation section. 2010-10-19 21:03:16 -07:00
echo.msg Add similar copyright disclaimer to that used on 2007-02-27 03:37:51 +00:00
edt-user.el Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs-buffer.gdb Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs.bash Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs.csh Comment that emacs.bash/csh are obsolete. 2008-10-30 04:37:40 +00:00
emacs.desktop * emacs.desktop (Icon): Update icon name. 2008-01-03 07:35:42 +00:00
emacs.icon
emacs.py Add 2008 to copyright years. 2008-01-08 04:54:02 +00:00
emacs2.py Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs3.py * emacs3.py: Import imp module and use it (Bug#5756). 2010-08-22 19:50:38 -04:00
enriched.doc Fix typos (Bug#6094). From Štěpán Němec. 2010-05-03 18:01:23 -04:00
ERC-NEWS Fix typos in ChangeLogs and NEWS files. 2010-01-14 19:29:36 +01:00
ETAGS.EBNF Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
ETAGS.README Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
forms-d2.dat Move here from ../lisp 2008-04-26 02:39:10 +00:00
FTP Make it a duplicate of ../FTP. 2007-04-15 01:34:43 +00:00
future-bug Karl Fogel says we can consider future-bug part of Emacs (for which he 2007-02-28 04:12:39 +00:00
GNU Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
GNUS-NEWS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
gnus-tut.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
grep.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
HELLO HELLO: Adjust Burmese for Unicode 5.2 encoding. 2010-04-23 11:14:40 +09:00
INTERVIEW
JOKES Add similar copyright disclaimer to that used on 2007-02-27 03:37:51 +00:00
LINUX-GNU
MACHINES Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
MAILINGLISTS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
MH-E-NEWS Tiny MH-E doc fixes. 2010-10-30 14:17:59 -07:00
MORE.STUFF Add a new entry for QWE 2010-04-04 12:42:05 +02:00
MOTIVATION
ms-kermit Add copyright disclaimer. 2007-03-10 04:22:35 +00:00
NEWS Backport VC improvements from trunk. 2010-10-31 23:13:42 -04:00
NEWS.1-17 Fix typos. 2010-10-23 01:38:34 +02:00
NEWS.18 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.19 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.20 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.21 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.22 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NXML-NEWS American English spelling fix. 2008-06-27 07:34:53 +00:00
ORDERS Update some URLs. 2009-12-15 03:12:44 +00:00
PROBLEMS Document GTK Emacs kill on display close in PROBLEMS. 2010-10-25 12:08:27 -04:00
ps-prin0.ps Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
ps-prin1.ps Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
README Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
rgb.txt
SERVICE Don't suggest emailing to get a copy -- the FSF staff have other work to do. 2007-04-15 14:52:51 +00:00
ses-example.ses Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
sex.6
spook.lines
TERMS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
THE-GNU-PROJECT Fix typo. 2007-09-21 22:50:37 +00:00
TODO CEDET is not TODO any more 2010-05-24 20:57:43 -04:00
WHY-FREE
yow.lines

This directory contains the architecture-independent files used by or
with Emacs.  This includes some text files of documentation for GNU
Emacs or of interest to Emacs users, and the file of dumped docstrings
for Emacs functions and variables.

`forms-d2.dat' is an example data file used by forms-d2.el.

COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES

File: emacs.icon
  Author: Sun Microsystems, Inc
  Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)