diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/print.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/print.c b/src/print.c index 3c560855b41..d6c85717f01 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -290,13 +290,6 @@ void print_interval (); | |||
| 290 | 290 | ||
| 291 | #define PRINTCHAR(ch) printchar (ch, printcharfun) | 291 | #define PRINTCHAR(ch) printchar (ch, printcharfun) |
| 292 | 292 | ||
| 293 | /* Nonzero if there is no room to print any more characters | ||
| 294 | so print might as well return right away. */ | ||
| 295 | |||
| 296 | #define PRINTFULLP() \ | ||
| 297 | (EQ (printcharfun, Qt) && !noninteractive \ | ||
| 298 | && printbufidx >= FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))))) | ||
| 299 | |||
| 300 | /* This is used to restore the saved contents of print_buffer | 293 | /* This is used to restore the saved contents of print_buffer |
| 301 | when there is a recursive call to print. */ | 294 | when there is a recursive call to print. */ |
| 302 | 295 | ||
| @@ -849,7 +842,7 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, | |||
| 849 | Lisp_Object obj; | 842 | Lisp_Object obj; |
| 850 | { | 843 | { |
| 851 | struct buffer *old = current_buffer; | 844 | struct buffer *old = current_buffer; |
| 852 | Lisp_Object original, printcharfun, value; | 845 | Lisp_Object value; |
| 853 | struct gcpro gcpro1; | 846 | struct gcpro gcpro1; |
| 854 | 847 | ||
| 855 | /* If OBJ is (error STRING), just return STRING. | 848 | /* If OBJ is (error STRING), just return STRING. |
| @@ -1255,7 +1248,7 @@ print_object (obj, printcharfun, escapeflag) | |||
| 1255 | if (sizeof (int) == sizeof (EMACS_INT)) | 1248 | if (sizeof (int) == sizeof (EMACS_INT)) |
| 1256 | sprintf (buf, "%d", XINT (obj)); | 1249 | sprintf (buf, "%d", XINT (obj)); |
| 1257 | else if (sizeof (long) == sizeof (EMACS_INT)) | 1250 | else if (sizeof (long) == sizeof (EMACS_INT)) |
| 1258 | sprintf (buf, "%ld", XINT (obj)); | 1251 | sprintf (buf, "%ld", (long) XINT (obj)); |
| 1259 | else | 1252 | else |
| 1260 | abort (); | 1253 | abort (); |
| 1261 | strout (buf, -1, -1, printcharfun, 0); | 1254 | strout (buf, -1, -1, printcharfun, 0); |
| @@ -1278,7 +1271,6 @@ print_object (obj, printcharfun, escapeflag) | |||
| 1278 | else | 1271 | else |
| 1279 | { | 1272 | { |
| 1280 | register int i, i_byte; | 1273 | register int i, i_byte; |
| 1281 | register unsigned char c; | ||
| 1282 | struct gcpro gcpro1; | 1274 | struct gcpro gcpro1; |
| 1283 | unsigned char *str; | 1275 | unsigned char *str; |
| 1284 | int size_byte; | 1276 | int size_byte; |