diff options
| author | Kim F. Storm | 2005-09-12 10:26:15 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-09-12 10:26:15 +0000 |
| commit | fa056b08ee30e3716413c7baf80df0b42cec95c3 (patch) | |
| tree | d62bf7d9fe64215f195b31602f0d042dec299557 /src | |
| parent | 18bb66c7bc062d02354eff1e05f5e09a72696810 (diff) | |
| download | emacs-fa056b08ee30e3716413c7baf80df0b42cec95c3.tar.gz emacs-fa056b08ee30e3716413c7baf80df0b42cec95c3.zip | |
(Ftranslate_region_internal): Reload `tt' after
signal_after_change that may have GC'ed.
(Fmessage, Fmessage_box, Fmessage_or_box): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/editfns.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/editfns.c b/src/editfns.c index a05d2396448..e67e56d2efa 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -2857,6 +2857,8 @@ It returns the number of characters changed. */) | |||
| 2857 | { | 2857 | { |
| 2858 | if (tt) | 2858 | if (tt) |
| 2859 | { | 2859 | { |
| 2860 | /* Reload as signal_after_change in last iteration may GC. */ | ||
| 2861 | tt = SDATA (table); | ||
| 2860 | if (string_multibyte) | 2862 | if (string_multibyte) |
| 2861 | { | 2863 | { |
| 2862 | str = tt + string_char_to_byte (table, oc); | 2864 | str = tt + string_char_to_byte (table, oc); |
| @@ -3118,8 +3120,9 @@ The message also goes into the `*Messages*' buffer. | |||
| 3118 | The first argument is a format control string, and the rest are data | 3120 | The first argument is a format control string, and the rest are data |
| 3119 | to be formatted under control of the string. See `format' for details. | 3121 | to be formatted under control of the string. See `format' for details. |
| 3120 | 3122 | ||
| 3121 | If the first argument is nil, the function clears any existing message; | 3123 | If the first argument is nil or the empty string, the function clears |
| 3122 | this lets the minibuffer contents show. See also `current-message'. | 3124 | any existing message; this lets the minibuffer contents show. See |
| 3125 | also `current-message'. | ||
| 3123 | 3126 | ||
| 3124 | usage: (message STRING &rest ARGS) */) | 3127 | usage: (message STRING &rest ARGS) */) |
| 3125 | (nargs, args) | 3128 | (nargs, args) |
| @@ -3148,8 +3151,8 @@ If a dialog box is not available, use the echo area. | |||
| 3148 | The first argument is a format control string, and the rest are data | 3151 | The first argument is a format control string, and the rest are data |
| 3149 | to be formatted under control of the string. See `format' for details. | 3152 | to be formatted under control of the string. See `format' for details. |
| 3150 | 3153 | ||
| 3151 | If the first argument is nil, clear any existing message; let the | 3154 | If the first argument is nil or the empty string, clear any existing |
| 3152 | minibuffer contents show. | 3155 | message; let the minibuffer contents show. |
| 3153 | 3156 | ||
| 3154 | usage: (message-box STRING &rest ARGS) */) | 3157 | usage: (message-box STRING &rest ARGS) */) |
| 3155 | (nargs, args) | 3158 | (nargs, args) |
| @@ -3210,8 +3213,8 @@ Otherwise, use the echo area. | |||
| 3210 | The first argument is a format control string, and the rest are data | 3213 | The first argument is a format control string, and the rest are data |
| 3211 | to be formatted under control of the string. See `format' for details. | 3214 | to be formatted under control of the string. See `format' for details. |
| 3212 | 3215 | ||
| 3213 | If the first argument is nil, clear any existing message; let the | 3216 | If the first argument is nil or the empty string, clear any existing |
| 3214 | minibuffer contents show. | 3217 | message; let the minibuffer contents show. |
| 3215 | 3218 | ||
| 3216 | usage: (message-or-box STRING &rest ARGS) */) | 3219 | usage: (message-or-box STRING &rest ARGS) */) |
| 3217 | (nargs, args) | 3220 | (nargs, args) |