aboutsummaryrefslogtreecommitdiffstats
path: root/lisp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bug-reference-setupfeature/bug-reference-setupTassilo Horn2020-06-172-3/+204
|
* * lisp/dired-aux.el (dired-vc-deduce-fileset): Add autoload cookie.Juri Linkov2020-06-171-0/+1
|
* Bump the project.el package versionDmitry Gutov2020-06-171-2/+1
| | | | * lisp/progmodes/project.el: Bump the package version.
* Change the key for project-find-regexpDmitry Gutov2020-06-171-1/+1
| | | | | | * lisp/progmodes/project.el (project-switch-commands): Change the key for 'project-find-regexp' to 'g', which seems to be the consensus.
* Make project file name completion adhere to customizationDmitry Gutov2020-06-171-0/+1
| | | | | | * lisp/progmodes/project.el (project-find-file-in): Bind completion-ignore-case to the value of read-file-name-completion-ignore-case (bug#41902).
* gnus-cloud: Improve cloud syncDavid Edmondson2020-06-161-27/+27
| | | | | | | | | | | After replaying a set of actions downloaded by gnus-cloud, persist the highest sequence number seen as the local `gnus-cloud-sequence' number, in order that a future download will not unnecessarily replay previously seen actions and any future uploads from this emacs instance use a higher sequence number than that downloaded. Remove the test on whether individual newsrc entries are older than the current time, as that is always going to be the case.
* Fix some Tramp problems seen during testsMichael Albinus2020-06-152-10/+51
| | | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist): Add `access-file'. (tramp-crypt-file-name-for-operation): Rewrite. Take second argument into account. (tramp-crypt-file-name-handler): Use it. (tramp-crypt-send-command): Set buffer multibyte (but utf8 files still don't work). (tramp-crypt-handle-access-file): New defun. (tramp-crypt-do-copy-or-rename-file): Short track if both files are on a crypted remote dir. * lisp/net/tramp.el (file-notify-rm-watch): Declare. (tramp-inhibit-progress-reporter): New defvar. (tramp-message): Display message only if not suppressed by progress reporter. (with-tramp-progress-reporter): Suppress concurrent progress reporter messages. (tramp-file-notify-process-sentinel): Simplify.
* 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.
* Band-aid for edebugging generator bodies (Bug#40434).Philipp Stephani2020-06-141-4/+4
| | | | | | | | | | | | Edebug doesn't support them well. Rather than trying to fix Edebug, disable instrumentation for now to prevent annoying bugs. * lisp/emacs-lisp/generator.el (iter-defun, iter-lambda, iter-make) (iter-do): Don't attempt to instrument bodies that are mangled by the CPS transformer. * test/lisp/emacs-lisp/generator-tests.el (generator-tests-edebug): New regression test.
* Ensure that getters and setters can be edebugged at the same time.Philipp Stephani2020-06-141-1/+1
| | | | | | | | | | | | It's necessary to add a name suffix to setters defined with 'gv-define-setter' so that Edebug can distinguish between the getter and the setter (Bug#41853). * lisp/emacs-lisp/gv.el (gv-define-setter): Add a name suffix to setter definitions. * test/lisp/emacs-lisp/gv-tests.el (gv-setter-edebug): New regression test.
* Rearrange detecting remote uid and gid in TrampMichael Albinus2020-06-149-126/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist): * lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist): * lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist): * lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add `tramp-get-remote-gid' and 'tramp-get-remote-uid'. * lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist): Add `file-ownership-preserved-p'. (tramp-crypt-add-directory): Check, that NAME is not quoted. (tramp-crypt-handle-file-ownership-preserved-p): New defun. (tramp-crypt-handle-insert-directory): Fix docstring. * lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add `tramp-get-remote-gid' and 'tramp-get-remote-uid'. (tramp-gvfs-handle-file-readable-p): Call `tramp-get-remote-uid'. (tramp-gvfs-handle-get-remote-uid) (tramp-gvfs-handle-get-remote-gid): Rename from `tramp-gvfs-get-remote-{uid,gid}'. Do not cache result. (tramp-gvfs-maybe-open-connection): No special handling for remote uid and gid. * lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add `tramp-get-remote-gid' and 'tramp-get-remote-uid'. (tramp-sh-handle-get-remote-uid, tramp-sh-handle-get-remote-gid): Rename from `tramp-get-remote-{uid,gid}'. Do not cache result. (tramp-sh-handle-file-ownership-preserved-p): Distinguish by GROUP when caching. * lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist): Add `tramp-get-remote-gid' and 'tramp-get-remote-uid'. (tramp-sudoedit-handle-get-remote-uid) (tramp-sudoedit-handle-get-remote-gid): Rename from `tramp-sudoedit-get-remote-{uid,gid}'. Do not cache result. (tramp-sudoedit-handle-set-file-uid-gid) (tramp-sudoedit-handle-write-region): Call `tramp-get-remote-uid' and `tramp-get-remote-gid'. (tramp-sudoedit-maybe-open-connection): No special handling for remote uid and gid. * lisp/net/tramp.el (tramp-file-name-for-operation): Add `tramp-get-remote-gid' and 'tramp-get-remote-uid'. (tramp-handle-write-region, tramp-check-cached-permissions): Call `tramp-get-remote-uid' and `tramp-get-remote-gid'. (tramp-get-remote-uid, tramp-get-remote-gid): New defuns. (tramp-local-host-p): Simplify `tramp-get-remote-uid' call. * test/lisp/net/tramp-tests.el (tramp-test17-dired-with-wildcards) Skip if needed.
* 2020-03-29 Michael R. Mauger <michael@mauger.com>Michael R. Mauger2020-06-131-1/+1
| | | | | | | | * lisp/progmodes/sql.el (sql-add-product): Re-correct argument spec. Previous change was due to my mistake; I have resolved back to the prior behavior (Bug#39960). * test/lisp/progmodes/sql-tests.el (sql-test-add-product): Added test to insure I don't make the same mistake again.
* Mark python-shell-virtualenv-root as safe for directoriesPhilip K2020-06-131-1/+2
| | | | | * lisp/progmodes/python.el (python-shell-virtualenv-root): Require a directory name. (Bug#41619)
* Highlight typed variables in PythonKonstantin Kharlamov2020-06-131-0/+2
| | | | | | * progmodes/python.el (python-font-lock-keywords-maximum-decoration): Recognize typed variables like "foo: int = 1" as well. (Bug#41684)
* Further fixes while testing tramp-cryptMichael Albinus2020-06-125-213/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/misc/tramp.texi (External methods): Remove experimental note for rclone. (Keeping files encrypted): Mark file encryption as experimental. * lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist): Use `tramp-handle-file-truename'. (tramp-adb-handle-file-truename): Remove. * lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist): Add `file-writable-p'. (tramp-crypt-send-command): Return t if no error. (tramp-crypt-do-encrypt-or-decrypt-file-name) (tramp-crypt-do-encrypt-or-decrypt-file): Raise an error if it fails. (tramp-crypt-do-copy-or-rename-file): Flush file properties also when copying a directory. (tramp-crypt-handle-file-writable-p): New defun. (tramp-crypt-handle-insert-directory): Check for library `text-property-search'. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-set-file-uid-gid): Rename from `tramp-gvfs-set-file-uid-gid'. * lisp/net/tramp-sh.el (tramp-sh-handle-file-truename): Use `tramp-handle-file-truename' as fallback. * lisp/net/tramp.el (tramp-handle-file-truename): Let-bind `tramp-crypt-enabled' to nil. (tramp-handle-write-region): Set also file ownership. * test/lisp/net/tramp-tests.el (tramp-test17-insert-directory): Skip if needed.
* Derive gnus-edit-form-mode from lisp-data-mode, fix mode mapEric Abrahamsen2020-06-121-9/+9
| | | | | | | * lisp/gnus/gnus-eform.el (gnus-edit-form-mode): Derive from lisp-data-mode, which can be handy for users who have turned on things like paredit for lisp-data-mode. (gnus-edit-form-mode-map): Put creation of the map inside the defvar.
* ; * lisp/faces.el (readable-foreground-color): Fix editing mistake.Mattias Engdegård2020-06-111-1/+2
|
* Improved light/dark colour predicate (bug#41544)Mattias Engdegård2020-06-103-28/+36
| | | | | | | | | | | | | | | | | | Add a predicate, color-dark-p, for deciding whether a colour is more readable with black or white as contrast. It has experimentally been shown to be more accurate and robust than the various methods currently employed. The new predicate compares the relative luminance of the colour to an empirically determined cut-off value, and it seems to get it right in almost all cases, with no value leading to outright bad results. * lisp/faces.el (readable-foreground-color): Use color-dark-p. (color-dark-p): New function. * lisp/facemenu.el (list-colors-print): Use readable-foreground-color, improving readability of list-colors-display. * lisp/textmodes/css-mode.el (css--contrasty-color): Remove. (css--fontify-region): Use readable-foreground-color.
* Futher tramp-crypt implementation and documentationMichael Albinus2020-06-101-6/+13
| | | | | | | | | | | | | | | * doc/misc/tramp.texi (Top, Configuration): Insert section `Keeping files encrypted' in menu. (Keeping files encrypted): New node. * lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist): Add `tramp-set-file-uid-gid'. (tramp-crypt-maybe-open-connection): Simplify. (tramp-crypt-do-encrypt-or-decrypt-file): Use `binary' coding system. (tramp-crypt-handle-set-file-uid-gid): New defun. * test/lisp/net/tramp-tests.el (tramp-test09-insert-file-contents): Adapt test.
* Slightly improve commit 73be4d1ed5b190bd93e9bad6aebe43d0dea0d7d3.Philipp Stephani2020-06-101-4/+4
| | | | | | * lisp/emacs-lisp/cl-macs.el (cl-lambda-list, cl-lambda-list1) (cl-macro-list, cl-macro-list1): Use exactly the same specification as for &optional (sans the third optional list element).
* Allow destructuring in &aux sections when using edebug (Bug#40431)Philipp Stephani2020-06-101-4/+4
| | | | | | | | | * lisp/emacs-lisp/cl-macs.el (cl-lambda-list, cl-lambda-list1) (cl-macro-list, cl-macro-list1): Allow arbitrary 'cl-lambda' arguments in the &aux section. * test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-aux-edebug): New regression test.
* ; Simplify last changeBasil L. Contovounesios2020-06-101-1/+0
| | | | | * lisp/progmodes/project.el (project--read-project-list): We are already at BOB after insert-file-contents.
* Save project list as lisp dataSimen Heggestøyl2020-06-091-13/+9
| | | | | | | | | | Save the project list file as lisp data instead of line separated strings to make it more extendable in the future. * lisp/progmodes/project.el (project--read-project-list) (project--write-project-list, project--add-to-project-list-front) (project--remove-from-project-list): Adjust to `project--list' now being an alist.
* Orthographical amendments to commit 145aab0672ae259736ee9230f8e0ff4effa5f4fdAlan Mackenzie2020-06-091-9/+9
| | | | | | | * etc/NEWS: Correct the spelling of CC Mode. * lisp/progmodes/cc-fonts.el (doxygen-font-lock-doc-comments): Replace curly quotes in comments by ASCII ones.
* Continue implementation of tramp-crypt.elMichael Albinus2020-06-091-23/+64
| | | | | | | | | | | | | | | | * lisp/net/tramp-crypt.el (tramp-crypt-do-encrypt-or-decrypt-file): Add leading "/" to infile. (tramp-crypt-add-directory): Fix docstring. Expand NAME. (tramp-crypt-remove-directory) (tramp-crypt-handle-file-name-all-completions) (tramp-crypt-handle-set-file-times): New defuns. (tramp-crypt-handle-file-executable-p) (tramp-crypt-handle-file-readable-p) (tramp-crypt-handle-file-system-info) (tramp-crypt-handle-set-file-modes): Fix implementation. * test/lisp/net/tramp-tests.el: Adapt call convention for (tramp--test-crypt-p).
* * lisp/simple.el (shell-command-on-region): Handle nil replace on rectangles.Juri Linkov2020-06-091-4/+19
| | | | | | When 'region-noncontiguous-p' is non-nil (rectangular region) but 'replace' is nil, pop up the shell output buffer (bug#41440). When 'replace' is non-nil, trim the trailing newline.
* Add autoload problem in tramp-crypt.el.Michael Albinus2020-06-081-16/+20
| | | | | | | | | | * lisp/net/tramp-crypt.el (tramp-crypt-encfs-config): Add ;;;###tramp-autoload cookie. (tramp-crypt-directories): Move it up. (tramp-crypt-file-name-p): Move it up. Add ;;;###tramp-autoload cookie. Make it a defsubst. * test/lisp/net/tramp-tests.el (tramp-crypt): Do not require.
* Use lexical-binding in lunar.el and add testsStefan Kangas2020-06-071-8/+9
| | | | | | * lisp/calendar/lunar.el: Use lexical-binding. (lunar-phases, diary-lunar-phases): Silence byte-compiler. * test/lisp/calendar/lunar-tests.el: New file.
* * lisp/emacs-lisp/byte-opt.el (side-effect-free-fns): Add `make-byte-code'.Andrea Corallo2020-06-071-2/+2
| | | | | | `make-byte-code' wraps `vector' doing some sanity check on the input arguments. `vector' is in side-effect-and-error-free-fns so add `make-byte-code' to side-effect-free-fns.
* Merge from origin/emacs-27Glenn Morris2020-06-075-26/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35661ef943 (origin/emacs-27) Fix typo in "(elisp) Type Keywords" 1af0e95fec Gnus nnir-summary-line-format has no effect dd366b5d3b Improve documentation of 'window-text-pixel-size' fbd49f969e * src/xdisp.c (Fwindow_text_pixel_size): Doc fix. (Bug#41... d8593fd19f Minor improvements to EDE and EIEIO manuals 3916e63f9e Have Fido mode also imitate Ido mode in ignore-case options cc35b197c7 Update package-menu-quick-help bf09106256 Improve documentation of 'sort-subr' 73749efa13 Update Ukrainian transliteration 30a7ee505a Fix Arabic shaping when eww/shr fill the text to be rendered 7d323f07c0 Silence some byte-compiler warnings in tests cf473e742f * test/lisp/battery-tests.el: New file. b07e3b1d97 Improve format-spec documentation (bug#41571) # Conflicts: # test/lisp/emacs-lisp/package-tests.el
| * Gnus nnir-summary-line-format has no effectTassilo Horn2020-06-071-3/+6
| | | | | | | | | | | | | | | | * lisp/gnus/nnir.el (nnir-mode): Update summary format specs if nnir-summary-line-format is set and different from gnus-summary-line-format. (nnir-open-server): Run nnir-mode in gnus-summary-generate-hook instead of gnus-summary-prepared-hook.
| * Have Fido mode also imitate Ido mode in ignore-case optionsJoão Távora2020-06-051-1/+4
| | | | | | | | | | | | | | Suggested by Sean Whitton <spwhitton@spwhitton.name>. * lisp/icomplete.el (icomplete--fido-mode-setup): Set ignore-case options.
| * Update package-menu-quick-helpBasil L. Contovounesios2020-06-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/package.el (package--quick-help-keys): Filtering is now bound to the prefix '/', not the key 'f' (bug#41721). Advertise only the standard 'g' binding now that both it and 'r' are bound to revert-buffer (bug#35504). (package--prettify-quick-help-key): Avoid modifying string literals. (package-menu-filter): Reintroduce as obsolete alias of package-menu-filter-by-keyword for backward compatibility (bug#36981).
| * Update Ukrainian transliterationAndrii Kolomoiets2020-06-051-1/+5
| | | | | | | | | | * lisp/language/cyril-util.el (standard-display-cyrillic-translit): Add missing letter "ґ"; tweak letter "г". (Bug#41683)
| * Improve format-spec documentation (bug#41571)Basil L. Contovounesios2020-06-021-19/+30
| | | | | | | | | | | | | | | | | | * doc/lispref/text.texi (Interpolated Strings): Move from here... * doc/lispref/strings.texi (Custom Format Strings): ...to here, renaming the node and clarifying the documentation. (Formatting Strings): End node with sentence referring to the next one. * lisp/format-spec.el (format-spec): Clarify docstring.
| * ; Auto-commit of loaddefs files.Glenn Morris2020-06-011-27/+55
| |
* | * lisp/progmodes/js.el (js-mode): Remove second call to c-init-language-varsAlan Mackenzie2020-06-071-1/+0
| | | | | | | | | | This spurious second call fouled up already set configuration variables. Fixes bug #41649.
* | Add file encryption to TrampMichael Albinus2020-06-072-3/+742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-crypt.el: New file. * lisp/net/tramp.el (tramp-run-real-handler): Add `tramp-crypt-file-name-handler'. (tramp-register-file-name-handlers): Call `tramp-register-crypt-file-name-handler'. (tramp-handle-insert-file-contents, tramp-local-host-p): Check for `tramp-crypt-enabled' * test/lisp/net/tramp-tests.el (tramp--test-crypt-p): New defun. (tramp-test24-file-acl, tramp-test25-file-selinux) (tramp-test28-process-file, tramp-test29-start-file-process) (tramp-test30-make-process, tramp-test31-interrupt-process) (tramp-test32-shell-command) (tramp-test32-shell-command-dont-erase-buffer) (tramp-test33-environment-variables) (tramp-test33-environment-variables-and-port-numbers) (tramp-test34-explicit-shell-file-name, tramp-test35-exec-path) (tramp-test35-remote-path, tramp-test36-vc-registered) (tramp--test-check-files, tramp-test43-asynchronous-requests): Use it.
* | Tramp code cleanupMichael Albinus2020-06-073-13/+13
| | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-cache.el (tramp-get-connection-property): Cleanup. * lisp/net/tramp-cmds.el (tramp-cleanup-all-connections): Delete also connection processes. * lisp/net/tramp-sh.el (tramp-set-remote-path): Cache 4096 even if PIPE_BUF doesn't exist.
* | Use 65535 as color-values scale value in the NS backendMattias Engdegård2020-06-071-1/+1
| | | | | | | | | | | | | | * src/nsfns.m (Fxw_color_values): Scale with 65535 instead of 65280, for uniformity with other backends. * lisp/faces.el (color-values): Update doc string. * doc/lispref/frames.texi (Color Names): Update examples.
* | The key prefix 'C-x t t' displays next command buffer in a new tab (bug#41691)Juri Linkov2020-06-073-54/+93
| | | | | | | | | | | | | | | | | | | | | | * lisp/tab-bar.el (other-tab-prefix): New command. (tab-prefix-map): Bind key 'C-x t t' to other-tab-prefix. * lisp/windmove.el (windmove-display-in-direction): Use display-buffer-override-next-command. * lisp/window.el (display-buffer-override-next-command): New function refactored from windmove-display-in-direction.
* | make-text-button no longer modifies its string argPaul Eggert2020-06-063-5/+8
| | | | | | | | | | | | | | | | | | * etc/NEWS: Mention this. * lisp/apropos.el (apropos-library-button): * lisp/ibuf-ext.el (ibuffer-old-saved-filters-warning): There’s no longer a need copy make-text-button’s string arg. * lisp/button.el (make-text-button): Return a copy of a string arg. Delay making the copy until after error-checking.
* | Un-deprecate oset and oset-defaultBasil L. Contovounesios2020-06-062-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For discussion see the following threads: https://lists.gnu.org/archive/html/emacs-devel/2020-05/msg00630.html https://lists.gnu.org/archive/html/emacs-devel/2020-05/msg00674.html https://lists.gnu.org/archive/html/emacs-devel/2020-06/msg00099.html * lisp/emacs-lisp/eieio.el (oset, oset-default): Un-deprecate. * lisp/emacs-lisp/eieio-core.el (eieio-oref): Declare gv-setter here instead of in lisp/emacs-lisp/eieio.el. Suggested by Stefan Monnier <monnier@iro.umontreal.ca>. (eieio-oref-default): Add gv-setter declaration. * etc/NEWS: Announce these changes. * doc/misc/eieio.texi (Accessing Slots): Document oref and oref-default as generalized variables. Consistently document getters before setters. * test/lisp/emacs-lisp/eieio-tests/eieio-tests.el: Use lexical-binding. (eieio-test-13-init-methods): Simplify. (eieio-test-33-instance-tracker): Declare IT-list as special.
* | Improve battery status display via GNU/Linux sysfsEllington Santos2020-06-061-5/+12
| | | | | | | | | | | | | | * lisp/battery.el (battery-linux-sysfs): Support %b format. Improve the display of %p. (Bug#41542) Copyright-paperwork-exempt: yes
* | Fix some side-effecting uses of make-text-buttonBasil L. Contovounesios2020-06-043-5/+3
| | | | | | | | | | | | | | | | | | | | | | For discussion, see the following thread: https://lists.gnu.org/archive/html/emacs-devel/2020-06/msg00117.html * lisp/apropos.el (apropos-library-button): * lisp/help-fns.el (help-fns--first-release): Return result of make-text-button instead of relying on its side effects. * lisp/ibuf-ext.el (ibuffer-old-saved-filters-warning): Avoid modifying an immutable string.
* | * lisp/dired.el (dired-toggle-marks): Use region for non-nil dired-mark-regionJuri Linkov2020-06-051-22/+40
| | | | | | | | | | | | (dired-mark--region-use-p, dired-mark--region-beginning) (dired-mark--region-end): New internal functions. (dired-mark-if): Use new functions. (Bug#39902)
* | Change default project list filename to "projects"Simen Heggestøyl2020-06-041-1/+1
| | | | | | | | | | * lisp/progmodes/project.el (project-list-file): Change the default filename to "projects".
* | Use characters for keys in project-switch-commandsSimen Heggestøyl2020-06-041-16/+12
| | | | | | | | | | | | | | * lisp/progmodes/project.el (project-switch-commands): Use characters for keys instead of string for better future compatibility with 'read-multiple-choice'. (project-switch-project): Adjust to above change.