aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Display file mode information when diff font lock prettify enabledMatthias Meulien2022-04-071-15/+28
| | | | | * lisp/vc/diff-mode.el (diff--font-lock-prettify): Make regexp capture file mode information.
* Add new user option `diff-entire-buffers'Lars Ingebrigtsen2022-03-211-2/+12
| | | | | | * lisp/vc/diff.el (diff-entire-buffers): New user option (bug#54060). (diff-file-local-copy): Use it. (diff-buffers): Mention it in the doc string.
* Show SVN status on "." directories, tooLars Ingebrigtsen2022-03-071-2/+2
| | | | | | * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Allow tracking state of the "." directory, too, since they may have modified properties (bug#7861).
* * lisp/vc/diff-mode.el (diff--font-lock-prettify): Recognize mode changesStefan Monnier2022-02-211-0/+3
|
* * lisp/vc/diff-mode.el (diff--font-lock-prettify): bug#54034Stefan Monnier2022-02-211-18/+49
| | | | | Handle Git's output when deleting and creating empty files, as well as when the diff is not shown because the file is considered as binary.
* * lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix mishapsStefan Monnier2022-02-191-23/+26
| | | | | | | | | This reverts the last change so it also applies to non-git diffs again. Instead, we're now more careful not to mis-recognize file headers as addition/removal lines. In addition to that, mark the file header such that it's re-font-locked all at once, and to still recognize it after `diff-reverse-direction`.
* Don't prefix bookmark name with VC backend nameMatthias Meulien2022-02-171-3/+2
| | | | | * lisp/vc/vc-dir.el (vc-dir-bookmark-make-record): Remove prefix from bookmark name.
* Extend bookmark menu with with handler type columnMatthias Meulien2022-02-171-0/+2
| | | | | | | | | | | | | * lisp/bookmark.el (bookmark-bmenu--revert): Extend table entries with handler type. (bookmark-bmenu-mode): Add handler type column. * lisp/doc-view.el (doc-view-bookmark-jump): Set bookmark handler type. * lisp/help-mode.el (help-bookmark-jump): Set bookmark handler type. * lisp/image-dired.el (image-dired-bookmark-jump): Set bookmark handler type. * lisp/info.el (Info-bookmark-jump): Set bookmark handler type. * lisp/net/eww.el (eww-bookmark-jump): Set bookmark handler type. * lisp/vc/vc-dir.el (vc-dir-bookmark-jump): Set bookmark handler type. * lisp/woman.el (woman-bookmark-jump): Set bookmark handler type.
* Fix computation of outline heading level for non-git diffMatthias Meulien2022-02-161-3/+4
| | | | | | * lisp/vc/diff-mode.el (diff-setup-buffer-type): Compute outline heading level using diff-hunk-header-re (bug#51809). (diff--font-lock-prettify): Disable prettify in non-git diff.
* Improve the ediff-diff-options documentationLars Ingebrigtsen2022-02-071-1/+4
| | | | | | * lisp/vc/ediff-diff.el (ediff-diff-options): * doc/misc/ediff.texi (Patch and Diff Programs): Note that setting this variable directly is probably the wrong thing to do (bug#6512).
* (with-demoted-errors): Warn on missing `format` argStefan Monnier2022-02-043-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `format` arg has been mandatory for a while, but the backward compatibility code that handled the case of a missing `format` arg made it hard to notice when using the old calling convention. * lisp/subr.el (with-demoted-errors): Warn on missing `format` arg. * lisp/emacs-lisp/smie.el (smie-indent--separator-outdent): Don't abuse `with-demoted-errors`. (smie-indent-line, smie-auto-fill): * test/lisp/emacs-lisp/ert-tests.el (ert-test-with-demoted-errors): * lisp/vc/vc-hooks.el (vc-refresh-state): * lisp/vc/vc-annotate.el (vc-annotate-background-mode): * lisp/vc/diff-mode.el (diff-syntax-fontify-hunk): * lisp/textmodes/reftex-toc.el (reftex-re-enlarge): * lisp/progmodes/sh-script.el (sh-smie-sh-rules): * lisp/progmodes/octave.el (inferior-octave-startup): * lisp/pcmpl-gnu.el (pcmpl-gnu-make-all-targets): * lisp/org/org-refile.el (org-refile): * lisp/org/org-capture.el (org-capture-store-last-position): * lisp/nxml/nxml-mode.el (nxml-mode): * lisp/notifications.el (notifications-notify): * lisp/gnus/mm-view.el (mm-display-inline-fontify): * lisp/finder.el (finder-unload-function): * lisp/files.el (safe-local-variable-p, backup-buffer-copy * lisp/autorevert.el (auto-revert-notify-handler): Pass `format` arg to `with-demoted-errors`.
* * lisp/vc/vc.el (vc-diff-internal): Assume revert-buffer is in current buffer.Juri Linkov2022-01-311-4/+3
| | | | | | | Support the case when reverting is in the buffer with a name other than the default name "*vc-diff*". Then don't try to switch to the buffer "*vc-diff*" with an assumption that revert-buffer is always performed in the current buffer (bug#28852).
* Make revert-buffer ('g') keep point in VC diff buffersCharles A. Roelli2022-01-291-4/+27
| | | | | | | | * lisp/vc/vc.el (vc-diff-restore-buffer): New function. (vc-diff-finish): Update its calling convention to include an optional 'oldbuf' parameter, and handle it. (vc-diff-internal): Pass a clone of the incumbent vc-diff buffer to 'vc-diff-finish' (bug#28852).
* Make smerge-refine-ignore-whitespace into defcustomLars Ingebrigtsen2022-01-261-2/+5
| | | | | * lisp/vc/smerge-mode.el (smerge-refine-ignore-whitespace): Make into defcustom (bug#12585).
* Improve how change-log-mode fills all-file-name linesLars Ingebrigtsen2022-01-251-0/+15
| | | | | | * lisp/vc/add-log.el (change-log-fill-file-list): New function to improve how we fill all-file-name ChangeLog lines (bug#19341). (change-log-indent): Use it.
* Mark nil vc-follow-symlinks as safeLars Ingebrigtsen2022-01-221-0/+1
| | | | | * lisp/vc/vc-hooks.el (vc-follow-symlinks): A nil value should be safe for file-local (bug#33264).
* Remove text mistakenly added to the diff--iterate-hunks doc stringLars Ingebrigtsen2022-01-211-2/+1
| | | | | * lisp/vc/diff-mode.el (diff--iterate-hunks): Remove text added by mistake to the doc string.
* Make diff--iterate-hunks more resilientLars Ingebrigtsen2022-01-211-16/+20
| | | | | * lisp/vc/diff-mode.el (diff--iterate-hunks): Ignore malformed hunks instead of signalling errors (bug#53343).
* VC: Fix tests for SCCS and MtnStefan Monnier2022-01-181-7/+8
| | | | | | | * test/lisp/vc/vc-tests.el: Prefer closures to `(lambda ...). (vc-test-mtn05-rename-file, vc-test-mtn06-version-diff): Skip. * lisp/vc/vc.el (vc-responsible-backend): Fix vc-test--register on SCCS.
* * pcvs-info.el (cvs-mode-toggle-mark): TypoStefan Monnier2022-01-151-1/+1
|
* pcvs-info.el: Prefer `declare-function` over `autoload`Stefan Monnier2022-01-141-1/+1
| | | | | * lisp/vc/pcvs-info.el (cvs-mode-toggle-mark): Use `declare-function` to silence the byte-compiler warning.
* Fix byte-compilation warning in pcvs-infoLars Ingebrigtsen2022-01-141-0/+2
| | | | | * lisp/vc/pcvs-info.el (cvs-mode-toggle-mark): Fix byte-compilation warning.
* Prefer defvar-keymap to easy-mmode-defmapStefan Kangas2022-01-131-3/+3
| | | | | | | | * lisp/progmodes/gud.el (gud-minibuffer-local-map): * lisp/vc/pcvs-info.el (cvs-status-map): Use defvar-keymap. * lisp/emacs-lisp/easy-mmode.el (easy-mmode-defmap): Document as deprecated.
* * lisp/vc/vc.el (vc-shrink-buffer-window): New function (bug#51062).Juri Linkov2022-01-111-6/+19
| | | | | | | (vc-diff-finish-functions): New variable. (vc-diff-finish): Use it. (vc-log-finish-functions): New variable. (vc-log-internal-common): Use it.
* Add diff-mode-read-only to enable shorter keys in diff-modeJuri Linkov2022-01-103-16/+24
| | | | | | | | | | | | | | | | | | | | To be able to use outline-minor-mode-cycle keys in diff-mode, outline-minor-mode should be higher in minor-mode-map-alist, and a new variable diff-mode-read-only should be set when the diff-mode buffer is read-only. https://lists.gnu.org/archive/html/emacs-devel/2022-01/msg00740.html * lisp/vc/diff-mode.el: Add diff-mode-read-only to minor-mode-map-alist. (diff-mode-read-only): New buffer-local variable. (diff-mode): Set diff-mode-read-only to t when buffer-read-only is non-nil. Update diff-mode-read-only in read-only-mode-hook. Remove buffer-read-only from minor-mode-overriding-map-alist. Remove view-mode-hook because now view-mode is higher than diff-mode-read-only in minor-mode-map-alist. * lisp/vc/vc-git.el (vc-git-stash-show): * lisp/vc/vc.el (vc-diff-internal): Set buffer-read-only to t before calling diff-mode that will set diff-mode-read-only.
* Fix typo in cvs-status-mode-map keymapLars Ingebrigtsen2022-01-051-2/+1
| | | | | * lisp/vc/cvs-status.el (cvs-status-mode-map): Fix typo in keymap definition.
* Merge from origin/emacs-28Stefan Kangas2022-01-051-39/+35
|\ | | | | | | | | | | | | | | e7aa3ece52 Fix vc-git with old Git over Tramp and cygwin-mount.el c0cfbca311 * lisp/emacs-lisp/checkdoc.el (bytecomp): Add missing require # Conflicts: # etc/NEWS
| * Fix vc-git with old Git over Tramp and cygwin-mount.elDmitry Gutov2022-01-051-39/+35
| | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-use-literal-pathspecs): New variable. (vc-git-command, vc-git--call): Use it to determine whether to set GIT_LITERAL_PATHSPECS=1 (bug#51497). (vc-git--literal-pathspec, vc-git--literal-pathspecs): Remove. Update all callers. This reverts the previous solution for bug#39452. * lisp/progmodes/project.el (project--vc-list-files): Use the new variable.
* | Merge from origin/emacs-28Eli Zaretskii2022-01-0140-40/+40
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-0140-40/+40
| |
* | Revert "Revert "Fix fontification in diff--font-lock-prettify""Tassilo Horn2021-12-291-13/+11
| | | | | | | | This reverts commit 3cadd72673d8095df7eeb8e847db87ae42b5e2f6.
* | Revert "Fix fontification in diff--font-lock-prettify"Tassilo Horn2021-12-291-11/+13
| | | | | | | | This reverts commit 1da392d62d1ae743151f7fda83d0725ec6053686.
* | Fix fontification in diff--font-lock-prettifyMatthias Meulien2021-12-291-13/+11
| | | | | | | | | | | | * lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix diff--font-lock-prettify on created or deleted files (bug#52810).
* | * lisp/vc/vc.el (vc-revert): Use generate-new-buffer, not just new buffer nameJuri Linkov2021-12-281-1/+1
| |
* | Make some variable aliases obsoleteStefan Kangas2021-12-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/make-mode.el (makefile-query-one-target-method): * lisp/skeleton.el (skeleton-transformation, skeleton-filter): * lisp/textmodes/artist.el (artist-text-renderer): * lisp/textmodes/bibtex.el (bibtex-autokey-name-case-convert): (bibtex-autokey-titleword-case-convert): * lisp/textmodes/ispell.el (ispell-format-word): * lisp/textmodes/sgml-mode.el (sgml-transformation): * lisp/vc/add-log.el (change-log-time-zone-rule): Make variable aliases obsolete.
* | ; * lisp/vc/vc-dispatcher.el (vc-command-messages): Doc fix.Eli Zaretskii2021-12-161-3/+4
| |
* | * lisp/vc/vc-dispatcher.el (vc-command-messages): Add choice 'log'.Juri Linkov2021-12-161-7/+13
| | | | | | | | | | (vc-do-command): Don't display messages but only write them to the *Messages* buffer when vc-command-messages is 'log' (bug#52518).
* | Merge from origin/emacs-28Stefan Kangas2021-12-161-1/+19
|\ \ | |/ | | | | 1e578267fb Fix control buffer window height in 'ediff-setup-control-b...
| * Fix control buffer window height in 'ediff-setup-control-buffer' (Bug#49277)Martin Rudalics2021-12-151-1/+19
| | | | | | | | | | | | | | * lisp/vc/ediff-util.el (ediff-setup-control-buffer): Emulate original 'shrink-window-if-larger-than-buffer' call by calling 'fit-window-to-buffer' with an appropriate maximum height argument (Bug#49277).
* | Add vc-git-stash-pop to vc-dir-git-modeLars Ingebrigtsen2021-12-071-1/+2
| | | | | | | | | | * lisp/vc/vc-git.el (vc-dir-git-mode-map): Add vc-git-stash-pop (bug#52158).
* | Make the Git stash commands available in vc-dir Git buffersLars Ingebrigtsen2021-12-062-1/+16
| | | | | | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir): Call the backend-specific minor mode if it exists. * lisp/vc/vc-git.el (vc-dir-git-mode-map): New map. (vc-dir-git-mode): New minor mode.
* | vc-git--program-version to support Git for macOS version stringJustin Schell2021-12-061-6/+8
| | | | | | | | | | | | | | | | | | | | | | `git version` on macOS returns e.g., "git version 2.30.1 (Apple Git-130)" and `vc-git--program-version` currently returns "0" instead of "2.30.1". * lisp/vc/vc-git.el (vc-git--program-version): Ignore text after the version number when parsing git versions (bug#52172). Copyright-paperwork-exempt: yes
* | Remove empty lines from stash read promptDmitry Gutov2021-11-261-7/+6
| | | | | | | | | | * lisp/vc/vc-git.el (vc-git-stash-read): Pass OMIT-NULLS (bug#52119). (vc-git-stash-list): Simplify.
* | Use substitute-command-keys for literal key sequencesStefan Kangas2021-11-223-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/abbrev.el (expand-region-abbrevs): * lisp/calc/calc-graph.el (calc-graph-show-dumb): * lisp/calc/calc-help.el (calc-help-for-help): * lisp/calc/calc-mode.el (calc-auto-why): * lisp/calc/calc.el (calc-do): * lisp/calculator.el (calculator-mode): * lisp/dired-aux.el (dired-create-files) (dired-do-create-files-regexp, dired-create-files-non-directory): * lisp/dired-x.el (dired-virtual): * lisp/dired.el (dired-mark-region, dired-unmark-all-files): * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): * lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode): * lisp/epa-ks.el (epa-ks--display-keys): * lisp/erc/erc.el (erc-toggle-debug-irc-protocol): * lisp/files.el (save-some-buffers): * lisp/gnus/gnus-dired.el (gnus-dired-find-file-mailcap) (gnus-dired-print): * lisp/gnus/gnus-group.el (gnus-keep-same-level): * lisp/gnus/gnus-score.el (gnus-score-find-trace): * lisp/gnus/gnus.el (to-list): * lisp/gnus/message.el (message--send-mail-maybe-partially): * lisp/mail/supercite.el (sc-set-variable): * lisp/minibuffer.el (minibuffer-inactive-mode): * lisp/progmodes/etags.el (select-tags-table): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode) (idlwave-shell-char-mode-loop): * lisp/replace.el (query-replace-help): * lisp/simple.el (set-variable): * lisp/subr.el (read-char-from-minibuffer): * lisp/textmodes/ispell.el (ispell-help, ispell-message): * lisp/textmodes/reftex-global.el (reftex-find-duplicate-labels): * lisp/textmodes/reftex-vars.el (reftex-toc-include-file-boundaries) (reftex-toc-include-labels, reftex-toc-include-index-entries) (reftex-toc-include-context, reftex-toc-follow-mode) (reftex-index-include-context, reftex-index-follow-mode) (reftex-enable-partial-scans) (reftex-auto-update-selection-buffers) (reftex-highlight-selection): * lisp/time.el (display-time-update): * lisp/vc/ediff-help.el (ediff-help-for-quick-help): * lisp/vc/ediff-init.el (ediff-keep-variants): * lisp/vc/ediff-ptch.el (ediff-fixup-patch-map) (ediff-patch-file-internal): * lisp/windmove.el (windmove-delete-default-keybindings): Use 'substitute-command-keys' for literal key sequences. * lisp/userlock.el (userlock--fontify-key): Remove function. (ask-user-about-lock, ask-user-about-lock-help) (ask-user-about-supersession-threat) (ask-user-about-supersession-help): Use 'substitute-command-keys' for literal key sequences. * lisp/ibuffer.el (ibuffer-unmark-all): Use 'substitute-command-keys' for command.
* | * lisp/vc/diff-mode.el (diff-minor-mode-prefix): Fix typo from 44faf54659Juri Linkov2021-11-181-1/+1
| |
* | Revert VC-related prefix user options to previous valuesLars Ingebrigtsen2021-11-183-12/+9
| | | | | | | | | | | | | | * lisp/vc/smerge-mode.el (smerge-command-prefix): * lisp/vc/pcvs.el (cvs-minor-mode-prefix): * lisp/vc/diff-mode.el (diff-minor-mode-prefix): Revert to previous values, as external packages rely on those values.
* | Use substitute-command-keys in some messagesStefan Kangas2021-11-171-1/+3
| | | | | | | | | | | | | | | | * lisp/dired.el (dired-get-file-for-visit): * lisp/doc-view.el (doc-view-buffer-message): * lisp/help.el (help-window-setup): * lisp/ibuf-ext.el (ibuffer-do-kill-lines): * lisp/vc/ediff.el (ediff-documentation): Use 'substitute-command-keys'.
* | Adjust `defvar-keymap' and `define-keymap' to the new syntaxLars Ingebrigtsen2021-11-166-67/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/smerge-mode.el (smerge-basic-map): * lisp/vc/pcvs.el (cvs-mode-map): (cvs-minor-mode-prefix): * lisp/vc/log-view.el (log-view-mode-map): * lisp/vc/log-edit.el (log-edit-mode-map): * lisp/vc/diff-mode.el (diff-mode-shared-map): (diff-minor-mode-prefix): * lisp/vc/cvs-status.el (cvs-status-mode-map): * lisp/simple.el (special-mode-map): * lisp/outline.el (outline--insert-open-button): (outline--insert-close-button): * lisp/net/shr.el (shr-map): * lisp/net/eww.el (eww-link-keymap): (eww-mode-map): (eww-submit-map): (eww-bookmark-mode-map): (eww-history-mode-map): (eww-buffers-mode-map): * lisp/mh-e/mh-speed.el (:keymap): * lisp/mh-e/mh-show.el (:keymap): * lisp/mh-e/mh-search.el (:keymap): * lisp/mh-e/mh-letter.el (:keymap): * lisp/mh-e/mh-folder.el (:keymap): * lisp/international/emoji.el (emoji-list-mode-map): * lisp/gnus/spam.el (:keymap): * lisp/gnus/mml.el (mml-mode-map): * lisp/gnus/message.el (message-mode-map): * lisp/gnus/gnus-undo.el (gnus-undo-mode-map): * lisp/gnus/gnus-topic.el (gnus-topic-mode-map): * lisp/gnus/gnus-sum.el (:keymap): * lisp/gnus/gnus-srvr.el (gnus-server-mode-map): (gnus-browse-mode-map): * lisp/gnus/gnus-salt.el (gnus-pick-mode-map): (gnus-tree-mode-map): * lisp/gnus/gnus-msg.el (:prefix): * lisp/gnus/gnus-ml.el (gnus-mailing-list-mode-map): * lisp/gnus/gnus-kill.el (gnus-kill-file-mode-map): * lisp/gnus/gnus-html.el (gnus-html-displayed-image-map): * lisp/gnus/gnus-group.el (:keymap): * lisp/gnus/gnus-eform.el (gnus-edit-form-mode-map): * lisp/gnus/gnus-draft.el (gnus-draft-mode-map): * lisp/gnus/gnus-dired.el (gnus-dired-mode-map): * lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-mode-map): * lisp/gnus/gnus-art.el (:keymap): (gnus-article-edit-mode-map): * lisp/gnus/gnus-agent.el (gnus-agent-group-mode-map): (gnus-agent-summary-mode-map): (gnus-agent-server-mode-map): (gnus-category-mode-map): Adjust `defvar-keymap' and `define-keymap' to the new syntax.
* | Fix previous -responsible-p changeLars Ingebrigtsen2021-11-143-3/+3
| | | | | | | | | | | | | | * lisp/vc/vc-sccs.el (vc-sccs-responsible-p): * lisp/vc/vc-rcs.el (vc-rcs-responsible-p): * lisp/vc/vc-cvs.el (vc-cvs-responsible-p): Make the previous change work with relative file names, too.
* | Make all vc-*-responsible-p functions return a stringLars Ingebrigtsen2021-11-144-13/+19
| | | | | | | | | | | | | | | | | | * lisp/vc/vc-sccs.el (vc-sccs-responsible-p): * lisp/vc/vc-rcs.el (vc-rcs-responsible-p): * lisp/vc/vc-dav.el (vc-dav-responsible-p): * lisp/vc/vc-cvs.el (vc-cvs-responsible-p): Return a file name instead of t when we get a match (which is what vc-backend-for-registration expects) (bug#51800).
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-07 16:39:32 +0000