2013-12-20 18:21:45 +02:00
|
|
|
;;; subr-x.el --- extra Lisp functions -*- lexical-binding:t -*-
|
2013-11-04 17:34:42 +02:00
|
|
|
|
2024-01-02 09:47:10 +08:00
|
|
|
;; Copyright (C) 2013-2024 Free Software Foundation, Inc.
|
2013-11-04 17:34:42 +02:00
|
|
|
|
2019-05-25 13:43:06 -07:00
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2013-11-04 17:34:42 +02:00
|
|
|
;; Keywords: convenience
|
|
|
|
;; Package: emacs
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs 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.
|
|
|
|
|
|
|
|
;; GNU Emacs 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
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2013-11-04 17:34:42 +02:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2013-12-20 18:21:45 +02:00
|
|
|
;; Less commonly used functions that complement basic APIs, often implemented in
|
|
|
|
;; C code (like hash-tables and strings), and are not eligible for inclusion
|
|
|
|
;; in subr.el.
|
|
|
|
|
2014-01-20 15:05:04 -05:00
|
|
|
;; Do not document these functions in the lispref.
|
2017-11-25 22:45:41 -08:00
|
|
|
;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01006.html
|
2014-01-20 15:05:04 -05:00
|
|
|
|
2017-04-18 19:07:28 -04:00
|
|
|
;; NB If you want to use this library, it's almost always correct to use:
|
|
|
|
;; (eval-when-compile (require 'subr-x))
|
|
|
|
|
2013-11-04 17:34:42 +02:00
|
|
|
;;; Code:
|
|
|
|
|
2016-11-26 12:03:25 +09:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 01:11:43 -03:00
|
|
|
|
|
|
|
|
|
|
|
(defmacro internal--thread-argument (first? &rest forms)
|
|
|
|
"Internal implementation for `thread-first' and `thread-last'.
|
|
|
|
When Argument FIRST? is non-nil argument is threaded first, else
|
|
|
|
last. FORMS are the expressions to be threaded."
|
|
|
|
(pcase forms
|
|
|
|
(`(,x (,f . ,args) . ,rest)
|
|
|
|
`(internal--thread-argument
|
|
|
|
,first? ,(if first? `(,f ,x ,@args) `(,f ,@args ,x)) ,@rest))
|
|
|
|
(`(,x ,f . ,rest) `(internal--thread-argument ,first? (,f ,x) ,@rest))
|
|
|
|
(_ (car forms))))
|
|
|
|
|
|
|
|
(defmacro thread-first (&rest forms)
|
2014-09-11 12:44:25 -07:00
|
|
|
"Thread FORMS elements as the first argument of their successor.
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 01:11:43 -03:00
|
|
|
Example:
|
|
|
|
(thread-first
|
|
|
|
5
|
|
|
|
(+ 20)
|
|
|
|
(/ 25)
|
|
|
|
-
|
|
|
|
(+ 40))
|
|
|
|
Is equivalent to:
|
|
|
|
(+ (- (/ (+ 5 20) 25)) 40)
|
|
|
|
Note how the single `-' got converted into a list before
|
|
|
|
threading."
|
2021-09-22 05:57:48 +02:00
|
|
|
(declare (indent 0)
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 01:11:43 -03:00
|
|
|
(debug (form &rest [&or symbolp (sexp &rest form)])))
|
|
|
|
`(internal--thread-argument t ,@forms))
|
|
|
|
|
|
|
|
(defmacro thread-last (&rest forms)
|
2014-09-11 12:44:25 -07:00
|
|
|
"Thread FORMS elements as the last argument of their successor.
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 01:11:43 -03:00
|
|
|
Example:
|
|
|
|
(thread-last
|
|
|
|
5
|
|
|
|
(+ 20)
|
|
|
|
(/ 25)
|
|
|
|
-
|
|
|
|
(+ 40))
|
|
|
|
Is equivalent to:
|
|
|
|
(+ 40 (- (/ 25 (+ 20 5))))
|
|
|
|
Note how the single `-' got converted into a list before
|
|
|
|
threading."
|
2021-09-22 05:57:48 +02:00
|
|
|
(declare (indent 0) (debug thread-first))
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 01:11:43 -03:00
|
|
|
`(internal--thread-argument nil ,@forms))
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
|
2015-05-20 18:50:38 +03:00
|
|
|
(defsubst hash-table-empty-p (hash-table)
|
|
|
|
"Check whether HASH-TABLE is empty (has 0 elements)."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (side-effect-free t))
|
2015-05-20 18:50:38 +03:00
|
|
|
(zerop (hash-table-count hash-table)))
|
2015-05-20 18:49:20 +03:00
|
|
|
|
2013-11-04 17:34:42 +02:00
|
|
|
(defsubst hash-table-keys (hash-table)
|
|
|
|
"Return a list of keys in HASH-TABLE."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (side-effect-free t))
|
2022-06-17 19:13:33 +02:00
|
|
|
(let ((keys nil))
|
|
|
|
(maphash (lambda (k _) (push k keys)) hash-table)
|
|
|
|
keys))
|
2013-11-04 17:34:42 +02:00
|
|
|
|
|
|
|
(defsubst hash-table-values (hash-table)
|
|
|
|
"Return a list of values in HASH-TABLE."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (side-effect-free t))
|
2022-06-17 19:13:33 +02:00
|
|
|
(let ((values nil))
|
|
|
|
(maphash (lambda (_ v) (push v values)) hash-table)
|
|
|
|
values))
|
2013-11-04 17:34:42 +02:00
|
|
|
|
2022-09-17 12:31:24 +02:00
|
|
|
;;;###autoload
|
2013-11-25 21:04:50 +02:00
|
|
|
(defsubst string-join (strings &optional separator)
|
2021-10-05 15:36:31 +02:00
|
|
|
"Join all STRINGS using SEPARATOR.
|
|
|
|
Optional argument SEPARATOR must be a string, a vector, or a list of
|
|
|
|
characters; nil stands for the empty string."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2018-06-01 21:58:10 +01:00
|
|
|
(mapconcat #'identity strings separator))
|
2013-11-25 21:04:50 +02:00
|
|
|
|
2014-09-29 14:14:08 -04:00
|
|
|
(define-obsolete-function-alias 'string-reverse 'reverse "25.1")
|
2013-11-26 17:24:10 +02:00
|
|
|
|
2020-03-07 18:26:44 +01:00
|
|
|
;;;###autoload
|
|
|
|
(defun string-truncate-left (string length)
|
2022-07-23 08:55:20 +02:00
|
|
|
"If STRING is longer than LENGTH, return a truncated version.
|
|
|
|
When truncating, \"...\" is always prepended to the string, so
|
|
|
|
the resulting string may be longer than the original if LENGTH is
|
|
|
|
3 or smaller."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2020-03-07 18:26:44 +01:00
|
|
|
(let ((strlen (length string)))
|
|
|
|
(if (<= strlen length)
|
|
|
|
string
|
|
|
|
(setq length (max 0 (- length 3)))
|
2022-07-23 08:55:20 +02:00
|
|
|
(concat "..." (substring string (min (1- strlen)
|
|
|
|
(max 0 (- strlen length))))))))
|
2020-03-07 18:26:44 +01:00
|
|
|
|
2022-08-09 19:49:40 +02:00
|
|
|
;;;###autoload
|
2013-11-29 18:51:44 +02:00
|
|
|
(defsubst string-blank-p (string)
|
2019-09-01 14:26:18 +02:00
|
|
|
"Check whether STRING is either empty or only whitespace.
|
|
|
|
The following characters count as whitespace here: space, tab, newline and
|
|
|
|
carriage return."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2013-12-07 20:46:03 +02:00
|
|
|
(string-match-p "\\`[ \t\n\r]*\\'" string))
|
2013-11-29 18:51:44 +02:00
|
|
|
|
2013-12-20 18:37:10 +02:00
|
|
|
(defsubst string-remove-prefix (prefix string)
|
|
|
|
"Remove PREFIX from STRING if present."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2013-12-20 18:37:10 +02:00
|
|
|
(if (string-prefix-p prefix string)
|
|
|
|
(substring string (length prefix))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defsubst string-remove-suffix (suffix string)
|
|
|
|
"Remove SUFFIX from STRING if present."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2013-12-20 18:37:10 +02:00
|
|
|
(if (string-suffix-p suffix string)
|
|
|
|
(substring string 0 (- (length string) (length suffix)))
|
|
|
|
string))
|
|
|
|
|
2021-08-14 15:20:59 +02:00
|
|
|
;;;###autoload
|
2020-12-21 18:53:32 +01:00
|
|
|
(defun string-clean-whitespace (string)
|
|
|
|
"Clean up whitespace in STRING.
|
|
|
|
All sequences of whitespaces in STRING are collapsed into a
|
|
|
|
single space character, and leading/trailing whitespace is
|
|
|
|
removed."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (important-return-value t))
|
2020-12-22 04:24:25 +01:00
|
|
|
(let ((blank "[[:blank:]\r\n]+"))
|
2020-12-21 22:34:33 +00:00
|
|
|
(string-trim (replace-regexp-in-string blank " " string t t)
|
2020-12-21 22:41:37 +01:00
|
|
|
blank blank)))
|
2020-12-21 18:53:32 +01:00
|
|
|
|
2024-07-01 05:14:25 +02:00
|
|
|
;;;###autoload
|
2024-07-06 11:28:39 +03:00
|
|
|
(defun string-fill (string width)
|
|
|
|
"Try to word-wrap STRING so that it displays with lines no wider than WIDTH.
|
|
|
|
STRING is wrapped where there is whitespace in it. If there are
|
|
|
|
individual words in STRING that are wider than WIDTH, the result
|
|
|
|
will have lines that are wider than WIDTH."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (important-return-value t))
|
2020-12-21 18:53:32 +01:00
|
|
|
(with-temp-buffer
|
|
|
|
(insert string)
|
|
|
|
(goto-char (point-min))
|
2024-07-06 11:28:39 +03:00
|
|
|
(let ((fill-column width)
|
2020-12-21 18:53:32 +01:00
|
|
|
(adaptive-fill-mode nil))
|
|
|
|
(fill-region (point-min) (point-max)))
|
|
|
|
(buffer-string)))
|
|
|
|
|
2024-07-01 05:14:25 +02:00
|
|
|
;;;###autoload
|
2020-12-25 05:58:09 +01:00
|
|
|
(defun string-limit (string length &optional end coding-system)
|
2021-10-30 10:26:38 +03:00
|
|
|
"Return a substring of STRING that is (up to) LENGTH characters long.
|
|
|
|
If STRING is shorter than or equal to LENGTH characters, return the
|
|
|
|
entire string unchanged.
|
2020-12-22 06:54:32 +01:00
|
|
|
|
2021-10-30 10:26:38 +03:00
|
|
|
If STRING is longer than LENGTH characters, return a substring
|
|
|
|
consisting of the first LENGTH characters of STRING. If END is
|
|
|
|
non-nil, return the last LENGTH characters instead.
|
2020-12-23 07:59:24 +01:00
|
|
|
|
2020-12-25 05:58:09 +01:00
|
|
|
If CODING-SYSTEM is non-nil, STRING will be encoded before
|
|
|
|
limiting, and LENGTH is interpreted as the number of bytes to
|
|
|
|
limit the string to. The result will be a unibyte string that is
|
2022-07-03 14:05:01 +02:00
|
|
|
shorter than LENGTH, but will not contain \"partial\"
|
|
|
|
characters (or glyphs), even if CODING-SYSTEM encodes characters
|
2022-07-05 13:07:56 +02:00
|
|
|
with several bytes per character. If the coding system specifies
|
2022-07-05 19:45:35 +03:00
|
|
|
prefix like the byte order mark (aka \"BOM\") or a shift-in sequence,
|
|
|
|
their bytes will be normally counted as part of LENGTH. This is
|
|
|
|
the case, for instance, with `utf-16'. If this isn't desired, use a
|
|
|
|
coding system that doesn't specify a BOM, like `utf-16le' or `utf-16be'.
|
2020-12-25 05:58:09 +01:00
|
|
|
|
2020-12-23 07:59:24 +01:00
|
|
|
When shortening strings for display purposes,
|
|
|
|
`truncate-string-to-width' is almost always a better alternative
|
|
|
|
than this function."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (important-return-value t))
|
2020-12-22 06:54:32 +01:00
|
|
|
(unless (natnump length)
|
|
|
|
(signal 'wrong-type-argument (list 'natnump length)))
|
2020-12-25 05:58:09 +01:00
|
|
|
(if coding-system
|
2022-07-03 14:05:01 +02:00
|
|
|
;; The previous implementation here tried to encode char by
|
|
|
|
;; char, and then adding up the length of the encoded octets,
|
|
|
|
;; but that's not reliably in the presence of BOM marks and
|
|
|
|
;; ISO-2022-CN which may add charset designations at the
|
|
|
|
;; start/end of each encoded char (which we don't want). So
|
|
|
|
;; iterate (with a binary search) instead to find the desired
|
|
|
|
;; length.
|
|
|
|
(let* ((glyphs (string-glyph-split string))
|
|
|
|
(nglyphs (length glyphs))
|
|
|
|
(too-long (1+ nglyphs))
|
|
|
|
(stop (max (/ nglyphs 2) 1))
|
|
|
|
(gap stop)
|
|
|
|
candidate encoded found candidate-stop)
|
|
|
|
;; We're returning the end of the string.
|
|
|
|
(when end
|
|
|
|
(setq glyphs (nreverse glyphs)))
|
|
|
|
(while (and (not found)
|
|
|
|
(< stop too-long))
|
|
|
|
(setq encoded
|
|
|
|
(encode-coding-string (string-join (seq-take glyphs stop))
|
|
|
|
coding-system))
|
|
|
|
(cond
|
|
|
|
((= (length encoded) length)
|
|
|
|
(setq found encoded
|
|
|
|
candidate-stop stop))
|
|
|
|
;; Too long; try shortening.
|
|
|
|
((> (length encoded) length)
|
|
|
|
(setq too-long stop
|
|
|
|
stop (max (- stop gap) 1)))
|
|
|
|
;; Too short; try lengthening.
|
|
|
|
(t
|
|
|
|
(setq candidate encoded
|
|
|
|
candidate-stop stop)
|
|
|
|
(setq stop
|
|
|
|
(if (>= stop nglyphs)
|
|
|
|
too-long
|
|
|
|
(min (+ stop gap) nglyphs)))))
|
|
|
|
(setq gap (max (/ gap 2) 1)))
|
|
|
|
(cond
|
|
|
|
((not (or found candidate))
|
|
|
|
"")
|
|
|
|
;; We're returning the end, so redo the encoding.
|
|
|
|
(end
|
|
|
|
(encode-coding-string
|
|
|
|
(string-join (nreverse (seq-take glyphs candidate-stop)))
|
|
|
|
coding-system))
|
|
|
|
(t
|
|
|
|
(or found candidate))))
|
|
|
|
;; Char-based version.
|
2020-12-25 05:58:09 +01:00
|
|
|
(cond
|
|
|
|
((<= (length string) length) string)
|
|
|
|
(end (substring string (- (length string) length)))
|
|
|
|
(t (substring string 0 length)))))
|
2020-12-21 18:53:32 +01:00
|
|
|
|
2024-07-01 05:14:25 +02:00
|
|
|
;;;###autoload
|
2020-12-22 06:59:25 +01:00
|
|
|
(defun string-pad (string length &optional padding start)
|
2020-12-21 20:01:28 +01:00
|
|
|
"Pad STRING to LENGTH using PADDING.
|
|
|
|
If PADDING is nil, the space character is used. If not nil, it
|
|
|
|
should be a character.
|
|
|
|
|
|
|
|
If STRING is longer than the absolute value of LENGTH, no padding
|
|
|
|
is done.
|
|
|
|
|
2020-12-22 06:59:25 +01:00
|
|
|
If START is nil (or not present), the padding is done to the end
|
2020-12-22 09:01:47 +00:00
|
|
|
of the string, and if non-nil, padding is done to the start of
|
|
|
|
the string."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2020-12-22 06:59:25 +01:00
|
|
|
(unless (natnump length)
|
|
|
|
(signal 'wrong-type-argument (list 'natnump length)))
|
|
|
|
(let ((pad-length (- length (length string))))
|
2022-08-10 13:06:12 +02:00
|
|
|
(cond ((<= pad-length 0) string)
|
|
|
|
(start (concat (make-string pad-length (or padding ?\s)) string))
|
|
|
|
(t (concat string (make-string pad-length (or padding ?\s)))))))
|
2020-12-21 20:01:28 +01:00
|
|
|
|
2024-07-01 05:14:25 +02:00
|
|
|
;;;###autoload
|
2020-12-21 22:05:37 +01:00
|
|
|
(defun string-chop-newline (string)
|
|
|
|
"Remove the final newline (if any) from STRING."
|
Add some `pure` and `side-effect-free` declarations
* lisp/subr.el (string-to-list, string-to-vector, string-or-null-p)
(booleanp, special-form-p, plistp, macrop, compiled-function-p)
(flatten-tree):
* lisp/emacs-lisp/subr-x.el (string-join, string-truncate-left)
(string-blank-p, string-remove-prefix, string-remove-suffix)
(string-pad, string-chop-newline):
Declare functions pure, side-effect-free, and/or error-free.
2023-02-15 12:01:25 +01:00
|
|
|
(declare (pure t) (side-effect-free t))
|
2020-12-21 23:18:05 +01:00
|
|
|
(string-remove-suffix "\n" string))
|
2020-12-21 22:05:37 +01:00
|
|
|
|
2019-02-23 21:18:36 +01:00
|
|
|
(defun replace-region-contents (beg end replace-fn
|
|
|
|
&optional max-secs max-costs)
|
|
|
|
"Replace the region between BEG and END using REPLACE-FN.
|
|
|
|
REPLACE-FN runs on the current buffer narrowed to the region. It
|
|
|
|
should return either a string or a buffer replacing the region.
|
|
|
|
|
|
|
|
The replacement is performed using `replace-buffer-contents'
|
|
|
|
which also describes the MAX-SECS and MAX-COSTS arguments and the
|
|
|
|
return value.
|
|
|
|
|
|
|
|
Note: If the replacement is a string, it'll be placed in a
|
|
|
|
temporary buffer so that `replace-buffer-contents' can operate on
|
|
|
|
it. Therefore, if you already have the replacement in a buffer,
|
|
|
|
it makes no sense to convert it to a string using
|
|
|
|
`buffer-substring' or similar."
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region beg end)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((repl (funcall replace-fn)))
|
|
|
|
(if (bufferp repl)
|
|
|
|
(replace-buffer-contents repl max-secs max-costs)
|
|
|
|
(let ((source-buffer (current-buffer)))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert repl)
|
|
|
|
(let ((tmp-buffer (current-buffer)))
|
|
|
|
(set-buffer source-buffer)
|
|
|
|
(replace-buffer-contents tmp-buffer max-secs max-costs)))))))))
|
|
|
|
|
2022-07-11 12:18:04 +02:00
|
|
|
;;;###autoload
|
2021-01-20 14:12:50 -05:00
|
|
|
(defmacro named-let (name bindings &rest body)
|
|
|
|
"Looping construct taken from Scheme.
|
|
|
|
Like `let', bind variables in BINDINGS and then evaluate BODY,
|
|
|
|
but with the twist that BODY can evaluate itself recursively by
|
|
|
|
calling NAME, where the arguments passed to NAME are used
|
2023-08-21 13:50:03 +02:00
|
|
|
as the new values of the bound variables in the recursive invocation.
|
|
|
|
|
|
|
|
This construct can only be used with lexical binding."
|
2021-01-20 14:12:50 -05:00
|
|
|
(declare (indent 2) (debug (symbolp (&rest (symbolp form)) body)))
|
|
|
|
(require 'cl-lib)
|
2023-08-21 13:50:03 +02:00
|
|
|
(unless lexical-binding
|
|
|
|
(error "`named-let' requires lexical binding"))
|
2021-01-20 14:12:50 -05:00
|
|
|
(let ((fargs (mapcar (lambda (b) (if (consp b) (car b) b)) bindings))
|
|
|
|
(aargs (mapcar (lambda (b) (if (consp b) (cadr b))) bindings)))
|
|
|
|
;; According to the Scheme semantics of named let, `name' is not in scope
|
|
|
|
;; while evaluating the expressions in `bindings', and for this reason, the
|
|
|
|
;; "initial" function call below needs to be outside of the `cl-labels'.
|
|
|
|
;; When the "self-tco" eliminates all recursive calls, the `cl-labels'
|
|
|
|
;; expands to a lambda which the byte-compiler then combines with the
|
|
|
|
;; funcall to make a `let' so we end up with a plain `while' loop and no
|
|
|
|
;; remaining `lambda' at all.
|
|
|
|
`(funcall
|
|
|
|
(cl-labels ((,name ,fargs . ,body)) #',name)
|
|
|
|
. ,aargs)))
|
|
|
|
|
2024-08-22 16:56:11 +02:00
|
|
|
(defvar work-buffer--list nil)
|
|
|
|
(defvar work-buffer-limit 10
|
|
|
|
"Maximum number of reusable work buffers.
|
|
|
|
When this limit is exceeded, newly allocated work buffers are
|
|
|
|
automatically killed, which means that in a such case
|
|
|
|
`with-work-buffer' becomes equivalent to `with-temp-buffer'.")
|
|
|
|
|
|
|
|
(defsubst work-buffer--get ()
|
|
|
|
"Get a work buffer."
|
|
|
|
(let ((buffer (pop work-buffer--list)))
|
|
|
|
(if (buffer-live-p buffer)
|
|
|
|
buffer
|
|
|
|
(generate-new-buffer " *work*" t))))
|
|
|
|
|
|
|
|
(defun work-buffer--release (buffer)
|
|
|
|
"Release work BUFFER."
|
|
|
|
(if (buffer-live-p buffer)
|
|
|
|
(with-current-buffer buffer
|
|
|
|
;; Flush BUFFER before making it available again, i.e. clear
|
|
|
|
;; its contents, remove all overlays and buffer-local
|
|
|
|
;; variables. Is it enough to safely reuse the buffer?
|
2024-10-30 16:55:52 +02:00
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
;; Avoid deactivating the region as side effect.
|
|
|
|
deactivate-mark)
|
2024-10-05 09:15:46 +08:00
|
|
|
(erase-buffer))
|
2024-08-22 16:56:11 +02:00
|
|
|
(delete-all-overlays)
|
|
|
|
(let (change-major-mode-hook)
|
|
|
|
(kill-all-local-variables t))
|
|
|
|
;; Make the buffer available again.
|
|
|
|
(push buffer work-buffer--list)))
|
|
|
|
;; If the maximum number of reusable work buffers is exceeded, kill
|
|
|
|
;; work buffer in excess, taking into account that the limit could
|
|
|
|
;; have been let-bound to temporarily increase its value.
|
|
|
|
(when (> (length work-buffer--list) work-buffer-limit)
|
|
|
|
(mapc #'kill-buffer (nthcdr work-buffer-limit work-buffer--list))
|
|
|
|
(setq work-buffer--list (ntake work-buffer-limit work-buffer--list))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defmacro with-work-buffer (&rest body)
|
|
|
|
"Create a work buffer, and evaluate BODY there like `progn'.
|
|
|
|
Like `with-temp-buffer', but reuse an already created temporary
|
|
|
|
buffer when possible, instead of creating a new one on each call."
|
|
|
|
(declare (indent 0) (debug t))
|
|
|
|
(let ((work-buffer (make-symbol "work-buffer")))
|
|
|
|
`(let ((,work-buffer (work-buffer--get)))
|
|
|
|
(with-current-buffer ,work-buffer
|
|
|
|
(unwind-protect
|
|
|
|
(progn ,@body)
|
|
|
|
(work-buffer--release ,work-buffer))))))
|
|
|
|
|
2021-10-27 15:41:18 +02:00
|
|
|
;;;###autoload
|
2024-07-27 20:48:38 -07:00
|
|
|
(defun string-pixel-width (string &optional buffer)
|
|
|
|
"Return the width of STRING in pixels.
|
|
|
|
If BUFFER is non-nil, use the face remappings from that buffer when
|
2024-09-11 13:21:58 +08:00
|
|
|
determining the width.
|
2024-09-09 14:28:12 +03:00
|
|
|
If you call this function to measure pixel width of a string
|
|
|
|
with embedded newlines, it returns the width of the widest
|
|
|
|
substring that does not include newlines."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (important-return-value t))
|
2022-02-19 14:20:30 +01:00
|
|
|
(if (zerop (length string))
|
|
|
|
0
|
2022-02-20 15:24:47 +01:00
|
|
|
;; Keeping a work buffer around is more efficient than creating a
|
|
|
|
;; new temporary buffer.
|
2024-08-22 16:56:11 +02:00
|
|
|
(with-work-buffer
|
2024-07-27 20:48:38 -07:00
|
|
|
(if buffer
|
|
|
|
(setq-local face-remapping-alist
|
|
|
|
(with-current-buffer buffer
|
|
|
|
face-remapping-alist))
|
|
|
|
(kill-local-variable 'face-remapping-alist))
|
2024-10-30 16:55:52 +02:00
|
|
|
;; Avoid deactivating the region as side effect.
|
|
|
|
(let (deactivate-mark)
|
|
|
|
(insert string))
|
2024-11-03 22:56:10 +01:00
|
|
|
;; If `display-line-numbers' is enabled in internal
|
|
|
|
;; buffers (e.g. globally), it breaks width calculation
|
|
|
|
;; (bug#59311). Disable `line-prefix' and `wrap-prefix',
|
|
|
|
;; for the same reason.
|
|
|
|
(add-text-properties
|
|
|
|
(point-min) (point-max) '(display-line-numbers-disable t))
|
2024-08-22 16:56:11 +02:00
|
|
|
;; Prefer `remove-text-properties' to `propertize' to avoid
|
|
|
|
;; creating a new string on each call.
|
|
|
|
(remove-text-properties
|
|
|
|
(point-min) (point-max) '(line-prefix nil wrap-prefix nil))
|
2024-11-03 22:56:10 +01:00
|
|
|
(setq line-prefix nil wrap-prefix nil)
|
2022-02-19 14:20:30 +01:00
|
|
|
(car (buffer-text-pixel-size nil nil t)))))
|
2021-10-27 15:41:18 +02:00
|
|
|
|
2021-10-30 15:22:36 +02:00
|
|
|
;;;###autoload
|
|
|
|
(defun string-glyph-split (string)
|
|
|
|
"Split STRING into a list of strings representing separate glyphs.
|
2022-12-25 14:54:33 +02:00
|
|
|
This takes into account combining characters and grapheme clusters:
|
2022-12-26 10:43:57 +01:00
|
|
|
if compositions are enabled, each sequence of characters composed
|
2022-12-25 14:54:33 +02:00
|
|
|
on display into a single grapheme cluster is treated as a single
|
|
|
|
indivisible unit."
|
Add more function declarations
* lisp/subr.el (buffer-narrowed-p, sha1, match-substitute-replacement)
(version-to-list, version<, version<=, version=)
(function-get, subregexp-context-p, split-string)
(combine-and-quote-strings, split-string-and-unquote)
(replace-regexp-in-string, syntax-after)
(string-trim-left, string-trim):
* lisp/emacs-lisp/subr-x.el (hash-table-empty-p, hash-table-keys)
(hash-table-values, string-glyph-split)
(string-clean-whitespace, string-fill, string-limit)
(string-pixel-width):
* lisp/env.el (substitute-env-vars, substitute-env-in-file-name)
(setenv-internal):
* lisp/emacs-lisp/rx.el (rx-to-string):
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth)
(regexp-opt-charset):
Add appropriate declarations: pure, side-effect-free, and/or
important-return-value.
2023-05-26 12:28:15 +02:00
|
|
|
(declare (side-effect-free t))
|
2021-10-30 15:22:36 +02:00
|
|
|
(let ((result nil)
|
|
|
|
(start 0)
|
|
|
|
comp)
|
|
|
|
(while (< start (length string))
|
2021-11-24 08:27:22 +01:00
|
|
|
(if (setq comp (find-composition-internal
|
|
|
|
start
|
|
|
|
;; Don't search backward in the string for the
|
|
|
|
;; start of the composition.
|
|
|
|
(min (length string) (1+ start))
|
|
|
|
string nil))
|
2021-10-30 15:22:36 +02:00
|
|
|
(progn
|
|
|
|
(push (substring string (car comp) (cadr comp)) result)
|
|
|
|
(setq start (cadr comp)))
|
|
|
|
(push (substring string start (1+ start)) result)
|
|
|
|
(setq start (1+ start))))
|
|
|
|
(nreverse result)))
|
|
|
|
|
2021-11-24 19:38:41 +01:00
|
|
|
;;;###autoload
|
|
|
|
(defun add-display-text-property (start end prop value
|
2021-11-24 20:10:14 +01:00
|
|
|
&optional object)
|
2021-11-24 19:38:41 +01:00
|
|
|
"Add display property PROP with VALUE to the text from START to END.
|
|
|
|
If any text in the region has a non-nil `display' property, those
|
|
|
|
properties are retained.
|
|
|
|
|
|
|
|
If OBJECT is non-nil, it should be a string or a buffer. If nil,
|
|
|
|
this defaults to the current buffer."
|
|
|
|
(let ((sub-start start)
|
|
|
|
(sub-end 0)
|
|
|
|
disp)
|
|
|
|
(while (< sub-end end)
|
|
|
|
(setq sub-end (next-single-property-change sub-start 'display object
|
|
|
|
(if (stringp object)
|
|
|
|
(min (length object) end)
|
|
|
|
(min end (point-max)))))
|
|
|
|
(if (not (setq disp (get-text-property sub-start 'display object)))
|
|
|
|
;; No old properties in this range.
|
2022-12-06 14:41:36 +02:00
|
|
|
(put-text-property sub-start sub-end 'display (list prop value)
|
|
|
|
object)
|
2021-11-24 19:38:41 +01:00
|
|
|
;; We have old properties.
|
|
|
|
(let ((vector nil))
|
|
|
|
;; Make disp into a list.
|
|
|
|
(setq disp
|
|
|
|
(cond
|
|
|
|
((vectorp disp)
|
|
|
|
(setq vector t)
|
|
|
|
(seq-into disp 'list))
|
|
|
|
((not (consp (car disp)))
|
|
|
|
(list disp))
|
|
|
|
(t
|
|
|
|
disp)))
|
2021-11-24 20:10:14 +01:00
|
|
|
;; Remove any old instances.
|
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 16:50:07 +08:00
|
|
|
(when-let* ((old (assoc prop disp)))
|
2021-11-24 20:10:14 +01:00
|
|
|
(setq disp (delete old disp)))
|
|
|
|
(setq disp (cons (list prop value) disp))
|
2021-11-24 19:38:41 +01:00
|
|
|
(when vector
|
|
|
|
(setq disp (seq-into disp 'vector)))
|
|
|
|
;; Finally update the range.
|
2022-12-06 14:41:36 +02:00
|
|
|
(put-text-property sub-start sub-end 'display disp object)))
|
2021-11-24 19:38:41 +01:00
|
|
|
(setq sub-start sub-end))))
|
|
|
|
|
2022-01-23 14:35:52 +01:00
|
|
|
;;;###autoload
|
|
|
|
(defun read-process-name (prompt)
|
|
|
|
"Query the user for a process and return the process object."
|
|
|
|
;; Currently supports only the PROCESS argument.
|
|
|
|
;; Must either return a list containing a process, or signal an error.
|
2022-12-15 02:24:56 +01:00
|
|
|
;; (Returning nil would mean the current buffer's process.)
|
2022-01-23 14:35:52 +01:00
|
|
|
(unless (fboundp 'process-list)
|
|
|
|
(error "Asynchronous subprocesses are not supported on this system"))
|
|
|
|
;; Local function to return cons of a complete-able name, and the
|
|
|
|
;; associated process object, for use with `completing-read'.
|
|
|
|
(cl-flet ((procitem
|
|
|
|
(p) (when (process-live-p p)
|
|
|
|
(let ((pid (process-id p))
|
|
|
|
(procname (process-name p))
|
|
|
|
(procbuf (process-buffer p)))
|
|
|
|
(and (eq (process-type p) 'real)
|
|
|
|
(cons (if procbuf
|
|
|
|
(format "%s (%s) in buffer %s"
|
|
|
|
procname pid
|
|
|
|
(buffer-name procbuf))
|
|
|
|
(format "%s (%s)" procname pid))
|
|
|
|
p))))))
|
|
|
|
;; Perform `completing-read' for a process.
|
|
|
|
(let* ((currproc (get-buffer-process (current-buffer)))
|
|
|
|
(proclist (or (process-list)
|
|
|
|
(error "No processes found")))
|
|
|
|
(collection (delq nil (mapcar #'procitem proclist)))
|
|
|
|
(selection (completing-read
|
|
|
|
(format-prompt prompt
|
|
|
|
(and currproc
|
|
|
|
(eq (process-type currproc) 'real)
|
|
|
|
(procitem currproc)))
|
|
|
|
collection nil :require-match nil nil
|
|
|
|
(car (seq-find (lambda (proc)
|
|
|
|
(eq currproc (cdr proc)))
|
|
|
|
collection))))
|
|
|
|
(process (and selection
|
|
|
|
(cdr (assoc selection collection)))))
|
|
|
|
(unless process
|
|
|
|
(error "No process selected"))
|
|
|
|
process)))
|
|
|
|
|
2022-05-03 21:22:53 +02:00
|
|
|
(defmacro with-buffer-unmodified-if-unchanged (&rest body)
|
2022-05-04 11:46:01 +03:00
|
|
|
"Like `progn', but change buffer-modified status only if buffer text changes.
|
|
|
|
If the buffer was unmodified before execution of BODY, and
|
|
|
|
buffer text after execution of BODY is identical to what it was
|
|
|
|
before, ensure that buffer is still marked unmodified afterwards.
|
|
|
|
For example, the following won't change the buffer's modification
|
|
|
|
status:
|
2022-05-03 21:22:53 +02:00
|
|
|
|
|
|
|
(with-buffer-unmodified-if-unchanged
|
|
|
|
(insert \"a\")
|
2022-05-04 11:46:01 +03:00
|
|
|
(delete-char -1))
|
|
|
|
|
|
|
|
Note that only changes in the raw byte sequence of the buffer text,
|
|
|
|
as stored in the internal representation, are monitored for the
|
|
|
|
purpose of detecting the lack of changes in buffer text. Any other
|
|
|
|
changes that are normally perceived as \"buffer modifications\", such
|
|
|
|
as changes in text properties, `buffer-file-coding-system', buffer
|
2022-05-04 14:53:34 +02:00
|
|
|
multibyteness, etc. -- will not be noticed, and the buffer will still
|
2022-05-04 13:08:53 +03:00
|
|
|
be marked unmodified, effectively ignoring those changes."
|
2022-05-03 21:22:53 +02:00
|
|
|
(declare (debug t) (indent 0))
|
2022-05-03 22:04:39 +02:00
|
|
|
(let ((hash (gensym))
|
|
|
|
(buffer (gensym)))
|
2022-05-03 21:22:53 +02:00
|
|
|
`(let ((,hash (and (not (buffer-modified-p))
|
2022-05-03 22:04:39 +02:00
|
|
|
(buffer-hash)))
|
|
|
|
(,buffer (current-buffer)))
|
2022-05-03 21:22:53 +02:00
|
|
|
(prog1
|
|
|
|
(progn
|
|
|
|
,@body)
|
|
|
|
;; If we didn't change anything in the buffer (and the buffer
|
|
|
|
;; was previously unmodified), then flip the modification status
|
|
|
|
;; back to "unchanged".
|
2022-05-03 22:06:31 +02:00
|
|
|
(when (and ,hash (buffer-live-p ,buffer))
|
2022-05-03 22:04:39 +02:00
|
|
|
(with-current-buffer ,buffer
|
2022-05-03 22:06:31 +02:00
|
|
|
(when (and (buffer-modified-p)
|
2022-05-03 22:04:39 +02:00
|
|
|
(equal ,hash (buffer-hash)))
|
|
|
|
(restore-buffer-modified-p nil))))))))
|
2022-05-03 21:22:53 +02:00
|
|
|
|
2022-08-12 22:22:17 +02:00
|
|
|
(defun emacs-etc--hide-local-variables ()
|
|
|
|
"Hide local variables.
|
|
|
|
Used by `emacs-authors-mode' and `emacs-news-mode'."
|
|
|
|
(narrow-to-region (point-min)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-max))
|
|
|
|
;; Obfuscate to avoid this being interpreted
|
|
|
|
;; as a local variable section itself.
|
|
|
|
(if (re-search-backward "^Local\sVariables:$" nil t)
|
|
|
|
(progn (forward-line -1) (point))
|
|
|
|
(point-max)))))
|
|
|
|
|
2013-12-20 18:21:45 +02:00
|
|
|
(provide 'subr-x)
|
2013-11-04 17:34:42 +02:00
|
|
|
|
2013-12-20 18:21:45 +02:00
|
|
|
;;; subr-x.el ends here
|