summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Collapse)AuthorAgeFilesLines
* Ediff: add some missing documentationPhilipp Stephani2017-11-051-25/+100
| | | | | | | | | | | | | | | | | | | | * vc/ediff.el (ediff-files, ediff-files3, ediff-buffers) (ediff-buffers3, ediff-merge-directories) (ediff-merge-directories-with-ancestor) (ediff-merge-directory-revisions) (ediff-merge-directory-revisions-with-ancestor) (ediff-windows-wordwise, ediff-windows-linewise) (ediff-regions-wordwise, ediff-regions-linewise) (ediff-merge-files, ediff-merge-files-with-ancestor) (ediff-merge-buffers, ediff-merge-buffers-with-ancestor) (ediff-merge-revisions, ediff-merge-revisions-with-ancestor) (ediff-patch-file, ediff-revision): Document missing arguments. (ediff-patch-buffer, ediff-revision): Add second space after period. (ediff-files-command, ediff3-files-command, ediff-merge-command) (ediff-merge-with-ancestor-command, ediff-directories-command) (ediff-directories3-command, ediff-merge-directories-command): Add documentation for the command line functions.
* Fix typos in ediff-wind.elEli Zaretskii2017-11-031-5/+5
| | | | | * lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge): Fix typos in commentary. (Bug#29138)
* ; Doc fixesCharles A. Roelli2017-10-311-0/+1
| | | | | | | | | * lisp/progmodes/xref.el (xref-file-location) (xref-backend-apropos): * etc/NEWS (Lisp Changes in Emacs 26.1): * doc/emacs/msdos.texi (Windows Keyboard): * lisp/vc/vc.el (vc-print-branch-log): * src/buffer.c (word-wrap): Doc additions and fixes.
* Avoid fullscreen ediff control frames by default (Bug#29026)Martin Rudalics2017-10-311-0/+2
| | | | | * lisp/vc/ediff-wind.el (ediff-control-frame-parameters): Add parameter to avoid fullscreen control frames (Bug#29026).
* Implement vc-default-dir-extra-headers for vc-rcsİ. Göktuğ Kayaalp2017-10-171-0/+2
| | | | | | Add a do-nothing implementation for vc-rcs to suppress the message which the default function adds to the vc-dir buffer (Bug#28570). * lisp/vc/vc-rcs.el (vc-rcs-dir-extra-headers): New function.
* ; Typo fixes, mostly repeated wordsPaul Eggert2017-10-091-1/+1
|
* Prefer HTTPS to HTTP for gnu.orgPaul Eggert2017-10-014-4/+4
| | | | | | | | | This fixes some URLs I omitted from my previous pass, notably those in lists.gnu.org. Although lists.gnu.org does not yet support TLS 1.1, TLS 1.0 is better than nothing. * lisp/erc/erc.el (erc-official-location): * lisp/mail/emacsbug.el (report-emacs-bug): Use https:, not http:.
* Bind vc-region-historyKaushal Modi2017-09-301-1/+1
| | | | | | | | | | * lisp/vc/vc-hooks.el (vc-prefix-map): Bind `vc-region-history' to 'C-x v h', which was earlier bound to `vc-insert-headers' (Bug#27644). * doc/emacs/maintaining.texi (VC Change Log): Mention the new binding. * doc/emacs/vc1-xtra.texi (Version Headers): Remove the association of 'C-x v h' with `vc-insert-headers'. (http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html)
* Avoid assertions in vc-hg.el on MS-WindowsAndy Moreton2017-09-301-4/+8
| | | | | | | | * lisp/vc/vc-hg.el (vc-hg--pcre-to-elisp-re) (vc-hg--slurp-hgignore, vc-hg--read-repo-requirements) (vc-hg-state-fast): Use file-name-absolute-p and directory-name-p instead of relying on Unix file-name syntax. This avoids assertion violations on MS-Windows.
* Fix log-view-diff-common when point is after last entryTom Tromey2017-09-181-4/+10
| | | | | | Bug#28466 * lisp/vc/log-view.el (log-view-diff-common): If point is after last entry, look at the previous revision.
* Allow smerge-keep-current to work for empty hunksTom Tromey2017-09-161-1/+1
| | | | | | | Bug#25555 * lisp/vc/smerge-mode.el (smerge-get-current): Allow point to be at match-end. * test/lisp/vc/smerge-mode-tests.el: New file.
* Call vc-setup-buffer in vc-git-log-{in,out}goingTom Tromey2017-09-161-0/+2
| | | | | | Bug#28427: * lisp/vc/vc-git.el (vc-git-log-incoming, vc-git-log-outgoing): Call vc-setup-buffer.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-1340-42/+42
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Call vc-resynch-buffer in vc-git-resolve-when-doneDmitry Gutov2017-09-131-4/+5
| | | | | | * lisp/vc/vc-git.el (vc-git-resolve-when-done): Call vc-resynch-buffer on the current file (bug#28121). Move its autoload to before this function.
* Support SVN files with svn:externals propertyAlfred M. Szmidt2017-09-081-2/+1
| | | | | | | * lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files marked with the svn:externals property. Copyright-paperwork-exempt: yes
* List locally removed files in vc-dir with SVN back-endAlfred M. Szmidt2017-09-081-0/+1
| | | | | | | * lisp/vc/vc-svn.el (vc-svn-after-dir-status): List files marked with ?! as needs-update. Copyright-paperwork-exempt: yes
* Fix 'diff-goto-source' when buffer is narrowed (Bug#21262)Charles A. Roelli2017-08-271-45/+47
| | | | | | | | * lisp/vc/diff-mode.el (diff-find-file-name): Save the current narrowing, and widen the buffer before searching for the name of the file corresponding to the diff. With thanks to Noam Postavsky.
* * lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate casesStefan Monnier2017-07-271-17/+49
| | | | | (smerge--refine-long-words): New var. (smerge--refine-chopup-region): Use it.
* Fix vc-src-dir-status-filesDieter Deyke2017-07-171-1/+1
| | | | | * lisp/vc/vc-src.el (vc-src-dir-status-files): Fix broken copy-paste from b1a765b3 (bug#27641).
* More small authors.el updatesGlenn Morris2017-06-061-1/+1
| | | | | | | | | | * admin/authors.el (authors-aliases): Fix recent addition. (authors-obsolete-files-regexps, authors-no-scan-regexps) (authors-ignored-files, authors-valid-file-names) (authors-renamed-files-alist): Additions. ; * lisp/vc/pcvs.el, test/lisp/emacs-lisp/checkdoc-tests.el: ; Fix Author headers. ; * ChangeLog.2: Fixes.
* ; Update some Maintainer: header commentsGlenn Morris2017-06-058-8/+8
|
* ; Small fixes for some Author: header commentsGlenn Morris2017-06-051-10/+10
|
* Improve of file-local-name use in vc-git-checkinNikolay Kudryavtsev2017-06-041-2/+3
| | | | | * lisp/vc/vc-git.el (vc-git-checkin): Use file-local-name only when calling git commit.
* Fix concatenation of "^" with diff-file-junk-reTino Calancha2017-05-241-1/+1
| | | | | | | | This regexp contains "\\|", thus a concatenation of "^" with it just matches the beginning of line for the first alternative in diff-file-junk-re. * lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Concat "^" with diff-file-junk-re wrapped in a shy group.
* vc-hg.el: Silence byte compiler warningPhilipp Stephani2017-05-231-0/+1
| | | | * lisp/vc/vc-hg.el (compilation-arguments): Forward-declare.
* * lisp/vc/vc-hg.el (compilation-directory): Silence byte-compiler.Stefan Monnier2017-05-231-0/+1
|
* Fix "g" in hg&git push&pull buffersSam Steingold2017-05-222-2/+18
| | | | | | lisp/vc/vc-git.el (vc-git--pushpull): Set locally `compilation-directory' and `compilation-arguments'. lisp/vc/vc-hg.el (vc-hg--pushpull): Likewise.
* Prevent loading vc-bzr writing to ~/.bzr.logGlenn Morris2017-05-201-1/+3
| | | | * lisp/vc/vc-bzr.el (vc-bzr-status-switches): Disable bzr logging.
* * lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufsStefan Monnier2017-05-171-44/+49
| | | | | | | | | | | Rename from smerge-refine-subst. Allow the `beg's to be markers. Add autoload cookie. (smerge--refine-forward): Rename from smerge-refine-forward. (smerge--refine-chopup-region): Rename from smerge-refine-chopup-region. Assume that its `beg` arg is a marker. (smerge--refine-highlight-change): Rename from smerge-refine-highlight-change. Remove `buf` arg. (smerge-refine-subst): Redefine as an obsolete alias.
* Require cl-lib at runtime in vc-hgGöktuğ Kayaalp2017-05-041-1/+2
| | | | * lisp/vc/vc-hg.el: Require cl-lib at runtime as well (bug#26609).
* vc-git-state: Return `ignored' as appropriate with newer GitDmitry Gutov2017-05-011-14/+22
| | | | | | | * lisp/vc/vc-git.el (vc-git--program-version): New variable. (vc-git--program-version): New function. (vc-git-state): Use it to choose whether to add '--ignored' (bug#19343).
* vc-git-state: Bring back CentOS 6 compatibilityDmitry Gutov2017-05-011-1/+20
| | | | | * lisp/vc/vc-git.el (vc-git-state): Bring back CentOS 6 compatibility (bug#19343).
* Speed up vc-git-status and make it more preciseJonathan Ganc2017-05-011-26/+49
| | | | | | | | * lisp/vc/vc-git.el (vc-git-state) (vc-git--git-status-to-vc-state): Update 'vc-git-state' to use 'git status', so that 'vc-git-state' can now return 'ignored', 'conflict', or 'unregistered' when appropriate. Discussed in bug#26066. Fixes bug#19343.
* Fix Git revision navigation in currently removed directoriesDmitry Gutov2017-05-011-3/+2
| | | | | | * lisp/vc/vc-git.el (vc-git-next-revision): Use the repo root as default-directory because FILE's parent directory might not exist anymore (bug#26345).
* * lisp/vc/vc-hg.el (vc-hg-state-fast): Fix compiler warningStefan Monnier2017-04-201-10/+3
| | | | by simplifying ascii-test.
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-179-104/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-diff.el (ediff-prepare-error-list): * lisp/vc/ediff-help.el (ediff-help-for-quick-help): * lisp/vc/ediff-init.el (ediff-barf-if-not-control-buffer) (ediff-check-version): * lisp/vc/ediff-merg.el (ediff-shrink-window-C): * lisp/vc/ediff-mult.el (ediff-draw-dir-diffs, ediff-show-dir-diffs) (ediff-append-custom-diff, ediff-meta-show-patch) (ediff-filegroup-action, ediff-show-meta-buffer, ediff-show-registry) (ediff-get-meta-info, ediff-patch-file-form-meta): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): * lisp/vc/ediff-util.el (ediff-toggle-autorefine) (ediff--check-ancestor-exists, ediff-toggle-read-only) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-toggle-show-clashes-only) (ediff-next-difference, ediff-previous-difference) (ediff-pop-diff, ediff-read-file-name, ediff-verify-file-buffer) (ediff-save-buffer): * lisp/vc/ediff-wind.el (ediff-make-wide-display): * lisp/vc/ediff.el (ediff-find-file, ediff-buffers-internal) (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-regions-wordwise, ediff-regions-linewise) (ediff-load-version-control): Use user-error. (debug-ignored-errors): No longer modify.
* Default to PCRE syntax when reading .hgignoreJim Blandy2017-04-101-1/+1
| | | | | * lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1): Default to the PCRE syntax (bug#26249).
* Remove references to OS/2 in code, doc, and commentsGlenn Morris2017-04-081-10/+8
| | | | | | | | | | | | | | | | | * lisp/gnus/nnheader.el (nnheader-read-timeout) (nnheader-file-name-translation-alist): Remove OS/2 case, and simplify. * lisp/emulation/viper-util.el (viper-color-defined-p): * lisp/net/pop3.el (pop3-read-timeout): * lisp/net/imap.el (imap-read-timeout): * lisp/url/url-privacy.el (url-setup-privacy-info): Remove OS/2 case. * lisp/emulation/viper-ex.el (viper-glob-function): * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix. * lisp/cus-edit.el (custom-display): Remove "pm" (OS/2). * doc/emacs/msdos-xtra.texi (MS-DOS): * doc/misc/gnus.texi (Various Various): * doc/misc/viper.texi (Rudimentary Changes): Remove mentions of OS/2. ; * lisp/url/url.el, lisp/url/url-vars.el: ; * lisp/progmodes/cperl-mode.el: Remove old comments.
* Check that file argument is a stringKaushal Modi2017-04-071-7/+16
| | | | | | | * lisp/vc/ediff-diff.el (ediff-exec-process): Check that the argument passed to `file-local-copy' is a string (Bug#26378). Also fix the existing comment for this function, and convert it to its doc-string.
* Make ediff handle remote and quoted file namesPhilipp Stephani2017-04-041-1/+5
| | | | | | | | | | Quoted file names need to be unquoted before passed to subprocesses (Bug#25950). * lisp/vc/ediff-diff.el (ediff-exec-process): Handle remote and quoted file names. * test/lisp/vc/ediff-diff-tests.el (ediff-diff-tests--ediff-exec-process--quoted-file): Add unit test.
* epatch: Save right backups in Git multipatchesTino Calancha2017-03-212-8/+7
| | | | | | | | | | Multipatches on N Git files save wrong backups for N-1 files; only the last one has a correct backup (Bug#26084). * lisp/vc/diff-mode.el (diff-file-junk-re): Add 'Prereq: ' * lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Use 'diff-file-junk-re'. * test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug25010): Rename from ibuffer-test-bug25010. (ediff-ptch-test-bug26084): New test.
* Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description. 2b774fa Mention "editor" in Emacs man page header ae60d0c Document problems with nerd-fonts 2fdb5a9 ; Details about pinning Emacs to w32 task bar 5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i... 4c51ef4 Clarify what is the "cursor" 8303c32 ; * etc/NEWS: Copyedits. 3f7493e ; Fix a typo in comment c54cf8d Improve commentary in lisp.h 8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro... 0ba9932 Disable native completion for ipython (Bug#25067) 38fc456 Fix a typo in ada-mode manual 00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d... a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-... # Conflicts: # etc/NEWS # etc/PROBLEMS
| * ; Fix a typo in commentTino Calancha2017-02-101-1/+1
| | | | | | | | | | * lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge): Fix a typo in comment.
* | Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate... 7e02a47 Index byte-compile-debug 7c1e598 Document `byte-compile-debug' in the ELisp manual 4d81eb4 Document variable `byte-compile-debug' 72ef710 Fix call to debugger on assertion failure ae8264c Call modification hooks in org-src fontify buffers b3139da ; Fix last change in doc/lispref/strings.texi c331f39 Improve documentation of 'format' conversions 9f52f67 Remove stale functions from ert manual c416b14 Fix a typo in Eshell manual 06695a0 ; Fix a typo in ediff-merg.el 954e9e9 Improve documentation of hooks related to saving buffers 9fcab85 Improve documentation of auto-save-visited-file-name 2236c53 fix typo in mailcap-mime-extensions 85a3e4e Fix typos in flymake.el a1ef10e More NEWS checking for admin.el's set-version # Conflicts: # lisp/emacs-lisp/bytecomp.el
| * ; Fix a typo in ediff-merg.elTino Calancha2017-01-211-1/+1
| | | | | | | | | | * lisp/vc/ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default): Fix a typo in docstring.
* | Show ancestor buffer in 3way mergesTino Calancha2017-03-144-67/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option ediff-show-ancestor', to control if the ancestor buffer must be shown in 3way merges (Bug#25493); set it non-nil by default. Add a toggle to change this option interactively; the original value of the option is restored on exit. Update the window setup so that the ancestor buffer is shown in 3way merges when ediff-show-ancestor is non-nil. Any operation on ediff windows must take in account the ancestor window as well, when this is shown. * lisp/vc/ediff-init.el (ediff-show-ancestor): New option. (ediff--show-ancestor-orig): New defvar. * lisp/vc/ediff-wind.el (ediff-window-Ancestor): New defvar. (ediff-setup-windows-plain-merge, ediff-setup-windows-multiframe-merge): Display ancestor buffer if ediff-show-ancestor is non-nil. (ediff-keep-window-config): Expect ancestor window in ediff-window-config-saved. (ediff-window-alist): Add entry for the ancestor window. * lisp/vc/ediff-util.el (ediff-setup-control-buffer): ediff-window-config-saved contains ancestor window. (ediff-show-ancestor): Delete this command. (ediff-setup-keymap): Bind ediff-toggle-show-ancestor to '/' for merge jobs. (ediff-update-diffs): Compute new diffs using ancestor buffer in 3way merges; don't cheat it to think that is performing a comparison, that trick is not necessary anymore: simply call 'ediff-setup-diff-regions-function' with file-A, file-B and the file ancestor. (ediff-recenter): Update doc string. Consider the ancestor buffer. (ediff--check-ancestor-exists): New defun. (ediff-toggle-show-ancestor): New command; toggle ediff-show-ancestor. (ediff--restore-options-on-exit): Restore ediff-show-ancestor on exit. (ediff-scroll-vertically, ediff-scroll-horizontally) (ediff-operate-on-windows): Consider the ancestor as well. * lisp/vc/ediff-help.el (ediff-long-help-message-merge): List ediff-toggle-show-ancestor. * doc/misc/ediff.texi (Introduction, Quick Help Commands): Update manual. ; * etc/NEWS: Announce these changes.
* | diff-mode: Improve default faces for buffer ancestorTino Calancha2017-03-141-14/+22
| | | | | | | | | | | | * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor) (ediff-fine-diff-Ancestor): Use defaults consistent with faces for 'ediff-buffer-A' and 'ediff-buffer-B'.
* | Replace change-log-date-face -> change-log-dateSam Steingold2017-03-083-3/+3
| | | | | | | | This fixes c430f7e23fc2c22f251ace4254e37dea1452dfc3.
* | * lisp/vc/add-log.el (change-log-next-buffer): Check if file existsJuri Linkov2017-02-281-8/+10
| | | | | | | | before adding it to the list of files.
* | Add more branch support to vc-dirTom Tromey2017-02-252-1/+21
| | | | | | | | | | | | | | | | | | | | | | Bug#25859: * lisp/vc/vc-dir.el (vc-dir-mode-map) Add "B" bindings. * lisp/vc/vc.el (vc-revision-history): New defvar. (vc-read-revision): Use vc-revision-history. (vc-print-branch-log): New function. * doc/emacs/maintaining.texi (VC Directory Commands): Document new bindings. * etc/NEWS: Mention new vc-dir bindings.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-15 15:16:53 +0000