Merge remote-tracking branch 'origin/master' into feature/android
This commit is contained in:
Po Lu
commit
a0c3643abd
11 changed files with 254 additions and 91 deletions
|
|
@ -380,11 +380,29 @@ org.bi
|
|||
// biz : https://en.wikipedia.org/wiki/.biz
|
||||
biz
|
||||
|
||||
// bj : https://en.wikipedia.org/wiki/.bj
|
||||
// bj : https://nic.bj/bj-suffixes.txt
|
||||
// submitted by registry <contact@nic.bj>
|
||||
bj
|
||||
asso.bj
|
||||
barreau.bj
|
||||
gouv.bj
|
||||
africa.bj
|
||||
agro.bj
|
||||
architectes.bj
|
||||
assur.bj
|
||||
avocats.bj
|
||||
co.bj
|
||||
com.bj
|
||||
eco.bj
|
||||
econo.bj
|
||||
edu.bj
|
||||
info.bj
|
||||
loisirs.bj
|
||||
money.bj
|
||||
net.bj
|
||||
org.bj
|
||||
ote.bj
|
||||
resto.bj
|
||||
restaurant.bj
|
||||
tourism.bj
|
||||
univ.bj
|
||||
|
||||
// bm : http://www.bermudanic.bm/dnr-text.txt
|
||||
bm
|
||||
|
|
@ -7171,7 +7189,7 @@ org.zw
|
|||
|
||||
// newGTLDs
|
||||
|
||||
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-12-07T15:13:11Z
|
||||
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-02-22T15:15:03Z
|
||||
// This list is auto-generated, don't edit it manually.
|
||||
// aaa : 2015-02-26 American Automobile Association, Inc.
|
||||
aaa
|
||||
|
|
@ -8370,7 +8388,7 @@ glass
|
|||
// gle : 2014-07-24 Charleston Road Registry Inc.
|
||||
gle
|
||||
|
||||
// global : 2014-04-17 Dot Global Domain Registry Limited
|
||||
// global : 2014-04-17 Identity Digital Limited
|
||||
global
|
||||
|
||||
// globo : 2013-12-19 Globo Comunicação e Participações S.A
|
||||
|
|
@ -8913,9 +8931,6 @@ locker
|
|||
// locus : 2015-06-25 Locus Analytics LLC
|
||||
locus
|
||||
|
||||
// loft : 2015-07-30 Annco, Inc.
|
||||
loft
|
||||
|
||||
// lol : 2015-01-30 XYZ.COM LLC
|
||||
lol
|
||||
|
||||
|
|
@ -9456,7 +9471,7 @@ pub
|
|||
// pwc : 2015-10-29 PricewaterhouseCoopers LLP
|
||||
pwc
|
||||
|
||||
// qpon : 2013-11-14 dotCOOL, Inc.
|
||||
// qpon : 2013-11-14 dotQPON LLC
|
||||
qpon
|
||||
|
||||
// quebec : 2013-12-19 PointQuébec Inc
|
||||
|
|
@ -9702,9 +9717,6 @@ sener
|
|||
// services : 2014-02-27 Binky Moon, LLC
|
||||
services
|
||||
|
||||
// ses : 2015-07-23 SES
|
||||
ses
|
||||
|
||||
// seven : 2015-08-06 Seven West Media Ltd
|
||||
seven
|
||||
|
||||
|
|
@ -9789,7 +9801,7 @@ smart
|
|||
// smile : 2014-12-18 Amazon Registry Services, Inc.
|
||||
smile
|
||||
|
||||
// sncf : 2015-02-19 Société Nationale des Chemins de fer Francais S N C F
|
||||
// sncf : 2015-02-19 Société Nationale SNCF
|
||||
sncf
|
||||
|
||||
// soccer : 2015-03-26 Binky Moon, LLC
|
||||
|
|
@ -10026,7 +10038,7 @@ toray
|
|||
// toshiba : 2014-04-10 TOSHIBA Corporation
|
||||
toshiba
|
||||
|
||||
// total : 2015-08-06 TOTAL SE
|
||||
// total : 2015-08-06 TotalEnergies SE
|
||||
total
|
||||
|
||||
// tours : 2015-01-22 Binky Moon, LLC
|
||||
|
|
@ -10665,6 +10677,11 @@ adobeaemcloud.net
|
|||
hlx.page
|
||||
hlx3.page
|
||||
|
||||
// Adobe Developer Platform : https://developer.adobe.com
|
||||
// Submitted by Jesse MacFadyen<jessem@adobe.com>
|
||||
adobeio-static.net
|
||||
adobeioruntime.net
|
||||
|
||||
// Agnat sp. z o.o. : https://domena.pl
|
||||
// Submitted by Przemyslaw Plewa <it-admin@domena.pl>
|
||||
beep.pl
|
||||
|
|
@ -10679,6 +10696,24 @@ airkitapps.eu
|
|||
// Submitted by Etienne Stalmans <security@aiven.io>
|
||||
aivencloud.com
|
||||
|
||||
// Akamai : https://www.akamai.com/
|
||||
// Submitted by Akamai Team <publicsuffixlist@akamai.com>
|
||||
akadns.net
|
||||
akamai.net
|
||||
akamai-staging.net
|
||||
akamaiedge.net
|
||||
akamaiedge-staging.net
|
||||
akamaihd.net
|
||||
akamaihd-staging.net
|
||||
akamaiorigin.net
|
||||
akamaiorigin-staging.net
|
||||
akamaized.net
|
||||
akamaized-staging.net
|
||||
edgekey.net
|
||||
edgekey-staging.net
|
||||
edgesuite.net
|
||||
edgesuite-staging.net
|
||||
|
||||
// alboto.ca : http://alboto.ca
|
||||
// Submitted by Anton Avramov <avramov@alboto.ca>
|
||||
barsy.ca
|
||||
|
|
@ -10923,6 +10958,10 @@ cdn.prod.atlassian-dev.net
|
|||
// Submitted by Lukas Reschke <lukas@authentick.net>
|
||||
translated.page
|
||||
|
||||
// Autocode : https://autocode.com
|
||||
// Submitted by Jacob Lee <jacob@autocode.com>
|
||||
autocode.dev
|
||||
|
||||
// AVM : https://avm.de
|
||||
// Submitted by Andreas Weise <a.weise@avm.de>
|
||||
myfritz.net
|
||||
|
|
@ -11051,6 +11090,11 @@ cafjs.com
|
|||
// Submitted by Marcus Popp <admin@callidomus.com>
|
||||
mycd.eu
|
||||
|
||||
// Canva Pty Ltd : https://canva.com/
|
||||
// Submitted by Joel Aquilina <publicsuffixlist@canva.com>
|
||||
canva-apps.cn
|
||||
canva-apps.com
|
||||
|
||||
// Carrd : https://carrd.co
|
||||
// Submitted by AJ <aj@carrd.co>
|
||||
drr.ac
|
||||
|
|
@ -11968,6 +12012,7 @@ u.channelsdvr.net
|
|||
// Fastly Inc. : http://www.fastly.com/
|
||||
// Submitted by Fastly Security <security@fastly.com>
|
||||
edgecompute.app
|
||||
fastly-edge.com
|
||||
fastly-terrarium.com
|
||||
fastlylb.net
|
||||
map.fastlylb.net
|
||||
|
|
@ -12482,6 +12527,10 @@ ngo.ng
|
|||
edu.scot
|
||||
sch.so
|
||||
|
||||
// HostFly : https://www.ie.ua
|
||||
// Submitted by Bohdan Dub <support@hostfly.com.ua>
|
||||
ie.ua
|
||||
|
||||
// HostyHosting (hostyhosting.com)
|
||||
hostyhosting.io
|
||||
|
||||
|
|
@ -12940,6 +12989,7 @@ cloudapp.net
|
|||
azurestaticapps.net
|
||||
1.azurestaticapps.net
|
||||
2.azurestaticapps.net
|
||||
3.azurestaticapps.net
|
||||
centralus.azurestaticapps.net
|
||||
eastasia.azurestaticapps.net
|
||||
eastus2.azurestaticapps.net
|
||||
|
|
@ -13006,7 +13056,19 @@ netlify.app
|
|||
|
||||
// ngrok : https://ngrok.com/
|
||||
// Submitted by Alan Shreve <alan@ngrok.com>
|
||||
ngrok.app
|
||||
ngrok-free.app
|
||||
ngrok.dev
|
||||
ngrok-free.dev
|
||||
ngrok.io
|
||||
ap.ngrok.io
|
||||
au.ngrok.io
|
||||
eu.ngrok.io
|
||||
in.ngrok.io
|
||||
jp.ngrok.io
|
||||
sa.ngrok.io
|
||||
us.ngrok.io
|
||||
ngrok.pizza
|
||||
|
||||
// Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
|
||||
// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
|
||||
|
|
@ -13526,6 +13588,56 @@ rocky.page
|
|||
спб.рус
|
||||
я.рус
|
||||
|
||||
// SAKURA Internet Inc. : https://www.sakura.ad.jp/
|
||||
// Submitted by Internet Service Department <rs-vendor-ml@sakura.ad.jp>
|
||||
180r.com
|
||||
dojin.com
|
||||
sakuratan.com
|
||||
sakuraweb.com
|
||||
x0.com
|
||||
2-d.jp
|
||||
bona.jp
|
||||
crap.jp
|
||||
daynight.jp
|
||||
eek.jp
|
||||
flop.jp
|
||||
halfmoon.jp
|
||||
jeez.jp
|
||||
matrix.jp
|
||||
mimoza.jp
|
||||
ivory.ne.jp
|
||||
mail-box.ne.jp
|
||||
mints.ne.jp
|
||||
mokuren.ne.jp
|
||||
opal.ne.jp
|
||||
sakura.ne.jp
|
||||
sumomo.ne.jp
|
||||
topaz.ne.jp
|
||||
netgamers.jp
|
||||
nyanta.jp
|
||||
o0o0.jp
|
||||
rdy.jp
|
||||
rgr.jp
|
||||
rulez.jp
|
||||
s3.isk01.sakurastorage.jp
|
||||
s3.isk02.sakurastorage.jp
|
||||
saloon.jp
|
||||
sblo.jp
|
||||
skr.jp
|
||||
tank.jp
|
||||
uh-oh.jp
|
||||
undo.jp
|
||||
rs.webaccel.jp
|
||||
user.webaccel.jp
|
||||
websozai.jp
|
||||
xii.jp
|
||||
squares.net
|
||||
jpn.org
|
||||
kirara.st
|
||||
x0.to
|
||||
from.tv
|
||||
sakura.tv
|
||||
|
||||
// Salesforce.com, Inc. https://salesforce.com/
|
||||
// Submitted by Michael Biven <mbiven@salesforce.com>
|
||||
*.builder.code.com
|
||||
|
|
@ -13678,6 +13790,9 @@ vp4.me
|
|||
|
||||
// Snowflake Inc : https://www.snowflake.com/
|
||||
// Submitted by Faith Olapade <faith.olapade@snowflake.com>
|
||||
snowflake.app
|
||||
privatelink.snowflake.app
|
||||
streamlit.app
|
||||
streamlitapp.com
|
||||
|
||||
// Snowplow Analytics : https://snowplowanalytics.com/
|
||||
|
|
@ -13953,6 +14068,10 @@ hk.org
|
|||
ltd.hk
|
||||
inc.hk
|
||||
|
||||
// UK Intis Telecom LTD : https://it.com
|
||||
// Submitted by ITComdomains <to@it.com>
|
||||
it.com
|
||||
|
||||
// UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
|
||||
// see also: whois -h whois.udr.org.yt help
|
||||
// Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2728,7 +2728,8 @@ directory in another window."
|
|||
(defun dired--find-possibly-alternative-file (file)
|
||||
"Find FILE, but respect `dired-kill-when-opening-new-dired-buffer'."
|
||||
(if (and dired-kill-when-opening-new-dired-buffer
|
||||
(file-directory-p file))
|
||||
(file-directory-p file)
|
||||
(< (length (get-buffer-window-list)) 2))
|
||||
(progn
|
||||
(set-buffer-modified-p nil)
|
||||
(dired--find-file #'find-alternate-file file))
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ Restore any changes to the window configuration made by calling
|
|||
(t
|
||||
(image-dired-line-up-dynamic))))
|
||||
|
||||
(defvar-local image-dired--number-of-thumbnails nil)
|
||||
(defvar-local image-dired--number-of-thumbnails 0)
|
||||
|
||||
;;;###autoload
|
||||
(defun image-dired-display-thumbs (&optional arg append do-not-pop)
|
||||
|
|
|
|||
|
|
@ -7765,6 +7765,9 @@ customize `display-fill-column-indicator-column'. You can change the
|
|||
character for the indicator setting `display-fill-column-indicator-character'.
|
||||
The globalized version is `global-display-fill-column-indicator-mode',
|
||||
which see.
|
||||
This minor mode assumes the buffer uses a fixed-pitch font; if you
|
||||
use variable-pitch fonts, the indicators on different lines might
|
||||
not appear aligned.
|
||||
See Info node `Displaying Boundaries' for details.
|
||||
|
||||
This is a minor mode. If called interactively, toggle the
|
||||
|
|
@ -9570,6 +9573,16 @@ displayed." t)
|
|||
|
||||
;;; Generated autoloads from eshell/em-extpipe.el
|
||||
|
||||
(defgroup eshell-extpipe nil "\
|
||||
Native shell pipelines.
|
||||
|
||||
This module lets you construct pipelines that use your operating
|
||||
system's shell instead of Eshell's own pipelining support. This
|
||||
is especially relevant when executing commands on a remote
|
||||
machine using Eshell's Tramp integration: using the remote
|
||||
shell's pipelining avoids copying the data which will flow
|
||||
through the pipeline to local Emacs buffers and then right back
|
||||
again." :tag "External pipelines" :group 'eshell-module)
|
||||
(register-definition-prefixes "em-extpipe" '("eshell-"))
|
||||
|
||||
|
||||
|
|
@ -9580,12 +9593,12 @@ displayed." t)
|
|||
|
||||
;;; Generated autoloads from eshell/em-hist.el
|
||||
|
||||
(register-definition-prefixes "em-hist" '("eshell"))
|
||||
(register-definition-prefixes "em-hist" '("em-hist-unload-function" "eshell"))
|
||||
|
||||
|
||||
;;; Generated autoloads from eshell/em-ls.el
|
||||
|
||||
(register-definition-prefixes "em-ls" '("eshell"))
|
||||
(register-definition-prefixes "em-ls" '("em-ls-unload-function" "eshell"))
|
||||
|
||||
|
||||
;;; Generated autoloads from eshell/em-pred.el
|
||||
|
|
@ -9610,7 +9623,7 @@ displayed." t)
|
|||
|
||||
;;; Generated autoloads from eshell/em-smart.el
|
||||
|
||||
(register-definition-prefixes "em-smart" '("eshell-"))
|
||||
(register-definition-prefixes "em-smart" '("em-smart-unload-hook" "eshell-"))
|
||||
|
||||
|
||||
;;; Generated autoloads from eshell/em-term.el
|
||||
|
|
@ -10237,7 +10250,7 @@ Example usage:
|
|||
|
||||
When present, ID should be a symbol or a string to use for naming
|
||||
the server buffer and identifying the connection unequivocally.
|
||||
See info node `(erc) Network Identifier' for details. Like USER
|
||||
See Info node `(erc) Network Identifier' for details. Like USER
|
||||
and CLIENT-CERTIFICATE, this parameter cannot be specified
|
||||
interactively.
|
||||
|
||||
|
|
@ -19439,7 +19452,7 @@ If called with an optional prefix argument ARG, prompts for month and year.
|
|||
This function is suitable for execution in an init file.
|
||||
|
||||
(fn &optional ARG)" t)
|
||||
(register-definition-prefixes "lunar" '("calendar-lunar-phases" "diary-lunar-phases" "eclipse-check" "lunar-"))
|
||||
(register-definition-prefixes "lunar" '("calendar-lunar-phases" "diary-lunar-phases" "lunar-"))
|
||||
|
||||
|
||||
;;; Generated autoloads from progmodes/m4-mode.el
|
||||
|
|
@ -19532,7 +19545,7 @@ and then select the region of un-tablified names and use
|
|||
|
||||
(fn TOP BOTTOM &optional MACRO)" t)
|
||||
(define-key ctl-x-map "q" 'kbd-macro-query)
|
||||
(register-definition-prefixes "macros" '("macro"))
|
||||
(register-definition-prefixes "macros" '("macros--insert-vector-macro"))
|
||||
|
||||
|
||||
;;; Generated autoloads from mail/mail-extr.el
|
||||
|
|
@ -25186,7 +25199,7 @@ Open profile FILENAME.
|
|||
|
||||
;;; Generated autoloads from progmodes/project.el
|
||||
|
||||
(push (purecopy '(project 0 9 6)) package--builtin-versions)
|
||||
(push (purecopy '(project 0 9 8)) package--builtin-versions)
|
||||
(autoload 'project-current "project" "\
|
||||
Return the project instance in DIRECTORY, defaulting to `default-directory'.
|
||||
|
||||
|
|
@ -26486,6 +26499,8 @@ usually more efficient than that of a simplified version:
|
|||
(cdr parens))))
|
||||
|
||||
(fn STRINGS &optional PAREN)")
|
||||
(function-put 'regexp-opt 'pure 't)
|
||||
(function-put 'regexp-opt 'side-effect-free 't)
|
||||
(autoload 'regexp-opt-depth "regexp-opt" "\
|
||||
Return the depth of REGEXP.
|
||||
This means the number of non-shy regexp grouping constructs
|
||||
|
|
@ -30297,7 +30312,7 @@ Studlify-case the current buffer." t)
|
|||
(defsubst string-join (strings &optional separator) "\
|
||||
Join all STRINGS using SEPARATOR.
|
||||
Optional argument SEPARATOR must be a string, a vector, or a list of
|
||||
characters; nil stands for the empty string." (mapconcat #'identity strings separator))
|
||||
characters; nil stands for the empty string." (declare (pure t) (side-effect-free t)) (mapconcat #'identity strings separator))
|
||||
(autoload 'string-truncate-left "subr-x" "\
|
||||
If STRING is longer than LENGTH, return a truncated version.
|
||||
When truncating, \"...\" is always prepended to the string, so
|
||||
|
|
@ -30305,10 +30320,12 @@ the resulting string may be longer than the original if LENGTH is
|
|||
3 or smaller.
|
||||
|
||||
(fn STRING LENGTH)")
|
||||
(function-put 'string-truncate-left 'pure 't)
|
||||
(function-put 'string-truncate-left 'side-effect-free 't)
|
||||
(defsubst string-blank-p (string) "\
|
||||
Check whether STRING is either empty or only whitespace.
|
||||
The following characters count as whitespace here: space, tab, newline and
|
||||
carriage return." (string-match-p "\\`[ \11\n\15]*\\'" string))
|
||||
carriage return." (declare (pure t) (side-effect-free t)) (string-match-p "\\`[ \11\n\15]*\\'" string))
|
||||
(autoload 'string-clean-whitespace "subr-x" "\
|
||||
Clean up whitespace in STRING.
|
||||
All sequences of whitespaces in STRING are collapsed into a
|
||||
|
|
@ -34220,6 +34237,10 @@ When using this command to register a new file (or files), it
|
|||
will automatically deduce which VC repository to register it
|
||||
with, using the most specific one.
|
||||
|
||||
If VERBOSE is non-nil (interactively, the prefix argument),
|
||||
you can specify a VC backend or (for centralized VCS only)
|
||||
the revision ID or branch ID.
|
||||
|
||||
(fn VERBOSE)" t)
|
||||
(autoload 'vc-register "vc" "\
|
||||
Register into a version control system.
|
||||
|
|
@ -34380,24 +34401,31 @@ Uses `vc-retrieve-tag' with the non-nil arg `branchp'.
|
|||
|
||||
(fn DIR NAME)" t)
|
||||
(autoload 'vc-print-log "vc" "\
|
||||
List the change log of the current fileset in a window.
|
||||
If WORKING-REVISION is non-nil, leave point at that revision.
|
||||
Show in another window the VC change history of the current fileset.
|
||||
If WORKING-REVISION is non-nil, it should be a revision ID; position
|
||||
point in the change history buffer at that revision.
|
||||
If LIMIT is non-nil, it should be a number specifying the maximum
|
||||
number of revisions to show; the default is `vc-log-show-limit'.
|
||||
|
||||
When called interactively with a prefix argument, prompt for
|
||||
WORKING-REVISION and LIMIT.
|
||||
|
||||
This shows a short log (one line for each commit) if the current
|
||||
fileset includes directories and the VC backend supports that;
|
||||
otherwise it shows the detailed log of each commit, which includes
|
||||
the full log message and the author. Additional control of the
|
||||
shown log style is available via `vc-log-short-style'.
|
||||
|
||||
(fn &optional WORKING-REVISION LIMIT)" t)
|
||||
(autoload 'vc-print-root-log "vc" "\
|
||||
List the revision history for the current VC controlled tree in a window.
|
||||
Show in another window VC change history of the current VC controlled tree.
|
||||
If LIMIT is non-nil, it should be a number specifying the maximum
|
||||
number of revisions to show; the default is `vc-log-show-limit'.
|
||||
When called interactively with a prefix argument, prompt for LIMIT.
|
||||
When the prefix argument is a number, use it as LIMIT.
|
||||
When called interactively with a prefix argument, prompt for LIMIT, but
|
||||
if the prefix argument is a number, use it as LIMIT.
|
||||
A special case is when the prefix argument is 1: in this case
|
||||
the command asks for the ID of a revision, and shows that revision
|
||||
with its diffs (if the underlying VCS supports that).
|
||||
the command prompts for the ID of a revision, and shows that revision
|
||||
with its diffs (if the underlying VCS backend supports that).
|
||||
|
||||
(fn &optional LIMIT REVISION)" t)
|
||||
(autoload 'vc-print-branch-log "vc" "\
|
||||
|
|
@ -34417,20 +34445,22 @@ In some version control systems REMOTE-LOCATION can be a remote branch name.
|
|||
|
||||
(fn &optional REMOTE-LOCATION)" t)
|
||||
(autoload 'vc-log-search "vc" "\
|
||||
Search the log of changes for PATTERN.
|
||||
Search the VC log of changes for PATTERN and show log of matching changes.
|
||||
|
||||
PATTERN is usually interpreted as a regular expression. However, its
|
||||
exact semantics is up to the backend's log search command; some can
|
||||
only match fixed strings.
|
||||
|
||||
Display all entries that match log messages in long format.
|
||||
With a prefix argument, ask for a command to run that will output
|
||||
log entries.
|
||||
This command displays in long format all the changes whose log messages
|
||||
match PATTERN.
|
||||
|
||||
With a prefix argument, the command asks for a shell command to run that
|
||||
will output log entries, and displays those log entries instead.
|
||||
|
||||
(fn PATTERN)" t)
|
||||
(autoload 'vc-log-mergebase "vc" "\
|
||||
Show a log of changes between the merge base of REV1 and REV2 revisions.
|
||||
The merge base is a common ancestor between REV1 and REV2 revisions.
|
||||
Show a log of changes between the merge base of revisions REV1 and REV2.
|
||||
The merge base is a common ancestor of revisions REV1 and REV2.
|
||||
|
||||
(fn FILES REV1 REV2)" t)
|
||||
(autoload 'vc-region-history "vc" "\
|
||||
|
|
@ -36912,7 +36942,7 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
|
|||
|
||||
;;; Generated autoloads from progmodes/xref.el
|
||||
|
||||
(push (purecopy '(xref 1 6 1)) package--builtin-versions)
|
||||
(push (purecopy '(xref 1 6 2)) package--builtin-versions)
|
||||
(autoload 'xref-find-backend "xref")
|
||||
(define-obsolete-function-alias 'xref-pop-marker-stack #'xref-go-back "29.1")
|
||||
(autoload 'xref-go-back "xref" "\
|
||||
|
|
|
|||
|
|
@ -1370,7 +1370,9 @@ special value `tramp-default-remote-path'.
|
|||
|
||||
`Private Directories' are the settings of the $PATH environment,
|
||||
as given in your `~/.profile'. This entry is represented in
|
||||
the list by the special value `tramp-own-remote-path'."
|
||||
the list by the special value `tramp-own-remote-path'.
|
||||
|
||||
For a full discussion, see Info node `(tramp) Remote programs'."
|
||||
:group 'tramp
|
||||
:type '(repeat (choice
|
||||
(const :tag "Default Directories" tramp-default-remote-path)
|
||||
|
|
|
|||
|
|
@ -88,19 +88,23 @@
|
|||
:safe 'integerp
|
||||
:group 'c)
|
||||
|
||||
(defun c-ts-mode-toggle-comment-style ()
|
||||
(defun c-ts-mode-toggle-comment-style (&optional arg)
|
||||
"Toggle the comment style between block and line comments.
|
||||
Optional numeric ARG, if supplied, switches to block comment
|
||||
style when positive, to line comment style when negative, and
|
||||
just toggles it when zero or left out."
|
||||
(interactive)
|
||||
(pcase-let ((`(,starter . ,ender)
|
||||
(if (string= comment-start "// ")
|
||||
(cons "/* " " */")
|
||||
(cons "// " ""))))
|
||||
(setq-local comment-start starter
|
||||
comment-end ender))
|
||||
(c-ts-mode-set-modeline))
|
||||
(interactive "P")
|
||||
(let ((prevstate-line (string= comment-start "// ")))
|
||||
(when (or (not arg)
|
||||
(zerop (setq arg (prefix-numeric-value arg)))
|
||||
(xor (> 0 arg) prevstate-line))
|
||||
(pcase-let ((`(,starter . ,ender)
|
||||
(if prevstate-line
|
||||
(cons "/* " " */")
|
||||
(cons "// " ""))))
|
||||
(setq-local comment-start starter
|
||||
comment-end ender))
|
||||
(c-ts-mode-set-modeline))))
|
||||
|
||||
(defun c-ts-mode-set-modeline ()
|
||||
(setq mode-name
|
||||
|
|
|
|||
|
|
@ -961,7 +961,7 @@ PRESERVE-BUFFERS as in `eglot-shutdown', which see."
|
|||
"Lookup `eglot-server-programs' for MODE.
|
||||
Return (MANAGED-MODES LANGUAGE-ID CONTACT-PROXY).
|
||||
|
||||
MANAGED-MODES is a list with MODE as its first elements.
|
||||
MANAGED-MODES is a list with MODE as its first element.
|
||||
Subsequent elements are other major modes also potentially
|
||||
managed by the server that is to manage MODE.
|
||||
|
||||
|
|
@ -1335,10 +1335,7 @@ This docstring appeases checkdoc, that's all."
|
|||
(lambda ()
|
||||
(setf (eglot--inhibit-autoreconnect server)
|
||||
(null eglot-autoreconnect)))))))
|
||||
(let ((default-directory (project-root project))
|
||||
(major-mode (car managed-modes)))
|
||||
(hack-dir-local-variables-non-file-buffer)
|
||||
(run-hook-with-args 'eglot-connect-hook server))
|
||||
(run-hook-with-args 'eglot-connect-hook server)
|
||||
(eglot--message
|
||||
"Connected! Server `%s' now managing `%s' buffers \
|
||||
in project `%s'."
|
||||
|
|
@ -2444,9 +2441,7 @@ format described above.")
|
|||
|
||||
(defun eglot-show-workspace-configuration (&optional server)
|
||||
"Dump `eglot-workspace-configuration' as JSON for debugging."
|
||||
(interactive (list (and (eglot-current-server)
|
||||
(eglot--read-server "Server configuration"
|
||||
(eglot-current-server)))))
|
||||
(interactive (list (eglot--read-server "Show workspace configuration for" t)))
|
||||
(let ((conf (eglot--workspace-configuration-plist server)))
|
||||
(with-current-buffer (get-buffer-create "*EGLOT workspace configuration*")
|
||||
(erase-buffer)
|
||||
|
|
@ -2457,14 +2452,23 @@ format described above.")
|
|||
(json-pretty-print-buffer))
|
||||
(pop-to-buffer (current-buffer)))))
|
||||
|
||||
(defun eglot--workspace-configuration (server)
|
||||
(if (functionp eglot-workspace-configuration)
|
||||
(funcall eglot-workspace-configuration server)
|
||||
eglot-workspace-configuration))
|
||||
|
||||
(defun eglot--workspace-configuration-plist (server)
|
||||
"Returns `eglot-workspace-configuration' suitable for serialization."
|
||||
(let ((val (eglot--workspace-configuration server)))
|
||||
(defun eglot--workspace-configuration-plist (server &optional path)
|
||||
"Returns SERVER's workspace configuration as a plist.
|
||||
If PATH consider that file's `file-name-directory' to get the
|
||||
local value of the `eglot-workspace-configuration' variable, else
|
||||
use the root of SERVER's `eglot--project'."
|
||||
(let ((val (with-temp-buffer
|
||||
(setq default-directory
|
||||
(if path
|
||||
(file-name-directory path)
|
||||
(project-root (eglot--project server))))
|
||||
;; Set the major mode to be the first of the managed
|
||||
;; modes. This is the one the user started eglot in.
|
||||
(setq major-mode (car (eglot--major-modes server)))
|
||||
(hack-dir-local-variables-non-file-buffer)()
|
||||
(if (functionp eglot-workspace-configuration)
|
||||
(funcall eglot-workspace-configuration server)
|
||||
eglot-workspace-configuration))))
|
||||
(or (and (consp (car val))
|
||||
(cl-loop for (section . v) in val
|
||||
collect (if (keywordp section) section
|
||||
|
|
@ -2489,25 +2493,17 @@ When called interactively, use the currently active server"
|
|||
(apply #'vector
|
||||
(mapcar
|
||||
(eglot--lambda ((ConfigurationItem) scopeUri section)
|
||||
(with-temp-buffer
|
||||
(let* ((uri-path (eglot--uri-to-path scopeUri))
|
||||
(default-directory
|
||||
(if (and uri-path
|
||||
(not (string-empty-p uri-path))
|
||||
(file-directory-p uri-path))
|
||||
(file-name-as-directory uri-path)
|
||||
(project-root (eglot--project server)))))
|
||||
(setq-local major-mode (car (eglot--major-modes server)))
|
||||
(hack-dir-local-variables-non-file-buffer)
|
||||
(cl-loop for (wsection o)
|
||||
on (eglot--workspace-configuration-plist server)
|
||||
by #'cddr
|
||||
when (string=
|
||||
(if (keywordp wsection)
|
||||
(substring (symbol-name wsection) 1)
|
||||
wsection)
|
||||
section)
|
||||
return o))))
|
||||
(cl-loop
|
||||
with scope-uri-path = (and scopeUri (eglot--uri-to-path scopeUri))
|
||||
for (wsection o)
|
||||
on (eglot--workspace-configuration-plist server scope-uri-path)
|
||||
by #'cddr
|
||||
when (string=
|
||||
(if (keywordp wsection)
|
||||
(substring (symbol-name wsection) 1)
|
||||
wsection)
|
||||
section)
|
||||
return o))
|
||||
items)))
|
||||
|
||||
(defun eglot--signal-textDocument/didChange ()
|
||||
|
|
|
|||
|
|
@ -916,11 +916,14 @@ This only affects the output of the command `ruby-toggle-block'."
|
|||
(smie-indent--hanging-p))
|
||||
ruby-indent-level)))
|
||||
(`(:before . "=")
|
||||
(save-excursion
|
||||
(and (smie-rule-parent-p " @ ")
|
||||
(goto-char (nth 1 (smie-indent--parent)))
|
||||
(smie-rule-prev-p "def=")
|
||||
(cons 'column (+ (current-column) ruby-indent-level -3)))))
|
||||
(or
|
||||
(save-excursion
|
||||
(and (smie-rule-parent-p " @ ")
|
||||
(goto-char (nth 1 (smie-indent--parent)))
|
||||
(smie-rule-prev-p "def=")
|
||||
(cons 'column (+ (current-column) ruby-indent-level -3))))
|
||||
(and (smie-rule-parent-p ",")
|
||||
(smie-rule-parent))))
|
||||
(`(:after . ,(or "?" ":"))
|
||||
(if ruby-after-operator-indent
|
||||
ruby-indent-level
|
||||
|
|
|
|||
|
|
@ -1527,7 +1527,10 @@ This default should work without changes."
|
|||
(define-obsolete-function-alias 'ediff-convert-standard-filename #'convert-standard-filename "28.1")
|
||||
(define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1")
|
||||
(define-obsolete-function-alias 'ediff-file-remote-p #'file-remote-p "29.1")
|
||||
(define-obsolete-function-alias 'ediff-window-display-p #'display-graphic-p "29.1")
|
||||
(define-obsolete-function-alias 'ediff-window-display-p #'display-graphic-p "29.1"
|
||||
"To prevent Ediff from creating frames, see `ediff-window-setup-function'.
|
||||
Set it to `ediff-setup-windows-plain' to do everything in a single frame,
|
||||
even on GUI terminal.")
|
||||
(define-obsolete-function-alias 'ediff-mouse-event-p #'mouse-event-p "29.1")
|
||||
|
||||
(provide 'ediff-init)
|
||||
|
|
|
|||
|
|
@ -163,6 +163,11 @@ def test2 (arg)
|
|||
)
|
||||
end
|
||||
|
||||
# Bug#61871
|
||||
foo, bar = baz.(
|
||||
some_arg
|
||||
)
|
||||
|
||||
# Bug#17097
|
||||
if x == :!=
|
||||
something
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue