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

1308 Commits

Author SHA1 Message Date
Stefan Kangas
616dcf27e5 ; Fix typos in Lisp symbols 2022-09-20 12:21:40 +02:00
Robert Pluim
5405852541 Remove mention of non-existent `annotate-switches'
* lisp/vc/vc.el (vc-annotate-switches): Remove mention of
`annotate-switches'.  As far as I can tell this has never existed in
Emacs.
2022-09-20 11:46:04 +02:00
Stefan Kangas
a4078fa628 ; * lisp/vc/ediff.el: Improve wording in last change. 2022-08-16 16:40:39 +02:00
Stefan Kangas
72fc7258bf Delete references to deleted library hilit19.el
* doc/misc/gnus.texi (Compatibility):
* lisp/progmodes/f90.el:
* lisp/ps-print.el:
* lisp/vc/ediff.el: Delete references to hilit19.el.
2022-08-12 17:49:54 +02:00
Stefan Kangas
85de996bbb * lisp/vc/diff-mode.el: Don't mention XEmacs. 2022-08-08 21:44:01 +02:00
Stefan Kangas
6908309827 Doc fixes: don't refer to some obsolete items
* admin/notes/multi-tty:
* lisp/chistory.el (command-history):
* lisp/emacs-lisp/nadvice.el:
* lisp/vc/diff-mode.el: Doc fix; don't refer to obsolete variables and
functions.
2022-06-30 23:18:45 +02:00
Lars Ingebrigtsen
74cc3b525f Fix doc string references to tags-loop-continue
* lisp/vc/vc-dir.el (vc-dir-search, vc-dir-query-replace-regexp):
Fix reference to obsolete tags-loop-continue (bug#55311).
2022-05-09 11:46:56 +02:00
Eli Zaretskii
16d1ab02af Add minimum instructions to 'query-replace' commands
* lisp/vc/vc-dir.el (vc-dir-query-replace-regexp):
* lisp/textmodes/reftex-global.el (reftex-query-replace-document):
* lisp/progmodes/project.el (project-query-replace-regexp):
* lisp/progmodes/etags.el (tags-query-replace):
* lisp/progmodes/ebrowse.el (ebrowse-tags-query-replace):
* lisp/isearch.el (isearch-query-replace, isearch-occur):
* lisp/emulation/viper-cmd.el (viper-query-replace):
* lisp/dired-aux.el (dired-do-query-replace-regexp)
(dired-do-find-regexp-and-replace):
* lisp/progmodes/xref.el (xref-query-replace-in-results):
* lisp/replace.el (query-replace, query-replace-regexp)
(query-replace-regexp-eval, map-query-replace-regexp): Add minimal
instructions for dealing with matches, with a link to the command
that shows the full instructions.  (Bug#55050)
2022-04-21 14:54:45 +03:00
Lars Ingebrigtsen
d53c999b4a Further vcs-cvs/rcs-responsible-p updates from master
* lisp/vc/vc-bzr.el (vc-bzr-responsible-p):
* lisp/vc/vc-sccs.el (vc-sccs-responsible-p):
* lisp/vc/vc-dav.el (vc-dav-responsible-p): Update doc string.

* lisp/vc/vc-rcs.el (vc-rcs-responsible-p):
* lisp/vc/vc-cvs.el (vc-cvs-responsible-p): Further fixes from
master.

* lisp/vc/vc-src.el (vc-src-responsible-p): Return the directory.

* lisp/vc/vc.el: Update comments.
2022-04-16 16:24:53 +02:00
Lars Ingebrigtsen
bc63651588 Make all vc-*-responsible-p functions return a string
* 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).

This fixes the regression reported in bug#54935.

Do not merge to master.
2022-04-14 15:46:43 +02:00
Dmitry Gutov
e7aa3ece52 Fix vc-git with old Git over Tramp and cygwin-mount.el
* 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.
2022-01-05 04:08:10 +02:00
Eli Zaretskii
19dcb237b5 ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
Martin Rudalics
1e578267fb Fix control buffer window height in 'ediff-setup-control-buffer' (Bug#49277)
* 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).
2021-12-15 18:53:49 +01:00
Juri Linkov
2963de6540 * lisp/vc/vc-git.el (vc-git-mergebase): More meaningful error message.
Display a readable error message instead of signaling an error on nil value.
2021-11-10 20:41:19 +02:00
Tom Levy
beaa7e14f3 ; Fix typos in CONTRIBUTE, ELisp manual, ediff
* CONTRIBUTE: Remove stray '. after git command.
* doc/lispref/functions.texi (Function Cells): Fix typo.
* lisp/vc/ediff.el (ediff-regions-wordwise): Fix typo in prompts
("Region's A buffer" => "Region A's buffer") (bug#51718).

Copyright-paperwork-exempt: yes
2021-11-10 01:17:42 +01:00
Jan Synacek
5c1a575ef4 Don't use color escape sequences in vc-git-expanded-log-entry
* lisp/vc/vc-git.el (vc-git-expanded-log-entry): Use '--no-color' flag
in git invocation.  (Bug#51262)

Copyright-paperwork-exempt: yes
2021-10-19 19:45:25 +02:00
Dmitry Gutov
0aa52e94f3 Mark vc-switch-backend as obsolete
* etc/NEWS: Mention the change.

* lisp/vc/vc.el (vc-switch-backend): Mark as obsolete (bug#50344).
(vc-transfer-file): Wrap the calls in 'with-suppressed-warnings'.
2021-10-14 02:29:27 +03:00
Dmitry Gutov
4afff515c8 Expand the full file name
* lisp/vc/vc-git.el (vc-git--literal-pathspec):
Expand the full file name, not just the local part (bug#51112).
2021-10-11 16:43:55 +03:00
Stefan Kangas
0a7bab689c ; Minor stylistic fixes found by checkdoc 2021-10-05 02:06:57 +02:00
Eli Zaretskii
5b44e0511a ; Fix some recent fixes to doc strings
* lisp/whitespace.el (whitespace-empty-at-bob-regexp):
* lisp/vc/vc-dir.el (vc-dir-child-files-and-states):
* lisp/vc/vc-annotate.el
(vc-annotate-show-changeset-diff-revision-at-line):
* lisp/vc/ediff.el (ediff-merge-with-ancestor-command):
* lisp/gnus/nnvirtual.el (nnvirtual-update-xref-header)
(nnvirtual-map-article):
* lisp/emulation/viper-init.el (viper-ESC-keyseq-timeout):
* lisp/emulation/viper-cmd.el
(viper-set-parsing-style-toggling-macro):
* lisp/cedet/data-debug.el (data-debug-insert-hash-table-button):
"The first line of a doc string must be a complete sentence."
Also, fix some awkward wording in doc strings while at that.
2021-09-26 16:50:11 +03:00
Stefan Kangas
c78e16962e ; Adjust overly long docstrings to fit 80 characters 2021-09-26 13:23:57 +02:00
Manuel Giraud
f6f87917fc Make 'C-u C-x v v' handle unregistered files.
* lisp/vc/vc.el (vc-next-action): Make 'C-u C-x v v' handle
unregistered files (bug#50602).
2021-09-25 03:39:39 +02:00
Stefan Kangas
0da8118dcb Use command substitution instead of raw keys in more places
* admin/authors.el (authors):
* lisp/abbrev.el (abbrev-suggest-show-report):
* lisp/calc/calc.el (calc-display-trail, calc):
* lisp/completion.el (completion-locate-db-error):
* lisp/dired-x.el (dired-extra-startup):
* lisp/emacs-lisp/package.el (package-install-selected-packages):
* lisp/emulation/viper.el (viper-mode):
* lisp/facemenu.el (list-colors-display):
* lisp/mail/emacsbug.el (report-emacs-bug-hook):
* lisp/mail/sendmail.el (mail):
* lisp/menu-bar.el (menu-bar-mode):
* lisp/org/org.el (org-revert-all-org-buffers):
* lisp/progmodes/antlr-mode.el (antlr-help-rules-intro)
(antlr-insert-makefile-rules):
* lisp/progmodes/gdb-mi.el (gdb--check-interpreter):
* lisp/progmodes/xscheme.el (xscheme-process-sentinel):
* lisp/ps-print.el (ps-font-info-database):
* lisp/recentf.el (recentf-edit-list, recentf-open-files):
* lisp/vc/ediff-util.el (ediff-suspend):
* lisp/vc/pcvs.el (cvs-mode):
* lisp/vc/vc-bzr.el (vc-bzr-dir-extra-headers): Use command
substitution.
2021-09-24 21:26:08 +02:00
Stefan Kangas
35d0675467 Prefer seq-random-elt to nth+random
* lisp/emacs-lisp/seq.el (seq-random-elt): Autoload.
* lisp/avoid.el (mouse-avoidance-random-shape):
* lisp/epa-ks.el (epa-ks--query-url):
* lisp/erc/erc-networks.el (erc-server-select):
* lisp/gnus/gnus-fun.el (gnus--random-face-with-type)
(gnus-fun-ppm-change-string):
* lisp/net/soap-inspect.el (soap-sample-value-for-xs-simple-type):
* lisp/obsolete/landmark.el (landmark-random-move):
* lisp/play/mpuz.el (mpuz-build-random-perm):
* lisp/play/zone.el (zone-pgm-stress):
* lisp/vc/add-log.el (add-change-log-entry):
* test/lisp/net/tramp-tests.el
(tramp-test44-asynchronous-requests): Prefer seq-random-elt to
nth+random.
2021-09-24 19:41:03 +02:00
Konstantin Kharlamov
150fc9c845 Do not count git markers as "deleted lines"
* lisp/vc/diff-mode.el (diff-fixup-modifs): Skip "end of patch"
markers that `git-format-patch` leaves around (bug#50761).
2021-09-23 23:25:41 +02:00
Dmitry Gutov
46a2c191f2 Fix vc-annotate-show-log-revision-at-line
* lisp/vc/vc-annotate.el (vc-annotate-show-log-revision-at-line):
Stop from being affected by 'vc-git-print-log-follow'.

* lisp/vc/vc-git.el (vc-git-print-log-follow):
Mention caveats in a comment.
2021-09-23 14:53:46 +03:00
Lars Ingebrigtsen
43c1ee90cb Don't use `format' on strings without % format directives
* lisp/vc/ediff-init.el (ediff-BAD-INFO):
* lisp/url/url-ldap.el (url-ldap):
* lisp/url/url-http.el (url-http--user-agent-default-string):
* lisp/textmodes/reftex.el (reftex-access-parse-file):
* lisp/textmodes/reftex-index.el (reftex-index-phrases-info):
* lisp/textmodes/ispell.el (ispell-create-debug-buffer):
* lisp/term.el (serial-read-speed):
* lisp/progmodes/verilog-mode.el (verilog-scan-debug):
* lisp/progmodes/idlwave.el (idlwave-find-module):
* lisp/progmodes/compile.el (compilation-revert-buffer):
* lisp/org/org-agenda.el (org-search-view):
* lisp/net/telnet.el (telnet-revert-buffer):
* lisp/net/soap-inspect.el (soap-sample-value-for-xs-simple-type):
* lisp/net/newst-backend.el (newsticker--cache-read):
* lisp/mh-e/mh-seq.el (mh-msg-is-in-seq):
* lisp/mail/smtpmail.el (smtpmail-via-smtp):
* lisp/mail/emacsbug.el (report-emacs-bug):
* lisp/jsonrpc.el (jsonrpc-error):
* lisp/help-fns.el (describe-variable):
* lisp/gnus/mm-decode.el (mm-possibly-verify-or-decrypt):
* lisp/gnus/gnus.el (gnus-group-startup-message):
(gnus-group-startup-message):
* lisp/gnus/gnus-group.el (gnus-group-restart):
* lisp/frame.el (make-frame-on-display):
* lisp/emulation/viper-ex.el (ex-help):
* lisp/calendar/icalendar.el (icalendar--convert-ical-to-diary):
(icalendar--add-diary-entry):
* lisp/calendar/cal-tex.el (cal-tex-end-document):
* lisp/calc/calcalg3.el (math-ninteg-romberg): Don't use `format'
on strings that have no % format directives in them.
2021-09-21 17:52:53 +02:00
Basil L. Contovounesios
5b962a7ad8 Avoid double argument evaluation in vc-call macro
* lisp/vc/vc-hooks.el (vc-call): Ensure second argument is evaluated
only once (bug#50690).
* etc/NEWS (Change Logs and VC): Announce this change in behavior.
2021-09-21 12:30:58 +01:00
Stefan Kangas
95f7f71560 ; Delete a spurious comment 2021-09-19 16:57:03 +02:00
Stefan Kangas
dc0f1eddd4 Add indent declaration to emerge-defvar-local
* lisp/vc/emerge.el (emerge-defvar-local): Add indent declaration
for docstring.  Fix wrongly indented callers.
2021-09-18 09:40:29 +02:00
Stefan Kangas
e0726bca40 Make doc argument of emerge-defvar-local optional
* lisp/vc/emerge.el (emerge-defvar-local): Make doc argument
optional.
2021-09-18 09:40:24 +02:00
Stefan Kangas
4dcbdb90d5 Make doc argument of ediff-defvar-local optional
* lisp/vc/ediff-init.el (ediff-defvar-local): Make DOC argument
optional.  Update callers passing the empty string to not use it.
2021-09-18 09:35:39 +02:00
Stefan Kangas
b2164df86b ; More stylistic docfixes in vc/*.el found by checkdoc 2021-09-18 09:35:29 +02:00
Stefan Kangas
cfa1e0a11b * lisp/vc/ediff-util.el (ediff-member): Make obsolete. 2021-09-17 11:05:09 +02:00
Stefan Kangas
24bd702561 Make ediff-set-difference into obsolete alias for seq-difference
* lisp/vc/ediff-util.el (ediff-set-difference): Make into obsolete
function alias for 'seq-difference'.
* lisp/vc/ediff-mult.el (ediff-intersect-directories): Update single caller.
2021-09-17 11:05:09 +02:00
Stefan Kangas
403010f2fd Make ediff-intersection into obsolete alias for seq-intersection
* lisp/vc/ediff-util.el (ediff-intersection): Make into obsolete
function alias for 'seq-intersection'.
* lisp/vc/ediff-mult.el (ediff-intersect-directories): Update
single caller.
2021-09-17 11:05:09 +02:00
Stefan Kangas
fb9df9b883 Make ediff-union into obsolete alias for seq-union
* lisp/emacs-lisp/seq.el (seq-union): Autoload.
* lisp/vc/ediff-util.el (ediff-union): Make into obsolete function
alias for 'seq-union'.
* lisp/vc/ediff-mult.el (ediff-intersect-directories): Update single
caller.
2021-09-17 11:05:06 +02:00
Alfred M. Szmidt
7e27cb6e72 * lisp/vc/vc.el: API doc fixes. 2021-09-17 02:03:22 +03:00
Manuel Giraud
2e5740894a Reuse vc-read-backend more
* lisp/vc/vc.el (vc-read-backend): New optional arguments.
(vc-create-repo): Use it here.
(vc-switch-backend): And here (bug#50603).
2021-09-17 02:01:09 +03:00
Stefan Kangas
63f419f133 ; Minor stylistic fixes found by checkdoc 2021-09-16 19:37:07 +02:00
Stefan Kangas
25ebb9374b ; More minor docfixes found by checkdoc 2021-09-14 07:57:14 +02:00
Stefan Kangas
f02624b342 ; Minor doc fixes found by checkdoc 2021-09-13 06:44:52 +02:00
Stefan Kangas
bd601099b9 Remove some remaining references to XEmacs
* lisp/allout.el (allout-overlay-preparations):
* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-unknown-include-menu)
(semantic-decoration-fileless-include-menu):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-setup-timers):
* lisp/vc/ediff-init.el:
* lisp/vc/ediff-util.el (ediff-mode): Remove some remaining references
to XEmacs.
2021-09-13 06:04:29 +02:00
Stefan Kangas
fc4b956c7c ; Fix symbol quoting typos 2021-09-12 18:36:49 +02:00
Dmitry Gutov
108dbed4c0 Re-fix bug#16897
* lisp/vc/vc-git.el (vc-git--file-list-is-rootdir):
Extract from 'vc-git-command'.
(vc-git--literal-pathspecs): Use it here as well.
2021-09-12 03:29:04 +03:00
Dmitry Gutov
ff2c4a8353 Have Git backend actions accept nil filenames again
* lisp/vc/vc-git.el (vc-git--literal-pathspec):
Move the nil check to the beginning (bug#50422).
2021-09-08 02:33:24 +03:00
Lars Ingebrigtsen
a8de88e330 Allow killing the diff buffer after `C-x v u'
* doc/emacs/maintaining.texi (VC Undo): Document this.
* lisp/vc/vc.el (vc-revert-show-diff): Allow a `kill' value.
(vc-revert): Use it (bug#16902).
2021-09-04 11:14:12 +02:00
Dmitry Gutov
0a18899f06 Fix recently broken vc-delete-file with Git
* lisp/vc/vc-git.el (vc-git-delete-file):
Treat FILE as string, not list (bug#50334).
2021-09-03 03:34:18 +03:00
Dmitry Gutov
d2ad64b7a5 Move the expansion of abbreviated names to vc-git.el
* lisp/vc/vc-git.el (vc-git--literal-pathspec):
Perform the expansion of abbreviated file names here instead
(bug#39452).

* lisp/vc/vc.el (vc-root-diff, vc-print-root-log):
Undo the recent change.
2021-08-31 02:47:31 +03:00
Lars Ingebrigtsen
5da9b3d2bd Move vc-branch-p and vc-branch-part from vc.el to vc-rcs.el and rename
* lisp/vc/vc-rcs.el (vc-rcs-branch-p): Renamed from `vc-branch-p'
(old name made into obsolete alias) and moved from vc.el.
(vc-rcs-branch-part): Renamed from `vc-branch-part'
(old name made into obsolete alias) and moved from vc.el.
2021-08-29 22:37:30 +02:00