aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorAndrea Corallo2020-08-09 15:03:23 +0200
committerAndrea Corallo2020-08-09 15:03:23 +0200
commit12a982d9789052d8e85efcacb4b311f4876c882a (patch)
treea452a8e888c6ee9c85d6a487359b7a1c0c9fa15b /src/editfns.c
parent80d7f710f2fab902e46aa3fddb8e1c1795420af3 (diff)
parent8e82baf5a730ff542118ddba5b76afdc1db643f6 (diff)
downloademacs-12a982d9789052d8e85efcacb4b311f4876c882a.tar.gz
emacs-12a982d9789052d8e85efcacb4b311f4876c882a.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 763d95bb8fa..cb09ea8a31a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -46,7 +46,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
46 46
47#include "composite.h" 47#include "composite.h"
48#include "intervals.h" 48#include "intervals.h"
49#include "ptr-bounds.h"
50#include "systime.h" 49#include "systime.h"
51#include "character.h" 50#include "character.h"
52#include "buffer.h" 51#include "buffer.h"
@@ -3131,8 +3130,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
3131 string was not copied into the output. 3130 string was not copied into the output.
3132 It is 2 if byte I was not the first byte of its character. */ 3131 It is 2 if byte I was not the first byte of its character. */
3133 char *discarded = (char *) &info[nspec_bound]; 3132 char *discarded = (char *) &info[nspec_bound];
3134 info = ptr_bounds_clip (info, info_size);
3135 discarded = ptr_bounds_clip (discarded, formatlen);
3136 memset (discarded, 0, formatlen); 3133 memset (discarded, 0, formatlen);
3137 3134
3138 /* Try to determine whether the result should be multibyte. 3135 /* Try to determine whether the result should be multibyte.