aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make error messages adhere to our standardsStefan Kangas2024-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | * src/cygw32.c (chdir_to_default_directory): * src/fns.c (secure_hash): * src/keyboard.c (Finternal_handle_focus_in): * src/keymap.c (store_in_keymap): * src/pgtkfns.c (pgtk_set_scroll_bar_foreground) (pgtk_set_scroll_bar_background, Fx_export_frames) (Fpgtk_set_monitor_scale_factor, pgtk_get_defaults_value) (pgtk_set_defaults_value, Fpgtk_print_frames_dialog) (pgtk_get_monitor_scale_factor): * src/pgtkterm.c (pgtk_set_parent_frame): * src/process.c (network_interface_info, send_process): * src/w32.c (w32_read_registry): * src/w32fns.c (Fw32_read_registry): * src/window.c (Frecenter): * src/xfns.c (Fx_export_frames, Fx_print_frames_dialog) (x_set_mouse_color): Make 'error' message strings follow our guidelines. More specifically, they should not end in a period, and normally also be capitalized. See '(elisp) Programming Tips'.
* New functions '(set-)window-cursor-type'Eshel Yaron2024-05-181-0/+49
| | | | | | | | | | | | | * src/window.h (struct window): Add 'cursor_type' slot. (wset_cursor_type): New inline function. * src/xdisp.c (get_window_cursor_type): Consult 'cursor_type'. * src/window.c (make_window): Initialize 'cursor_type' to t. (Fset_window_cursor_type, Fwindow_cursor_type): New functions. (syms_of_window): List their symbols. * doc/lispref/windows.texi (Window Point): Document them. * doc/lispref/frames.texi (Cursor Parameters): Mention new 'set-window-cursor-type'. * etc/NEWS: Announce new functions. (Bug#70622)
* Merge from origin/emacs-29Eli Zaretskii2024-05-181-3/+12
|\ | | | | | | | | | | | | | | | | | | | | a4828155d8f ; * doc/lispintro/emacs-lisp-intro.texi (nthcdr): Whitesp... df1a9e42ba4 Document :box attribute caveats when used on display strings ca17bc8dd0b Improve documentation of 'movemail' d47aa33bcdb Replace incorrect link in Rmail chapter of Emacs manual 35138b90dd2 ; * doc/lispref/parsing.texi (Parsing Program Source): Im... 3dd09516c9a ; Improve documentation of 'set-fontset-font' 042b58b5ff4 ; * doc/emacs/search.texi (Word Search): Add index entry. 60b1768dc50 ; * src/window.c (Fwindow_scroll_bars): Doc fix.
| * ; * src/window.c (Fwindow_scroll_bars): Doc fix.Eli Zaretskii2024-05-131-3/+12
| |
* | Fix ommissions in window scrolling commands that ought to clear vscrollPo Lu2024-04-271-1/+21
| | | | | | | | | | | | | | | | | | | | * src/window.c (Fdelete_other_windows_internal) (window_scroll_for_long_lines, Frecenter, Fmove_to_window_line): Reset window vscroll, or, if force_start be set, just preserve_vscroll_p, after moving window start to a position computed from iterators for the window in question, so that vscroll may be reliably reset again after the conditions for redisplay's doing the same were corrected. (bug#70386)
* | Fix resetting the frame's 'frozen_window_starts' flagEli Zaretskii2024-04-151-2/+4
| | | | | | | | | | | | | | | | * src/window.c (grow_mini_window, shrink_mini_window): Reimplement how the frame's 'frozen_window_starts' flag is set and reset, to make sure it is always reset when the mini-window gets to its normal one-line height. Patch by Martin Rudalics <rudalics@gmx.at> (Bug#70038)
* | ; * src/window.c (shrink_mini_window): Revert inadvertent change.Eli Zaretskii2024-04-131-1/+1
| |
* | ; Fix documentation of last change.Eli Zaretskii2024-04-131-1/+1
| | | | | | | | | | | | * etc/NEWS: * doc/lispref/display.texi (Other Display Specs): * doc/lispref/text.texi (Special Properties): Fix last changes.
* | Merge from origin/emacs-29Eli Zaretskii2024-03-301-7/+10
|\ \ | |/ | | | | | | 38faacf353f Improve documentation of <Delete> in user manual 9d3d77f12da Fix documentation of 'other-window-for-scrolling'
| * Fix documentation of 'other-window-for-scrolling'Eli Zaretskii2024-03-251-7/+10
| | | | | | | | | | | | * src/window.c (Fother_window_for_scrolling): More accurate documentation of how "the other" window is looked for. Suggested by Karthik Chikmagalur <karthikchikmagalur@gmail.com>.
* | Document and announce 'marker-last-position'Martin Rudalics2024-03-161-6/+6
| | | | | | | | | | | | | | | | | | * doc/lispref/markers.texi (Information from Markers): Document 'marker-last-position'. * etc/NEWS: Announce 'marker-last-position'. * src/window.c (window_restore_killed_buffer_windows): Minor doc-string fix. * doc/lispref/windows.texi (Window Configurations): Minor fix.
* | In window-related documentation write 'symbol' instead of 'constant'Martin Rudalics2024-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Suggested by Michael Heerdegen <michael_heerdegen@web.de>. * src/window.c (window_restore_killed_buffer_windows): In doc-string write 'symbol' instead of 'constant'. * lisp/window.el (display-buffer--lru-window) (display-buffer-use-least-recent-window): In doc-strings write 'symbol' instead of 'constant'. * doc/lispref/windows.texi (Window Configurations): Write 'symbol' instead of 'constant'.
* | ; Fix documentation of a recent change (bug#68235)Eli Zaretskii2024-03-151-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | * etc/NEWS: * doc/lispref/windows.texi (Window Configurations): Improve wording of 'window-restore-killed-buffer-windows's doc. * src/window.c (syms_of_window) <window-restore-killed-buffer-windows>: Doc fix. * etc/NEWS: * doc/lispref/buffers.texi (Buffer Names): Document 'buffer-last-name'.
* | Further adjustments for restoring killed buffer windows (Bug#68235)Martin Rudalics2024-03-151-63/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * etc/NEWS: Announce 'window-restore-killed-buffer-windows'. * src/buffer.h (struct buffer) : New field last_name_. * src/buffer.c (Fbuffer_last_name): New function to return last name of buffer before it was killed or renamed. (bset_last_name, Fget_buffer_create, Fmake_indirect_buffer) (Frename_buffer, Fkill_buffer, init_buffer_once): Set buffer's last_name_ field accordingly. * src/window.c (window_restore_killed_buffer_windows): New variable replacing Vwindow_kept_windows_functions. (Fset_window_configuration): Use window_restore_killed_buffer_windows instead of Vwindow_kept_windows_functions. * lisp/window.el (window--state-put-2, window-state-put): Use 'window-restore-killed-buffer-windows' instead of 'window-kept-windows-functions'. * doc/lispref/windows.texi (Window Configurations): Describe 'window-restore-killed-buffer-windows' which replaces 'window-kept-windows-functions'.
* | Fix 'set-window-configuration' and 'window-state-put'Martin Rudalics2024-03-041-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some bugs with 'window-state-put' (Bug#69093). Add new hook 'window-kept-windows-functions' (Bug#68235). * doc/lispref/windows.texi (Window Configurations): Mention 'window-kept-windows-functions'. (Window Hooks): Describe new abnormal hook 'window-kept-windows-functions'. * src/marker.c (Fmarker_last_position): New function to return the last position of a marker even if its buffer is now dead. * src/window.c (Fset_window_configuration): If 'window-kept-windows-functions' is non-nil, do not delete any window whose buffer is now dead but remember all such windows in a list to pass to 'window-kept-windows-functions'. Run 'window-kept-windows-functions' if it is non-nil. (Vwindow_kept_windows_functions): New abnormal hook run by Fset_window_configuration and 'window-state-put' with two arguments - the frame whose configuration is restored and a list of entries for each window whose buffer was found dead during restoration. Each entry is a list of four elements, the window, the dead buffer, and the last know positions of the start and point of that window. * lisp/window.el (window-state-put-kept-windows) (window-state-put-selected-window): New variables. (window--state-put-2): Make sure buffer is live before restoring its state. Set 'window-state-put-selected-window' to state's selected window. If 'window-kept-windows-functions' is non-nil, do not delete any windows whose buffer is found dead but remember all such windows in a list to pass to 'window-kept-windows-functions'. (window-state-put): Run 'window-kept-windows-functions' if it is non-nil. Select window recorded in 'window-state-put-selected-window'.
* | Fix bug#69140Po Lu2024-02-231-1/+8
| | | | | | | | | | | | * src/window.c (grow_mini_window): Don't adjust frame matrices or force redisplay if the provided window cannot be resized. (bug#69140)
* | * src/window.c (set_window_buffer): Flush the `base_line_number` cacheStefan Monnier2024-02-041-0/+2
| |
* | Prevent matrices from remaining invalid post mini-window resizePo Lu2024-01-251-1/+11
| | | | | | | | | | | | | | | | | | * src/androidfns.c (android_create_tip_frame): Enable building with GLYPH_DEBUG. * src/window.c (resize_mini_window_apply): Garbage the frame if F->redisplay is already set to indicate that redisplay_internal should nevertheless return to it.
* | Merge from origin/emacs-29Eli Zaretskii2024-01-061-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | bf7034048c1 ; * doc/emacs/custom.texi (Changing a Variable): Update e... 466d1c98a9e Fix icons.el when icon does not exist as a file 2a861124e89 ; Improve documentation of 'buffer-match-p' dc9d02f8a01 * lisp/isearch.el (isearch-search-and-update): Let-bind '... 9308d9a74ab * src/comp.c (Fcomp__compile_ctxt_to_file): Fix hash tabl... a2a6619b282 Provide decent documentation for 'help-quick' ab66b749a27 ; * src/window.c (Fset_window_margins): Doc fix. 1a677d1429d treesit--pre-syntax-ppss: Fix args-out-of-range in intern...
| * ; * src/window.c (Fset_window_margins): Doc fix.Eli Zaretskii2024-01-031-1/+5
| |
* | Merge from savannah/emacs-29Po Lu2024-01-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc4e6b13296 ; Update copyright years in more files 64b37776318 ; Run set-copyright from admin.el 8e1c56ae467 ; Add 2024 to copyright years # Conflicts: # doc/misc/modus-themes.org # doc/misc/texinfo.tex # etc/NEWS # etc/refcards/ru-refcard.tex # etc/themes/modus-operandi-theme.el # etc/themes/modus-themes.el # etc/themes/modus-vivendi-theme.el # lib/alloca.in.h # lib/binary-io.h # lib/c-ctype.h # lib/c-strcasecmp.c # lib/c-strncasecmp.c # lib/careadlinkat.c # lib/cloexec.c # lib/close-stream.c # lib/diffseq.h # lib/dup2.c # lib/filemode.h # lib/fpending.c # lib/fpending.h # lib/fsusage.c # lib/getgroups.c # lib/getloadavg.c # lib/gettext.h # lib/gettime.c # lib/gettimeofday.c # lib/group-member.c # lib/malloc.c # lib/md5-stream.c # lib/md5.c # lib/md5.h # lib/memmem.c # lib/memrchr.c # lib/nanosleep.c # lib/save-cwd.h # lib/sha1.c # lib/sig2str.c # lib/stdlib.in.h # lib/strtoimax.c # lib/strtol.c # lib/strtoll.c # lib/time_r.c # lib/xalloc-oversized.h # lisp/auth-source-pass.el # lisp/emacs-lisp/lisp-mnt.el # lisp/emacs-lisp/timer.el # lisp/info-look.el # lisp/jit-lock.el # lisp/loadhist.el # lisp/mail/rmail.el # lisp/net/ntlm.el # lisp/net/webjump.el # lisp/progmodes/asm-mode.el # lisp/progmodes/project.el # lisp/progmodes/sh-script.el # lisp/textmodes/flyspell.el # lisp/textmodes/reftex-toc.el # lisp/textmodes/reftex.el # lisp/textmodes/tex-mode.el # lisp/url/url-gw.el # m4/alloca.m4 # m4/clock_time.m4 # m4/d-type.m4 # m4/dirent_h.m4 # m4/dup2.m4 # m4/euidaccess.m4 # m4/fchmodat.m4 # m4/filemode.m4 # m4/fsusage.m4 # m4/getgroups.m4 # m4/getloadavg.m4 # m4/getrandom.m4 # m4/gettime.m4 # m4/gettimeofday.m4 # m4/gnulib-common.m4 # m4/group-member.m4 # m4/inttypes.m4 # m4/malloc.m4 # m4/manywarnings.m4 # m4/mempcpy.m4 # m4/memrchr.m4 # m4/mkostemp.m4 # m4/mktime.m4 # m4/nproc.m4 # m4/nstrftime.m4 # m4/pathmax.m4 # m4/pipe2.m4 # m4/pselect.m4 # m4/pthread_sigmask.m4 # m4/readlink.m4 # m4/realloc.m4 # m4/sig2str.m4 # m4/ssize_t.m4 # m4/stat-time.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/stdio_h.m4 # m4/stdlib_h.m4 # m4/stpcpy.m4 # m4/strnlen.m4 # m4/strtoimax.m4 # m4/strtoll.m4 # m4/time_h.m4 # m4/timegm.m4 # m4/timer_time.m4 # m4/timespec.m4 # m4/unistd_h.m4 # m4/warnings.m4 # nt/configure.bat # nt/preprep.c # test/lisp/register-tests.el
| * ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
| |
* | Split safe_call between redisplay and non-redisplay versionsStefan Monnier2023-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `safe_call/eval` family of functions started its life in `xdisp.c` for the needs of redisplay but quickly became popular outside of it. This is not ideal because despite their name, they are somewhat specific to the needs of redisplay. So we split them into `safe_call/eval` (in `eval.c`) and `dsafe_call/eval` (in `xdisp.c`). We took this opportunity to slightly change their calling convention to be friendly to the CALLN-style macros. While at it, we introduce a new `calln` macro as well which does all that `call[1-8]` used to do. * src/eval.c (safe_eval_handler, safe_funcall, safe_eval): New functions, Copied from `xdisp.c`. Don't obey `inhibit_eval_during_redisplay` any more. Adjust error message to not claim it happened during redisplay. * src/lisp.h (calln): New macro. (call1, call2, call3, call4, call5, call6, call7, call8): Turn them into aliases of `calln`. (safe_funcall): Declare. (safe_calln): New macro. (safe_call1, safe_call2): Redefine as compatibility macros. (safe_call, safe_call1, safe_call2): Delete. Replace all callers with calls to `safe_calln`. * src/xdisp.c (dsafe_eval_handler): Rename from `safe_eval_handler`. Adjust all users. (dsafe__call): Rename from `safe_call` and change calling convention to work with something like CALLMANY. Adjust all users. (safe_call, safe__call1, safe_call2): Delete functions. (SAFE_CALLMANY, dsafe_calln): New macros. (dsafe_call1, dsafe_eval): Rename from `safe_call1` and `safe_eval`, and rewrite using them. Adjust all users. (clear_message, prepare_menu_bars, redisplay_window): Use `dsafe_calln`. (run_window_scroll_functions): Don't let-bind `Qinhibit_quit` since `safe_run_hooks_2` does it for us.
* | Merge from origin/emacs-29Eli Zaretskii2023-12-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f361cc985d ; Minor copyedits in description of ':box' face property 46fe7a17f53 Fix dragging mode line on text terminals with a mouse (bu... 12daf386f37 ; * doc/lispref/processes.texi (Network): Fix wording and... 037d858dc1a (rust-ts-mode): Set electric-indent-chars dc9b733ab88 js-ts-mode: Highlight function parameters inside destruct... 4a72f13bdfb js-ts-mode: Highlight property shorthands in assignments 83ed9018ede (js--treesit-font-lock-settings): Highlight parameters in... ad0f87bb4c3 (js--treesit-font-lock-settings): Remove some duplicates 71c5f3694fd ; Another fix of doc string of 'message-mail-user-agent' ... 04a39353bae ; * lisp/gnus/message.el (message-mail-user-agent): Doc f... 82ddcf37ec6 ; * doc/lispref/files.texi (Changing Files): Fix last cha... 89068516b3e Don't claim to signal an error when deleting a nonexistin... 4fd254e1830 * lisp/indent.el (indent-rigidly): Improve prompt (bug#67... 5f923ff1a6a ; Fix typos a1f88963f5d rust-ts-mode--comment-docstring: Handle block doc comments a547b0e2e83 rust-ts-mode--comment-docstring: Fix/improve the previous...
| * ; Fix typosStefan Kangas2023-12-031-1/+1
| |
* | Support for menu bar in window_from_coordinatesManuel Giraud2023-10-281-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/window.h: * src/window.c (window_from_coordinates): In the no toolkit build, add support for the menu bar window. Add a new 'menu_bar_p' argument so the function's signature has changed. All callers changed. * src/androidterm.c (handle_one_android_event): * src/haikuterm.c (haiku_read_socket): * src/keyboard.c (make_lispy_position): * src/nsterm.m ([EmacsView mouseDown:]): * src/pgtkterm.c (button_event): * src/w32term.c (w32_read_socket): * src/xdisp.c (note_mouse_highlight): * src/xterm.c (handle_one_xevent): Set menu_bar_p to true.
* | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-251-1/+1
|\ \
| * \ Merge from origin/emacs-29Eli Zaretskii2023-06-241-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0147ff9e50 * lisp/emacs-lisp/shortdoc.el: More and better `substring... fa06249a9fb Fix "C-x RET r" when the new encoding is UTF 679e9d7c56e ; Mention MinGW64 GCC 13.1 problems in PROBLEMS fdc1a12ed1a Fix "vc-print-log does not erase buffer" and associated p... d507aa7336b Add selector_expression indentation rule 1f664a0af75 Add "nixd" LSP server to Eglot e962cf4ba72 Fix building --with-native-compilation=aot from release t... 4ca371e9cc7 Fix bug#64152 (Minibuffer sometimes goes "modal") a0ccf1859cc Disable target-async by default in gdb-mi.el 2bad5829ff7 Revert "Fix parsing of dn line if WITHDN is non-nil" 7637e361d3b Don't truncate filenames with "emacs.el" in them 2591eb1190a Improve documentation of 'minibuffer-message' 6f211bc57b9 Eglot: again fix positions of coinciding inlay hint overl... a24e9e3fee5 ; Update ChangeLog.4 and etc/AUTHORS.
| | * Fix bug#64152 (Minibuffer sometimes goes "modal")Alan Mackenzie2023-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, when a frame has no minibuffer and is using that of a different "normal" frame, C-x 5 o, etc., and GUI operations fail. Fix by partially reverting the commit from 2022-07-07 15:38:09 +0000 "Remove obscure, obsolete code from do_switch_frame". As a consequent change, also revert the commit from 2022-07-08 20:19:03 +0000 "Remove now unused parameter TRACK from do_switch_frame". * src/frame.c (do_switch_frame): Restore the TRACK parameter. Restore the code which redirects the frame focus when a new frame gets selected. * src/frame.c (Fselect_frame, Fhandle_switch_frame) (delete_frame) * src/keyboard.c (quit_throw_to_read_char) * src/lisp.h (do_switch_frame prototype) * src/minibuf.c (read_minibuf_unwind) * src/window.c (Fset_window_configuration): Restore the TRACK argument to do_switch_frame. * src/xterm.c (x_try_restore_frame): Add a zero TRACK argument to do_switch_frame.
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-241-61/+5
|\ \ \ | |/ /
| * | Revert "Avoid header line with some empty non-nil formats"Eli Zaretskii2023-06-231-48/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f66cbbfe520ee31ef26676e09a926217d9736fe. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious.
| * | Revert "; Fix last change"Eli Zaretskii2023-06-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 05c2be28a3e97bd920d0bf8c8b59ec682a420cce. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious.
| * | Revert "; Fix coding style in just installed change"Eli Zaretskii2023-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 229f0b8dd3b92827b6e0c6fc105508e8b80858f5. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious.
| * | Revert "; * src/window.c (window_wants_header_line): Shut up bogus GCC warning."Eli Zaretskii2023-06-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ef8485ad05dd9200b68ea8141fd44c7b976140cd. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious.
| * | Revert "Avoid infinite recursion in 'window_wants_header_line'"Eli Zaretskii2023-06-231-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3de8ed09ab46b9922e15aaf0cc8884b41087c996. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious.
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-211-3/+2
|\ \ \ | |/ /
| * | Allow displaying tool bar on the bottom of the framePo Lu2023-06-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/xterm.c (x_clear_under_internal_border): Subtract bottom margins before clearing bottom border. (XTflash): Subtract bottom margins before flashing mini window. * src/xfns.c (x_set_tool_bar_position): Allow setting different values outside of GTK+. (frame_geometry): Adjust inner width and height for tool bars placed on the bottom. * src/xdisp.c (init_xdisp): Calculate using top margins only. * src/window.c (resize_frame_windows): Fix commentary. * src/w32fns.c (Fw32_frame_geometry): Report tool bar position correctly. (w32_clear_under_internal_border): Subtract bottom margins prior to clearing bottom border. (w32_set_tool_bar_position): New function. (Fw32_frame_edges): Subtract bottom tool bar from inner width and height. (w32_frame_parm_handlers): Add `set_tool_bar_position' parameter handler. * src/pgtkterm.c (pgtk_flash): Subtract bottom margins before clearing bottom border. (XTflash): Subtract bottom margins before flashing mini window. * src/pgtkfns.c (frame_geometry): Set `inner_top' correctly. (Fpgtk_set_mouse_absolute_pixel_position): (Fpgtk_mouse_absolute_pixel_position): (Fpgtk_page_setup_dialog): (Fpgtk_get_page_setup): Wrap lines which cause C Mode to hang. * src/nsterm.m (ns_clear_under_internal_border): Subtract bottom margins before clearing bottom border. * src/nsfns.m (ns_set_tool_bar_position): New function. Error if arg is not top. (ns_frame_parm_handlers): Add that as the handler for `tool-bar-position', to prevent it from being set to an invalid value. * src/haikuterm.c (haiku_flash): Subtract bottom margins before flashing mini window. (haiku_clear_under_internal_border): Subtract bottom margins before clearing bottom border. * src/haikufns.c (haiku_set_tool_bar_position): Allow setting values other than `top'. (frame_geometry): Take bottom margin into account when calculating inner dimensions. * src/frame.h (struct frame): Always define `tool_bar_position'. (fset_tool_bar_position): Define function everywhere. (FRAME_TOOL_BAR_POSITION): Define correctly on all toolkits. (FRAME_TOOL_BAR_TOP_HEIGHT): (FRAME_TOOL_BAR_TOP_LINES): (FRAME_TOOL_BAR_BOTTOM_HEIGHT): (FRAME_TOOL_BAR_BOTTOM_LINES): New macros. Each pair returns the tool bar dimensions only if the tool bar position is set appropriately. (FRAME_TOP_MARGIN, FRAME_TOP_MARGIN_HEIGHT): Only add tool bar height if it is placed at the top of the frame. (FRAME_BOTTOM_MARGIN, FRAME_BOTTOM_MARGIN_HEIGHT): Add ``bottom margins''. (FRAME_MARGINS, FRAME_MARGIN_HEIGHT): Move original margin macro here. (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): (FRAME_TEXT_TO_PIXEL_HEIGHT): (FRAME_PIXEL_TO_TEXT_HEIGHT): (FRAME_INNER_HEIGHT): Subtract both vertical margins. * src/frame.c (adjust_frame_size): Subtract both top and bottom margins to determine the inner height. (make_frame): Initialize `f->tool_bar_position' unconditionally. * src/dispnew.c (adjust_frame_glyphs_for_window_redisplay): Place internal tool bar on bottom if requested. * doc/lispref/frames.texi (Frame Layout): Describe the possibility of the tool bar being placed below the inner area of the frame. (Layout Parameters): Describe that `tool-bar-position' is now supported almost everywhere.
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-111-1/+11
|\ \ \ | |/ /
| * | Avoid infinite recursion in 'window_wants_header_line'Eli Zaretskii2023-06-101-1/+11
| | | | | | | | | | | | | | | | | | * src/window.c (null_header_line_format): Avoid infinite recursion by disallowing :eval on recursive calls. (Bug#63988)
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-071-2/+3
|\ \ \ | |/ /
| * | ; * src/window.c (window_wants_header_line): Shut up bogus GCC warning.Eli Zaretskii2023-06-061-2/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-061-3/+3
|\ \ \ | |/ /
| * | ; Fix coding style in just installed changePo Lu2023-06-061-3/+3
| | | | | | | | | | | | * src/window.c (window_wants_header_line): Fix whitespace.
* | | Merge remote-tracking branch 'origin/master' into feature/androidPo Lu2023-06-061-2/+47
|\ \ \ | |/ /
| * | ; Fix last changeEli Zaretskii2023-06-061-5/+4
| | | | | | | | | | | | | | | * src/window.c (window_wants_header_line): Fix whitespace and commentary in last change. (Bug#63825)
| * | Avoid header line with some empty non-nil formatsEshel Yaron2023-06-061-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the value of 'header-line-format' to indicate that no header line should be displayed when it trivially yields 'nil', even if it is not plain 'nil'. Previously, any non-nil 'header-line-format' resulted in a (possibly empty) header line. This change adds some flexibility by also taking a non-nil value of 'header-line-format' to mean that no header line should be displayed if it's a list whose 'car' is a symbol and either that symbol is ':eval' and the second list element evaluates to 'nil', or the symbol's value as a variable is 'nil' or void. (Bug#63825) * src/xdisp.c (safe_eval_inhibit_quit): New function. * src/lisp.h (safe_eval_inhibit_quit): Declare it. * src/window.c (null_header_line_format): New function. (window_wants_header_line): Use it. * doc/lispref/modes.texi (Header Line): Update to reflect new conditions for displaying a window's header line. * etc/NEWS: Announce updated treatment of 'header-line-format'.
* | | Fix typos in Android portRobert Pluim2023-03-151-1/+1
| | | | | | | | | | | | | | | | | | * src/fileio.c (Finsert_file_contents): * src/window.c (replace_buffer_in_windows): Call Fboundp, not boundp.
* | | Save build timestamps in Android buildsPo Lu2023-03-071-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | * java/Makefile.in (install_temp/assets/build_info): New rule.:(emacs.apk-in): Depend on that file. * lisp/version.el (android-read-build-system) (android-read-build-time): New functions. (emacs-build-system, emacs-build-time): Use those functions on Android, as dumping is done after installation on Android. * src/fileio.c (Finsert_file_contents): * src/window.c (replace_buffer_in_windows): Don't call functions if they are not defined, which can happen during loadup.
* | Merge from origin/emacs-29Stefan Kangas2023-03-051-2/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 836044f329a Fix c-ts-mode preproc directive indentation 64980a59b65 ; * lisp/files.el (hack-local-variables): Fix typo in the... a7cd125d490 More robustly unspoof HOME in Eglot tests (bug#61637) 6c66dbd02c7 Turn on Eglot inlay hints by default 246f5b541c5 Update ts modes missed in 4c16fd3a512 to use column-0 0bfba49ca7c Robustify Eglot for "transient" projects ea5fd375bb2 Fix documentation of 'normal-mode' in buffers that don't ... 4c16fd3a512 Change tree-sitter indent anchor 'point-min' to 'column-0' f47b3930158 Fix go-ts-mode multi-line string indentation (bug#61923) e0bf2da3db6 ; More accurate doc strings for 'window-at' and 'window-a...
| * ; More accurate doc strings for 'window-at' and 'window-at-x-y'.Eli Zaretskii2023-03-041-2/+5
| | | | | | | | | | * lisp/window.el (window-at-x-y): * src/window.c (Fwindow_at): Doc fix. (Bug#61948)
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-13 10:05:25 +0000