diff options
| author | Yuan Fu <casouri@gmail.com> | 2022-10-05 14:22:03 -0700 |
|---|---|---|
| committer | Yuan Fu <casouri@gmail.com> | 2022-10-05 14:22:03 -0700 |
| commit | 7ebbd4efc3d45403cf845d35c36c21756baeeba8 (patch) | |
| tree | f53223ce7dbd64c079aced6e1a77964d1a8eaa3f /src/fileio.c | |
| parent | cb183f6467401fb5ed2b7fc98ca75be9d943cbe3 (diff) | |
| parent | 95efafb72664049f8ac825047df3645656cf76f4 (diff) | |
| download | emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.tar.gz emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.tar.bz2 emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.zip | |
Merge branch 'master' into feature/tree-sitter
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/fileio.c b/src/fileio.c index 9697f6c8cf1..dd7f85ec97f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3808,7 +3808,7 @@ file_offset (Lisp_Object val) } } - wrong_type_argument (intern ("file-offset"), val); + wrong_type_argument (Qfile_offset, val); } /* Return a special time value indicating the error number ERRNUM. */ @@ -4875,7 +4875,7 @@ by calling `format-decode', which see. */) if (! NILP (insval)) { if (! RANGED_FIXNUMP (0, insval, ZV - PT)) - wrong_type_argument (intern ("inserted-chars"), insval); + wrong_type_argument (Qinserted_chars, insval); inserted = XFIXNAT (insval); } } @@ -4898,7 +4898,7 @@ by calling `format-decode', which see. */) insval = call3 (Qformat_decode, Qnil, make_fixnum (inserted), visit); if (! RANGED_FIXNUMP (0, insval, ZV - PT)) - wrong_type_argument (intern ("inserted-chars"), insval); + wrong_type_argument (Qinserted_chars, insval); inserted = XFIXNAT (insval); } else @@ -4921,7 +4921,7 @@ by calling `format-decode', which see. */) insval = call3 (Qformat_decode, Qnil, make_fixnum (oinserted), visit); if (! RANGED_FIXNUMP (0, insval, ZV - PT)) - wrong_type_argument (intern ("inserted-chars"), insval); + wrong_type_argument (Qinserted_chars, insval); if (ochars_modiff == CHARS_MODIFF) /* format_decode didn't modify buffer's characters => move point back to position before inserted text and leave @@ -4944,7 +4944,7 @@ by calling `format-decode', which see. */) if (!NILP (insval)) { if (! RANGED_FIXNUMP (0, insval, ZV - PT)) - wrong_type_argument (intern ("inserted-chars"), insval); + wrong_type_argument (Qinserted_chars, insval); inserted = XFIXNAT (insval); } } @@ -4962,7 +4962,7 @@ by calling `format-decode', which see. */) if (!NILP (insval)) { if (! RANGED_FIXNUMP (0, insval, ZV - PT)) - wrong_type_argument (intern ("inserted-chars"), insval); + wrong_type_argument (Qinserted_chars, insval); if (ochars_modiff == CHARS_MODIFF) /* after_insert_file_functions didn't modify buffer's characters => move point back to @@ -6019,11 +6019,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) bool old_message_p = 0; struct auto_save_unwind auto_save_unwind; - intmax_t sum = INT_ADD_WRAPV (specpdl_end - specpdl, 40, &sum) - ? INTMAX_MAX : sum; - if (max_specpdl_size < sum) - max_specpdl_size = sum; - if (minibuf_level) no_message = Qt; @@ -6431,9 +6426,11 @@ syms_of_fileio (void) DEFSYM (Qfile_date_error, "file-date-error"); DEFSYM (Qfile_missing, "file-missing"); DEFSYM (Qpermission_denied, "permission-denied"); + DEFSYM (Qfile_offset, "file-offset"); DEFSYM (Qfile_notify_error, "file-notify-error"); DEFSYM (Qremote_file_error, "remote-file-error"); DEFSYM (Qexcl, "excl"); + DEFSYM (Qinserted_chars, "inserted-chars"); DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system, doc: /* Coding system for encoding file names. |