emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from origin/emacs-31

Browse source 
b365ef37b9 Fix pixels-vs-columns confusion in margin face fill (bug#...
e0185b0907 Fix ISO date insertion in diary
3c9517300e ; Tag process-test-stderr-filter :unstable on emba
422bf36847 Minor fix for 'format-mode-line'
1381479572 Improve the previous fix in toggle-window-dedicated
This commit is contained in:
Eli Zaretskii 2026-06-27 06:28:26 -04:00
parent 4724964ad2 b365ef37b9
commit e53f0b4749
18 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/calendar/calendar.el
View file

@ -918,7 +918,9 @@ including those inserted into the diary from the calendar with
(defconst diary-european-date-insertion-form '(day "/" month "/" year)
"Pseudo-pattern for European dates in `diary-date-insertion-form'")
(defconst diary-iso-date-insertion-form '(year "/" month "/" day)
(defconst diary-iso-date-insertion-form '((format "%s-%.2d-%.2d" year
(string-to-number month)
(string-to-number day)))
"Pseudo-pattern for ISO dates in `diary-date-insertion-form'")
(defcustom diary-date-insertion-form

8
lisp/window.el
View file

@ -7993,7 +7993,13 @@ variable to t, strong dedication will be used by default and
\\[universal-argument] will make the window weakly dedicated.
See the info node `(elisp)Dedicated Windows' for more details."
(interactive "@i\nP\np")
(interactive "i\nP\np")
(when (and (not window) (mouse-event-p last-input-event))
(let ((event-window (posn-window (event-start last-input-event))))
(unless (eq (selected-window) event-window)
(setq window event-window))))
(setq window (window-normalize-window window))
(setq flag (cond
((consp flag)

12
src/xdisp.c
View file

@ -24470,11 +24470,10 @@ extend_face_to_end_of_line (struct it *it)
to fill the rest. */
if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
&& (it->glyph_row->used[LEFT_MARGIN_AREA]
< WINDOW_LEFT_MARGIN_WIDTH (it->w)))
< WINDOW_LEFT_MARGIN_COLS (it->w)))
{
int used = it->glyph_row->used[LEFT_MARGIN_AREA];
int remaining_pixels = (WINDOW_LEFT_MARGIN_WIDTH (it->w)
* FRAME_COLUMN_WIDTH (f));
int remaining_pixels = WINDOW_LEFT_MARGIN_WIDTH (it->w);
/* Subtract width of existing glyphs. */
struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA];
@ -24509,11 +24508,10 @@ extend_face_to_end_of_line (struct it *it)
to fill the rest. */
if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
&& (it->glyph_row->used[RIGHT_MARGIN_AREA]
< WINDOW_RIGHT_MARGIN_WIDTH (it->w)))
< WINDOW_RIGHT_MARGIN_COLS (it->w)))
{
int used = it->glyph_row->used[RIGHT_MARGIN_AREA];
int remaining_pixels = (WINDOW_RIGHT_MARGIN_WIDTH (it->w)
* FRAME_COLUMN_WIDTH (f));
int remaining_pixels = WINDOW_RIGHT_MARGIN_WIDTH (it->w);
/* Subtract width of existing glyphs. */
struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA];
@ -29079,6 +29077,8 @@ are the selected window and the WINDOW's buffer). */)
face = EQ (window, selected_window)
? Qmode_line_active
: Qmode_line_inactive;
else if (EQ (face, Qdefault))
face = Qnil;
old_buffer = current_buffer;

2
test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-iso
View file

@ -1,4 +1,4 @@
&2012/5/15 15:00-15:30 Query
&2012-05-15 15:00-15:30 Query
Location: phone
Status: confirmed
Organizer: A. Luser <a.luser@foo.com>

2
test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-iso
View file

@ -1,4 +1,4 @@
&2014/12/8 18:30-22:55 Norwegian til Tromsoe-Langnes -
&2014-12-08 18:30-22:55 Norwegian til Tromsoe-Langnes -
Location: Stavanger-Sola
Category: Appointment
Access: public

2
test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-iso
View file

@ -1 +1 @@
&2018/11/5 21:00 event with same start/end time
&2018-11-05 21:00 event with same start/end time

2
test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-iso
View file

@ -1,4 +1,4 @@
2025/9/19 09:00-11:30 Testing legacy `icalendar-import-format*' vars
2025-09-19 09:00-11:30 Testing legacy `icalendar-import-format*' vars
CLASS=private
DESCRIPTION=described
LOCATION=somewhere

8
test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-iso
View file

@ -1,7 +1,7 @@
&2011/7/23 event-1
&2011-07-23 event-1
&2011/7/24 event-2
&2011-07-24 event-2
&2011/7/25 event-3a
&2011-07-25 event-3a
&2011/7/25 event-3b
&2011-07-25 event-3b

2
test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-iso
View file

@ -1 +1 @@
&2003/9/19 09:00-11:30 non-recurring
&2003-09-19 09:00-11:30 non-recurring

2
test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-iso
View file

@ -1 +1 @@
&2003/9/19 non-recurring allday
&2003-09-19 non-recurring allday

2
test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-iso
View file

@ -1,4 +1,4 @@
&2004/11/23 14:45-15:45 another example
&2004-11-23 14:45-15:45 another example
Status: tentative
Access: private
UID: 6161a312-3902-11d9-b512-f764153bb28b

2
test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-iso
View file

@ -1,4 +1,4 @@
&2004/11/23 14:00-14:30 folded summary
&2004-11-23 14:00-14:30 folded summary
Status: tentative
Access: private
UID: 04979712-3902-11d9-93dd-8f9f4afe08da

2
test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-iso
View file

@ -1 +1 @@
&2003/9/19 long summary
&2003-09-19 long summary

2
test/lisp/calendar/diary-icalendar-resources/import-time-format-12hr-blank.diary-iso
View file

@ -1 +1 @@
&2003/9/19 9.00h-11.30h 12hr blank-padded
&2003-09-19 9.00h-11.30h 12hr blank-padded

2
test/lisp/calendar/diary-icalendar-resources/import-with-attachment.diary-iso
View file

@ -1,3 +1,3 @@
&2003/9/19 09:00 Has an attachment
&2003-09-19 09:00 Has an attachment
Attachment: R3Jl.plain
UID: f9fee9a0-1231-4984-9078-f1357db352db

4
test/lisp/calendar/diary-icalendar-resources/import-with-timezone.diary-iso
View file

@ -1,3 +1,3 @@
&2012/1/15 15:00-15:30 standardtime
&2012-01-15 15:00-15:30 standardtime
&2012/12/15 11:00-11:30 daylightsavingtime
&2012-12-15 11:00-11:30 daylightsavingtime

2
test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-iso
View file

@ -1,2 +1,2 @@
&2003/9/19 09:00-11:30 non-recurring
&2003-09-19 09:00-11:30 non-recurring
UID: 1234567890uid

1
test/src/process-tests.el
View file

@ -113,6 +113,7 @@ process to complete."
(looking-at "hello stderr!"))))))
(ert-deftest process-test-stderr-filter ()
:tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
(skip-unless (executable-find "bash"))
(with-timeout (60 (ert-fail "Test timed out"))
(let* ((stderr-sentinel-called nil)