diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-12-10 10:35:54 -0500 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-12-10 10:35:54 -0500 |
| commit | 0da2a4650cdac008ac9a50ec8a7729093632a6a8 (patch) | |
| tree | afa1912d319f67994506ae8ee6236d2c61aa8a8b /lisp/ChangeLog.14 | |
| parent | fab48f1a543bed74e031d2e2cebac4e1165d7b4b (diff) | |
| parent | 2773cf9e013a989df99a689317de941bde2cbf29 (diff) | |
| download | emacs-0da2a4650cdac008ac9a50ec8a7729093632a6a8.tar.gz | |
Merge from origin/emacs-29
2773cf9e013 ; Fix typos
020aff95fa3 ; Fix typos in ChangeLog files
5e03a621efc ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--else-heuristi...
f0734e1c0d1 Fix c-ts-mode indent heuristic (bug#67417)
08fc6bace20 Fix c-ts-mode indentation (bug#67357)
71bc2815ccd Add font-locking for hash-bang lines in typescript-ts-mode.
db8347c8c87 Add font-locking for hash-bang lines in js-ts-mode
91f2ade57bb ruby-mode: Better detect regexp vs division (bug#67569)
Diffstat (limited to 'lisp/ChangeLog.14')
| -rw-r--r-- | lisp/ChangeLog.14 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index efaac2869c8..a7a028d6708 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -16505,7 +16505,7 @@ (diary-list-entries-2): Simplify finding start of date. (diary-show-all-entries, make-diary-entry): Respect non-nil values of pop-up-frames. - (diary-mark-entries-1): Re-use offset in abbreviated-year case. + (diary-mark-entries-1): Reuse offset in abbreviated-year case. (mark-sexp-diary-entries): Remove superfluous call to diary-pull-attrs. 2008-03-27 Dan Nicolaescu <dann@ics.uci.edu> @@ -17072,14 +17072,14 @@ * calendar/cal-bahai.el (calendar-bahai-leap-year-p) (calendar-bahai-leap-base, calendar-bahai-from-absolute): Doc fixes. (calendar-absolute-from-bahai): Fix the leap-year case. - (calendar-bahai-from-absolute): Re-use the Gregorian month. + (calendar-bahai-from-absolute): Reuse the Gregorian month. (calendar-bahai-date-string, calendar-bahai-print-date): Handle pre-Bahai dates. * calendar/cal-china.el (chinese-calendar-celestial-stem) (chinese-calendar-terrestrial-branch): Make defcustoms. - * calendar/cal-menu.el (calendar-mouse-holidays): Re-use the title. + * calendar/cal-menu.el (calendar-mouse-holidays): Reuse the title. (calendar-mouse-view-diary-entries): Use or. (calendar-mouse-chinese-date): Remove unused command. (cal-menu-load-hook): Mark as obsolete. |