diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-31 21:08:33 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-31 21:08:33 +0800 |
| commit | 53f7cc2078c64fa169b167faa89f552fbafea18e (patch) | |
| tree | 5462f3536fe14872fbb6ad949fd9407780d03852 /src/textconv.c | |
| parent | 69c4bbc0d694594f43b02e9da5c236f3b9271b1d (diff) | |
| download | emacs-53f7cc2078c64fa169b167faa89f552fbafea18e.tar.gz | |
Fix build with Lisp_Object type checking
* configure.ac: Pass through `--enable-check-lisp-object-type'
on Android.
* src/alloc.c (android_make_lisp_symbol):
* src/android.c:
* src/androidfns.c (android_set_no_focus_on_map)
(android_set_no_accept_focus):
* src/androidfont.c (androidfont_match, androidfont_open_font):
* src/androidselect.c (Fandroid_get_clipboard)
(Fandroid_get_clipboard_targets):
* src/keyboard.c (make_lispy_event, syms_of_keyboard):
* src/sfntfont.c (sfnt_enum_font_1, sfntfont_list_1):
* src/textconv.c (really_set_point_and_mark): Fix Lisp_Object
and integer screw-ups.
Diffstat (limited to 'src/textconv.c')
| -rw-r--r-- | src/textconv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/textconv.c b/src/textconv.c index 1530cc0ce32..a2c790d5374 100644 --- a/src/textconv.c +++ b/src/textconv.c @@ -1022,7 +1022,8 @@ really_set_point_and_mark (struct frame *f, ptrdiff_t point, /* Set the point. */ Fgoto_char (make_fixnum (point)); - if (mark == point && BVAR (current_buffer, mark_active)) + if (mark == point + && !NILP (BVAR (current_buffer, mark_active))) call0 (Qdeactivate_mark); else call1 (Qpush_mark, make_fixnum (mark)); |