pestctrl/emacs
1
0
Fork 0
forked from Github/emacs
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-04-01 14:25:00 +08:00
commit ca53e2bfbc
8 changed files with 77 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/publicsuffix.txt
View file

@ -7189,7 +7189,7 @@ org.zw
// newGTLDs
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-02-22T15:15:03Z
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-03-18T15:13:13Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@ -8898,9 +8898,6 @@ limo
// lincoln : 2014-11-13 Ford Motor Company
lincoln
// linde : 2014-12-04 Linde Aktiengesellschaft
linde
// link : 2013-11-14 Nova Registry Ltd
link
@ -8967,9 +8964,6 @@ luxe
// luxury : 2013-10-17 Luxury Partners, LLC
luxury
// macys : 2015-07-31 Macys, Inc.
macys
// madrid : 2014-05-01 Comunidad de Madrid
madrid

13
lisp/gnus/gnus-art.el
View file

@ -7390,6 +7390,7 @@ This is an extended text-mode.
\\{gnus-article-edit-mode-map}"
(make-local-variable 'gnus-article-edit-done-function)
(make-local-variable 'gnus-prev-winconf)
(make-local-variable 'gnus-prev-cwc)
(setq-local font-lock-defaults '(message-font-lock-keywords t))
(setq-local mail-header-separator "")
(setq-local gnus-article-edit-mode t)
@ -7420,7 +7421,8 @@ groups."
(defun gnus-article-edit-article (start-func exit-func &optional quiet)
"Start editing the contents of the current article buffer."
(let ((winconf (current-window-configuration)))
(let ((winconf (current-window-configuration))
(cwc gnus-current-window-configuration))
(set-buffer gnus-article-buffer)
(let ((message-auto-save-directory
;; Don't associate the article buffer with a draft file.
@ -7431,6 +7433,7 @@ groups."
(gnus-configure-windows 'edit-article)
(setq gnus-article-edit-done-function exit-func)
(setq gnus-prev-winconf winconf)
(setq gnus-prev-cwc cwc)
(unless quiet
(gnus-message 6 "C-c C-c to end edits"))))
@ -7440,7 +7443,8 @@ groups."
(let ((func gnus-article-edit-done-function)
(buf (current-buffer))
(start (window-start))
(winconf gnus-prev-winconf))
(winconf gnus-prev-winconf)
(cwc gnus-prev-cwc))
(widen) ;; Widen it in case that users narrowed the buffer.
(funcall func arg)
(set-buffer buf)
@ -7458,6 +7462,7 @@ groups."
(set-text-properties (point-min) (point-max) nil)
(gnus-article-mode)
(set-window-configuration winconf)
(setq gnus-current-window-configuration cwc)
(set-buffer buf)
(set-window-start (get-buffer-window buf) start)
(set-window-point (get-buffer-window buf) (point)))
@ -7479,10 +7484,12 @@ groups."
(erase-buffer)
(if (gnus-buffer-live-p gnus-original-article-buffer)
(insert-buffer-substring gnus-original-article-buffer))
(let ((winconf gnus-prev-winconf))
(let ((winconf gnus-prev-winconf)
(cwc gnus-prev-cwc))
(kill-all-local-variables)
(gnus-article-mode)
(set-window-configuration winconf)
(setq gnus-current-window-configuration cwc)
;; Tippy-toe some to make sure that point remains where it was.
(with-current-buffer curbuf
(set-window-start (get-buffer-window (current-buffer)) window-start)

13
lisp/gnus/gnus-eform.el
View file

@ -70,17 +70,20 @@ It is a slightly enhanced `lisp-data-mode'.
(when (gnus-visual-p 'group-menu 'menu)
(gnus-edit-form-make-menu-bar))
(make-local-variable 'gnus-edit-form-done-function)
(make-local-variable 'gnus-prev-winconf))
(make-local-variable 'gnus-prev-winconf)
(make-local-variable 'gnus-prev-cwc))
(defun gnus-edit-form (form documentation exit-func &optional layout)
"Edit FORM in a new buffer.
Call EXIT-FUNC on exit. Display DOCUMENTATION in the beginning
of the buffer.
The optional LAYOUT overrides the `edit-form' window layout."
(let ((winconf (current-window-configuration)))
(let ((winconf (current-window-configuration))
(cwc gnus-current-window-configuration))
(set-buffer (gnus-get-buffer-create gnus-edit-form-buffer))
(gnus-configure-windows (or layout 'edit-form))
(gnus-edit-form-mode)
(setq gnus-prev-cwc cwc)
(setq gnus-prev-winconf winconf)
(setq gnus-edit-form-done-function exit-func)
(erase-buffer)
@ -113,9 +116,11 @@ The optional LAYOUT overrides the `edit-form' window layout."
(defun gnus-edit-form-exit ()
"Kill the current buffer."
(interactive nil gnus-edit-form-mode)
(let ((winconf gnus-prev-winconf))
(let ((winconf gnus-prev-winconf)
(cwc gnus-prev-cwc))
(kill-buffer (current-buffer))
(set-window-configuration winconf)))
(set-window-configuration winconf)
(setq gnus-current-window-configuration cwc)))
(provide 'gnus-eform)

2
lisp/gnus/gnus-icalendar.el
View file

@ -165,7 +165,7 @@
(icalendar--get-event-property-attributes
event field) zone-map))
(dtdate-dec (icalendar--decode-isodatetime dtdate nil dtdate-zone)))
(encode-time dtdate-dec)))
(when dtdate-dec (encode-time dtdate-dec))))
(defun gnus-icalendar-event--find-attendee (ical name-or-email)
(let* ((event (car (icalendar--all-events ical)))

22
lisp/gnus/gnus-sum.el
View file

@ -1408,6 +1408,7 @@ the normal Gnus MIME machinery."
(defvar gnus-newsgroup-adaptive-score-file nil)
(defvar gnus-current-score-file nil)
(defvar gnus-current-move-group nil)
(defvar gnus-current-move-article nil)
(defvar gnus-current-copy-group nil)
(defvar gnus-current-crosspost-group nil)
(defvar gnus-newsgroup-display nil)
@ -8500,7 +8501,15 @@ If UNREPLIED (the prefix), limit to unreplied articles."
If REVERSE, limit the summary buffer to articles that are marked
with MARKS. MARKS can either be a string of marks or a list of marks.
Returns how many articles were removed."
(interactive "sMarks: " gnus-summary-mode)
(interactive
(list
(completing-read "Marks:"
(let ((mark-list '()))
(mapc (lambda (datum)
(cl-pushnew (gnus-data-mark datum) mark-list))
gnus-newsgroup-data)
(mapcar 'char-to-string mark-list)))
current-prefix-arg) gnus-summary-mode)
(gnus-summary-limit-to-marks marks t))
(defun gnus-summary-limit-to-marks (marks &optional reverse)
@ -8509,7 +8518,15 @@ If REVERSE (the prefix), limit the summary buffer to articles that are
not marked with MARKS. MARKS can either be a string of marks or a
list of marks.
Returns how many articles were removed."
(interactive "sMarks: \nP" gnus-summary-mode)
(interactive
(list
(completing-read "Marks:"
(let ((mark-list '()))
(mapc (lambda (datum)
(cl-pushnew (gnus-data-mark datum) mark-list))
gnus-newsgroup-data)
(mapcar 'char-to-string mark-list)))
current-prefix-arg) gnus-summary-mode)
(prog1
(let ((data gnus-newsgroup-data)
(marks (if (listp marks) marks
@ -10248,6 +10265,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
article gnus-newsgroup-name (current-buffer) t)))
;; run the move/copy/crosspost/respool hook
(set (intern "gnus-current-move-article") (cdr art-group))
(run-hook-with-args 'gnus-summary-article-move-hook
action
(gnus-data-header (gnus-data-find article))

1
lisp/gnus/gnus.el
View file

@ -2445,6 +2445,7 @@ are always t.")
;; Save window configuration.
(defvar gnus-prev-winconf nil)
(defvar gnus-prev-cwc nil)
(defvar gnus-reffed-article-number nil)

90
lisp/ldefs-boot.el
View file

@ -3779,14 +3779,18 @@ and exists only for compatibility reasons.
;;; Generated autoloads from progmodes/cc-vars.el
(autoload 'c-string-list-p "cc-vars" "\
Return non-nil if VAL is a list of strings.
(fn VAL)")
(put 'c-basic-offset 'safe-local-variable 'integerp)
(put 'c-backslash-column 'safe-local-variable 'integerp)
(put 'c-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'c++-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'objc-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'java-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'idl-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'pike-font-lock-extra-types 'safe-local-variable #'c-list-of-strings)
(put 'c-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'c++-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'objc-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'java-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'idl-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'pike-font-lock-extra-types 'safe-local-variable #'c-string-list-p)
(put 'c-file-style 'safe-local-variable 'string-or-null-p)
(register-definition-prefixes "cc-vars" '("awk-mode-hook" "c++-" "c-" "defcustom-c-stylevar" "idl-" "java-" "objc-" "pike-"))
@ -8234,15 +8238,23 @@ Make a global mode GLOBAL-MODE corresponding to buffer-local minor MODE.
TURN-ON is a function that will be called with no args in every buffer
and that should try to turn MODE on if applicable for that buffer.
Each of KEY VALUE is a pair of CL-style keyword arguments. :predicate
specifies which major modes the globalized minor mode should be switched on
in. As the minor mode defined by this function is always global, any
:global keyword is ignored. Other keywords have the same meaning as in
`define-minor-mode', which see. In particular, :group specifies the custom
group. The most useful keywords are those that are passed on to the
`defcustom'. It normally makes no sense to pass the :lighter or :keymap
keywords to `define-globalized-minor-mode', since these are usually passed
to the buffer-local version of the minor mode.
Each of KEY VALUE is a pair of CL-style keyword arguments.
The :predicate argument specifies in which major modes should the
globalized minor mode be switched on. The value should be t (meaning
switch on the minor mode in all major modes), nil (meaning don't
switch on in any major mode), a list of modes (meaning switch on only
in those modes and their descendants), or a list (not MODES...),
meaning switch on in any major mode except MODES. The value can also
mix all of these forms, see the info node `Defining Minor Modes' for
details.
As the minor mode defined by this function is always global, any
:global keyword is ignored.
Other keywords have the same meaning as in `define-minor-mode',
which see. In particular, :group specifies the custom group.
The most useful keywords are those that are passed on to the `defcustom'.
It normally makes no sense to pass the :lighter or :keymap keywords
to `define-globalized-minor-mode', since these are usually passed to
the buffer-local version of the minor mode.
BODY contains code to execute each time the mode is enabled or disabled.
It is executed after toggling the mode, and before running
@ -9218,7 +9230,7 @@ Turn on EDT Emulation." t)
;;; Generated autoloads from progmodes/eglot.el
(push (purecopy '(eglot 1 12)) package--builtin-versions)
(push (purecopy '(eglot 1 13)) package--builtin-versions)
(autoload 'eglot "eglot" "\
Start LSP server in support of PROJECT's buffers under MANAGED-MAJOR-MODE.
@ -22454,7 +22466,7 @@ Coloring:
;;; Generated autoloads from org/org.el
(push (purecopy '(org 9 6 1)) package--builtin-versions)
(push (purecopy '(org 9 6 2)) package--builtin-versions)
(autoload 'org-babel-do-load-languages "org" "\
Load the languages defined in `org-babel-load-languages'.
@ -23553,48 +23565,6 @@ DESC must be a `package-desc' object.
(autoload 'package-vc-install-selected-packages "package-vc" "\
Ensure packages specified in `package-vc-selected-packages' are installed." t)
(defvar package-vc-selected-packages 'nil "\
List of packages that must be installed.
Each member of the list is of the form (NAME . SPEC), where NAME
is a symbol designating the package and SPEC is one of:
- nil, if any package version can be installed;
- a version string, if that specific revision is to be installed;
- a property list, describing a package specification. Valid
key/value pairs are
`:url' (string)
The URL of the repository used to fetch the package source.
`:branch' (string)
If given, the name of the branch to checkout after cloning the directory.
`:lisp-dir' (string)
The repository-relative name of the directory to use for loading the Lisp
sources. If not given, the value defaults to the root directory
of the repository.
`:main-file' (string)
The main file of the project, relevant to gather package metadata.
If not given, the assumed default is the package name with \".el\"
appended to it.
`:vc-backend' (symbol)
A symbol of the VC backend to use for cloning the package. The
value ought to be a member of `vc-handled-backends'. If omitted,
`vc-clone' will fall back onto the archive default or on
`package-vc-default-backend'.
All other keys are ignored.
This user option differs from `package-selected-packages' in that
it is meant to be specified manually. If you want to install all
the packages in the list, you cal also use
`package-vc-install-selected-packages'.
Note that this option will not override an existing source
package installation or revert the checked out revision.")
(custom-autoload 'package-vc-selected-packages "package-vc" nil)
(autoload 'package-vc-update-all "package-vc" "\
Attempt to update all installed VC packages." t)
(autoload 'package-vc-update "package-vc" "\
@ -36975,7 +36945,7 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
Go back to the previous position in xref history.
To undo, use \\[xref-go-forward]." t)
(autoload 'xref-go-forward "xref" "\
Got to the point where a previous \\[xref-go-back] was invoked." t)
Go to the point where a previous \\[xref-go-back] was invoked." t)
(autoload 'xref-marker-stack-empty-p "xref" "\
Whether the xref back-history is empty.")
(autoload 'xref-forward-history-empty-p "xref" "\

8
src/fns.c
View file

@ -506,16 +506,18 @@ Symbols are also allowed; their print names are used instead. */)
/* String data is normally allocated with word alignment, but
there are exceptions (notably pure strings) so we restrict the
wordwise skipping to safe architectures. */
if (HAVE_FAST_UNALIGNED_ACCESS)
#ifdef HAVE_FAST_UNALIGNED_ACCESS
{
/* First compare entire machine words. */
int ws = sizeof (size_t);
const char *w1 = SSDATA (string1);
const char *w2 = SSDATA (string2);
while (b < nb - ws + 1 && load_unaligned_size_t (w1 + b)
== load_unaligned_size_t (w2 + b))
while (b < nb - ws + 1
&& (load_unaligned_size_t (w1 + b)
== load_unaligned_size_t (w2 + b)))
b += ws;
}
#endif
/* Scan forward to the differing byte. */
while (b < nb && SREF (string1, b) == SREF (string2, b))