1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Commit Graph

126 Commits

Author SHA1 Message Date
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Dan Nicolaescu
28e4e2b434 * smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.

* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
2008-01-16 06:22:59 +00:00
Dan Nicolaescu
ba463d9eca * smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
2008-01-14 07:38:05 +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
43202f8a9d (cvs-mode-commit, cvs-mode-edit-log): Also pass a diff
function to log-edit.
2007-12-02 17:56:03 +00:00
Stefan Monnier
77fdc5c31d (cvs-revert-if-needed): Fix copy&paste typo. 2007-11-20 04:04:45 +00:00
Dan Nicolaescu
cef8032b09 * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
* play/yow.el (doctor-ret-or-read):
* vc-hooks.el (vc-dired-resynch-file):
* vc-hg.el (log-view-get-marked):
* smerge-mode.el (ediff-cleanup-mess):
* pcvs.el (vc-editable-p, vc-checkout):
* pcomplete.el (comint-bol):
* informat.el (texinfo-format-refill):
* ido.el (tramp-tramp-file-p):
* ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier)
(ibuffer-generate-filter-groups)
(ibuffer-format-filter-group-data):
* add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as
functions.

* textmodes/ispell.el (ispell-int-char): Make it a defalias
instead of fset.
(ispell-message): Use with-no-warnings for sc-cite-regexp call.

* ido.el (ido-file-internal): Move with-no-warnings to include the
ffap-string-at-point call.

* pcomplete.el (pcomplete-executables): Move defsubst before first
use.

