1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-28 01:34:16 -07:00
Commit graph

44802 commits

Author SHA1 Message Date
Po Lu
6919d5a7c0 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-10 08:54:56 +08:00
Eli Zaretskii
c0b9041ebd Fix logic in 'compute_window_start_on_continuation_line'
* src/xdisp.c (compute_window_start_on_continuation_line): Fix a
thinko in logic.  Patch by dickmao <dick.r.chiang@gmail.com>.
(Bug#52378)
2021-12-09 21:29:32 +02:00
Stefan Kangas
6ecb24f877 Merge from origin/emacs-28
1821844357 Add missing K key documentation for Cangjie input methods
be860c1385 Fix manual entry of 'quit-restore-window' (Bug#52328)
35a96139df Clarify a comment in xdisp.c
6ba2f028cf Revert "Grep alias `all' shall not match parent directory"
eb9e33e238 ; * etc/NEWS: Non-nil repeat-keep-prefix is not the defaul...
538fc1d0e0 Fix mode-line display in Calendar mode

# Conflicts:
#	etc/NEWS
#	lisp/help.el
2021-12-09 14:53:51 +01:00
Eli Zaretskii
35a96139df Clarify a comment in xdisp.c
* src/xdisp.c (compute_window_start_on_continuation_line): Clarify
a comment.  (Bug#52378)
2021-12-09 09:18:04 +02:00
Po Lu
47cd820d93 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-09 10:30:18 +08:00
Po Lu
58cf601aad Fix coarse scroll deltas on macOS
* src/nsterm.m (- mouseDown): Multiply deltas as appropriate.
2021-12-08 19:50:27 +08:00
Po Lu
41b1d223c6 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-08 14:18:09 +08:00
Po Lu
5671709590 Send scroll stop events to xwidgets correctly
* src/xterm.c (handle_one_xevent): Record stop events manually.

* src/xwidget.h (xwidget_scroll):
* src/xwidget.c (xwidget_scroll): New parameter `stop_p'.
2021-12-08 10:04:31 +08:00
Po Lu
bdeb189cf2 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-08 09:03:14 +08:00
Lars Ingebrigtsen
7d7f3d98dc Pacify svg_load_image compiler warning
* src/image.c (svg_load_image): Fix compiler warning from gcc
(Debian 11.2.0-10).
2021-12-08 01:53:05 +01:00
Lars Ingebrigtsen
b9c43acdd6 Check decoding results in webp_load before using it
* src/image.c (webp_load): Check whether we were able to decode
the image before using it.
2021-12-08 01:38:39 +01:00
Po Lu
d9b3f665bc Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-07 09:32:13 +08:00
Yuuki Harano
0b6a632f99 Merge branch 'feature/pgtk' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk 2021-12-07 00:46:39 +09:00
Yuuki Harano
f68a0314e3 * src/pgtkterm.c (x_set_parent_frame): Fix coding style 2021-12-07 00:35:54 +09:00
Yuuki Harano
42d4ffad5a Fix SEGV crash by unref css provider too much
I Got css provider from F, and was going to remove it from style
context.  But between them, unhighlight was called when
gtk_container_remove was called, and the css provider was already
freed, so I can't use the css provider to remove it from style
context.

As a fix, I call gtk_container_remove after remove it.
Also, I free a css provider set by unhighlight.

* src/pgtkterm.c (x_set_parent_frame):
2021-12-07 00:20:30 +09:00
Stefan Kangas
2e8d1ad0f2 image.c: Remove some dead code
* src/image.c (gui_put_x_image): Remove dead code, commented out since
2004.
2021-12-06 12:06:35 +01:00
Po Lu
7314c12e64 Fix child frame crash on pgtk
* src/gtkutil.c (xg_check_special_colors): Use `FRAME_WIDGET'
on PGTK.
2021-12-06 13:43:23 +08:00
Po Lu
c83dc91579 Fix coding style
* src/pgtkfns.c (frame_geometry):
* src/pgtkterm.c (x_set_parent_frame):
(pgtk_text_icon):
(key_release_event):
(configure_event):
(map_event):
(window_state_event):
(delete_event):
(enter_notify_event): Fix coding style.
2021-12-06 13:08:28 +08:00
Po Lu
8f2d0450ad Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-06 08:57:17 +08:00
Lars Ingebrigtsen
6620d03e33 ; * src/image.c (webp_load): Minor stylistic fix-up to previous change
* src/image.c (webp_load): Minor stylistic fix-up to previous change.
2021-12-05 23:31:36 +01:00
dickmao
dd2a846890 Add workaround to compilation warning in gcc 10.x in image.c
* src/image.c (webp_load): Work around a (wrong) compiler warning
in gcc 10.x (bug#52276).
2021-12-05 23:29:51 +01:00
Eli Zaretskii
25dc0d1de6 ; Another protection from out-of-bounds access to it->stack[]. 2021-12-05 18:03:40 +02:00
Yuuki Harano
f99745c78e * src/frame.c (gui_set_border_width): Revert confused changes 2021-12-06 00:39:36 +09:00
Yuuki Harano
aacc371ac5 Merge branch 'feature/pgtk' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk 2021-12-06 00:37:31 +09:00
Yuuki Harano
e5f74cecf1 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk 2021-12-06 00:37:01 +09:00
Eli Zaretskii
509dec902c Fix out-of-bounds access in xdisp.c
* src/xdisp.c (produce_stretch_glyph): Avoid indexing it->stack
with a negative index.  Reported by Po Lu <luangruo@yahoo.com>.
2021-12-05 17:34:05 +02:00
Stefan Kangas
520a703fa7 Merge from origin/emacs-28
c086358574 Update to Org 9.5.1-15-gdb4805
fef3e60061 * lisp/emacs-lisp/edebug.el (edebug-eval-defun): Minor doc...
a1e30e4106 ; Fix most remaining AUTHORS warnings
f3e6a432c5 ; * doc/misc/efaq.texi (New in Emacs 28): Add more news.
00236cc802 Fix the enumeration values returned by 'try_scrolling'
2021-12-05 06:30:35 +01:00
Po Lu
f851e725b3 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-04 20:34:08 +08:00
Po Lu
44ed098153 Fix double buffering on pgtk
* src/pgtkterm.c (pgtk_update_end): Stop flipping buffers here.
(pgtk_frame_up_to_date)
(pgtk_buffer_flipping_unblocked_hook): New function.

(pgtk_create_terminal): Attach new hooks.

(leave_notify_event): Clear mouse face.
2021-12-04 20:31:58 +08:00
Po Lu
3925fd777f Fix coding style of a recent change
* src/pgtkfns.c (update_watched_scale_factor): Fix coding style.
2021-12-04 19:45:12 +08:00
Eli Zaretskii
aa6681a51a Fix the MinGW build broken by recent changes in image.c
* src/image.c (rsvg_handle_get_intrinsic_size_in_pixels)
[WINDOWSNT]: Fix prototype.  (Bug#44655)
2021-12-04 13:42:25 +02:00
Alan Third
796075ef7e Make use of Trash on macOS (bug#21340)
* src/nsfns.m (Fsystem_move_file_to_trash): New function.
2021-12-04 10:44:54 +00:00
Eli Zaretskii
3e7aff5fcd Yet another place inside redisplay_window to prevent quitting
* src/xdisp.c (handle_single_display_spec): Inhibit quitting
around the call to 'lookup_derived_face' (which can QUIT).
(Bug#44448)
2021-12-04 10:37:40 +02:00
Eli Zaretskii
00236cc802 Fix the enumeration values returned by 'try_scrolling'
* src/xdisp.c (try_scrolling): Make the enum values match the
commentary.  Reported by Po Lu <luangruo@yahoo.com>.
2021-12-04 10:19:56 +02:00
Yuuki Harano
d44d6ae016 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk 2021-12-04 16:06:16 +09:00
Yuuki Harano
729311c22b Keep track of scale factor by atimer and recreate cairo_surface_t
Otherwise texts become blurry when a frame moved from 1x monitor
to 2x monitor.  I need GTK's such signal, but there isn't. Instead
I watch frame's monitor's scale factor periodically.  We can see
blurriness for a short time, but it is gone soon.

* src/pgtkfns.c (update_watched_scale_factor): New function to check
scale factor and recreate cairo_surface_t if changed.
* src/pgtkfns.c (Fx_create_frame): Initialize atimer.
(Fx_show_tip): Add an argument.
* src/pgtkterm.c (FRAME_CR_SURFACE_DESIRED_WIDTH): Move macros to pgtkterm.h
(x_free_frame_resources): Free atimer.
(size_allocate): Add an argument.
(pgtk_cr_update_surface_desired_size): Add an argument. Recreate if it
is true.
* src/pgtkterm.h (struct pgtk_output): New members.
(FRAME_CR_SURFACE_DESIRED_HEIGHT): Move macros from pgtkterm.c
2021-12-04 15:54:37 +09:00
Stefan Kangas
d82cfbc0e9 Merge from origin/emacs-28
745a732ae4 ; Further author fixes in authors.el
bef17bca21 * src/dosfns.c (Fint86): Doc fix; don't use obsolete names.
bc55dc04af * doc/misc/erc.texi (Keystroke Summary): Fix doc for TAB.
ef4d216eb3 Remove reference to variable obsolete since 24.1
7282e492d5 * doc/misc/efaq.texi (New in Emacs 28): New node.
eafcccd38f ; FAQ: Normalize references to the NEWS.NN file
c006c490eb ; * doc/misc/efaq.texi (Latest version of Emacs): Update v...
9fbc4fa0e7 Add Tramp version integrated in Emacs 28.1
2021-12-04 06:30:32 +01:00
Stefan Kangas
ab828569ab Merge from origin/emacs-28
5d6f828799 Unbreak build after 9c222b9c1a.
2021-12-04 06:30:32 +01:00
Stefan Kangas
bef17bca21 * src/dosfns.c (Fint86): Doc fix; don't use obsolete names. 2021-12-04 01:00:11 +01:00
Paul Eggert
1e2bc1bbf4 Port to Tiny C on x86-64
This allows Emacs to build on Ubuntu 21.10 x86-64 with
‘./configure --without-modules CC=tcc’.
* configure.ac (GC_SETJMP_WORKS):
Accept __x86_64__ as an alias for __amd64__.
* src/lisp.h (alignas): Provide a no-op substitute.
2021-12-03 13:09:34 -08:00
Paul Eggert
5586eb463f Prefer rsvg_handle_get_intrinsic_size_in_pixels
Use rsvg_handle_get_intrinsic_size_in_pixels if available,
as this is simpler and better than what we were doing.
From a comment by by Alan Third (Bug#44655#56).
* src/image.c (init_svg_functions): Arrange for the new function.
(svg_load_image): Prefer the results of
rsvg_handle_get_intrinsic_size_in_pixels if available.
2021-12-03 10:25:09 -08:00
Paul Eggert
bcb4651c41 Improve overflow checking in svg_load_image
* src/image.c: Include math.h, for lrint.
(scale_image_size, compute_image_size): Use ‘double’, not ‘int’
for image size args, since librsvg uses ‘double’ for pixel counts.
(scale_image_size): Use ceil instead of rounding, to avoid
discarding fractional SVG pixels.  Divisor and multiplier are now
double instead of int, for better portability to librsvg
functions with fractional pixel sizes.
(image_get_dimension, compute_image_size, svg_load_image):
Be more careful about ignoring, rejecting or clipping scale
factors or sizes that are out of integer range.
(compute_image_size): Don’t bother to calculate :max-width if
:width is specified, and likewise for :max-height and :height.
2021-12-03 10:25:09 -08:00
Paul Eggert
02386da938 Simplify svg_load_image
* src/image.c (svg_load_image): Simplify slightly.
2021-12-03 10:25:09 -08:00
Paul Eggert
19ac237c9e More-robust svg_load_image fallback
Suggested by Alan Third (Bug#44655#56).
* src/image.c (svg_load_image): Fall back on
rsvg_handle_get_geometry_for_layer if the
rsvg_handle_get_intrinsic_dimensions computations yielded unusable
viewbox width and height, instead of falling back only if
rsvg_handle_get_intrinsic_dimensions did not report image width
and height, or did not report a viewbox.
2021-12-03 10:25:09 -08:00
Koen van Greevenbroek
f638541785 Fix a compilation warning in pgtkterm.c
* src/pgtkterm.c (set_fullscreen_state): Fix a compilation warning
(bug#52260).

Copyright-paperwork-exempt: yes
2021-12-03 18:12:07 +01:00
Philipp Stephani
5d6f828799 Unbreak build after 9c222b9c1a.
* src/pdumper.c (dump_subr): Fix Lisp_Subr hash value.
2021-12-03 09:40:15 +01:00
Eli Zaretskii
1431fce67f Revert "Support display of non-ASCII characters with aligned columns"
This reverts commit 608267c71e.
2021-12-03 10:02:46 +02:00
Po Lu
ba063f8141 Send scroll stop events to xwidgets when built with XInput 2
* src/xwidget.c (xwidget_scroll): Set xg_event->scroll.is_stop
when appropriate.
2021-12-03 14:31:20 +08:00
Po Lu
57a9bf8d41 Merge remote-tracking branch 'origin/master' into feature/pgtk 2021-12-03 14:07:40 +08:00
Stefan Kangas
c66eb52453 Merge from origin/emacs-28
9c222b9c1a Port to C compilers that lack size-0 arrays
fed35a8951 Port emacsclient to Solaris 10
f35d6a9c73 * CONTRIBUTE: Improve commit message instructions
e0ee1d003a Work around IBM XL C compiler bug
6b99b6eb8b * admin/make-tarball.txt: Various clarifications.
bbf4140091 * admin/diff-tar-files: Don't assume .tar.gz.
0a50ad11db * lisp/tab-bar.el (tab-bar-close-other-tabs): Fix regression.
2021-12-03 06:30:26 +01:00