2024-01-27 01:38:46 +00:00
|
|
|
;;; visual-wrap.el --- Smart line-wrapping with wrap-prefix -*- lexical-binding: t -*-
|
2024-01-27 01:30:16 +00:00
|
|
|
|
|
|
|
;; Copyright (C) 2011-2021, 2024 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
;; Author: Stephen Berman <stephen.berman@gmx.net>
|
|
|
|
;; Stefan Monnier <monnier@iro.umontreal.ca>
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
|
|
|
;; Keywords: convenience
|
|
|
|
;; Package: emacs
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This package provides the `visual-wrap-prefix-mode' minor mode
|
|
|
|
;; which sets the wrap-prefix property on the fly so that
|
|
|
|
;; single-long-line paragraphs get word-wrapped in a way similar to
|
2024-01-27 17:18:16 +00:00
|
|
|
;; what you'd get with M-q using adaptive-fill-mode, but without
|
2024-01-27 01:30:16 +00:00
|
|
|
;; actually changing the buffer's text.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(defcustom visual-wrap-extra-indent 0
|
|
|
|
"Number of extra spaces to indent in `visual-wrap-prefix-mode'.
|
|
|
|
|
|
|
|
`visual-wrap-prefix-mode' indents the visual lines to the level
|
|
|
|
of the actual line plus `visual-wrap-extra-indent'. A negative
|
|
|
|
value will do a relative de-indent.
|
|
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
|
|
actual indent = 2
|
|
|
|
extra indent = -1
|
|
|
|
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
|
|
|
|
do eiusmod tempor incididunt ut labore et dolore magna
|
|
|
|
aliqua. Ut enim ad minim veniam, quis nostrud exercitation
|
|
|
|
ullamco laboris nisi ut aliquip ex ea commodo consequat.
|
|
|
|
|
|
|
|
actual indent = 2
|
|
|
|
extra indent = 2
|
|
|
|
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
|
|
|
|
do eiusmod tempor incididunt ut labore et dolore magna
|
|
|
|
aliqua. Ut enim ad minim veniam, quis nostrud exercitation
|
|
|
|
ullamco laboris nisi ut aliquip ex ea commodo consequat."
|
|
|
|
:type 'integer
|
|
|
|
:safe 'integerp
|
2024-01-27 08:38:14 +00:00
|
|
|
:version "30.1"
|
2024-01-27 01:30:16 +00:00
|
|
|
:group 'visual-line)
|
|
|
|
|
|
|
|
(defun visual-wrap--face-extend-p (face)
|
|
|
|
;; Before Emacs 27, faces always extended beyond EOL, so we check
|
|
|
|
;; for a non-default background instead.
|
|
|
|
(cond
|
|
|
|
((listp face)
|
|
|
|
(plist-get face (if (fboundp 'face-extend-p) :extend :background)))
|
|
|
|
((symbolp face)
|
|
|
|
(if (fboundp 'face-extend-p)
|
|
|
|
(face-extend-p face nil t)
|
|
|
|
(face-background face nil t)))))
|
|
|
|
|
|
|
|
(defun visual-wrap--prefix-face (fcp _beg end)
|
|
|
|
;; If the fill-context-prefix already specifies a face, just use that.
|
|
|
|
(cond ((get-text-property 0 'face fcp))
|
|
|
|
;; Else, if the last character is a newline and has a face
|
|
|
|
;; that extends beyond EOL, assume that this face spans the
|
|
|
|
;; whole line and apply it to the prefix to preserve the
|
|
|
|
;; "block" visual effect.
|
|
|
|
;;
|
|
|
|
;; NB: the face might not actually span the whole line: see
|
|
|
|
;; for example removed lines in diff-mode, where the first
|
|
|
|
;; character has the diff-indicator-removed face, while the
|
|
|
|
;; rest of the line has the diff-removed face.
|
|
|
|
((= (char-before end) ?\n)
|
|
|
|
(let ((eol-face (get-text-property (1- end) 'face)))
|
|
|
|
;; `eol-face' can be a face, a "face value"
|
|
|
|
;; (plist of face properties) or a list of one of those.
|
|
|
|
(if (or (not (consp eol-face)) (keywordp (car eol-face)))
|
|
|
|
;; A single face.
|
|
|
|
(if (visual-wrap--face-extend-p eol-face) eol-face)
|
|
|
|
;; A list of faces. Keep the ones that extend beyond EOL.
|
|
|
|
(delq nil (mapcar (lambda (f)
|
|
|
|
(if (visual-wrap--face-extend-p f) f))
|
|
|
|
eol-face)))))))
|
|
|
|
|
2024-07-28 03:48:38 +00:00
|
|
|
(defun visual-wrap--adjust-prefix (prefix)
|
|
|
|
"Adjust PREFIX with `visual-wrap-extra-indent'."
|
|
|
|
(if (numberp prefix)
|
|
|
|
(+ visual-wrap-extra-indent prefix)
|
|
|
|
(let ((prefix-len (string-width prefix)))
|
|
|
|
(cond
|
|
|
|
((= 0 visual-wrap-extra-indent)
|
|
|
|
prefix)
|
|
|
|
((< 0 visual-wrap-extra-indent)
|
|
|
|
(concat prefix (make-string visual-wrap-extra-indent ?\s)))
|
|
|
|
((< 0 (+ visual-wrap-extra-indent prefix-len))
|
|
|
|
(substring prefix
|
|
|
|
0 (+ visual-wrap-extra-indent prefix-len)))
|
|
|
|
(t
|
|
|
|
"")))))
|
|
|
|
|
|
|
|
(defun visual-wrap--apply-to-line (position)
|
|
|
|
"Apply visual-wrapping properties to the logical line starting at POSITION."
|
|
|
|
(save-excursion
|
|
|
|
(goto-char position)
|
Mark if-let and when-let obsolete
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark
if-let and when-let obsolete (bug#73853 and elsewhere). Move
docstring text around so that if-let* and when-let* descriptions
no longer refer to if-let and when-let.
* etc/NEWS: Announce the change.
* admin/admin.el (reminder-for-release-blocking-bugs):
* doc/misc/erc.texi (display-buffer):
* lisp/ansi-color.el (ansi-color-apply)
(ansi-color--face-vec-face):
* lisp/ansi-osc.el (ansi-osc-apply-on-region)
(ansi-osc-hyperlink):
* lisp/arc-mode.el (archive-goto-file)
(archive-next-file-displayer):
* lisp/auth-source-pass.el (auth-source-pass-search)
(auth-source-pass--parse-data)
(auth-source-pass--find-match-many):
* lisp/autorevert.el (auto-revert-notify-rm-watch):
* lisp/buff-menu.el (Buffer-menu-unmark-all-buffers)
(Buffer-menu-group-by-root):
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
* lisp/cedet/pulse.el (pulse-tick):
* lisp/comint.el (comint--fontify-input-ppss-flush-indirect)
(comint--intersect-regions):
* lisp/completion-preview.el (completion-preview--try-table)
(completion-preview--capf-wrapper, completion-preview--update):
* lisp/cus-edit.el (setopt--set)
(custom-dirlocals-maybe-update-cons, custom-dirlocals-validate):
* lisp/custom.el (load-theme):
* lisp/descr-text.el (describe-char):
* lisp/desktop.el (desktop--emacs-pid-running-p):
* lisp/dired-x.el (menu):
* lisp/dired.el (dired-font-lock-keywords)
(dired-insert-directory, dired--insert-disk-space, dired-mode):
* lisp/dnd.el (dnd-handle-multiple-urls):
* lisp/dom.el (dom-remove-attribute):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare):
* lisp/emacs-lisp/comp-common.el (comp-function-type-spec):
* lisp/emacs-lisp/comp-cstr.el (comp--all-classes)
(comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem)
(comp-cstr-intersection-no-mem, comp-cstr-fixnum-p)
(comp-cstr-type-p):
* lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install)
(native--compile-async):
* lisp/emacs-lisp/comp.el (comp--get-function-cstr)
(comp--function-pure-p, comp--intern-func-in-ctxt)
(comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar)
(comp--add-call-cstr, comp--compute-dominator-tree)
(comp--dom-tree-walker, comp--ssa-rename)
(comp--function-call-maybe-fold, comp--fwprop-call)
(comp--call-optim-func):
* lisp/emacs-lisp/edebug.el (edebug-global-prefix)
(edebug-remove-instrumentation):
* lisp/emacs-lisp/eieio.el (initialize-instance):
* lisp/emacs-lisp/ert-x.el (ert-resource-directory):
* lisp/emacs-lisp/ert.el (ert--expand-should-1)
(ert-test-location, ert-write-junit-test-report)
(ert-test--erts-test):
* lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string)
(icons--create):
* lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p):
* lisp/emacs-lisp/loaddefs-gen.el
(loaddefs-generate--make-autoload)
(loaddefs-generate--parse-file):
* lisp/emacs-lisp/multisession.el
(multisession-edit-mode--revert, multisession-edit-value):
* lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data)
(package-vc--version, package-vc--clone):
* lisp/emacs-lisp/package.el (package--reload-previously-loaded):
* lisp/emacs-lisp/pp.el (pp--insert-lisp):
* lisp/emacs-lisp/subr-x.el (add-display-text-property):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print):
* lisp/emacs-lisp/timer.el (run-at-time):
* lisp/emacs-lisp/vtable.el (vtable-goto-table)
(vtable-goto-column, vtable-update-object, vtable--insert-line)
(vtable--compute-widths, vtable--make-keymap):
* lisp/emacs-lisp/warnings.el (display-warning):
* lisp/epa-file.el (epa-file-insert-file-contents):
* lisp/epa.el (epa-show-key):
* lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt)
(PRIVMSG, erc--get-isupport-entry):
* lisp/erc/erc-button.el (erc-button-add-nickname-buttons)
(erc--button-next):
* lisp/erc/erc-common.el (erc--find-group):
* lisp/erc/erc-fill.el (erc-fill, erc-fill-static)
(erc-fill--wrap-escape-hidden-speaker)
(erc-fill--wrap-unmerge-on-date-stamp)
(erc-fill--wrap-massage-initial-message-post-clear)
(erc-fill-wrap, erc-fill--wrap-rejigger-region):
* lisp/erc/erc-goodies.el (erc--scrolltobottom-all)
(erc--keep-place-indicator-on-window-buffer-change)
(keep-place-indicator, erc--keep-place-indicator-adjust-on-clear)
(erc-keep-place-move, erc--command-indicator-display):
* lisp/erc/erc-ibuffer.el (erc-members):
* lisp/erc/erc-join.el (erc-join--remove-requested-channel)
(erc-autojoin--join):
* lisp/erc/erc-networks.el
(erc-networks--id-qualifying-init-parts, erc-networks--id-reload)
(erc-networks--id-ensure-comparable)
(erc-networks--reclaim-orphaned-target-buffers)
(erc-networks--server-select):
* lisp/erc/erc-nicks.el (erc-nicks-invert)
(erc-nicks--redirect-face-widget-link, erc-nicks--highlight)
(erc-nicks--highlight-button)
(erc-nicks--list-faces-help-button-action, erc-nicks-list-faces)
(erc-nicks-refresh, erc-nicks--colors-from-faces)
(erc-nicks--track-prioritize)
(erc-nicks--remember-face-for-track):
* lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next)
(erc--querypoll-on-352, erc--querypoll-send):
* lisp/erc/erc-sasl.el (erc-sasl--read-password):
* lisp/erc/erc-services.el
(erc-services-issue-ghost-and-retry-nick):
* lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar)
(erc-speedbar-toggle-nicknames-window-lock)
(erc-speedbar--compose-nicks-face):
* lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect)
(erc-stamp-prefix-log-filter, erc--conceal-prompt)
(erc--insert-timestamp-left, erc-insert-timestamp-right)
(erc-stamp--defer-date-insertion-on-post-modify)
(erc-insert-timestamp-left-and-right)
(erc-stamp--redo-right-stamp-post-clear)
(erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps):
* lisp/erc/erc-status-sidebar.el (bufbar)
(erc-status-sidebar-prefer-target-as-name)
(erc-status-sidebar-default-allsort, erc-status-sidebar-click):
* lisp/erc/erc-track.el (erc-track--shortened-names-get)
(erc-track--setup, erc-track--select-mode-line-face)
(erc-track-modified-channels, erc-track--collect-faces-in)
(erc-track--switch-buffer, erc-track--replace-killed-buffer):
* lisp/erc/erc-truncate.el (erc-truncate--setup)
(erc-truncate-buffer):
* lisp/erc/erc.el (erc--ensure-query-member)
(erc--ensure-query-members, erc--remove-channel-users-but)
(erc--cusr-change-status, erc--find-mode, erc--update-modules)
(erc-log-irc-protocol, erc--refresh-prompt)
(erc--restore-important-text-props)
(erc--order-text-properties-from-hash, erc-send-input-line)
(erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY)
(erc-cmd-BANLIST, erc--speakerize-nick)
(erc--format-speaker-input-message, erc-channel-receive-names)
(erc-send-current-line, erc-format-target-and/or-network)
(erc-kill-buffer-function, erc-restore-text-properties)
(erc--get-eq-comparable-cmd):
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which)
(eshell-maybe-replace-by-alias):
* lisp/eshell/em-glob.el (eshell-glob-convert):
* lisp/eshell/em-pred.el (eshell-pred-user-or-group)
(eshell-pred-file-time, eshell-pred-file-type)
(eshell-pred-file-mode, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-prompt.el (eshell-forward-paragraph)
(eshell-next-prompt):
* lisp/eshell/esh-arg.el (eshell-resolve-current-argument):
* lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which)
(eshell-plain-command--which, eshell-plain-command):
* lisp/eshell/esh-io.el (eshell-duplicate-handles)
(eshell-protect-handles, eshell-get-target, eshell-close-target):
* lisp/eshell/esh-proc.el (eshell-sentinel):
* lisp/eshell/esh-var.el (eshell-parse-variable-ref)
(eshell-get-variable, eshell-set-variable):
* lisp/faces.el (face-at-point):
* lisp/ffap.el (ffap-in-project):
* lisp/filenotify.el (file-notify--rm-descriptor):
* lisp/files-x.el (read-dir-locals-file)
(connection-local-update-profile-variables)
(connection-local-value):
* lisp/files.el (file-remote-p, abbreviate-file-name)
(set-auto-mode, hack-local-variables)
(revert-buffer-restore-read-only):
* lisp/find-dired.el (find-dired-sort-by-filename):
* lisp/font-lock.el (font-lock--filter-keywords):
* lisp/gnus/gnus-art.el (article-emojize-symbols):
* lisp/gnus/gnus-int.el (gnus-close-server):
* lisp/gnus/gnus-search.el (gnus-search-transform)
(gnus-search-indexed-parse-output, gnus-search-server-to-engine):
* lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url):
* lisp/gnus/gnus.el (gnus-check-backend-function):
* lisp/gnus/message.el (message-send-mail):
* lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers):
* lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article)
(nnatom--read-article-or-group-authors, nnatom--read-publish)
(nnatom--read-update, nnatom--read-links):
* lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server)
(nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article)
(nnfeed-retrieve-headers, nnfeed--print-part)
(nnfeed-request-article, nnfeed-request-group)
(nnfeed-request-list, nnfeed--group-description)
(nnfeed-request-group-description)
(nnfeed-request-list-newsgroups, nnfeed-request-rename-group):
* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads):
* lisp/help-fns.el (help-find-source)
(help-fns--insert-menu-bindings, help-fns--mention-first-release)
(help-fns--mention-shortdoc-groups)
(help-fns--customize-variable-version)
(help-fns--face-custom-version-info, describe-mode):
* lisp/help-mode.el (help-make-xrefs):
* lisp/help.el (help-key-description, help--describe-command):
* lisp/hfy-cmap.el (htmlfontify-load-rgb-file):
* lisp/ibuf-ext.el (ibuffer-jump-to-filter-group)
(ibuffer-kill-filter-group, ibuffer-kill-line)
(ibuffer-save-filter-groups, ibuffer-save-filters, filename)
(basename, file-extension, ibuffer-diff-buffer-with-file-1)
(ibuffer-mark-by-file-name-regexp)
(ibuffer-mark-by-content-regexp):
* lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen):
* lisp/ibuffer.el (ibuffer-mouse-toggle-mark)
(ibuffer-toggle-marks, ibuffer-mark-interactive)
(ibuffer-compile-format, process, ibuffer-map-lines):
* lisp/image.el (image--compute-map)
(image--compute-original-map):
* lisp/image/exif.el (exif-parse-buffer):
* lisp/image/image-converter.el (image-convert-p, image-convert)
(image-converter--find-converter):
* lisp/image/image-dired-util.el
(image-dired-file-name-at-point):
* lisp/image/image-dired.el (image-dired-track-original-file)
(image-dired--on-file-in-dired-buffer)
(image-dired--with-thumbnail-buffer)
(image-dired-jump-original-dired-buffer)
(image-dired--slideshow-step, image-dired-display-image):
* lisp/image/wallpaper.el (wallpaper--init-action-kill)
(wallpaper--find-setter, wallpaper--find-command)
(wallpaper--find-command-args, wallpaper--x-monitor-name):
* lisp/info-look.el (info-lookup-interactive-arguments)
(info-complete)::(:mode):
* lisp/info.el (info-pop-to-buffer, Info-read-node-name-1):
* lisp/international/emoji.el (emoji--adjust-displayable-1)
(emoji--add-recent):
* lisp/jsonrpc.el (jsonrpc--call-deferred)
(jsonrpc--process-sentinel, jsonrpc--remove):
* lisp/keymap.el (keymap-local-lookup):
* lisp/mail/emacsbug.el (report-emacs-bug-hook)
(submit-emacs-patch):
* lisp/mail/ietf-drums.el (ietf-drums-parse-addresses):
* lisp/mail/mailclient.el (mailclient-send-it):
* lisp/mail/rfc6068.el (rfc6068-parse-mailto-url):
* lisp/mail/undigest.el (rmail-digest-parse-mixed-mime):
* lisp/minibuffer.el (completion-metadata-get)
(completions--after-change)
(minibuffer-visible-completions--filter):
* lisp/net/browse-url.el (browse-url-url-at-point)
(browse-url-file-url, browse-url-emacs):
* lisp/net/dbus.el (dbus-byte-array-to-string)
(dbus-monitor-goto-serial):
* lisp/net/dictionary.el (dictionary-search):
* lisp/net/eww.el (eww--download-directory)
(eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit)
(eww-follow-link, eww-read-alternate-url)
(eww-copy-alternate-url):
* lisp/net/goto-addr.el (goto-address-at-point):
* lisp/net/mailcap.el (mailcap-mime-info):
* lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string)
(rcirc-kill-buffer-hook, rcirc-print, rcirc-when)
(rcirc-color-attributes, rcirc-handler-NICK)
(rcirc-handler-TAGMSG, rcirc-handler-BATCH):
* lisp/net/shr.el (shr-descend, shr-adaptive-fill-function)
(shr-correct-dom-case, shr-tag-a):
* lisp/net/sieve.el (sieve-manage-quit):
* lisp/outline.el (outline-cycle-buffer):
* lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate):
* lisp/proced.el (proced-auto-update-timer):
* lisp/progmodes/bug-reference.el
(bug-reference-try-setup-from-vc):
* lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph):
* lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset)
(c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun):
* lisp/progmodes/compile.el (compilation-error-properties)
(compilation-find-file-1):
* lisp/progmodes/eglot.el (eglot--check-object)
(eglot--read-server, eglot-upgrade-eglot)
(eglot-handle-notification, eglot--CompletionParams)
(eglot-completion-at-point, eglot--sig-info)
(eglot-register-capability):
* lisp/progmodes/elisp-mode.el
(emacs-lisp-native-compile-and-load)
(elisp-eldoc-var-docstring-with-value):
* lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test):
* lisp/progmodes/flymake.el (flymake--update-eol-overlays)
(flymake-eldoc-function):
* lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom)
(gdb-frame-handler):
* lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring)
(go-ts-mode--comment-on-previous-line-p)
(go-ts-mode--get-test-regexp-at-point)
(go-ts-mode-test-this-file):
* lisp/progmodes/grep.el (lgrep, rgrep-default-command)
(grep-file-at-point):
* lisp/progmodes/perl-mode.el (perl--end-of-format-p):
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun):
* lisp/progmodes/project.el (project--other-place-command)
(project--find-default-from, project--transplant-file-name)
(project-prefixed-buffer-name, project--remove-from-project-list)
(project-prompt-project-name, project-remember-projects-under)
(project--switch-project-command)
(project-uniquify-dirname-transform, project-mode-line-format):
* lisp/progmodes/python.el
(python-font-lock-keywords-maximum-decoration)
(python--treesit-fontify-union-types)
(python-shell-get-process-name, python-shell-restart)
(python-shell-completion-at-point, python-ffap-module-path)
(python-util-comint-end-of-output-p, python--import-sources)
(python-add-import, python-remove-import, python-fix-imports):
* lisp/progmodes/xref.el (xref--add-log-current-defun):
* lisp/repeat.el (repeat-echo-message-string):
* lisp/saveplace.el (save-place-dired-hook):
* lisp/server.el (server-save-buffers-kill-terminal):
* lisp/shadowfile.el (shadow-make-fullname)
(shadow-contract-file-name, shadow-define-literal-group):
* lisp/shell.el (shell-highlight-undef-mode):
* lisp/simple.el (command-completion-using-modes-p)
(command-execute, file-user-uid, file-group-gid)
(first-completion, last-completion, switch-to-completions):
* lisp/startup.el (startup--load-user-init-file):
* lisp/tab-line.el (tab-line-tabs-buffer-group-by-project):
* lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer):
* lisp/term/android-win.el (android-encode-select-string)
(gui-backend-set-selection):
* lisp/term/haiku-win.el (haiku-dnd-convert-string)
(haiku-select-encode-xstring, haiku-select-encode-utf-8-string):
* lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize):
* lisp/textmodes/ispell.el (ispell-completion-at-point):
* lisp/textmodes/sgml-mode.el (sgml-validate)
(html-mode--complete-at-point):
* lisp/textmodes/tex-mode.el (tex-recenter-output-buffer)
(xref-backend-references):
* lisp/thingatpt.el (thing-at-point-file-at-point)
(thing-at-point-face-at-point):
* lisp/thread.el (thread-list--get-status):
* lisp/time.el (world-clock-copy-time-as-kill, world-clock):
* lisp/touch-screen.el (touch-screen-handle-touch):
* lisp/treesit.el (treesit-language-at, treesit-node-at)
(treesit-node-on, treesit-buffer-root-node)
(treesit-node-field-name, treesit-local-parsers-at)
(treesit-local-parsers-on, treesit--cleanup-local-range-overlays)
(treesit-font-lock-recompute-features)
(treesit-font-lock-fontify-region, treesit-transpose-sexps)
(treesit-add-log-current-defun, treesit-major-mode-setup)
(treesit--explorer-refresh, treesit-install-language-grammar):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/vc/smerge-mode.el (smerge-diff):
* lisp/vc/vc-dir.el (vc-dir):
* lisp/vc/vc-dispatcher.el (vc-do-async-command):
* lisp/vc/vc-git.el (vc-git-dir--branch-headers)
(vc-git-dir--stash-headers, vc-git--log-edit-summary-check)
(vc-git-stash-list):
* lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset)
(vc-clone):
* lisp/visual-wrap.el (visual-wrap--apply-to-line):
* lisp/wid-edit.el (widget-text)
(widget-editable-list-insert-before):
* lisp/window-tool-bar.el
(window-tool-bar--keymap-entry-to-string):
* lisp/window.el (display-buffer, display-buffer-full-frame)
(window-point-context-set, window-point-context-use)
(window-point-context-use-default-function):
* lisp/xdg.el (xdg-current-desktop):
* lisp/xwidget.el (xwidget-webkit-callback):
* lisp/yank-media.el (yank-media--get-selection)
(yank-media-types):
* test/lisp/comint-tests.el
(comint-tests/test-password-function):
* test/lisp/completion-preview-tests.el
(completion-preview-tests--capf):
* test/lisp/cus-edit-tests.el (with-cus-edit-test):
* test/lisp/erc/erc-scenarios-base-local-modules.el
(-phony-sblm-):
* test/lisp/erc/erc-scenarios-stamp.el
(erc-scenarios-stamp--on-post-modify):
* test/lisp/erc/erc-services-tests.el
(erc-services-tests--asp-parse-entry):
* test/lisp/erc/erc-tests.el (erc-modules--internal-property)
(erc--find-mode, erc-tests--update-modules):
* test/lisp/erc/resources/erc-d/erc-d-i.el
(erc-d-i--parse-message):
* test/lisp/erc/resources/erc-d/erc-d-t.el
(erc-d-t-kill-related-buffers, erc-d-t-with-cleanup):
* test/lisp/erc/resources/erc-d/erc-d-tests.el
(erc-d-i--parse-message--irc-parser-tests):
* test/lisp/erc/resources/erc-d/erc-d-u.el
(erc-d-u--read-exchange-slowly):
* test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire)
(erc-d--finalize-done, erc-d--command-handle-all):
* test/lisp/erc/resources/erc-scenarios-common.el
(erc-scenarios-common-with-cleanup):
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests--common-display-message)
(erc-tests-common-create-subprocess):
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058):
* test/lisp/international/mule-tests.el
(mule-cmds-tests--ucs-names-missing-names):
* test/lisp/progmodes/python-tests.el
(python-tests-get-shell-interpreter)
(python-tests--get-interpreter-info):
* test/lisp/progmodes/ruby-ts-mode-tests.el
(ruby-ts-resource-file):
* test/lisp/replace-tests.el (replace-tests-with-undo):
* test/src/emacs-tests.el (emacs-tests--seccomp-debug):
* test/src/process-tests.el (process-tests--emacs-command)
(process-tests--emacs-binary, process-tests--dump-file):
* test/src/treesit-tests.el (treesit--ert-test-defun-navigation):
Replace use of the now-obsolete if-let and when-let.
2024-10-24 08:50:07 +00:00
|
|
|
(when-let* ((first-line-prefix (fill-match-adaptive-prefix))
|
|
|
|
(next-line-prefix (visual-wrap--content-prefix
|
|
|
|
first-line-prefix position)))
|
2024-07-28 03:48:38 +00:00
|
|
|
(when (numberp next-line-prefix)
|
2024-08-17 20:21:00 +00:00
|
|
|
;; Set a minimum width for the prefix so it lines up correctly
|
|
|
|
;; with subsequent lines. Make sure not to do this past the end
|
|
|
|
;; of the line though! (`fill-match-adaptive-prefix' could
|
|
|
|
;; potentially return a prefix longer than the current line in
|
|
|
|
;; the buffer.)
|
2024-08-05 02:37:00 +00:00
|
|
|
(add-display-text-property
|
2024-08-17 20:21:00 +00:00
|
|
|
position (min (+ position (length first-line-prefix))
|
|
|
|
(line-end-position))
|
2024-08-05 02:37:00 +00:00
|
|
|
'min-width `((,next-line-prefix . width))))
|
2024-07-28 03:48:38 +00:00
|
|
|
(setq next-line-prefix (visual-wrap--adjust-prefix next-line-prefix))
|
|
|
|
(put-text-property
|
|
|
|
position (line-end-position) 'wrap-prefix
|
|
|
|
(if (numberp next-line-prefix)
|
|
|
|
`(space :align-to (,next-line-prefix . width))
|
|
|
|
next-line-prefix)))))
|
|
|
|
|
|
|
|
(defun visual-wrap--content-prefix (prefix position)
|
|
|
|
"Get the next-line prefix for the specified first-line PREFIX.
|
|
|
|
POSITION is the position in the buffer where PREFIX is located.
|
|
|
|
|
|
|
|
This returns a string prefix to use for subsequent lines; an integer,
|
|
|
|
indicating the number of canonical-width spaces to use; or nil, if
|
|
|
|
PREFIX was empty."
|
|
|
|
(cond
|
|
|
|
((string= prefix "")
|
|
|
|
nil)
|
|
|
|
((or (and adaptive-fill-first-line-regexp
|
|
|
|
(string-match adaptive-fill-first-line-regexp prefix))
|
|
|
|
(and comment-start-skip
|
|
|
|
(string-match comment-start-skip prefix)))
|
|
|
|
;; If we want to repeat the first-line prefix on subsequent lines,
|
|
|
|
;; return its string value. However, we remove any `wrap-prefix'
|
|
|
|
;; property that might have been added earlier. Otherwise, we end
|
|
|
|
;; up with a string containing a `wrap-prefix' string containing a
|
|
|
|
;; `wrap-prefix' string...
|
|
|
|
(remove-text-properties 0 (length prefix) '(wrap-prefix) prefix)
|
|
|
|
prefix)
|
|
|
|
(t
|
|
|
|
;; Otherwise, we want the prefix to be whitespace of the same width
|
2024-08-23 22:11:24 +00:00
|
|
|
;; as the first-line prefix. We want to return an integer width (in
|
|
|
|
;; units of the font's average-width) large enough to fit the
|
|
|
|
;; first-line prefix.
|
|
|
|
(let ((avg-space (propertize (buffer-substring position (1+ position))
|
|
|
|
'display '(space :width 1))))
|
2024-10-19 23:12:43 +00:00
|
|
|
;; Remove any `min-width' display specs since we'll replace with
|
|
|
|
;; our own later in `visual-wrap--apply-to-line' (bug#73882).
|
|
|
|
(add-display-text-property 0 (length prefix) 'min-width nil prefix)
|
|
|
|
(max (string-width prefix)
|
|
|
|
(ceiling (string-pixel-width prefix (current-buffer))
|
|
|
|
(string-pixel-width avg-space (current-buffer))))))))
|
2024-01-27 01:30:16 +00:00
|
|
|
|
|
|
|
(defun visual-wrap-fill-context-prefix (beg end)
|
2024-01-27 17:15:00 +00:00
|
|
|
"Compute visual wrap prefix from text between BEG and END.
|
2024-01-27 08:38:14 +00:00
|
|
|
This is like `fill-context-prefix', but with prefix length adjusted
|
|
|
|
by `visual-wrap-extra-indent'."
|
2024-07-28 03:48:38 +00:00
|
|
|
(declare (obsolete nil "31.1"))
|
2024-01-27 01:30:16 +00:00
|
|
|
(let* ((fcp
|
|
|
|
;; `fill-context-prefix' ignores prefixes that look like
|
|
|
|
;; paragraph starts, in order to avoid inadvertently
|
|
|
|
;; creating a new paragraph while filling, but here we're
|
|
|
|
;; only dealing with single-line "paragraphs" and we don't
|
|
|
|
;; actually modify the buffer, so this restriction doesn't
|
|
|
|
;; make much sense (and is positively harmful in
|
|
|
|
;; taskpaper-mode where paragraph-start matches everything).
|
2024-01-27 11:36:15 +00:00
|
|
|
(or (let ((paragraph-start regexp-unmatchable))
|
2024-08-23 22:11:24 +00:00
|
|
|
(fill-context-prefix beg end))
|
2024-01-27 01:30:16 +00:00
|
|
|
;; Note: fill-context-prefix may return nil; See:
|
|
|
|
;; http://article.gmane.org/gmane.emacs.devel/156285
|
|
|
|
""))
|
2024-07-28 03:48:38 +00:00
|
|
|
(prefix (visual-wrap--adjust-prefix fcp))
|
2024-01-27 01:30:16 +00:00
|
|
|
(face (visual-wrap--prefix-face fcp beg end)))
|
|
|
|
(if face
|
|
|
|
(propertize prefix 'face face)
|
|
|
|
prefix)))
|
|
|
|
|
|
|
|
(defun visual-wrap-prefix-function (beg end)
|
|
|
|
"Indent the region between BEG and END with visual filling."
|
|
|
|
;; Any change at the beginning of a line might change its wrap
|
|
|
|
;; prefix, which affects the whole line. So we need to "round-up"
|
|
|
|
;; `end' to the nearest end of line. We do the same with `beg'
|
|
|
|
;; although it's probably not needed.
|
|
|
|
(goto-char end)
|
|
|
|
(unless (bolp) (forward-line 1))
|
|
|
|
(setq end (point))
|
|
|
|
(goto-char beg)
|
|
|
|
(forward-line 0)
|
|
|
|
(setq beg (point))
|
|
|
|
(while (< (point) end)
|
2024-07-28 03:48:38 +00:00
|
|
|
(visual-wrap--apply-to-line (point))
|
|
|
|
(forward-line))
|
2024-01-27 01:30:16 +00:00
|
|
|
`(jit-lock-bounds ,beg . ,end))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(define-minor-mode visual-wrap-prefix-mode
|
2024-02-01 08:08:47 +00:00
|
|
|
"Display continuation lines with prefixes from surrounding context.
|
|
|
|
To enable this minor mode across all buffers, enable
|
|
|
|
`global-visual-wrap-prefix-mode'."
|
2024-01-27 01:30:16 +00:00
|
|
|
:lighter ""
|
|
|
|
:group 'visual-line
|
|
|
|
(if visual-wrap-prefix-mode
|
|
|
|
(progn
|
|
|
|
;; HACK ATTACK! We want to run after font-lock (so our
|
|
|
|
;; wrap-prefix includes the faces applied by font-lock), but
|
|
|
|
;; jit-lock-register doesn't accept an `append' argument, so
|
|
|
|
;; we add ourselves beforehand, to make sure we're at the end
|
|
|
|
;; of the hook (bug#15155).
|
|
|
|
(add-hook 'jit-lock-functions
|
|
|
|
#'visual-wrap-prefix-function 'append t)
|
|
|
|
(jit-lock-register #'visual-wrap-prefix-function))
|
|
|
|
(jit-lock-unregister #'visual-wrap-prefix-function)
|
|
|
|
(with-silent-modifications
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(remove-text-properties (point-min) (point-max) '(wrap-prefix nil))))))
|
|
|
|
|
2024-02-01 08:08:47 +00:00
|
|
|
;;;###autoload
|
|
|
|
(define-globalized-minor-mode global-visual-wrap-prefix-mode
|
|
|
|
visual-wrap-prefix-mode visual-wrap-prefix-mode
|
|
|
|
:init-value nil
|
|
|
|
:group 'visual-line)
|
|
|
|
|
2024-01-27 01:30:16 +00:00
|
|
|
(provide 'visual-wrap)
|
|
|
|
;;; visual-wrap.el ends here
|