aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * lisp/vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" andSantiago Payà i Miralta2014-06-061-8/+5
| | | | | | vc-hg-command. Fixes: debbugs:17570
* * lisp/vc/vc-rcs.el: Comment.Glenn Morris2014-05-201-4/+3
|
* Make some pointless/useless emerge.el options obsoleteGlenn Morris2014-05-131-0/+9
| | | | | * vc/emerge.el (emerge-temp-file-prefix): Make pointless option obsolete. (emerge-temp-file-mode): Make non-functional option obsolete.
* * lisp/vc/vc-hg.el (vc-hg-unregister): New function (tiny change)Santiago Payà i Miralta2014-05-101-5/+4
| | | | Fixes: debbugs:17454
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-023-7/+6
| | | | | | | | | | | Use nil rather than `default' for the "default" appearance. * lisp/vc/ediff-util.el (ediff-inferior-compare-regions) (ediff-toggle-autorefine, ediff-unselect-difference): Don't use a misleading `default' value when it's really a boolean. * lisp/vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the overlay is not visible. Fixes: debbugs:17388
* Fix application of dolist to a vector (Bug#17257).YAMAMOTO Mitsuharu2014-04-141-2/+3
| | | | | * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): Use mapc to loop over a vector.
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-103-48/+3
| | | | | | | | | | | * lisp/vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable. (ediff-highest-priority): Remove function. * lisp/vc/ediff-util.el (ediff-highlight-diff-in-one-buffer): * lisp/vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer) (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with overlay priorities. Fixes: debbugs:17234
* Small codes update for revert-buffer-function no longer being nil by defaultGlenn Morris2014-04-021-2/+4
| | | | | | * lisp/menu-bar.el (menu-bar-file-menu): * lisp/vc/ediff.el (ediff-current-file): Update for revert-buffer-function no longer being nil by default.
* lisp/vc/pcvs*.el: Fix typos.Juanma Barranquero2014-03-125-49/+49
| | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/pcvs-defs.el (cvs-auto-remove-handled) (cvs-auto-remove-directories, cvs-default-ignore-marks) (cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer) (cvs-execute-single-dir): Fix docstring typos. * lisp/vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos. (cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes. * lisp/vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring. * lisp/vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set): Fix docstring typos. * lisp/vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot) (cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark) (cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday) (cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot) (cvs-dired-use-hook): Fix docstring typos. (cvs-mode-view-file-other-window, cvs-mode-byte-compile-files): Doc fixes.
* Fix #16897Dmitry Gutov2014-03-081-1/+9
| | | | | * lisp/vc/vc-git.el (vc-git-command): Turn FILE-OR-LIST into nil when it only contains the repository root.
* * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):Glenn Morris2014-02-151-2/+4
| | | | | | Do not use ediff-defvar-local on pre-defined variables. Fixes: debbugs:16744
* Replace "Maintainer: FSF" with the emacs-devel mailing addressGlenn Morris2014-02-096-6/+6
|
* Fixes: debbugs:16690Andreas Schwab2014-02-091-1/+1
| | | | * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix.
* Be more consistent in using register-read-with-preview to read registersGlenn Morris2014-02-021-2/+6
| | | | | | | | | | | | | | | | | | | * frameset.el (frameset-to-register): * kmacro.el (kmacro-to-register): * register.el (increment-register): * calc/calc-yank.el (calc-copy-to-register, calc-insert-register) (calc-append-to-register, calc-prepend-to-register): * play/gametree.el (gametree-layout-to-register) (gametree-apply-register-layout): * textmodes/picture.el (picture-clear-rectangle-to-register) (picture-yank-rectangle-from-register): * vc/emerge.el (emerge-combine-versions-register): Use register-read-with-preview to read registers. * cedet/semantic/senator.el (senator-copy-tag-to-register): Use register-read-with-preview, if available. * calculator.el, emulation/viper-cmd.el: Comments.
* * lisp/vc/pcvs.el (cvs-append-to-ignore): Add compatibility alias.Glenn Morris2014-01-271-2/+3
| | | | | | (vc-editable-p, vc-checkout): Remove unused declarations. * etc/NEWS: Small edits.
* * lisp/vc/vc-git.el (vc-git-print-log): Remove --follow;Glenn Morris2014-01-211-1/+1
| | | | | | reverts 2014-01-09 change. Fixes: debbugs:16422
* * lisp/vc/log-edit.el: Fix highlighting of summary when it's the first line.Stefan Monnier2014-01-131-1/+18
| | | | | | (log-edit--match-first-line): New function. (log-edit-font-lock-keywords): Use it. (log-edit-mode): Make jit-lock-defer-multiline work.
* Minor bug fix.Eric S. Raymond2014-01-091-1/+1
| | | | Fixes: debbugs:8756
* Explain recent change to log-view.elDaniel Colascione2014-01-061-0/+3
|
* Fix defun navigation in vc log view.Daniel Colascione2014-01-051-12/+33
|
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-0139-39/+39
|
* Every defcustom should specify its typeGlenn Morris2013-12-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * apropos.el (apropos-match-face): * calculator.el (calculator-displayer): * dabbrev.el (dabbrev-search-these-buffers-only): * face-remap.el (buffer-face-mode-face): * simple.el (yank-handled-properties): * emacs-lisp/testcover.el (testcover-potentially-1value-functions): * mail/footnote.el (footnote-mode-line-string, footnote-prefix): * mail/hashcash.el (hashcash-accept-resources, hashcash-program) (hashcash-double-spend-database): * progmodes/ruby-mode.el (ruby-deep-indent-paren) (ruby-deep-indent-paren-style): * textmodes/flyspell.el (flyspell-auto-correct-binding): * textmodes/rst.el (rst-toc-indent, rst-toc-insert-style) (rst-toc-insert-number-separator, rst-toc-insert-max-level): * vc/pcvs-defs.el (cvs-minor-mode-prefix): * erc/erc-log.el (erc-log-file-coding-system): * gnus/gnus-sieve.el (gnus-sieve-select-method): * gnus/gravatar.el (gravatar-automatic-caching, gravatar-cache-ttl) (gravatar-rating, gravatar-size): * gnus/message.el (message-minibuffer-local-map): * gnus/sieve-manage.el (sieve-manage-authenticators) (sieve-manage-authenticator-alist): Specify custom types. * mail/hashcash.el (hashcash-program): Rename from hashcash-path. Update callers.
* Add missing custom :versions, plus small fixesGlenn Morris2013-12-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | * emacs-lisp/smie.el (smie-config): Add type, version, initialize. * bookmark.el (bookmark-bmenu-use-header-line): * doc-view.el (doc-view-scale-internally): * pcmpl-x.el (pcmpl-x-tlmgr-program, pcmpl-x-ack-program): * register.el (register-preview-delay): * net/shr.el (shr-bullet): * progmodes/cfengine.el (cfengine-cf-promises) (cfengine-parameters-indent): * progmodes/octave.el (inferior-octave-error-regexp-alist): * textmodes/reftex-vars.el (reftex-label-regexps): * vc/log-edit.el (log-edit-setup-add-author): Add version. * cedet/ede/linux.el (project-linux-build-directory-default) (project-linux-architecture-default): Fix custom types. Add version. * gnus/gnus-icalendar.el (gnus-icalendar-org, gnus-icalendar): * gnus/gnus-sum.el (gnus-subthread-sort-functions): Add version. * gnus/gnus-sync.el (gnus-sync-file-encrypt-to): Add type and version.
* Some fixes for vc-ignore (Bug#15754).Xue Fuqiao2013-12-261-15/+25
| | | | Inspired by Andreas Politz and Dmitry Gutov.
* * lisp/vc/log-edit.el (log-edit-insert-filenames-without-changelog): New ↵Juri Linkov2013-12-191-0/+16
| | | | | | | | function. (log-edit-hook): Add it to :options. Fixes: debbugs:16170
* * lisp/vc/log-edit.el (log-edit-hook): Add `log-edit-insert-message-template'Juri Linkov2013-12-191-50/+57
| | | | | | | | | | | to the default list. Move `log-edit-show-files' to the end. Add more available functions to options. (log-edit): Move default specific settings to `log-edit-insert-message-template'. Don't move point. (log-edit-insert-message-template): New function. (log-edit-insert-changelog): Add `save-excursion' and don't move point. Fixes: debbugs:16170
* * vc/vc-git.el: Silence byte-compiler warnings.Juanma Barranquero2013-12-111-3/+4
| | | | | (vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored. (log-edit-set-header): Declare.
* Remember log-edit comment when the buffer is killedDmitry Gutov2013-12-041-4/+5
| | | | | | | | | | * lisp/vc/log-edit.el (log-edit-add-new-comment): Rename to `log-edit-remember-comment', make argument optional. Adjust all callers. (log-edit-mode): Add `log-edit-remember-comment' to `kill-buffer-hook' locally. (log-edit-kill-buffer): Don't remember comment explicitly since the buffer is killed anyway.
* Support the new log-edit behavior in vc-git-log-edit-toggle-amendDmitry Gutov2013-12-032-7/+21
| | | | | | | | | | * lisp/vc/log-edit.el (log-edit-set-header): Extract from `log-edit-toggle-header'. (log-edit-extract-headers): Separate the summary, when extracted from header, from the rest of the message with an empty line. * lisp/vc/vc-git.el (vc-git-log-edit-toggle-amend): Move the summary line, if present, to the Summary header.
* Fix minor log-edit-show-files annoyancesDmitry Gutov2013-12-021-5/+6
| | | | | | | * lisp/vc/log-edit.el (log-edit-kill-buffer): Move the use of `save-selected-window' to `log-edit-hide-buf'. This makes `log-edit-show-files' idempotent. (log-edit-show-files): Mark the new window as dedicated.
* Install the actual changes missing in previous revisionDmitry Gutov2013-12-021-7/+23
| | | | | | | | | | * lisp/vc/log-edit.el (log-edit-mode-map): Add binding for `log-edit-kill-biffer'. (log-edit-hide-buf): Add a FIXME comment. (log-edit-add-new-comment): New function, extracted from `log-edit-done'. (log-edit-done, log-edit-add-to-changelog): Use it. (log-edit-kill-buffer): New command.
* Apply the initial log-edit tweaks discussed at emacs-develDmitry Gutov2013-12-011-5/+28
| | | | | | | | | | | | | | | * .dir-locals.el: (log-edit-move): Add the "Author: " header. * lisp/vc/log-edit.el (log-edit-mode-map): Add binding for `log-edit-beginning-of-line'. (log-edit-setup-add-author): New user option. (log-edit-beginning-of-line): New command. (log-edit): Move major mode call above the contents setup so that the local variable values are already applied. (log-edit): Only insert "Author: " when `log-edit-setup-add-author' is non-nil. (log-edit): When SETUP is non-nil, position point after ": " instead of point-min.
* * lisp/vc/vc-dispatcher.el (vc-log-edit): Setup the Summary&Author headers.Stefan Monnier2013-11-271-1/+1
|
* Fix ugly ^M characters in Diff output shown by "C-x v u".Eli Zaretskii2013-11-261-0/+7
| | | | | lisp/vc/vc.el (vc-diff-internal): Use *-dos coding-system when reading output from Diff on MS-Windows and MS-DOS.
* * lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names basedDavid Kastrup2013-11-251-6/+23
| | | | | | on the conflict markers when available. (smerge--get-marker): New function. (smerge-end-re, smerge-base-re): Add subgroup.
* * lisp/vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Make itDmitry Gutov2013-11-251-1/+1
| | | | | | work when annotation is invisible. Fixes: debbugs:13886
* * vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-onlyIvan Shmakov2013-11-221-1/+2
| | | | | | Only allow diff-default-read-only to set buffer-read-only to t, never to nil. Fixes: debbugs:15938
* * vc/vc-git.el (vc-git-dir-extra-headers): Add headersDan Nicolaescu2013-11-191-0/+5
| | | | when rebase or bisect are in progress.
* * lisp/vc/vc.el (vc-diff-knows-L): Remove; unused since 2007-10-10.Glenn Morris2013-11-131-7/+0
|
* * lisp/vc/vc-rcs.el (vc-rcs-parse): Make `gather' get e, b, and @-holesStefan Monnier2013-11-051-30/+30
| | | | | | via arguments so as to get the right ones. Fixes: debbugs:15418
* * lisp/vc/pcvs.el (cvs-status-cvstrees): Autoload to silence compiler.Glenn Morris2013-10-291-0/+2
|
* * lisp/vc/vc.el (vc-print-log): Don't use a working revision unlessGlenn Morris2013-10-241-1/+2
| | | | | | one was explicitly specified. Fixes: debbugs:15322
* * lisp/vc/vc.el (vc-print-root-log): Always set `default-directory'Dmitry Gutov2013-10-241-4/+4
| | | | value, whether we could auto-deduce `backend', or not.
* * vc/vc.el (vc-diff-build-argument-list-internal): If the file isJoão Távora2013-10-101-3/+2
| | | | | not locked, use last revision and current source as defaults. (Bug#15569)
* * lisp/vc/vc-svn.el (vc-svn-create-repo): Expand paths in file://... url.Glenn Morris2013-10-091-1/+3
| | | | Fixes: debbugs:15446
* * lisp/vc/pcvs.el: Use lexical-binding.Stefan Monnier2013-10-072-49/+55
| | | | | | | | (cvs-temp-buffer, cvs-make-cvs-buffer): Pass some vars in the lexical environment of `eval'. (cvs-mode-run, cvs-mode-do): Change `postproc' to be a function rather than a list of expressions. Adjust callers. * lisp/vc/pcvs-defs.el (cvs-postprocess): Remove, unused.
* New functions for finding the administrative directory in VC.Xue Fuqiao2013-10-056-0/+23
| | | | | | | | * vc/vc-svn.el (vc-svn-find-admin-dir): * vc/vc-rcs.el (vc-rcs-find-admin-dir): * vc/vc-mtn.el (vc-mtn-find-admin-dir): * vc/vc-cvs.el (vc-cvs-find-admin-dir): * vc/vc-arch.el (vc-arch-find-admin-dir): New functions.
* * lisp/vc/vc-git.el (vc-git-grep): Disable pager.Mitchel Humpherys2013-10-011-1/+1
|
* lisp/vc/vc-sccs.el (vc-sccs-search-project-dir): Mark unused argument.Juanma Barranquero2013-09-231-1/+1
|
* Add keybinding for vc-log-incoming in vc-dir.Xue Fuqiao2013-09-212-1/+2
| | | | | | * doc/emacs/maintaining.texi (VC Directory Commands): Add keybinding for vc-log-incoming in vc-dir. * lisp/vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming.