aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert feature added in bfd96e995d using project directories in vc (bug#41821)Juri Linkov2020-07-023-10/+3
|
* vc-known-roots: Actually updateDmitry Gutov2020-06-261-1/+1
| | | | | * lisp/vc/vc-hooks.el (vc-known-roots): Actually update for the change in 733921edfe (bug#41821).
* M-n in read-directory-name of vc commands gets project dirs (bug#41821)Juri Linkov2020-06-243-3/+10
| | | | | | | | | | * lisp/progmodes/project.el (project-known-roots): New autoloaded function. * lisp/vc/vc-hooks.el (vc-known-roots): New function. * lisp/vc/vc.el (vc-root-diff, vc-print-root-log): * lisp/vc/vc-dir.el (vc-dir): Use 'vc-known-roots' for default values for read-directory-name.
* More not-state-changing vc commands can be used from non-file buffersJuri Linkov2020-06-241-3/+1
| | | | | | | | | * lisp/vc/vc.el (vc-deduce-fileset): Instead of checking for log-view-mode, check for '(not buffer-file-name)' before trying to get the backend for default-directory. Remove the branch that checks for '(not buffer-file-name)' and signals the error because vc-responsible-backend used in previous condition already signals its error. (Bug#41974)
* Fix display-buffer-override-next-command to call action only once (bug#39722)Juri Linkov2020-06-221-2/+3
| | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-bookmark-jump): Don't use save-window-excursion. * lisp/window.el (display-buffer-override-next-command): Reset display-buffer-overriding-action after the first buffer display action. * lisp/tab-bar.el (switch-to-buffer-other-tab): Don't reuse frame tabs. (other-tab-prefix): Don't reuse frame tabs.
* Bind default-directory to given DIR.Tassilo Horn2020-06-181-0/+1
| | | | | | | | Otherwise, "git config branch.<branch>.remote" would return the global default "origin" instead of the actual, project-specific remote name. * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Bind default-directory to given DIR.
* vc-git-dir-extra-headers: Fix recent breakageDmitry Gutov2020-06-181-2/+2
| | | | | | | * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Account for 'remote' being set to "" when not found (https://lists.gnu.org/archive/html/emacs-devel/2020-06/msg00582.html). (vc-git-dir-extra-headers): Check the value of remote-url instead.
* Auto-setup for bug-reference-modeTassilo Horn2020-06-171-3/+7
| | | | | | | | | | | | | | | | | | | | | | Tries to guess suitable bug-reference-bug-regexp and bug-reference-url-format values based on version control URL (in file buffers) and mail information (in Gnus summary and article buffers). * lisp/progmodes/bug-reference.el (bug-reference--maybe-setup-from-vc): New defun. (bug-reference-setup-from-vc-alist): New defvar defining setup rules based on version control URL. (bug-reference-try-setup-from-vc): New defun using above defvar. (bug-reference--maybe-setup-from-mail): New defun. (bug-reference-setup-from-mail-alist): New defvar defining setup rules based on mail/newsgroups and header values. (bug-reference-try-setup-from-gnus): New defun using above defvar. (bug-reference--try-setup-gnus-article): New defun. (bug-reference--run-auto-setup): New defun. (bug-reference-mode): Call bug-reference--run-auto-setup as :after-hook. (bug-reference-prog-mode): Call bug-reference--run-auto-setup as :after-hook.
* Use vc-git-repository-url in vc-git-dir-extra-headersTassilo Horn2020-06-151-11/+5
| | | | | * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Use vc-git-repository-url for getting the remote's URL.
* Add optional remote-name argument to VC repository-url commandTassilo Horn2020-06-155-8/+13
| | | | | | | | | | | * lisp/vc/vc.el: Document new remote-name argument of VC repository-url command. * lisp/vc/vc-git.el (vc-git-repository-url): Add and use new arg. * lisp/vc/vc-hg.el (vc-hg-repository-url): Add and use new arg. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): Add new arg but ignore it. * lisp/vc/vc-svn.el (vc-svn-repository-url): Add new arg but ignore it.
* Add new VC command `repository-url'Tassilo Horn2020-06-145-1/+35
| | | | | | | | * lisp/vc/vc.el: Document repository-url command. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): New defun. * lisp/vc/vc-git.el (vc-git-repository-url): New defun. * lisp/vc/vc-hg.el (vc-hg-repository-url): New defun. * lisp/vc/vc-svn.el (vc-svn-repository-url): New defun.
* Implement 'mark-resolved' for the Git backendDmitry Gutov2020-05-231-0/+4
| | | | * lisp/vc/vc-git.el (vc-git-mark-resolved): New function.
* Bookmark locations can refer to VC directory buffers (bug#39722)Matthias Meulien2020-05-211-0/+36
| | | | | | | | | * etc/NEWS: Document feature. * lisp/vc/vc-dir.el (vc-dir-mode): Set local bookmark-make-record-function. (bookmark-make-record-default, bookmark-prop-get, bookmark-default-handler) (bookmark-get-bookmark-record): Declarations. (vc-dir-bookmark-make-record): Make record used to bookmark a `vc-dir' buffer. (vc-dir-bookmark-jump): Provides bookmark-jump behavior for a `vc-dir' buffer.
* vc-working-revision: Bind default-directoryDmitry Gutov2020-05-181-1/+1
| | | | | | | * lisp/vc/vc-hooks.el (vc-working-revision): Bind default-directory to be on the safe side. Suggested by Ilya Ostapyshyn (https://lists.gnu.org/archive/html/emacs-devel/2020-05/msg02301.html).
* Remove Emacs 22 compat code from ediff-vers.elStefan Kangas2020-05-161-15/+10
| | | | | | | | * lisp/vc/ediff-vers.el (ediff-vc-revision-other-window) (ediff-vc-working-revision): Redefine Emacs 22 compatibility aliases as obsolete function aliases. (ediff-vc-internal, ediff-vc-merge-internal): Don't use the now obsolete aliases.
* Use directory-files-no-dot-files-regexp wherever possibleMattias Engdegård2020-04-161-1/+1
| | | | | | | | | | | | | | | | Suggested by Paul Eggert. * lisp/files.el (directory-files-no-dot-files-regexp): Clarify semantics and purpose. * lisp/dired.el (dired-re-no-dot): Define as obsolete alias of directory-files-no-dot-files-regexp. (dired-delete-file): * lisp/gnus/gnus-util.el (gnus-delete-directory): * lisp/net/ange-ftp.el (ange-ftp-delete-directory): * lisp/obsolete/vc-arch.el (vc-arch-trim-revlib): * lisp/org/ob-core.el (org-babel-remove-temporary-directory): * lisp/vc/vc-rcs.el (vc-rcs-unregister): Use directory-files-no-dot-files-regexp.
* Fix bugs, inefficiencies and bad style in regexpsMattias Engdegård2020-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Found by relint. See discussion at https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg00265.html * lisp/org/org-table.el (org-table-finish-edit-field): * lisp/arc-mode.el (archive-rar-summarize): Avoid wrapped subsumption in repeated sequences. * lisp/erc/erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Replace inefficient repeated empty-matching expression with a plain greedy form. (erc-dcc-handle-ctcp-send): Adjust group numbers. * lisp/net/puny.el (puny-encode-domain): Fix fast-path shortcut pattern so that it actually works as intended. * lisp/progmodes/gdb-mi.el (gdb-control-commands-regexp): * lisp/vc/diff-mode.el (diff-imenu-generic-expression): Remove superfluous backslashes. * lisp/progmodes/scheme.el (scheme-imenu-generic-expression): Correct confused definition-matching pattern which would match more than intended. * lisp/textmodes/sgml-mode.el (sgml-tag-name-re): Avoid inefficient matching by using the fact that the first character cannot match the last char of sgml-name-re.
* Merge from origin/emacs-27Glenn Morris2020-04-151-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5f7c26907 (origin/emacs-27) * admin/authors.el: Add an author alias. d87a4d1f4e Limit RLIMIT_NOFILE to FD_SETSIZE on macOS e5ca8e5e73 Fix Elisp manual entry on 'set-window-configuration' 485f24223f ; Update ChangeLog.3 8f200254fb ; Update etc/AUTHORS c7adc851ad * admin/authors.el: Add missing author aliases. 4acdd7fe58 Fix edge case errors in filename-matching regexps 5f36e21fe5 Clarify the doc string of 'yank' 13301d4266 New function erc-track-switch-buffer-other-window 38f7538d8f New function erc-switch-to-buffer-other-window # Conflicts: # etc/NEWS
| * Fix edge case errors in filename-matching regexpsMattias Engdegård2020-04-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes fix actual or latent bugs in regexps that match file names, such as PATTERN arguments to 'directory-files'. See https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg00265.html * admin/authors.el (authors-obsolete-files-regexps) (authors-renamed-files-regexps): * lisp/auth-source-pass.el (auth-source-pass-entries): * lisp/calendar/todo-mode.el (todo-show, todo-find-filtered-items-file) (todo-filter-items, todo-reset-nondiary-marker, todo-reset-done-string) (todo-reset-comment-string, todo-reset-highlight-item): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-load-ebrowse-caches): * lisp/cedet/semantic/texi.el (semantic-texi-associated-files): * lisp/cedet/srecode/map.el (srecode-map-update-map): * lisp/dired.el (dired-re-no-dot): * lisp/emacs-lisp/autoload.el (update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-find): * lisp/files.el (auto-mode-alist, directory-files-no-dot-files-regexp): * lisp/finder.el (finder-compile-keywords): * lisp/generic-x.el (inetd-conf-generic-mode, named-boot-generic-mode) (resolve-conf-generic-mode, etc-modules-conf-generic-mode): * lisp/gnus/gnus-agent.el (gnus-agent-read-agentview) (gnus-agent-regenerate-group, gnus-agent-update-files-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-articles-in-group): * lisp/gnus/gnus-score.el (gnus-score-search-global-directories): * lisp/gnus/gnus-util.el (gnus-delete-directory): * lisp/gnus/gnus-uu.el (gnus-uu-dir-files): * lisp/gnus/nndraft.el (nndraft-request-group): * lisp/gnus/nnmh.el (nnmh-request-group, nnmh-request-create-group): (nnmh-request-delete-group, nnmh-active-number, nnmh-update-gnus-unreads): * lisp/gnus/nnspool.el (nnspool-request-group): * lisp/gnus/spam-stat.el (spam-stat-process-directory) (spam-stat-test-directory): * lisp/help-fns.el (help-fns--first-release): * lisp/help.el (view-emacs-news): * lisp/international/quail.el (quail-update-leim-list-file): * lisp/international/titdic-cnv.el (batch-titdic-convert): * lisp/mail/mspools.el (mspools-set-vm-spool-files) (mspools-get-spool-files): * lisp/mail/rmail.el (rmail-secondary-file-regexp) (rmail-speedbar-match-folder-regexp): * lisp/net/ange-ftp.el (ange-ftp-delete-directory): * lisp/net/tramp.el (tramp-use-absolute-autoload-file-names): * lisp/obsolete/gulp.el (gulp-send-requests): * lisp/obsolete/vc-arch.el (vc-arch-trim-revlib): * lisp/org/ob-core.el (org-babel-remove-temporary-directory): * lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp, ebnf-style-database): * lisp/progmodes/executable.el (executable-command-find-posix-p): * lisp/startup.el (command-line): * lisp/textmodes/refer.el (refer-get-bib-files): * lisp/url/url-about.el (url-probe-protocols): * lisp/vc/vc-rcs.el (vc-rcs-register, vc-rcs-unregister): * test/lisp/net/tramp-archive-tests.el (tramp-archive-test19-directory-files-and-attributes): * test/lisp/net/tramp-tests.el (tramp-test19-directory-files-and-attributes): Replace ^ and $ with \` and \', respectively. Use (rx (or (not ".") "...")), translated into "[^.]\\|\\.\\.\\.", to match anything but "." and "..", instead of several incorrect regexps.
* | * lisp/vc/vc.el (vc-deduce-fileset): Improve docstring (bug#34949).Juri Linkov2020-04-141-12/+22
| |
* | gnus-shorten-url: Improve and avoid args-out-of-range errorŠtěpán Němec2020-04-132-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'gnus-shorten-url' (used by 'gnus-summary-browse-url') ignored fragment identifiers and didn't check substring bounds, in some cases leading to runtime errors, e.g.: (gnus-shorten-url "https://some.url.with/path/and#also_a_long_target" 40) ;; => Lisp error: (args-out-of-range "/path/and" -18 nil) This commit makes it account for #fragments and fixes faulty string computation, reusing existing helper function. (bug#39980) * lisp/vc/ediff-init.el (ediff-truncate-string-left): Rename to 'string-truncate-left' and move... * lisp/emacs-lisp/subr-x.el (string-truncate-left): ...here. All callers changed. * lisp/gnus/gnus-sum.el (gnus-shorten-url): Fix args-out-of-range error, don't drop #fragments, use 'string-truncate-left'.
* | Merge from origin/emacs-27Glenn Morris2020-04-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | 6de20c7eab (origin/emacs-27) Fix syntax error in man page. f8607d3c03 Handle filling of indented ChangeLog function entries 7e78f0d1b2 Fix void-variable n-reb in re-builder (Bug#40409) 452d776a5d Fix small bug in copy_string_contents. fa823653ff Fix invocations of gpg from Gnus d4f51d0a2e Don't draw GTK's internal border and tab bar on top of eac... 38731d504e ; * src/buffer.c (syms_of_buffer) <inhibit-read-only>: Doc... 44ac9e48bb Tweak htmlfontify's generated output
| * Handle filling of indented ChangeLog function entriesNoam Postavsky2020-04-041-1/+1
| | | | | | | | | | | | * lisp/vc/log-edit.el (log-edit-fill-entry): Relax regexp a bit to recognize function entries with leading blanks. * test/lisp/vc/log-edit-tests.el: New test.
* | * lisp/vc/vc-dir.el: Commands to mark un/registered files (bug#34949)Juri Linkov2020-04-031-0/+31
| | | | | | | | | | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-mark-state-files): New function. (vc-dir-mark-registered-files) (vc-dir-mark-unregistered-files): New commands. (vc-dir-mode-map): Bind vc-dir-mark-registered-files to '* r'. (vc-dir-menu-map): Add menu entries for vc-dir-mark-registered-files and vc-dir-mark-unregistered-files.
* | Support state changing VC operations on directories in Dired (bug#34949)Juri Linkov2020-03-302-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/dired-aux.el (dired-vc-next-action): New command. (dired-vc-deduce-fileset): Rename from vc-dired-deduce-fileset in vc.el. * lisp/dired.el (dired-mode-map): Remap vc-next-action to dired-vc-next-action. * lisp/vc/vc-dir.el (vc-dir-mark-files): New function. (vc-dir-refresh): Run hook vc-dir-refresh-hook. * lisp/vc/vc.el (vc-deduce-fileset): Rename arg 'observer' to 'not-state-changing' and document it in docstring. (vc-dired-deduce-fileset): Rename to dired-vc-deduce-fileset in dired-aux.el. * lisp/cedet/ede.el (ede-turn-on-hook, ede-minor-mode): * lisp/desktop.el (desktop-minor-mode-table): Rename the long ago obsolete vc-dired-mode to vc-dir-mode.
* | * lisp/vc/vc-dir.el (vc-dir-root): New command (bug#12492, bug#34949).Juri Linkov2020-03-292-4/+14
| | | | | | | | | | * lisp/vc/vc-hooks.el (vc-menu-map): Change menu command from 'vc-dir' to 'vc-dir-root'.
* | Disable enable-local-variables for hunk-only in diff-syntax-fontify-propsJuri Linkov2020-03-271-1/+3
| | | | | | | | | | * lisp/vc/diff-mode.el (diff-syntax-fontify-props): Let-bind enable-local-variables to nil when hunk-only is non-nil (bug#39190)
* | Merge from origin/emacs-27Glenn Morris2020-03-232-35/+40
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | d66331aea4 (origin/emacs-27) Don't build the Gnulib 'utimens' module ... f2351a689b Add Harfbuzz dependency 8944310d7c Don't signal during backtrace unrewind (Bug#40088) 8709aaddd8 Fix a couple of problems in changelog generating functions 9ab85f087f Fix cl-concatenate (Bug#40180) 561e9fb91b Improve documentation of project.el commands b28a9a6cc3 Make svg images with links valid 7515252cce * lisp/tab-line.el (tab-line-new-button-show): New defcustom. # Conflicts: # etc/NEWS # nt/gnulib-cfg.mk
| * Fix a couple of problems in changelog generating functionsNoam Postavsky2020-03-222-35/+40
| | | | | | | | | | | | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-add-log-current-defuns): If there is a scan-error when calling end-of-defun, go to end of hunk. This can easily happen since we are calling end-of-defun on a partial code fragment from a diff. * lisp/vc/log-edit.el (log-edit-generate-changelog-from-diff): Bind display-buffer-overriding-action around the log-edit-show-diff call only. Otherwise, it can affect, for example, debugger windows triggered by the diff-add-log-current-defuns call.
* | Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-213-35/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-init.el (ediff-H-glyph): * lisp/vc/ediff-util.el (ediff-inferior-compare-regions) (ediff-setup-keymap): * lisp/vc/ediff-wind.el (ediff-control-frame-parameters) (ediff-prefer-iconified-control-frame) (ediff-setup-control-frame, ediff-xemacs-select-frame-hook): Remove XEmacs compat code and declare compatibility functions obsolete. * lisp/vc/ediff-init.el (ediff-temp-file-prefix): Redefine as obsolete variable alias for 'temporary-file-directory'. * lisp/vc/ediff-util.el (ediff-make-temp-file): Don't use obsolete variable name.
* | * lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enableStefan Monnier2020-03-181-7/+8
| | | | | | | | Don't do anything if smerge-mode is already enabled.
* | In vc-print-branch-log use root instead of the default directory (bug#39704)Juri Linkov2020-03-101-4/+6
| | | | | | | | | | * lisp/vc/vc.el (vc-print-branch-log): Use rootdir instead of default-directory for the second arg of vc-print-log-internal.
* | Merge from origin/emacs-27Glenn Morris2020-03-041-10/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4e4510ccd Fix handling MS-Windows keyboard input above the BMP a38bebb0c1 * etc/NEWS: More complete description of rx 'not' changes. d373647e8f ; * doc/emacs/mini.texi (Yes or No Prompts): Fix last change. 1ca6d15656 * doc/emacs/mini.texi (Yes or No Prompts): 'y-or-n-p' now ... fe1a447d52 Don't attempt to cache glyph metrics for FONT_INVALID_CODE b42b894d1d Fix fit-frame-to-buffer for multi-monitor setup 366fd4fd07 (emacs-27) ; * etc/NEWS: Fix typo. 49d3cd90bd rx: Improve 'or' compositionality (bug#37659) 6b48aedb6b * lisp/tab-line.el: Fix auto-hscrolling (bug#39649) c5f255d681 (tag: emacs-27.0.90) ; Update lisp/ldefs-boot.el 60c84ad992 ; * etc/TODO: Fix last change. 5af9e5baad ; Add an entry to TODO d424195905 Fix rx charset generation 9908b5a614 Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/e... 6dc2ebe00e Fix overquoting in mule.el 5cca73dd82 * src/timefns.c (time_arith): Omit incorrect comment. d767c357ca Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/e... 4dec693f70 * lisp/vc/vc-cvs.el (vc-cvs-ignore): Copy-edit doc string ff729e3f97 ; bug#39779: Fix some typos in documentation. 696ee02c3a checkdoc: Don't mistake "cf." for sentence end # Conflicts: # etc/NEWS
| * * lisp/vc/vc-cvs.el (vc-cvs-ignore): Copy-edit doc stringMattias Engdegård2020-02-281-10/+11
| |
* | Merge from origin/emacs-27Glenn Morris2020-03-042-11/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b7d226779 * etc/AUTHORS: Update. 4aa758e53d ; ChangeLog.3 update 9261b1ed49 * admin/authors.el (authors-ignored-files): Fix entries. 86e4da6eaf ; ChangeLog.3 update 009c6a1767 ; ChangeLog.3 fixes f9e53947c7 Fix documented slot name of eieio-instance-tracker class 999d75c0c1 Range-check width passed to define-fringe-bitmap 29e415d6b0 ; ChangeLog.3 fixes 4653baa6a5 ; ChangeLog.3 update & fixes. a95ec6e060 * admin/authors.el: Add missing entries af519a6348 Define libgnutls-version properly 9ec6eb1065 vc-dir-ignore: More accurately choose base directory e74fb4688b * lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect)... 3bce7ec382 CC Mode: Protect against consecutive calls to before-chang...
| * vc-dir-ignore: More accurately choose base directoryDmitry Gutov2020-02-252-11/+14
| | | | | | | | | | | | | | | | * lisp/vc/vc-dir.el: (vc-dir-ignore): Use it (bug#37189). * lisp/vc/vc.el: (vc--ignore-base-dir): Extract from vc-ignore.
* | Merge from origin/emacs-27Glenn Morris2020-02-234-43/+67
|\ \ | |/ | | | | | | | | | | | | | | | | | | dd5756436c Move more logic to vc-ignore from vc-default-ignore 2aed279be1 Warn about the likes of "[:alnum:]" in regexps 0273f261a7 Don't write absolute filenames and duplicate strings to CV... d7c22338d2 Fix cursor-sensor--detect when current buf != selected win... 2e39fc83bb * doc/emacs/sending.texi (Mail Sending): Fix index entries. b410f902d5 Document 'message-send-mail-function' in the Emacs manual ac0546612d Fix reference to 'message-send-and-exit' in Emacs manual cd6a9b8f65 Skip shell prompt on current line in Eshell even if it's p...
| * Move more logic to vc-ignore from vc-default-ignoreDmitry Gutov2020-02-232-28/+33
| | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-ignore): Pass relative file names to vc-ignore. * lisp/vc/vc.el (vc-ignore): Move the responsibility of constructing the ignore pattern (right now, most often a relative file name) using a file name received from the user, here. (vc-default-ignore): ...from here (bug#37189, see discussion). Also clarify the docstring.
| * Don't write absolute filenames and duplicate strings to CVS ignore filesWolfgang Scherer2020-02-222-15/+34
| | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-cvs.el (vc-cvs-ignore): Expand filename correctly and pass on only the basename as the pattern. (vc-cvs-append-to-ignore) Do not write duplicate strings to .cvsignore. New optional parameter SORT to more explicitly control sorting of the ignore entries. (Bug#37215) * lisp/vc/pcvs.el (cvs-mode-ignore): Call 'vc-cvs-append-to-ignore' with SORT argument.
* | Remove subsumed repetitions in regexpsMattias Engdegård2020-02-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make regexps smaller and faster by removing terms that are superfluous by virtue of standing next to another term that matches more. See https://lists.gnu.org/archive/html/emacs-devel/2020-01/msg00949.html for details. * lisp/bs.el (bs--make-header-match-string): * lisp/gnus/deuglify.el (gnus-outlook-repair-attribution-block): * lisp/gnus/message.el (message-subject-trailing-was-ask-regexp) (message-subject-trailing-was-regexp): * lisp/informat.el (Info-validate): * lisp/net/browse-url.el (browse-url-button-regexp): * lisp/net/rcirc.el (rcirc-url-regexp): * lisp/org/ob-core.el (org-babel-remove-result): * lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org-table.el (org-table-expand-lhs-ranges): * lisp/org/org.el (org-maybe-keyword-time-regexp, org-ts-regexp) (org-ts-regexp-inactive, org-ts-regexp-both): * lisp/play/gametree.el (gametree-hack-file-layout): * lisp/progmodes/cc-mode.el (c-Java-defun-prompt-regexp): * lisp/progmodes/idlw-shell.el (idlwave-shell-halting-error): * lisp/progmodes/ruby-mode.el (ruby-mode-set-encoding): * lisp/progmodes/verilog-mode.el (verilog-error-font-lock-keywords) (verilog-verilint-off, verilog-case-indent-level) (verilog-within-translate-off, verilog-start-translate-off) (verilog-back-to-start-translate-off, verilog-end-translate-off) (verilog-expand-dirnames): * lisp/term.el (term-control-seq-regexp): * lisp/textmodes/reftex-vars.el (featurep): * lisp/url/url-gw.el (url-open-telnet): * lisp/vc/ediff-ptch.el (ediff-context-diff-label-regexp): * lisp/vc/pcvs-parse.el (cvs-parse-status): * test/src/regex-emacs-tests.el (regex-tests-PCRE): Remove subsumed repetitions. * lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Simplify repetition of a repetition.
* | Support state changing VC operations in dired-mode on files (bug#34949)Juri Linkov2020-02-192-8/+30
| | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-deduce-fileset): Don't error out when observer is nil. (vc-dired-deduce-fileset): Add optional args 'state-model-only-files' and 'observer'. Check that all files are in a consistent state when state-model-only-files is non-nil. Error out on directories. * lisp/vc/vc-dispatcher.el (vc-dispatcher-browsing): Check dired-mode for derived-mode-p.
* | Merge from origin/emacs-27Glenn Morris2020-02-132-8/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 0304f53076 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory 027da652a4 Fix display of minibuffer prompt in ido.el 5a21aaff46 rx: Use longest match for all-string 'or' forms (bug#37659) 2b12c2b6f2 Make sure not to mark directories ff4ed4a0ff ; Add a TODO 3a5129a1c9 vc-hg-dir-status-files: Fix when DIR is not repository root # Conflicts: # etc/NEWS
| * Make sure not to mark directoriesWolfgang Scherer2020-02-121-2/+3
| | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-mark-all-files): Make sure not to mark directories (bug#37182).
| * ; Add a TODODmitry Gutov2020-02-121-0/+3
| |
| * vc-hg-dir-status-files: Fix when DIR is not repository rootDmitry Gutov2020-02-121-6/+6
| | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-dir-status-files): Make sure it works correctly in a subdirectory of the repo root. Bind default-directory to DIR and add 're: -I .' to the arguments (bug#39380).
* | Improve prefix arg support in 'ediff-scroll-horizontally'Kyle Hubert2020-02-081-2/+2
| | | | | | | | | | | | | | | | * lisp/vc/ediff-util.el (ediff-scroll-horizontally): Use 'current-prefix-arg' to pass the value of prefix argument to scrolling commands. (Bug#39353) Copyright-paperwork-exempt: yes
* | Merge from origin/emacs-27Glenn Morris2020-02-062-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09eed01afb Wrap some set-auto-mode calls with delay-mode-hooks (bug#3... 4a0a114505 Support ido-vertical-mode better ef5fba9f40 Fix faces tab-bar and tab-line. 831508422e Cater for 3-argument version of pthread_setname_np f27187f963 Clarify lexvar restrictions for add-to-ordered-list, add-t... 32763dac46 Replace add-to-list to lexical variable with push (bug#39373) d07f177382 Clarify add-to-list documentation (bug#39373) d3d2ea927c MH-E: alter content in mh-display-msg, not mh-show-mode db7fa2546f Update documentation for mh-show-mode-hook d10be6bf28 Example goto-addr hook: MH-E already uses goto-address # Conflicts: # etc/NEWS
| * Wrap some set-auto-mode calls with delay-mode-hooks (bug#39190)Juri Linkov2020-02-062-2/+6
| | | | | | | | | | | | | | | | | | * lisp/gnus/mm-view.el (mm-display-inline-fontify): * lisp/vc/diff-mode.el (diff-syntax-fontify-props): * lisp/vc/vc.el (vc-find-revision-no-save): Add delay-mode-hooks around set-auto-mode calls to not run hooks that might assume buffer-file-name really associates buffer with a file.
* | Merge from origin/emacs-27Glenn Morris2020-01-221-1/+4
|\ \ | |/ | | | | | | | | | | | | | | 3b0938c042 (origin/emacs-27) Render Ido suggestions using an overlay d5d90dc412 * doc/misc/tramp.texi (Bug Reports): Encourage use of "ema... ac09e8e121 * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#... 7e37e61f4b Correct statement about ftcr and recommend HarfBuzz 4aec94da37 Avoid leaving artifacts when the system caret is used on w32 5abd8d73b0 Improve display of temporary echo messages
| * * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456Stefan Monnier2020-01-211-1/+4
| | | | | | | | | | This situation is not an internal error, but a perfectly normal occurrence, so a `cl-assert` is not right
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-09 21:39:56 +0000