1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 10:50:49 -08:00
Commit graph

706 commits

Author SHA1 Message Date
Eric S. Raymond
9580f1fd71 * vc.el (vc-dired-hook): Show unregistered file status as "?" in
non-terse mode.
(vc-dired-ignorable-p): Ignore Makefile when it has a peer named
Makefile.in or Makefile.am
2007-12-27 16:17:17 +00:00
Eric S. Raymond
ba0f59050f Refactoring step. 2007-12-27 15:26:02 +00:00
Eric S. Raymond
35d33ce769 * vc.el (vc-dired-ignorable-p, vc-dired-hook): Speed optimization;
use completion-ignored-extensions to detect files that should be
ignorted in VC-Dired listings, heading off lots of expensive calls
to (vc-state).
2007-12-27 14:41:44 +00:00
Eric S. Raymond
9b64a7f0cf * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
machinery in place to support editing of change comments
with 'e' in a log-view buffer.  Not documented yet as this
only works for SCCS, RCS, and maybe CVS if you have admin
privileges.  When we have backend support for Subversion and
more modern systems it will ve time to write this up.
2007-12-27 11:26:27 +00:00
Eric S. Raymond
cdce374aed *** empty log message *** 2007-12-26 23:24:08 +00:00
Martin Rudalics
772111be13 (vc-ensure-vc-buffer): Avoid infinite looping when
vc-parent-buffer is the current buffer.
2007-12-19 09:25:18 +00:00
Eric S. Raymond
5f01100afe bname needs to be a buffer name, not a filename. 2007-12-18 08:25:34 +00:00
Deepak Goel
1f325d92d3 Fix vc.el breakage. 2007-12-06 19:56:41 +00:00
Deepak Goel
1388485d6b Fix my previous breakages; improve ChangeLog 2007-12-06 19:48:30 +00:00
Deepak Goel
8c16bd8c35 Fix buggy calls to `error'. 2007-12-06 17:56:42 +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
Dan Nicolaescu
73e72da43b * progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
byte compiler.
(cperl-mode): Use with-no-warnings for setting vc-header-alist.

* progmodes/idlwave.el (idlwave-shell-get-path-info)
(idlwave-shell-temp-file, idlwave-shell-is-running)
(widget-value, comint-dynamic-complete-filename, Info-goto-node):
* progmodes/idlw-help.el (idlwave-prepare-structure-tag-completion)
(idlwave-all-method-classes, idlwave-all-method-keyword-classes)
(idlwave-beginning-of-statement, idlwave-best-rinfo-assoc)
(idlwave-class-found-in, idlwave-class-or-superclass-with-tag)
(idlwave-completing-read, idlwave-current-routine)
(idlwave-downcase-safe, idlwave-entry-find-keyword)
(idlwave-expand-keyword, idlwave-find-class-definition)
(idlwave-find-inherited-class, idlwave-find-struct-tag)
(idlwave-get-buffer-visiting, idlwave-in-quote)
(idlwave-make-full-name, idlwave-members-only)
(idlwave-popup-select, idlwave-routine-source-file)
(idlwave-routines, idlwave-sintern-class)
(idlwave-sintern-keyword, idlwave-sintern-method)
(idlwave-sintern-routine-or-method)
(idlwave-substitute-link-target, idlwave-sys-dir)
(idlwave-this-word, idlwave-what-module-find-class)
(idlwave-where):
* progmodes/idlw-complete-structtag.el (idlwave-shell-buffer):
* mail/uce.el (rmail-msg-is-pruned)
(rmail-maybe-set-message-counters, rmail-msgbeg, rmail-msgend)
(rmail-toggle-header):
* mail/sendmail.el (dired-view-file, dired-get-filename):
* mail/rmailkwd.el (rmail-maybe-set-message-counters)
(rmail-display-labels, rmail-msgbeg)
(rmail-set-message-deleted-p, rmail-message-labels-p)
(rmail-show-message, mail-comma-list-regexp)
(mail-parse-comma-list):
* mail/rmail.el (rmail-spam-filter, rmail-summary-goto-msg)
(rmail-summary-mark-undeleted, rmail-summary-mark-deleted)
(rfc822-addresses, mail-abbrev-make-syntax-table)
(mail-sendmail-delimit-header, mail-header-end):
* mail/hashcash.el (message-narrow-to-headers-or-head)
(message-fetch-field, message-goto-eoh)
(message-narrow-to-headers):
* vc.el (view-mode-exit): Declare as functions.

* mail/vms-pmail.el:
* vmsproc.el:
* vms-patch.el: Don't byte compile these files, they don't work.

* Makefile.in (SOME_MACHINE_LISP): Remove VMS files, they are not
compiled anymore.
2007-11-27 06:57:07 +00:00
Thien-Thi Nguyen
5731a8e006 (vc-annotate-mode): Frob buffer invisibility spec.
(vc-annotate-toggle-annotation-visibility): New command.
(vc-annotate-mode-map): Bind "V" to it.
(vc-annotate-mode-menu): Add entry for it.
(vc-annotate-get-time-set-line-props): New func.
(vc-annotate-display-autoscale)
(vc-annotate-display-difference): Use it.
2007-11-24 16:20:10 +00:00
Thien-Thi Nguyen
83f1f73ba6 Delete eol whitespace; nfc. 2007-11-24 16:13:38 +00:00
Dan Nicolaescu
d24182bbae (vc-deduce-fileset): Also look for a fileset in the parent
buffer if the parent buffer is in vc-dired-mode.
2007-11-23 15:17:25 +00:00
Dan Nicolaescu
48b4313069 (vc-find-revision): Set the parent buffer.
Use when instead of if.
2007-11-20 08:15:00 +00:00
Stefan Monnier
4befebc175 (vc-diff-internal): Pop-to-buffer later. 2007-11-15 16:33:08 +00:00
Dan Nicolaescu
30a308aa4b (vc-register): Allow registering a file passed as a
parameter instead of just the current buffer.
2007-11-13 15:11:41 +00:00
Dan Nicolaescu
c27f56ee33 (vc-start-entry): Fix setting the in the case the function
is called from vc-dired.  Use when instead of if where
appropriate.
2007-11-11 14:55:56 +00:00
Dan Nicolaescu
fe1919ab86 * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.
2007-11-10 05:22:16 +00:00
Dan Nicolaescu
e83d1fe875 * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.

* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.

* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.

* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
Thien-Thi Nguyen
01823b77a2 (vc-annotate): Fix omission bug:
Specify value for vc-sentinel-movepoint.
2007-10-30 12:44:24 +00:00
Stefan Monnier
0b8dce84f8 (vc-update-changelog-rcs2log): Remove incorrect `backend' arg. 2007-10-24 02:34:25 +00:00
Eric S. Raymond
ccd9fab66a Restore vc-next-action functionality of registering files. 2007-10-20 21:02:46 +00:00
Eric S. Raymond
e0752dd75b Condition out a misleading message. 2007-10-20 16:34:44 +00:00
Stefan Monnier
a7192ddb04 Remove diff-tree' operation, now subsumed by diff'.
Also `revision-completion-table' now takes a list of files.
(vc-deduce-fileset): Remove unused var `regexp'.
Only obey allow-directory-wildcard in dired buffers.
(vc-default-diff-tree): Remove.
(vc-diff-added-files): New var.
(vc-diff-internal): Use it.  Remove arg `backend'.  Update callers.
(vc-version-diff): Revert from `vc-history-diff' to the original name.
Remove the `backend' arg.
(vc-contains-version-controlled-file): Remove.
(vc-diff): Bring it closer to the version in Emacs-22.
(vc-revert): Fix typo in let-binding.
(vc-default-unregister): Remove.
(vc-dired-buffers-for-dir): Remove N^2 behavior.
2007-10-19 20:59:49 +00:00
Stefan Monnier
17f3909f61 (vc-diff-sentinel, vc-diff-internal): Revert some changes in the
behavior unrelated to filesets.
2007-10-17 16:22:27 +00:00
Dan Nicolaescu
5e8b0a322e Fix previous change. 2007-10-11 23:32:32 +00:00
Dan Nicolaescu
f509e24555 * vc.el (vc-deduce-fileset): Delete unused code.
(vc-next-action): Fix typos.
2007-10-11 22:21:17 +00:00
Eric S. Raymond
f23c992e98 Corrected version of Juanma's fix patch.
.
2007-10-11 16:53:58 +00:00
Eric S. Raymond
0438c6910a Fix evaluation time of a macro arument. 2007-10-11 16:37:42 +00:00
Eric S. Raymond
ebd0c5ba61 Bug fixes by Juanma Barranquero. Temporarily disable the check for
his edge case, it's calling some brittle code.
2007-10-11 15:29:58 +00:00
Eric S. Raymond
727c4443eb Address an edge case in vc-diff. This is an experimental fix and may change. 2007-10-11 15:13:29 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Eric S. Raymond
d7b60083ce Merge in new VC with filesets. 2007-10-10 13:17:53 +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
Eric S. Raymond
ce27c5c542 Remove unused code. 2007-10-08 23:21:09 +00:00
Eric S. Raymond
3f57aeb7d0 Correct a bug that was revealed during a review of new VC. 2007-10-08 23:18:31 +00:00
Eric S. Raymond
d6ba9c398e Typo and whitespace fixes to reduce the diff with new VC. 2007-10-06 14:36:09 +00:00
Eric S. Raymond
61de26cb85 Port various comments from new VC to reduce the noise in the diff.
Rename vc-revert-buffer1 to vc-revert-buffer-internal.
Patch in the new vc-create-repo function to go with the
header comment about it already present.
No changes to existing logic.
2007-10-06 11:14:32 +00:00
Eric S. Raymond
0d0e935627 Terminology sync, workfile version -> focus version. 2007-10-06 08:56:58 +00:00
Dan Nicolaescu
2765044b39 Reorder functions, no code changes. 2007-10-05 04:35:37 +00:00
Dan Nicolaescu
5e8c0b8b36 Mention all supported VC backends. 2007-09-22 17:17:22 +00:00
Dan Nicolaescu
793a22023e * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.

* menu-bar.el (vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.

* vc.el: Document new VC operation `extra-menu'.

* vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New
function.
2007-09-18 01:28:25 +00:00
Stefan Monnier
86e80023f4 (vc-process-sentinel): New function.
(vc-exec-after): Use it instead of using ugly hackish analysis and
construction of Elisp code.
(vc-sentinel-movepoint): New dynamically scoped var.
(vc-print-log, vc-annotate): Set it to move the user's point.
2007-09-15 22:25:55 +00:00
Dan Nicolaescu
d920b27aea (vc-default-diff-tree): Pass a list to the diff vc command
instead of a file.
2007-09-06 05:28:08 +00:00
Glenn Morris
f4f6d1ed13 Remove CVS $Id$ header. Comment. 2007-09-03 06:18:58 +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
Dan Nicolaescu
a549ce7054 * vc-hooks.el (vc-registered): Use mapc instead of mapcar.
(vc-delete-automatic-version-backups): Likewise.

* vc.el (vc-dired-buffers-for-dir): Likewise.
2007-08-26 00:32:23 +00:00
Stefan Monnier
0f67ac3871 *** empty log message *** 2007-08-23 20:12:07 +00:00