Commit graph

67 commits

Author SHA1 Message Date
Dan Nicolaescu
9cac248c2e * lisp/log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax. 2010-06-01 21:45:46 -07:00
Chong Yidong
bef4957b87 Rename relative filenames in ChangeLog entries according to root.
* lisp/log-edit.el (log-edit-strip-single-file-name): Default to nil.
(log-edit-changelog-entries): Doc fix.
(log-edit-changelog-insert-entries): Args changed.  Rename
relative filenames in ChangeLog entries.  Delete tabs.
(log-edit-insert-changelog-entries): Reorganize return value of
`log-edit-changelog-entries' to pass filenames to
log-edit-changelog-insert-entries.
2010-05-25 18:50:56 -04:00
Stefan Monnier
e97a42c15b Make the log-edit comments use RFC822 format throughout.
* 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-hg.el (vc-hg-log-edit-mode): Remove.
(vc-hg-checkin): Remove extra arg.  Use log-edit-extract-headers.

* vc-git.el (vc-git-log-edit-mode): Remove.
(vc-git-checkin): Remove extra arg.  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-start-logentry): Remove argument `extra'.
(vc-finish-logentry): Remove extra args.

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

* log-edit.el (log-edit-extra-flags)
(log-edit-before-checkin-process): Remove.
(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-view-process-buffer): Remove.
(log-edit-extract-headers): New function to replace it.
2010-04-20 22:05:24 -04:00
Glenn Morris
495b517c6f * log-edit.el (log-edit-before-checkin-process): Doc fix. 2010-03-23 20:27:24 -07:00
Dan Nicolaescu
09158997b5 Add special markup processing for commit logs.
* log-edit.el (log-edit-extra-flags): New variable.
(log-edit): Add new argument MODE.  Use that mode when non-nil
instead of the log-view-mode.
(log-view-process-buffer): New function.

* vc.el: Document that the checkin method takes optional
arguments.  Document new backend specific method: log-view-mode.
(vc-default-log-edit-mode): New function.
(vc-checkin): Use a backend specific log-view-mode.
Pass extra arguments to the checkin method.
(vc-modify-change-comment): Pass a dummy extra argument.

* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
log-edit.
(vc-start-logentry): Add a mode argument, pass it to vc-log-edit.
(vc-finish-logentry): Process the log buffer before passing it
down.  Pass log-edit-extra-flags.

* vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit
command.
(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.

* vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit
command.
(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
(vc-hg-log-edit-mode): New derived mode.

* vc-arch.el (vc-arch-checkin):
* vc-cvs.el (vc-cvs-checkin):
* vc-git.el (vc-git-checkin):
* vc-mtn.el (vc-mtn-checkin):
* vc-rcs.el (vc-rcs-checkin):
* vc-sccs.el (vc-sccs-checkin):
* vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
2010-03-19 02:37:41 -07:00
Dan Nicolaescu
8117868f0c Add .dir-locals.el support for file-less buffers.
* files.el (hack-local-variables): Split out code to apply local
variable settings ...
(hack-local-variables-apply): ... here.  New function.
(hack-dir-local-variables): Use the default directory for when the
buffer does not have an associated file.
(hack-dir-local-variables-non-file-buffer): New function.
* diff-mode.el (diff-mode):
* vc-annotate.el (vc-annotate-mode):
* vc-dir.el (vc-dir-mode):
* log-edit.el (log-edit-mode):
* log-view.el (log-view-mode): Call hack-dir-local-variables-non-file-buffer.
2010-03-12 00:04:54 -08:00
Glenn Morris
c6265c1062 (log-edit-strip-single-file-name): Add missing :safe, :group, and
:version tags.
2010-01-27 21:19:23 -08:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Juanma Barranquero
32226619c5 Use called-interactively-p' instead of interactive-p'. 2009-10-02 03:48:36 +00:00
Stefan Monnier
8390fb808b (log-edit-changelog-entries): Avoid inf-loops.
Try and avoid copying twice the same paragraph.
(log-edit-changelog-paragraph, log-edit-changelog-subparagraph):
Remove save-excursion.
(log-edit-changelog-entry): Do it here instead.
2009-09-25 17:57:09 +00:00
Stefan Monnier
31764e153f * log-edit.el (log-edit-strip-single-file-name): New var.
(log-edit-insert-changelog): Use it.
2009-08-19 19:55:58 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Lute Kamstra
9201cc281b * align.el:
* 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.
2008-12-03 05:48:14 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Juanma Barranquero
b8ce3df989 (cvs-commit-buffer-require-final-newline, cvs-changelog-full-paragraphs):
Add WHEN to obsolescence declaration.
2008-04-18 10:29:55 +00:00
Dan Nicolaescu
799224fe61 * outline.el (outline-mode-menu-bar-map):
* log-view.el (log-view-mode-menu):
* log-edit.el (log-edit-menu): Add :help.
2008-04-09 06:15:13 +00:00
Thien-Thi Nguyen
2507310c84 (log-edit): Doc fix. 2008-01-15 15:03:36 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Dan Nicolaescu
37b72bf5ea * (log-edit-show-diff): Error out if the diff function is not set. 2007-12-01 20:34:23 +00:00
Dan Nicolaescu
93a142e14f * log-edit.el (log-edit-show-diff): New function.
(log-edit-mode-map, log-edit-menu): Bind it.
(log-edit-diff-function): New variable.
(log-edit): Change the 3rd param to be an alist and accept a
function that computes a diff for the files involved.

* vc.el (vc-log-edit): Add a diff function parameter to log-edit.
2007-12-01 19:37:20 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
4837b516ea Replace `iff' in doc-strings and comments. 2007-08-08 07:40:09 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
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
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
d944ee49dd (log-edit-changelog-entries): Use with-current-buffer. 2007-06-26 16:40:26 +00:00
Richard M. Stallman
3d200243c3 (log-edit-changelog-paragraph): Return point-max as the end of the
ChangeLog paragraph when it ends without a line termination.
2007-05-27 23:18:08 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Glenn Morris
c90f275771 Update copyright years. 2006-12-05 07:06:08 +00:00
Stefan Monnier
cc1eecfd88 Update my email address. 2006-04-30 15:49:08 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Stefan Monnier
2122713598 (log-edit-insert-cvs-rcstemplate): Ignore stderr. 2005-11-28 22:31:47 +00:00
Stefan Monnier
f7eeab0d22 *** empty log message *** 2005-11-28 20:22:04 +00:00
Romain Francoise
ce5a3ac01e 2005-09-25 Romain Francoise <romain@orebokech.com>
* dired-aux.el (dired-copy-file-recursive):
	* dired.el (dired-delete-file):
	* ediff-mult.el (ediff-dir-diff-copy-file):
	* ediff-util.el (ediff-test-save-region):
	* forms.el (forms-mode):
	* ido.el (ido-file-internal, ido-delete-file-at-head):
	* log-edit.el (log-edit-done):
	* ses.el (ses-yank-resize):
	* play/gomoku.el (gomoku-human-plays, gomoku)
	(gomoku-human-resigns, gomoku-prompt-for-other-game)
	(gomoku-offer-a-draw):
	* play/landmark.el (lm-human-resigns, lm):
	* net/eudcb-ldap.el (eudc-ldap-check-base):
	* play/mpuz.el (mpuz-offer-abort, mpuz-try-letter, mpuz-close-game):
	* progmodes/ebrowse.el (ebrowse-find-pattern):
	* progmodes/idlw-shell.el (idlwave-shell-set-bp-check):
	* textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer):
	End `yes-or-no-p' and `y-or-n-p' prompts with question mark and
	space.

	* vc.el (vc-delete-file):
	* play/gomoku.el (gomoku-terminate-game, gomoku)
	(gomoku-prompt-for-move, gomoku-human-takes-back):
	* play/landmark.el (lm-human-takes-back, lm-prompt-for-move)
	(lm-start-robot, lm-human-plays): Remove extraneous spaces in
	messages.
2005-09-24 23:26:28 +00:00
Deepak Goel
8a26c16552 Message format spec fixes (1) 2005-09-18 12:25:02 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Juanma Barranquero
5ab405e407 (log-edit-changelog-full-paragraphs): Fix spellings in docstrings. 2005-06-10 14:05:27 +00:00
Nick Roberts
b543ff57ce (log-edit-changelog-entries): Distinguish between
filenames like xfns.c and fns.c.
Coded by Stefan Monnier  <monnier@iro.umontreal.ca>.
2005-05-25 21:29:56 +00:00
Kim F. Storm
bf247b6ed0 Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
John Paul Wallington
285e8acc98 (vc-comment-ring, vc-comment-ring-index)
(vc-previous-comment, vc-next-comment)
(vc-comment-search-reverse, vc-comment-search-forward)
(vc-comment-to-change-log): Made obsolete in version 21.4, not 21.5.
2004-08-21 14:55:18 +00:00
Stefan Monnier
63fbe552e8 (log-edit-font-lock-keywords): Typo. 2004-03-18 19:29:33 +00:00
Stefan Monnier
165a7fbe66 (log-edit-font-lock-keywords): New var.
(log-edit-mode): Use it.
2004-03-18 02:48:51 +00:00
Andreas Schwab
44d7d150a1 (log-edit-changelog-entries): Prefer local value of
change-log-default-name in the buffer visiting the file.
2003-10-06 22:52:52 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
9fe89a26bf (log-edit-maximum-comment-ring-size, log-edit-comment-ring)
(log-edit-comment-ring-index, log-edit-last-comment-match): Rename vars from
vc-maximum-comment-ring-size, vc-comment-ring, vc-comment-ring-index,
and vc-last-comment-match.
(log-edit-new-comment-index, log-edit-previous-comment)
(log-edit-next-comment, log-edit-comment-search-backward)
(log-edit-comment-search-forward, log-edit-comment-to-change-log):
Rename funs from vc-new-comment-index, vc-previous-comment,
vc-next-comment, vc-comment-search-reverse, vc-comment-search-forward,
and vc-comment-to-change-log.
2003-05-31 16:43:30 +00:00
Stefan Monnier
0916e95698 Don't require vc.el anymore.
(log-edit-mode-map): Fold vc-log-mode-map into it.
(vc-log-mode-map): Redefine as an alias.
(vc-previous-comment): Don't widen.
(vc-comment-to-change-log): Don't redundantly set paragraph-separate.
Don't require `add-log' since it's already required at toplevel.
2003-05-18 03:01:22 +00:00
Stefan Monnier
12dd83de4f (vc-log-mode-map, vc-maximum-comment-ring-size, vc-comment-ring)
(vc-comment-ring-index, vc-last-comment-match): Move vars from vc.el.
(vc-new-comment-index, vc-previous-comment, vc-next-comment)
(vc-comment-search-reverse, vc-comment-search-forward)
(vc-comment-to-change-log): Move funs from vc.el.
(log-edit-show-files): Remove unused var `editbuf'.
2003-05-18 02:46:56 +00:00
Juanma Barranquero
a664185bac (cvs-commit-buffer-require-final-newline, cvs-changelog-full-paragraphs): Add
obsolescence declaration and remove redundant info from docstring.
2003-02-05 23:11:02 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00