* vc-hg.el (vc-hg-revision-table): Fix last change.
2007-11-19 16:29:47 +00:00
Stefan Monnier
e75e6cc8f7 (cvs-revert-if-needed): Ignore `unknown' files, since cvs
did not touch them.
2007-11-15 15:37:55 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Stefan Monnier
62b84d3645 (cvs-tags-list, cvs-retrieve-revision, cvs-find-modif)
(cvs-execute-single-file): Use process-file.
(cvs-run-process): Use start-file-process.
2007-09-15 02:22:12 +00:00
Stefan Monnier
fd071fdf4c (cvs-mode-add-change-log-entry-other-window): Use
add-log-buffer-file-name-function rather than bind buffer-file-name,
so we dont end up calling change-log-mode in *cvs* when `fi' is the
ChangeLog file itself.
2007-09-08 03:11:43 +00:00
Stefan Monnier
8b5f251b26 Add comment. 2007-09-07 19:47:56 +00:00
Miles Bader
7f22a76506 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
2007-08-27 04:00:19 +00:00
Reiner Steib
f29897bb38 (cvs-query-directory): Only prompt when prefix is given.
Don't behave differently when executed via M-x.  Add doc string.
2007-08-25 12:25:50 +00:00
Reiner Steib
2cbde70235 (cvs-query-directory): Only prompt when prefix is given.
Don't behave differently when executed via M-x.  Add doc string.
2007-08-25 12:18:43 +00:00
Stefan Monnier
f512054743 (cvs-mode-status): Fix long-standing typo. 2007-08-23 18:39:32 +00:00
Sam Steingold
dae2bd5682 (cvs-vc-command-advice): Fix a typo in code (file->files). 2007-08-22 15:48:22 +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
Richard M. Stallman
ad4fed11b3 (cvs-reread-cvsrc, cvs-checkout, cvs-mode-checkout)
(cvs-execute-single-file): Use new name split-string-and-unquote.
(cvs-header-msg): Use new name combine-and-quote-strings.
2007-08-12 18:11:57 +00:00
Stefan Monnier
b6e9189c67 (cvs-vc-command-advice): Handle the new fileset case. 2007-07-31 15:23:27 +00:00
Stefan Monnier
405b871790 (cvs-temp-buffer): Undo last ill-conceived change.
Replace it with another one which disables undo before calling
erase-buffer and then turns it back on if needed.
2007-07-25 04:50:33 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
483bdbb35b (cvs-temp-buffer): Disable undo in temp buffers. 2007-07-24 01:06:39 +00:00
Stefan Monnier
7d56ddc576 (cvs-mode-add-change-log-entry-other-window): Use a directory
name for buffer-file-name if it refers to a directory.
2007-07-23 05:32:32 +00:00
Nick Roberts
24086dddf0 (cvs-reread-cvsrc, cvs-header-msg, cvs-checkout)
(cvs-mode-checkout, cvs-execute-single-file): Use new function names
strings->string and string->strings.
2007-07-08 06:51:48 +00:00
Juanma Barranquero
7feaa74746 (cvs-dired-use-hook): Doc fix. 2007-05-16 11:25:46 +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
3c5471b8a2 (cvs-retrieve-revision): Set buffer-file-coding-system. 2006-11-17 02:58:35 +00:00
Stefan Monnier
04e408d9e2 (cvs-update-header): Fix handling of extra newlines so that
they don't keep accumulating.
2006-10-02 00:21:07 +00:00
Romain Francoise
e1a2960c07 * cus-theme.el (customize-create-theme)
(custom-theme-visit-theme): End `y-or-n-p' prompt with a space.

* filesets.el (filesets-add-buffer): Ditto.

* pcvs.el (cvs-change-cvsroot): Ditto.
2006-08-13 17:05:12 +00:00
Stefan Monnier
608f267107 (cvs-retrieve-revision): Use decode-coding-inserted-region. 2006-06-14 15:38:10 +00:00
Thien-Thi Nguyen
1b04f30a22 (cvs-make-cvs-buffer): Specify NOSEP to `ewoc-create'. 2006-05-27 17:41:18 +00:00
Thien-Thi Nguyen
c93a67c54c (cvs-make-cvs-buffer): Specify
extra newline for ewoc's header and footer.
(cvs-update-header): Update initial header recognition.
Append newline to final header and footer values.
2006-05-18 12:07:10 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Juri Linkov
bd9fa00e04 (defun-cvs-mode): Put `definition-name' property on
the constructed function name fun-1.
2005-12-08 07:49:07 +00:00
Stefan Monnier
bad3da7a5f (cvs-edit-log-files): New var.
(cvs-mode-edit-log): New arg `file'.
(cvs-edit-log-minor-wrap): Don't set the ignore-marks property.
Instead force the use of the original file and nothing else.
(cvs-edit-log-filelist): Don't use the cvs-mode-* function unless
the cvs-minor-wrap-function is set.
(cvs-do-edit-log): Obey the vars set in cvs-edit-log-minor-wrap.
2005-10-15 12:04:34 +00:00
Stefan Monnier
7a34e7b1dc (cvs-sentinel): Make sure we do re-enable undo. 2005-10-06 15:32:14 +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
e248903c19 (cvs-mode): Follow error conventions. 2005-06-14 15:20:05 +00:00
Miles Bader
94d5c8765b Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * lisp/pcvs.el (cvs-mode-find-file): Use renamed pcvs faces.
   * lisp/pcvs-defs.el (cvs-mode-map): Likewise.
   * lisp/cvs-status.el (cvs-status-font-lock-keywords): Likewise.
2005-06-10 09:13:25 +00:00
Stefan Monnier
5f4d0dd97e (cvs-mode-commit, cvs-mode-edit-log): Don't fiddle with
list-buffers-directory.  This caused the *cvs-commit* buffer to be
sometimes mistakenly reused as a *cvs* buffer.
2005-05-06 22:19:48 +00:00
Stefan Monnier
2231c2bc7d Rename "full-path" -> "full-name". 2005-04-26 20:37:31 +00:00
Stefan Monnier
59bb94103a (cvs-checkout): Prompt for cvsroot as well. 2005-04-03 21:18:51 +00:00
Stefan Monnier
5f0e7257a7 (cvs-sentinel): Fix last change. 2005-04-01 18:01:55 +00:00
Stefan Monnier
8f53f317b1 (cvs-temp-buffer, cvs-mode-kill-process, cvs-buffer-check):
Use buffer-live-p.
(cvs-mode-run): Don't call cvs-update-header here.
(cvs-run-process): Call cvs-update-header.
Use process properties for cvs-postprocess and cvs-buffer so that
the sentinel can behave better if the temp buffer is killed.
Use a pipe rather than a tty, to better handle unexpected prompts.
(cvs-sentinel): Rewrite.  Call cvs-update-header.
2005-04-01 17:58:09 +00:00