procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-30

Browse source 
5e97079cc7 ; Fix call to 'decode_string_utf_8' in  #ifdef'ed-away code
6902673b5b ; Improve commentary in calendar.el
08b62132dd Add 'lua-ts-mode' to 'interpreter-mode-alist'
d8ffcf2fba Document representation of dates in calendar.el
faaa13ec76 Autoload 'shortdoc-help-fns-examples-function'
This commit is contained in:
Eli Zaretskii 2024-12-21 07:56:28 -05:00
commit a1d08d2c13
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/calendar/calendar.el
View file

@ -90,6 +90,19 @@
;; <https://doi.org/10.1002/spe.4380230404>
;; <http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.42.6421&rep=rep1&type=pdf>
;; A note on how dates are represented:
;; The standard format for a (Gregorian) calendar date in this file is a
;; list of integers (MONTH DAY YEAR) -- see the functions
;; `calendar-extract-year', `calendar-extract-month', and
;; `calendar-extract-day'. Internally it also uses an "absolute" format
;; which is an integer number of days since December 31, 1BC on the
;; Gregorian calendar (see e.g. `calendar-absolute-from-gregorian'), and
;; converts between different calendar scales by converting to and from
;; the absolute format (see e.g. `calendar-iso-from-absolute' in
;; cal-iso.el). This representation is also useful for certain
;; calculations; e.g. `calendar-day-of-week' is simply the absolute
;; represention modulo 7, because December 31, 1BC is a Sunday.
;; A note on free variables:

2
lisp/help-fns.el
View file

@ -1594,6 +1594,8 @@ it is displayed along with the global value."
(prin1-to-string (nth 1 var)))))
(set (nth 0 var) (read str)))))
(autoload 'shortdoc-help-fns-examples-function "shortdoc")
(defun help-fns--run-describe-functions (functions &rest args)
(with-current-buffer standard-output
(unless (bolp)

3
lisp/progmodes/lua-ts-mode.el
View file

@ -839,7 +839,8 @@ Calls REPORT-FN directly."
(derived-mode-add-parents 'lua-ts-mode '(lua-mode))
(when (treesit-ready-p 'lua)
(add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode)))
(add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode))
(add-to-list 'interpreter-mode-alist '("\\<lua\\(?:jit\\)?" . lua-ts-mode)))
(provide 'lua-ts-mode)

2
src/coding.c
View file

@ -10407,7 +10407,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8,
if (NILP (decode_method))
{
for (int i = 0; i < repeat_count; i++)
val = decode_string_utf_8 (string, buffer, ! NILP (nocopy),
val = decode_string_utf_8 (string, NULL, -1, buffer, ! NILP (nocopy),
handle_8_bit, handle_over_uni);
}
else if (EQ (decode_method, Qt))