diff options
| author | Eli Zaretskii | 2025-09-13 07:23:12 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2025-09-13 07:23:12 -0400 |
| commit | 125b3588c9a69625aa72cb3a86c332a804d02458 (patch) | |
| tree | 4b8c0f8791ed217df56a32ea98fedbd28e672d66 /src | |
| parent | abfd8a454a9af33317558a7f904088830946d37b (diff) | |
| parent | 47454566772479c706ea53b4ee9ad5caaafd9130 (diff) | |
| download | emacs-125b3588c9a69625aa72cb3a86c332a804d02458.tar.gz emacs-125b3588c9a69625aa72cb3a86c332a804d02458.zip | |
Merge from origin/emacs-30
47454566772 ; * lisp/dired-x.el (dired-find-subdir): Doc fix (bug#794...
0832e5fec56 ; * lisp/vc/vc.el (vc-print-root-log): Improve docstring ...
2fafcdbf6ac ; Minor copyedits in src/editfns.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/editfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index af53923f92c..c2393106b41 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -1693,7 +1693,7 @@ If narrowing is in effect, this function returns only the visible part | |||
| 1693 | of the buffer. | 1693 | of the buffer. |
| 1694 | 1694 | ||
| 1695 | This function copies the text properties of that part of the buffer | 1695 | This function copies the text properties of that part of the buffer |
| 1696 | into the result string; if you don’t want the text properties, | 1696 | into the result string; if you don't want the text properties, |
| 1697 | use `buffer-substring-no-properties' instead. */) | 1697 | use `buffer-substring-no-properties' instead. */) |
| 1698 | (void) | 1698 | (void) |
| 1699 | { | 1699 | { |
| @@ -2151,7 +2151,7 @@ a buffer or a string. But this is deprecated. */) | |||
| 2151 | Lisp_Object src = CALLN (Fvector, source_buffer, Qnil, Qnil); | 2151 | Lisp_Object src = CALLN (Fvector, source_buffer, Qnil, Qnil); |
| 2152 | /* Walk backwards through the lists of changes. This was also | 2152 | /* Walk backwards through the lists of changes. This was also |
| 2153 | cargo-culted from src/analyze.c in GNU Diffutils. Because we | 2153 | cargo-culted from src/analyze.c in GNU Diffutils. Because we |
| 2154 | walk backwards, we don’t have to keep the positions in sync. */ | 2154 | walk backwards, we don't have to keep the positions in sync. */ |
| 2155 | while (i >= 0 || j >= 0) | 2155 | while (i >= 0 || j >= 0) |
| 2156 | { | 2156 | { |
| 2157 | rarely_quit (++ctx.quitcounter); | 2157 | rarely_quit (++ctx.quitcounter); |
| @@ -3426,7 +3426,7 @@ usage: (format-message STRING &rest OBJECTS) */) | |||
| 3426 | return styled_format (nargs, args, true); | 3426 | return styled_format (nargs, args, true); |
| 3427 | } | 3427 | } |
| 3428 | 3428 | ||
| 3429 | /* Implement ‘format-message’ if MESSAGE is true, ‘format’ otherwise. */ | 3429 | /* Implement `format-message' if MESSAGE is true, `format' otherwise. */ |
| 3430 | 3430 | ||
| 3431 | static Lisp_Object | 3431 | static Lisp_Object |
| 3432 | styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) | 3432 | styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) |