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

Merge from origin/emacs-25

Browse source 
9ffe7dd * lisp/isearch.el (isearch-define-mode-toggle): Improve logic
16140f7 * lisp/menu-bar.el (menu-bar-options-menu): New search submenu
3db6adb * lisp/isearch.el (search-default-mode)
4ea1ea7 * lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
c77ffc8 Use monitor's resolution for positioning tooltips
49e5749 Fix file-notify-test on MS-Windows
be1d874 Fix issues found by auditing w32notify code
87ae218 Extend etags Ruby support for accessors
aa35257 Update publicsuffix.txt.
6816bff Ensure that Gnus dribble handling allows removing entries
691feae Be consistent when using encoded strings in nnimap data
3ed423b Display the decoded Gnus group name
5428b5b Use completion-ignore-case instead of defining command
This commit is contained in:
Paul Eggert 2016-02-09 14:23:10 -08:00
commit b3fc7a3e76
22 changed files with 332 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/search.texi
View file

@ -1268,7 +1268,7 @@ character sequences}.
Generally, search commands in Emacs by default perform character Generally, search commands in Emacs by default perform character
folding, thus matching equivalent character sequences. You can folding, thus matching equivalent character sequences. You can
disable this behavior by customizing the variable disable this behavior by customizing the variable
@code{search-default-regexp-mode} to @code{nil}. @xref{Search @code{search-default-mode} to @code{nil}. @xref{Search
Customizations}. Within an incremental search, typing @kbd{M-s '} Customizations}. Within an incremental search, typing @kbd{M-s '}
(@code{isearch-toggle-character-fold}) toggles character folding, but (@code{isearch-toggle-character-fold}) toggles character folding, but
only for that search. (Replace commands have a different default, only for that search. (Replace commands have a different default,
@ -1800,7 +1800,7 @@ not described elsewhere.
@cindex default search mode @cindex default search mode
@cindex search mode, default @cindex search mode, default
The default search mode for the incremental search is specified by The default search mode for the incremental search is specified by
the variable @code{search-default-regexp-mode}. It can be @code{nil}, the variable @code{search-default-mode}. It can be @code{nil},
@code{t}, or a function. If it is @code{nil}, the default mode is to @code{t}, or a function. If it is @code{nil}, the default mode is to
do literal searches without character folding, but with case folding do literal searches without character folding, but with case folding
and lax-whitespace matches as determined by @code{case-fold-search} and lax-whitespace matches as determined by @code{case-fold-search}

2
etc/NEWS
View file

@ -670,7 +670,7 @@ item as before.
** Search and Replace ** Search and Replace
+++ +++
*** New user option `search-default-regexp-mode' *** New user option `search-default-mode'
specifies the default mode for I-search. specifies the default mode for I-search.
+++ +++

219
etc/publicsuffix.txt
View file

@ -395,7 +395,7 @@ mil.bo
tv.bo tv.bo
// br : http://registro.br/dominio/categoria.html // br : http://registro.br/dominio/categoria.html
// Submitted by registry <fneves@registro.br> 2014-08-11 // Submitted by registry <fneves@registro.br>
br br
adm.br adm.br
adv.br adv.br
@ -485,7 +485,7 @@ net.bt
org.bt org.bt
// bv : No registrations at this time. // bv : No registrations at this time.
// Submitted by registry <jarle@uninett.no> 2006-06-16 // Submitted by registry <jarle@uninett.no>
bv bv
// bw : http://en.wikipedia.org/wiki/.bw // bw : http://en.wikipedia.org/wiki/.bw
@ -597,7 +597,7 @@ gov.cm
net.cm net.cm
// cn : http://en.wikipedia.org/wiki/.cn // cn : http://en.wikipedia.org/wiki/.cn
// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11 // Submitted by registry <tanyaling@cnnic.cn>
cn cn
ac.cn ac.cn
com.cn com.cn
@ -646,7 +646,7 @@ mo.cn
tw.cn tw.cn
// co : http://en.wikipedia.org/wiki/.co // co : http://en.wikipedia.org/wiki/.co
// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11 // Submitted by registry <tecnico@uniandes.edu.co>
co co
arts.co arts.co
com.co com.co
@ -766,7 +766,7 @@ pol.dz
art.dz art.dz
// ec : http://www.nic.ec/reg/paso1.asp // ec : http://www.nic.ec/reg/paso1.asp
// Submitted by registry <vabboud@nic.ec> 2008-07-04 // Submitted by registry <vabboud@nic.ec>
ec ec
com.ec com.ec
info.ec info.ec
@ -887,7 +887,7 @@ veterinaire.fr
ga ga
// gb : This registry is effectively dormant // gb : This registry is effectively dormant
// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12 // Submitted by registry <Damien.Shaw@ja.net>
gb gb
// gd : http://en.wikipedia.org/wiki/.gd // gd : http://en.wikipedia.org/wiki/.gd
@ -946,7 +946,7 @@ org.gl
gm gm
// gn : http://psg.com/dns/gn/gn.txt // gn : http://psg.com/dns/gn/gn.txt
// Submitted by registry <randy@psg.com> 2008-06-17 // Submitted by registry <randy@psg.com>
gn gn
ac.gn ac.gn
com.gn com.gn
@ -971,7 +971,7 @@ asso.gp
gq gq
// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html // gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
// Submitted by registry <segred@ics.forth.gr> 2008-06-09 // Submitted by registry <segred@ics.forth.gr>
gr gr
com.gr com.gr
edu.gr edu.gr
@ -1009,7 +1009,7 @@ net.gy
org.gy org.gy
// hk : https://www.hkdnr.hk // hk : https://www.hkdnr.hk
// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11 // Submitted by registry <hk.tech@hkirc.hk>
hk hk
com.hk com.hk
edu.hk edu.hk
@ -1137,7 +1137,7 @@ net.il
org.il org.il
// im : https://www.nic.im/ // im : https://www.nic.im/
// Submitted by registry <info@nic.im> 2013-11-15 // Submitted by registry <info@nic.im>
im im
ac.im ac.im
co.im co.im
@ -1618,7 +1618,7 @@ jobs
// jp : http://en.wikipedia.org/wiki/.jp // jp : http://en.wikipedia.org/wiki/.jp
// http://jprs.co.jp/en/jpdomain.html // http://jprs.co.jp/en/jpdomain.html
// Submitted by registry <info@jprs.jp> 2014-10-30 // Submitted by registry <info@jprs.jp>
jp jp
// jp organizational type names // jp organizational type names
ac.jp ac.jp
@ -3542,7 +3542,7 @@ mil.kz
com.kz com.kz
// la : http://en.wikipedia.org/wiki/.la // la : http://en.wikipedia.org/wiki/.la
// Submitted by registry <gavin.brown@nic.la> 2008-06-10 // Submitted by registry <gavin.brown@nic.la>
la la
int.la int.la
net.la net.la
@ -3554,7 +3554,7 @@ com.la
org.la org.la
// lb : http://en.wikipedia.org/wiki/.lb // lb : http://en.wikipedia.org/wiki/.lb
// Submitted by registry <randy@psg.com> 2008-06-17 // Submitted by registry <randy@psg.com>
lb lb
com.lb com.lb
edu.lb edu.lb
@ -3594,7 +3594,7 @@ hotel.lk
ac.lk ac.lk
// lr : http://psg.com/dns/lr/lr.txt // lr : http://psg.com/dns/lr/lr.txt
// Submitted by registry <randy@psg.com> 2008-06-17 // Submitted by registry <randy@psg.com>
lr lr
com.lr com.lr
edu.lr edu.lr
@ -3748,7 +3748,7 @@ net.ms
org.ms org.ms
// mt : https://www.nic.org.mt/go/policy // mt : https://www.nic.org.mt/go/policy
// Submitted by registry <help@nic.org.mt> 2013-11-19 // Submitted by registry <help@nic.org.mt>
mt mt
com.mt com.mt
edu.mt edu.mt
@ -4350,7 +4350,7 @@ net.mw
org.mw org.mw
// mx : http://www.nic.mx/ // mx : http://www.nic.mx/
// Submitted by registry <farias@nic.mx> 2008-06-19 // Submitted by registry <farias@nic.mx>
mx mx
com.mx com.mx
org.mx org.mx
@ -4419,17 +4419,18 @@ info.nf
other.nf other.nf
store.nf store.nf
// ng : http://psg.com/dns/ng/ // ng : http://www.nira.org.ng/index.php/join-us/register-ng-domain/189-nira-slds
ng ng
com.ng com.ng
edu.ng edu.ng
gov.ng
i.ng
mil.ng
mobi.ng
name.ng name.ng
net.ng net.ng
org.ng org.ng
sch.ng sch.ng
gov.ng
mil.ng
mobi.ng
// ni : http://www.nic.ni/ // ni : http://www.nic.ni/
com.ni com.ni
@ -5226,7 +5227,7 @@ våler.hedmark.no
*.np *.np
// nr : http://cenpac.net.nr/dns/index.html // nr : http://cenpac.net.nr/dns/index.html
// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17 // Submitted by registry <technician@cenpac.net.nr>
nr nr
biz.nr biz.nr
info.nr info.nr
@ -5240,7 +5241,7 @@ com.nr
nu nu
// nz : http://en.wikipedia.org/wiki/.nz // nz : http://en.wikipedia.org/wiki/.nz
// Confirmed by registry <jay@nzrs.net.nz> 2014-05-19 // Submitted by registry <jay@nzrs.net.nz>
nz nz
ac.nz ac.nz
co.nz co.nz
@ -5310,7 +5311,7 @@ edu.pf
*.pg *.pg
// ph : http://www.domains.ph/FAQ2.asp // ph : http://www.domains.ph/FAQ2.asp
// Submitted by registry <jed@email.com.ph> 2008-06-13 // Submitted by registry <jed@email.com.ph>
ph ph
com.ph com.ph
net.ph net.ph
@ -5339,7 +5340,7 @@ gos.pk
info.pk info.pk
// pl http://www.dns.pl/english/index.html // pl http://www.dns.pl/english/index.html
// updated by .PL registry on 2015-04-28 // Submitted by registry
pl pl
com.pl com.pl
net.pl net.pl
@ -5618,7 +5619,7 @@ go.pw
belau.pw belau.pw
// py : http://www.nic.py/pautas.html#seccion_9 // py : http://www.nic.py/pautas.html#seccion_9
// Confirmed by registry 2012-10-03 // Submitted by registry
py py
com.py com.py
coop.py coop.py
@ -5641,32 +5642,32 @@ sch.qa
// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs // re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
re re
com.re
asso.re asso.re
com.re
nom.re nom.re
// ro : http://www.rotld.ro/ // ro : http://www.rotld.ro/
ro ro
com.ro
org.ro
tm.ro
nt.ro
nom.ro
info.ro
rec.ro
arts.ro arts.ro
com.ro
firm.ro firm.ro
info.ro
nom.ro
nt.ro
org.ro
rec.ro
store.ro store.ro
tm.ro
www.ro www.ro
// rs : http://en.wikipedia.org/wiki/.rs // rs : https://www.rnids.rs/en/domains/national-domains
rs rs
co.rs
org.rs
edu.rs
ac.rs ac.rs
co.rs
edu.rs
gov.rs gov.rs
in.rs in.rs
org.rs
// ru : http://www.cctld.ru/ru/docs/aktiv_8.php // ru : http://www.cctld.ru/ru/docs/aktiv_8.php
// Industry domains // Industry domains
@ -5831,7 +5832,7 @@ edu.sa
sch.sa sch.sa
// sb : http://www.sbnic.net.sb/ // sb : http://www.sbnic.net.sb/
// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08 // Submitted by registry <lee.humphries@telekom.com.sb>
sb sb
com.sb com.sb
edu.sb edu.sb
@ -5848,7 +5849,7 @@ org.sc
edu.sc edu.sc
// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm // sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
// Submitted by registry <admin@isoc.sd> 2008-06-17 // Submitted by registry <admin@isoc.sd>
sd sd
com.sd com.sd
net.sd net.sd
@ -5860,7 +5861,7 @@ gov.sd
info.sd info.sd
// se : http://en.wikipedia.org/wiki/.se // se : http://en.wikipedia.org/wiki/.se
// Submitted by registry <patrik.wallstrom@iis.se> 2014-03-18 // Submitted by registry <patrik.wallstrom@iis.se>
se se
a.se a.se
ac.se ac.se
@ -5923,7 +5924,7 @@ mil.sh
si si
// sj : No registrations at this time. // sj : No registrations at this time.
// Submitted by registry <jarle@uninett.no> 2008-06-16 // Submitted by registry <jarle@uninett.no>
sj sj
// sk : http://en.wikipedia.org/wiki/.sk // sk : http://en.wikipedia.org/wiki/.sk
@ -5931,7 +5932,7 @@ sj
sk sk
// sl : http://www.nic.sl // sl : http://www.nic.sl
// Submitted by registry <adam@neoip.com> 2008-06-12 // Submitted by registry <adam@neoip.com>
sl sl
com.sl com.sl
net.sl net.sl
@ -6020,7 +6021,7 @@ org.sv
red.sv red.sv
// sx : http://en.wikipedia.org/wiki/.sx // sx : http://en.wikipedia.org/wiki/.sx
// Confirmed by registry <jcvignes@openregistry.com> 2012-05-31 // Submitted by registry <jcvignes@openregistry.com>
sx sx
gov.sx gov.sx
@ -6059,7 +6060,7 @@ tf
tg tg
// th : http://en.wikipedia.org/wiki/.th // th : http://en.wikipedia.org/wiki/.th
// Submitted by registry <krit@thains.co.th> 2008-06-17 // Submitted by registry <krit@thains.co.th>
th th
ac.th ac.th
co.th co.th
@ -6130,7 +6131,7 @@ defense.tn
turen.tn turen.tn
// to : http://en.wikipedia.org/wiki/.to // to : http://en.wikipedia.org/wiki/.to
// Submitted by registry <egullich@colo.to> 2008-06-17 // Submitted by registry <egullich@colo.to>
to to
com.to com.to
gov.to gov.to
@ -6141,7 +6142,7 @@ mil.to
// subTLDs: https://www.nic.tr/forms/eng/policies.pdf // subTLDs: https://www.nic.tr/forms/eng/policies.pdf
// and: https://www.nic.tr/forms/politikalar.pdf // and: https://www.nic.tr/forms/politikalar.pdf
// Submitted by <mehmetgurevin@gmail.com> 2014-07-19 // Submitted by <mehmetgurevin@gmail.com>
tr tr
com.tr com.tr
info.tr info.tr
@ -6215,7 +6216,7 @@ club.tw
商業.tw 商業.tw
// tz : http://www.tznic.or.tz/index.php/domains // tz : http://www.tznic.or.tz/index.php/domains
// Confirmed by registry <manager@tznic.or.tz> 2013-01-22 // Submitted by registry <manager@tznic.or.tz>
tz tz
ac.tz ac.tz
co.tz co.tz
@ -6231,7 +6232,7 @@ sc.tz
tv.tz tv.tz
// ua : https://hostmaster.ua/policy/?ua // ua : https://hostmaster.ua/policy/?ua
// Submitted by registry <dk@cctld.ua> 2012-04-27 // Submitted by registry <dk@cctld.ua>
ua ua
// ua 2LD // ua 2LD
com.ua com.ua
@ -6601,7 +6602,7 @@ org.uz
va va
// vc : http://en.wikipedia.org/wiki/.vc // vc : http://en.wikipedia.org/wiki/.vc
// Submitted by registry <kshah@ca.afilias.info> 2008-06-13 // Submitted by registry <kshah@ca.afilias.info>
vc vc
com.vc com.vc
net.vc net.vc
@ -6611,8 +6612,7 @@ mil.vc
edu.vc edu.vc
// ve : https://registro.nic.ve/ // ve : https://registro.nic.ve/
// Confirmed by registry 2012-10-04 // Submitted by registry
// Updated 2014-05-20 - Bug 940478
ve ve
arts.ve arts.ve
co.ve co.ve
@ -6826,7 +6826,7 @@ yt
فلسطين فلسطين
// xn--90a3ac ("srb", Cyrillic) : RS // xn--90a3ac ("srb", Cyrillic) : RS
// http://www.rnids.rs/en/the-.срб-domain // https://www.rnids.rs/en/domains/national-domains
срб срб
пр.срб пр.срб
орг.срб орг.срб
@ -6905,7 +6905,7 @@ xxx
// za : http://www.zadna.org.za/content/page/domain-information // za : http://www.zadna.org.za/content/page/domain-information
ac.za ac.za
agrica.za agric.za
alt.za alt.za
co.za co.za
edu.za edu.za
@ -10591,11 +10591,11 @@ zuerich
// (Note: these are in alphabetical order by company name) // (Note: these are in alphabetical order by company name)
// Amazon CloudFront : https://aws.amazon.com/cloudfront/ // Amazon CloudFront : https://aws.amazon.com/cloudfront/
// Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22 // Submitted by Donavan Miller <donavanm@amazon.com>
cloudfront.net cloudfront.net
// Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
// Submitted by Osman Surkatty <osmans@amazon.com> 2014-12-16 // Submitted by Osman Surkatty <osmans@amazon.com>
ap-northeast-1.compute.amazonaws.com ap-northeast-1.compute.amazonaws.com
ap-southeast-1.compute.amazonaws.com ap-southeast-1.compute.amazonaws.com
ap-southeast-2.compute.amazonaws.com ap-southeast-2.compute.amazonaws.com
@ -10614,15 +10614,15 @@ z-1.compute-1.amazonaws.com
z-2.compute-1.amazonaws.com z-2.compute-1.amazonaws.com
// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
// Submitted by Adam Stein <astein@amazon.com> 2013-04-02 // Submitted by Adam Stein <astein@amazon.com>
elasticbeanstalk.com elasticbeanstalk.com
// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
// Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27 // Submitted by Scott Vidmar <svidmar@amazon.com>
elb.amazonaws.com elb.amazonaws.com
// Amazon S3 : https://aws.amazon.com/s3/ // Amazon S3 : https://aws.amazon.com/s3/
// Submitted by Eric Kinolik <kilo@amazon.com> 2015-04-08 // Submitted by Eric Kinolik <kilo@amazon.com>
s3.amazonaws.com s3.amazonaws.com
s3-ap-northeast-1.amazonaws.com s3-ap-northeast-1.amazonaws.com
s3-ap-southeast-1.amazonaws.com s3-ap-southeast-1.amazonaws.com
@ -10640,11 +10640,11 @@ s3.cn-north-1.amazonaws.com.cn
s3.eu-central-1.amazonaws.com s3.eu-central-1.amazonaws.com
// BetaInABox // BetaInABox
// Submitted by adrian@betainabox.com 2012-09-13 // Submitted by Adrian <adrian@betainabox.com>
betainabox.com betainabox.com
// CentralNic : http://www.centralnic.com/names/domains // CentralNic : http://www.centralnic.com/names/domains
// Submitted by registry <gavin.brown@centralnic.com> 2012-09-27 // Submitted by registry <gavin.brown@centralnic.com>
ae.org ae.org
ar.com ar.com
br.com br.com
@ -10675,38 +10675,42 @@ za.bz
za.com za.com
// Africa.com Web Solutions Ltd : https://registry.africa.com // Africa.com Web Solutions Ltd : https://registry.africa.com
// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
africa.com africa.com
// iDOT Services Limited : http://www.domain.gr.com // iDOT Services Limited : http://www.domain.gr.com
// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
gr.com gr.com
// Radix FZC : http://domains.in.net // Radix FZC : http://domains.in.net
// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
in.net in.net
// US REGISTRY LLC : http://us.org // US REGISTRY LLC : http://us.org
// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
us.org us.org
// co.com Registry, LLC : https://registry.co.com // co.com Registry, LLC : https://registry.co.com
// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
co.com co.com
// c.la : http://www.c.la/ // c.la : http://www.c.la/
c.la c.la
// cloudControl : https://www.cloudcontrol.com/ // cloudControl : https://www.cloudcontrol.com/
// Submitted by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23 // Submitted by Tobias Wilken <tw@cloudcontrol.com>
cloudcontrolled.com cloudcontrolled.com
cloudcontrolapp.com cloudcontrolapp.com
// co.ca : http://registry.co.ca/ // co.ca : http://registry.co.ca/
co.ca co.ca
// i-registry s.r.o. : http://www.i-registry.cz/
// Submitted by Martin Semrad <semrad@i-registry.cz>
co.cz
// CDN77.com : http://www.cdn77.com // CDN77.com : http://www.cdn77.com
// Submitted by Jan Krpes <jan.krpes@cdn77.com> 2015-07-13 // Submitted by Jan Krpes <jan.krpes@cdn77.com>
c.cdn77.org c.cdn77.org
cdn77-ssl.net cdn77-ssl.net
r.cdn77.net r.cdn77.net
@ -10718,19 +10722,23 @@ co.nl
co.no co.no
// Commerce Guys, SAS // Commerce Guys, SAS
// Submitted by Damien Tournoud <damien@commerceguys.com> 2015-01-22 // Submitted by Damien Tournoud <damien@commerceguys.com>
*.platform.sh *.platform.sh
// Cupcake : https://cupcake.io/ // Cupcake : https://cupcake.io/
// Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08 // Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
cupcake.is cupcake.is
// DreamHost : http://www.dreamhost.com/ // DreamHost : http://www.dreamhost.com/
// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
dreamhosters.com dreamhosters.com
// Drobo : http://www.drobo.com/
// Submitted by Ricardo Padilha <rpadilha@drobo.com>
mydrobo.com
// DuckDNS : http://www.duckdns.org/ // DuckDNS : http://www.duckdns.org/
// Submitted by Richard Harper <richard@duckdns.org> 2015-05-17 // Submitted by Richard Harper <richard@duckdns.org>
duckdns.org duckdns.org
// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
@ -11015,8 +11023,7 @@ worse-than.tv
writesthisblog.com writesthisblog.com
// EU.org https://eu.org/ // EU.org https://eu.org/
// Submitted by Pierre Beyssac <hostmaster@eu.org> 2015-04-17 // Submitted by Pierre Beyssac <hostmaster@eu.org>
eu.org eu.org
al.eu.org al.eu.org
asso.eu.org asso.eu.org
@ -11075,7 +11082,7 @@ uk.eu.org
us.eu.org us.eu.org
// Fastly Inc. http://www.fastly.com/ // Fastly Inc. http://www.fastly.com/
// Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31 // Submitted by Vladimir Vuksan <vladimir@fastly.com>
a.ssl.fastly.net a.ssl.fastly.net
b.ssl.fastly.net b.ssl.fastly.net
global.ssl.fastly.net global.ssl.fastly.net
@ -11083,28 +11090,28 @@ a.prod.fastly.net
global.prod.fastly.net global.prod.fastly.net
// Firebase, Inc. // Firebase, Inc.
// Submitted by Chris Raynor <chris@firebase.com> 2014-01-21 // Submitted by Chris Raynor <chris@firebase.com>
firebaseapp.com firebaseapp.com
// Flynn : https://flynn.io // Flynn : https://flynn.io
// Submitted by Jonathan Rudenberg <jonathan@flynn.io> 2014-07-12 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
flynnhub.com flynnhub.com
// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains // GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28 // Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk>
service.gov.uk service.gov.uk
// GitHub, Inc. // GitHub, Inc.
// Submitted by Ben Toews <btoews@github.com> 2014-02-06 // Submitted by Ben Toews <btoews@github.com>
github.io github.io
githubusercontent.com githubusercontent.com
// GlobeHosting, Inc. // GlobeHosting, Inc.
// Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12 // Submitted by Zoltan Egresi <egresi@globehosting.com>
ro.com ro.com
// Google, Inc. // Google, Inc.
// Submitted by Eduardo Vela <evn@google.com> 2014-12-19 // Submitted by Eduardo Vela <evn@google.com>
appspot.com appspot.com
blogspot.ae blogspot.ae
blogspot.al blogspot.al
@ -11192,12 +11199,12 @@ withyoutube.com
hashbang.sh hashbang.sh
// Heroku : https://www.heroku.com/ // Heroku : https://www.heroku.com/
// Submitted by Tom Maher <tmaher@heroku.com> 2013-05-02 // Submitted by Tom Maher <tmaher@heroku.com>
herokuapp.com herokuapp.com
herokussl.com herokussl.com
// iki.fi // iki.fi
// Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05 // Submitted by Hannu Aronsson <haa@iki.fi>
iki.fi iki.fi
// info.at : http://www.info.at/ // info.at : http://www.info.at/
@ -11208,45 +11215,45 @@ info.at
co.pl co.pl
// Microsoft : http://microsoft.com // Microsoft : http://microsoft.com
// Submitted by Barry Dorrans <bdorrans@microsoft.com> 2014-01-24 // Submitted by Barry Dorrans <bdorrans@microsoft.com>
azurewebsites.net azurewebsites.net
azure-mobile.net azure-mobile.net
cloudapp.net cloudapp.net
// Mozilla Foundation : https://mozilla.org/ // Mozilla Foundation : https://mozilla.org/
// Submited by glob <glob@mozilla.com> 2015-07-06 // Submitted by glob <glob@mozilla.com>
bmoattachments.org bmoattachments.org
// Neustar Inc. // Neustar Inc.
// Submitted by Trung Tran <Trung.Tran@neustar.biz> 2015-04-23 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
4u.com 4u.com
// ngrok : https://ngrok.com/ // ngrok : https://ngrok.com/
// Submitted by Alan Shreve <alan@ngrok.com> 2015-11-10 // Submitted by Alan Shreve <alan@ngrok.com>
ngrok.io ngrok.io
// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
nfshost.com nfshost.com
// NYC.mn : http://www.information.nyc.mn // NYC.mn : http://www.information.nyc.mn
// Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11 // Submitted by Matthew Brown <mattbrown@nyc.mn>
nyc.mn nyc.mn
// One Fold Media : http://www.onefoldmedia.com/ // One Fold Media : http://www.onefoldmedia.com/
// Submitted by Eddie Jones <eddie@onefoldmedia.com> 2014-06-10 // Submitted by Eddie Jones <eddie@onefoldmedia.com>
nid.io nid.io
// Opera Software, A.S.A. // Opera Software, A.S.A.
// Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26 // Submitted by Yngve Pettersen <yngve@opera.com>
operaunite.com operaunite.com
// OutSystems // OutSystems
// Submitted by Duarte Santos <domain-admin@outsystemscloud.com> 2014-03-11 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
outsystemscloud.com outsystemscloud.com
// Pagefront : https://www.pagefronthq.com/ // Pagefront : https://www.pagefronthq.com/
// Submitted by Jason Kriss <jason@pagefronthq.com> 2015-12-02 // Submitted by Jason Kriss <jason@pagefronthq.com>
pagefrontapp.com pagefrontapp.com
// .pl domains (grandfathered) // .pl domains (grandfathered)
@ -11258,45 +11265,49 @@ wroc.pl
zakopane.pl zakopane.pl
// Pantheon Systems, Inc. : https://pantheon.io/ // Pantheon Systems, Inc. : https://pantheon.io/
// Submitted by Gary Dylina <gary@pantheon.io> 2015-09-14 // Submitted by Gary Dylina <gary@pantheon.io>
pantheon.io pantheon.io
gotpantheon.com gotpantheon.com
// prgmr.com : https://prgmr.com/
// Submitted by Sarah Newman <owner@prgmr.com>
xen.prgmr.com
// priv.at : http://www.nic.priv.at/ // priv.at : http://www.nic.priv.at/
// Submitted by registry <lendl@nic.at> 2008-06-09 // Submitted by registry <lendl@nic.at>
priv.at priv.at
// QA2 // QA2
// Submitted by Daniel Dent (https://www.danieldent.com/) 2015-07-16 // Submitted by Daniel Dent (https://www.danieldent.com/)
qa2.com qa2.com
// Rackmaze LLC : https://www.rackmaze.com // Rackmaze LLC : https://www.rackmaze.com
// Submitted by Kirill Pertsev <kika@rackmaze.com> 2015-12-02 // Submitted by Kirill Pertsev <kika@rackmaze.com>
rackmaze.com rackmaze.com
rackmaze.net rackmaze.net
// Red Hat, Inc. OpenShift : https://openshift.redhat.com/ // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
// Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24 // Submitted by Tim Kramer <tkramer@rhcloud.com>
rhcloud.com rhcloud.com
// Sandstorm Development Group, Inc. : https://sandcats.io/ // Sandstorm Development Group, Inc. : https://sandcats.io/
// Submitted by Asheesh Laroia <asheesh@sandstorm.io> 2015-07-21 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
sandcats.io sandcats.io
// Service Online LLC : http://drs.ua/ // Service Online LLC : http://drs.ua/
// Submitted by Serhii Bulakh <support@drs.ua> 2015-07-30 // Submitted by Serhii Bulakh <support@drs.ua>
biz.ua biz.ua
co.ua co.ua
pp.ua pp.ua
// SinaAppEngine : http://sae.sina.com.cn/ // SinaAppEngine : http://sae.sina.com.cn/
// Submitted by SinaAppEngine <saesupport@sinacloud.com> 2015-02-02 // Submitted by SinaAppEngine <saesupport@sinacloud.com>
sinaapp.com sinaapp.com
vipsinaapp.com vipsinaapp.com
1kapp.com 1kapp.com
// Synology, Inc. : https://www.synology.com/ // Synology, Inc. : https://www.synology.com/
// Submitted by Rony Weng <ronyweng@synology.com> 2015-12-02 // Submitted by Rony Weng <ronyweng@synology.com>
diskstation.me diskstation.me
dscloud.biz dscloud.biz
dscloud.me dscloud.me
@ -11319,18 +11330,18 @@ med.pl
sopot.pl sopot.pl
// UDR Limited : http://www.udr.hk.com // UDR Limited : http://www.udr.hk.com
// Submitted by registry <hostmaster@udr.hk.com> 2014-11-07 // Submitted by registry <hostmaster@udr.hk.com>
hk.com hk.com
hk.org hk.org
ltd.hk ltd.hk
inc.hk inc.hk
// Yola : https://www.yola.com/ // Yola : https://www.yola.com/
// Submitted by Stefano Rivera <stefano@yola.com> 2014-07-09 // Submitted by Stefano Rivera <stefano@yola.com>
yolasite.com yolasite.com
// ZaNiC : http://www.za.net/ // ZaNiC : http://www.za.net/
// Submitted by registry <hostmaster@nic.za.net> 2009-10-03 // Submitted by registry <hostmaster@nic.za.net>
za.net za.net
za.org za.org

6
lib-src/etags.c
View file

@ -4731,8 +4731,12 @@ Ruby_functions (FILE *inf)
if (reader || writer || alias) if (reader || writer || alias)
{ {
do { do {
char *np = cp; char *np;
cp = skip_spaces (cp);
if (*cp == '(')
cp = skip_spaces (cp + 1);
np = cp;
cp = skip_name (cp); cp = skip_name (cp);
if (*np != ':') if (*np != ':')
continue; continue;

10
lisp/erc/erc.el
View file

@ -1141,7 +1141,7 @@ which the local user typed."
(define-key map "\C-c\C-u" 'erc-kill-input) (define-key map "\C-c\C-u" 'erc-kill-input)
(define-key map "\C-c\C-x" 'erc-quit-server) (define-key map "\C-c\C-x" 'erc-quit-server)
(define-key map "\M-\t" 'ispell-complete-word) (define-key map "\M-\t" 'ispell-complete-word)
(define-key map "\t" 'erc-completion-at-point) (define-key map "\t" 'completion-at-point)
;; Suppress `font-lock-fontify-block' key binding since it ;; Suppress `font-lock-fontify-block' key binding since it
;; destroys face properties. ;; destroys face properties.
@ -1463,6 +1463,7 @@ Defaults to the server buffer."
(concat "\C-l\\|\\(^" (regexp-quote (erc-prompt)) "\\)")) (concat "\C-l\\|\\(^" (regexp-quote (erc-prompt)) "\\)"))
(set (make-local-variable 'paragraph-start) (set (make-local-variable 'paragraph-start)
(concat "\\(" (regexp-quote (erc-prompt)) "\\)")) (concat "\\(" (regexp-quote (erc-prompt)) "\\)"))
(setq-local completion-ignore-case t)
(add-hook 'completion-at-point-functions 'erc-complete-word-at-point nil t)) (add-hook 'completion-at-point-functions 'erc-complete-word-at-point nil t))
;; activation ;; activation
@ -3996,13 +3997,6 @@ Prompt for one if called interactively."
(format "MODE %s +k %s" tgt key) (format "MODE %s +k %s" tgt key)
(format "MODE %s -k" tgt))))) (format "MODE %s -k" tgt)))))
(defun erc-completion-at-point ()
"Perform completion on the text around point case-insensitively.
See `completion-at-point'."
(interactive)
(let ((completion-ignore-case t))
(completion-at-point)))
(defun erc-quit-server (reason) (defun erc-quit-server (reason)
"Disconnect from current server after prompting for REASON. "Disconnect from current server after prompting for REASON.
`erc-quit-reason' works with this just like with `erc-cmd-QUIT'." `erc-quit-reason' works with this just like with `erc-cmd-QUIT'."

4
lisp/gnus/gnus-start.el
View file

@ -862,7 +862,9 @@ If REGEXP is given, lines that match it will be deleted."
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(delete-region (point-at-bol) end)))) (delete-region (point-at-bol) end))))
(goto-char (point-max)) (goto-char (point-max))
(insert string "\n") ;; Make sure that each dribble entry is a single line, so that
;; the "remove" code above works.
(insert (replace-regexp-in-string "\n" "\\\\n" string) "\n")
;; This has been commented by Josh Huber <huber@alum.wpi.edu> ;; This has been commented by Josh Huber <huber@alum.wpi.edu>
;; It causes problems with both XEmacs and Emacs 21, and doesn't ;; It causes problems with both XEmacs and Emacs 21, and doesn't
;; seem to be of much value. (FIXME: remove this after we make sure ;; seem to be of much value. (FIXME: remove this after we make sure

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

@ -4011,7 +4011,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(gnus-group-next-unread-group 1)) (gnus-group-next-unread-group 1))
(gnus-handle-ephemeral-exit quit-config))) (gnus-handle-ephemeral-exit quit-config)))
(if (null (gnus-list-of-unread-articles group)) (if (null (gnus-list-of-unread-articles group))
(gnus-message 3 "Group %s contains no messages" group) (gnus-message 3 "Group %s contains no messages"
(gnus-group-decoded-name group))
(gnus-message 3 "Can't select group")) (gnus-message 3 "Can't select group"))
nil) nil)
;; The user did a `C-g' while prompting for number of articles, ;; The user did a `C-g' while prompting for number of articles,

26
lisp/gnus/nnimap.el
View file

@ -113,6 +113,12 @@ some servers.")
(defvoo nnimap-current-infos nil) (defvoo nnimap-current-infos nil)
(defun nnimap-decode-gnus-group (group)
(decode-coding-string group 'utf-8))
(defun nnimap-encode-gnus-group (group)
(encode-coding-string group 'utf-8))
(defvoo nnimap-fetch-partial-articles nil (defvoo nnimap-fetch-partial-articles nil
"If non-nil, Gnus will fetch partial articles. "If non-nil, Gnus will fetch partial articles.
If t, Gnus will fetch only the first part. If a string, it If t, Gnus will fetch only the first part. If a string, it
@ -794,9 +800,6 @@ textual parts.")
(incf num))) (incf num)))
(nreverse parts))) (nreverse parts)))
(defun nnimap-decode-gnus-group (group)
(decode-coding-string group 'utf-8))
(deffoo nnimap-request-group (group &optional server dont-check info) (deffoo nnimap-request-group (group &optional server dont-check info)
(setq group (nnimap-decode-gnus-group group)) (setq group (nnimap-decode-gnus-group group))
(let ((result (nnimap-change-group (let ((result (nnimap-change-group
@ -825,7 +828,7 @@ textual parts.")
(- (cdr active) (car active)) (- (cdr active) (car active))
(car active) (car active)
(cdr active) (cdr active)
group)) (nnimap-encode-gnus-group group)))
t)))) t))))
(deffoo nnimap-request-group-scan (group &optional server info) (deffoo nnimap-request-group-scan (group &optional server info)
@ -860,7 +863,8 @@ textual parts.")
(erase-buffer) (erase-buffer)
(insert (insert
(format (format
"211 %d %d %d %S\n" (1+ (- high low)) low high group)) "211 %d %d %d %S\n" (1+ (- high low)) low high
(nnimap-encode-gnus-group group)))
t)))) t))))
(deffoo nnimap-request-create-group (group &optional server _args) (deffoo nnimap-request-create-group (group &optional server _args)
@ -1323,7 +1327,7 @@ If LIMIT, first try to limit the search to the N last articles."
(let* ((sequence (car response)) (let* ((sequence (car response))
(response (cadr response)) (response (cadr response))
(group (cadr (assoc sequence sequences))) (group (cadr (assoc sequence sequences)))
(egroup (encode-coding-string group 'utf-8))) (egroup (nnimap-encode-gnus-group group)))
(when (and group (when (and group
(equal (caar response) "OK")) (equal (caar response) "OK"))
(let ((uidnext (nnimap-find-parameter "UIDNEXT" response)) (let ((uidnext (nnimap-find-parameter "UIDNEXT" response))
@ -1354,7 +1358,7 @@ If LIMIT, first try to limit the search to the N last articles."
(nnimap-get-groups))) (nnimap-get-groups)))
(unless (assoc group nnimap-current-infos) (unless (assoc group nnimap-current-infos)
;; Insert dummy numbers here -- they don't matter. ;; Insert dummy numbers here -- they don't matter.
(insert (format "%S 0 1 y\n" (encode-coding-string group 'utf-8))))) (insert (format "%S 0 1 y\n" (nnimap-encode-gnus-group group)))))
t))) t)))
(deffoo nnimap-retrieve-group-data-early (server infos) (deffoo nnimap-retrieve-group-data-early (server infos)
@ -1453,8 +1457,9 @@ If LIMIT, first try to limit the search to the N last articles."
(active (gnus-active group))) (active (gnus-active group)))
(when active (when active
(insert (format "%S %d %d y\n" (insert (format "%S %d %d y\n"
(decode-coding-string (nnimap-encode-gnus-group
(gnus-group-real-name group) 'utf-8) (nnimap-decode-gnus-group
(gnus-group-real-name group)))
(cdr active) (cdr active)
(car active)))))))))))) (car active))))))))))))
@ -1672,7 +1677,8 @@ If LIMIT, first try to limit the search to the N last articles."
(nreverse result)))) (nreverse result))))
(defun nnimap-store-info (info active) (defun nnimap-store-info (info active)
(let* ((group (gnus-group-real-name (gnus-info-group info))) (let* ((group (nnimap-decode-gnus-group
(gnus-group-real-name (gnus-info-group info))))
(entry (assoc group nnimap-current-infos))) (entry (assoc group nnimap-current-infos)))
(if entry (if entry
(setcdr entry (list info active)) (setcdr entry (list info active))

36
lisp/isearch.el
View file

@ -224,7 +224,7 @@ Default value, nil, means edit the string instead."
(autoload 'character-fold-to-regexp "character-fold") (autoload 'character-fold-to-regexp "character-fold")
(defcustom search-default-regexp-mode #'character-fold-to-regexp (defcustom search-default-mode #'character-fold-to-regexp
"Default mode to use when starting isearch. "Default mode to use when starting isearch.
Value is nil, t, or a function. Value is nil, t, or a function.
@ -234,9 +234,9 @@ If t, default to regexp searches (as if typing `\\[isearch-toggle-regexp]' durin
isearch). isearch).
If a function, use that function as an `isearch-regexp-function'. If a function, use that function as an `isearch-regexp-function'.
Example functions are `word-search-regexp' \(`\\[isearch-toggle-word]'), Example functions (and the keys to toggle them during isearch)
`isearch-symbol-regexp' \(`\\[isearch-toggle-symbol]'), and are `word-search-regexp' \(`\\[isearch-toggle-word]'), `isearch-symbol-regexp'
`character-fold-to-regexp' \(`\\[isearch-toggle-character-fold]')." \(`\\[isearch-toggle-symbol]'), and `character-fold-to-regexp' \(`\\[isearch-toggle-character-fold]')."
;; :type is set below by `isearch-define-mode-toggle'. ;; :type is set below by `isearch-define-mode-toggle'.
:type '(choice (const :tag "Literal search" nil) :type '(choice (const :tag "Literal search" nil)
(const :tag "Regexp search" t) (const :tag "Regexp search" t)
@ -558,7 +558,11 @@ If the value is a function (e.g. `isearch-symbol-regexp'), it is
called to convert a plain search string to a regexp used by called to convert a plain search string to a regexp used by
regexp search functions. regexp search functions.
The symbol property `isearch-message-prefix' put on this function The symbol property `isearch-message-prefix' put on this function
specifies the prefix string displayed in the search message.") specifies the prefix string displayed in the search message.
This variable is set and changed during isearch. To change the
default behaviour used for searches, see `search-default-mode'
instead.")
;; We still support setting this to t for backwards compatibility. ;; We still support setting this to t for backwards compatibility.
(define-obsolete-variable-alias 'isearch-word (define-obsolete-variable-alias 'isearch-word
'isearch-regexp-function "25.1") 'isearch-regexp-function "25.1")
@ -868,11 +872,11 @@ used to set the value of `isearch-regexp-function'."
(setq isearch-forward forward (setq isearch-forward forward
isearch-regexp (or regexp isearch-regexp (or regexp
(and (not regexp-function) (and (not regexp-function)
(eq search-default-regexp-mode t))) (eq search-default-mode t)))
isearch-regexp-function (or regexp-function isearch-regexp-function (or regexp-function
(and (functionp search-default-regexp-mode) (and (functionp search-default-mode)
(not regexp) (not regexp)
search-default-regexp-mode)) search-default-mode))
isearch-op-fun op-fun isearch-op-fun op-fun
isearch-last-case-fold-search isearch-case-fold-search isearch-last-case-fold-search isearch-case-fold-search
isearch-case-fold-search case-fold-search isearch-case-fold-search case-fold-search
@ -1506,7 +1510,7 @@ Use `isearch-exit' to quit without signaling."
(isearch-repeat 'backward)) (isearch-repeat 'backward))
;;; Toggles for `isearch-regexp-function' and `search-default-regexp-mode'. ;;; Toggles for `isearch-regexp-function' and `search-default-mode'.
(defmacro isearch-define-mode-toggle (mode key function &optional docstring &rest body) (defmacro isearch-define-mode-toggle (mode key function &optional docstring &rest body)
"Define a command called `isearch-toggle-MODE' and bind it to `M-s KEY'. "Define a command called `isearch-toggle-MODE' and bind it to `M-s KEY'.
The first line of the command's docstring is auto-generated, the The first line of the command's docstring is auto-generated, the
@ -1524,21 +1528,19 @@ The command then executes BODY and updates the isearch prompt."
(if docstring (concat "\n" docstring) "")) (if docstring (concat "\n" docstring) ""))
(interactive) (interactive)
,@(when function ,@(when function
`((setq isearch-regexp-function `((setq isearch-regexp-function #',function)
(unless (eq isearch-regexp-function #',function) (setq isearch-regexp nil)))
#',function))
(when isearch-regexp-function (setq isearch-regexp nil))))
,@body ,@body
(setq isearch-success t isearch-adjusted t) (setq isearch-success t isearch-adjusted t)
(isearch-update)) (isearch-update))
(define-key isearch-mode-map ,key #',command-name) (define-key isearch-mode-map ,key #',command-name)
,@(when (symbolp function) ,@(when (and function (symbolp function))
`((put ',function 'isearch-message-prefix ,(format "%s " mode)) `((put ',function 'isearch-message-prefix ,(format "%s " mode))
(put ',function :advertised-binding ,key) (put ',function :advertised-binding ,key)
(cl-callf (lambda (types) (cons 'choice (cl-callf (lambda (types) (cons 'choice
(cons '(const :tag ,(capitalize (format "%s search" mode)) ,function) (cons '(const :tag ,(capitalize (format "%s search" mode)) ,function)
(cdr types)))) (cdr types))))
(get 'search-default-regexp-mode 'custom-type))))))) (get 'search-default-mode 'custom-type)))))))
(isearch-define-mode-toggle word "w" word-search-regexp "\ (isearch-define-mode-toggle word "w" word-search-regexp "\
Turning on word search turns off regexp mode.") Turning on word search turns off regexp mode.")
@ -2571,7 +2573,7 @@ the word mode."
(setq regexp-function #'word-search-regexp)) (setq regexp-function #'word-search-regexp))
(let ((description (let ((description
;; Don't use a description on the default search mode. ;; Don't use a description on the default search mode.
(cond ((equal regexp-function search-default-regexp-mode) "") (cond ((equal regexp-function search-default-mode) "")
(regexp-function (regexp-function
(and (symbolp regexp-function) (and (symbolp regexp-function)
(or (get regexp-function 'isearch-message-prefix) (or (get regexp-function 'isearch-message-prefix)
@ -2579,7 +2581,7 @@ the word mode."
(isearch-regexp "regexp ") (isearch-regexp "regexp ")
;; We're in literal mode. If the default mode is not ;; We're in literal mode. If the default mode is not
;; literal, then describe it. ;; literal, then describe it.
((functionp search-default-regexp-mode) "literal ")))) ((functionp search-default-mode) "literal "))))
(if space-before (if space-before
;; Move space from the end to the beginning. ;; Move space from the end to the beginning.
(replace-regexp-in-string "\\(.*\\) \\'" " \\1" description) (replace-regexp-in-string "\\(.*\\) \\'" " \\1" description)

57
lisp/menu-bar.el
View file

@ -244,7 +244,7 @@
(setq menu-bar-last-search-type 'string) (setq menu-bar-last-search-type 'string)
;; Ideally, this whole command would be equivalent to `C-s RET'. ;; Ideally, this whole command would be equivalent to `C-s RET'.
(let ((isearch-forward (not backward)) (let ((isearch-forward (not backward))
(isearch-regexp-function search-default-regexp-mode) (isearch-regexp-function search-default-mode)
(isearch-regexp nil)) (isearch-regexp nil))
(if (or (equal string "") (not string)) (if (or (equal string "") (not string))
(funcall (isearch-search-fun-default) (car search-ring)) (funcall (isearch-search-fun-default) (car search-ring))
@ -1256,6 +1256,52 @@ mail status in mode line"))
:enable (not (truncated-partial-width-window-p)))) :enable (not (truncated-partial-width-window-p))))
menu)) menu))
(defvar menu-bar-search-options-menu
(let ((menu (make-sparse-keymap "Search Options")))
(dolist (x '((character-fold-to-regexp "Fold Characters" "Character folding")
(isearch-symbol-regexp "Whole Symbols" "Whole symbol")
(word-search-regexp "Whole Words" "Whole word")))
(bindings--define-key menu (vector (nth 0 x))
`(menu-item ,(nth 1 x)
(lambda ()
(interactive)
(setq search-default-mode #',(nth 0 x))
(message ,(format "%s search enabled" (nth 2 x))))
:help ,(format "Enable %s search" (downcase (nth 2 x)))
:button (:radio . (eq search-default-mode #',(nth 0 x))))))
(bindings--define-key menu [regexp-search]
'(menu-item "Regular Expression"
(lambda ()
(interactive)
(setq search-default-mode t)
(message "Regular-expression search enabled"))
:help "Enable regular-expression search"
:button (:radio . (eq search-default-mode t))))
(bindings--define-key menu [regular-search]
'(menu-item "Literal Search"
(lambda ()
(interactive)
(when search-default-mode
(setq search-default-mode nil)
(when (symbolp search-default-mode)
(message "Literal search enabled"))))
:help "Disable special search modes"
:button (:radio . (not search-default-mode))))
(bindings--define-key menu [custom-separator]
menu-bar-separator)
(bindings--define-key menu [case-fold-search]
(menu-bar-make-toggle
toggle-case-fold-search case-fold-search
"Ignore Case"
"Case-Insensitive Search %s"
"Ignore letter-case in search commands"))
menu))
(defvar menu-bar-options-menu (defvar menu-bar-options-menu
(let ((menu (make-sparse-keymap "Options"))) (let ((menu (make-sparse-keymap "Options")))
(bindings--define-key menu [customize] (bindings--define-key menu [customize]
@ -1367,12 +1413,9 @@ mail status in mode line"))
(:visible (and (boundp 'cua-enable-cua-keys) (:visible (and (boundp 'cua-enable-cua-keys)
(not cua-enable-cua-keys))))) (not cua-enable-cua-keys)))))
(bindings--define-key menu [case-fold-search] (bindings--define-key menu [search-options]
(menu-bar-make-toggle `(menu-item "Default Search Options"
toggle-case-fold-search case-fold-search ,menu-bar-search-options-menu))
"Ignore Case for Search"
"Case-Insensitive Search %s"
"Ignore letter-case in search commands"))
(bindings--define-key menu [line-wrapping] (bindings--define-key menu [line-wrapping]
`(menu-item "Line Wrapping in This Buffer" `(menu-item "Line Wrapping in This Buffer"

1
src/w32inevt.c
View file

@ -660,6 +660,7 @@ handle_file_notifications (struct input_event *hold_quit)
inev.arg = list3 (make_pointer_integer (notifications_desc), inev.arg = list3 (make_pointer_integer (notifications_desc),
action, fname); action, fname);
kbd_buffer_store_event_hold (&inev, hold_quit); kbd_buffer_store_event_hold (&inev, hold_quit);
nevents++;
if (!fni->NextEntryOffset) if (!fni->NextEntryOffset)
break; break;

5
src/w32notify.c
View file

@ -144,8 +144,9 @@ send_notifications (BYTE *info, DWORD info_size, void *desc,
if (!notification_buffer_in_use) if (!notification_buffer_in_use)
{ {
if (info_size) if (info_size)
memcpy (file_notifications, info, info_size); memcpy (file_notifications, info,
notifications_size = info_size; min (info_size, sizeof (file_notifications)));
notifications_size = min (info_size, sizeof (file_notifications));
notifications_desc = desc; notifications_desc = desc;
/* If PostMessage fails, the message queue is full. If that /* If PostMessage fails, the message queue is full. If that
happens, the last thing they will worry about is file happens, the last thing they will worry about is file

61
src/xfns.c
View file

@ -5683,6 +5683,7 @@ compute_tip_xy (struct frame *f, Lisp_Object parms, Lisp_Object dx, Lisp_Object
int win_x, win_y; int win_x, win_y;
Window root, child; Window root, child;
unsigned pmask; unsigned pmask;
int min_x, min_y, max_x, max_y = -1;
/* User-specified position? */ /* User-specified position? */
left = Fcdr (Fassq (Qleft, parms)); left = Fcdr (Fassq (Qleft, parms));
@ -5695,45 +5696,81 @@ compute_tip_xy (struct frame *f, Lisp_Object parms, Lisp_Object dx, Lisp_Object
if ((!INTEGERP (left) && !INTEGERP (right)) if ((!INTEGERP (left) && !INTEGERP (right))
|| (!INTEGERP (top) && !INTEGERP (bottom))) || (!INTEGERP (top) && !INTEGERP (bottom)))
{ {
Lisp_Object frame, attributes, monitor, geometry;
block_input (); block_input ();
XQueryPointer (FRAME_X_DISPLAY (f), FRAME_DISPLAY_INFO (f)->root_window, XQueryPointer (FRAME_X_DISPLAY (f), FRAME_DISPLAY_INFO (f)->root_window,
&root, &child, root_x, root_y, &win_x, &win_y, &pmask); &root, &child, root_x, root_y, &win_x, &win_y, &pmask);
unblock_input (); unblock_input ();
XSETFRAME(frame, f);
attributes = Fx_display_monitor_attributes_list (frame);
/* Try to determine the monitor where the mouse pointer is and
its geometry. See bug#22549. */
while (CONSP (attributes))
{
monitor = XCAR (attributes);
geometry = Fassq (Qgeometry, monitor);
if (CONSP (geometry))
{
min_x = XINT (Fnth (make_number (1), geometry));
min_y = XINT (Fnth (make_number (2), geometry));
max_x = min_x + XINT (Fnth (make_number (3), geometry));
max_y = min_y + XINT (Fnth (make_number (4), geometry));
if (min_x <= *root_x && *root_x < max_x
&& min_y <= *root_y && *root_y < max_y)
{
break;
}
max_y = -1;
}
attributes = XCDR (attributes);
}
}
/* It was not possible to determine the monitor's geometry, so we
assign some sane defaults here: */
if ( max_y < 0 )
{
min_x = 0;
min_y = 0;
max_x = x_display_pixel_width (FRAME_DISPLAY_INFO (f));
max_y = x_display_pixel_height (FRAME_DISPLAY_INFO (f));
} }
if (INTEGERP (top)) if (INTEGERP (top))
*root_y = XINT (top); *root_y = XINT (top);
else if (INTEGERP (bottom)) else if (INTEGERP (bottom))
*root_y = XINT (bottom) - height; *root_y = XINT (bottom) - height;
else if (*root_y + XINT (dy) <= 0) else if (*root_y + XINT (dy) <= min_y)
*root_y = 0; /* Can happen for negative dy */ *root_y = min_y; /* Can happen for negative dy */
else if (*root_y + XINT (dy) + height else if (*root_y + XINT (dy) + height <= max_y)
<= x_display_pixel_height (FRAME_DISPLAY_INFO (f)))
/* It fits below the pointer */ /* It fits below the pointer */
*root_y += XINT (dy); *root_y += XINT (dy);
else if (height + XINT (dy) <= *root_y) else if (height + XINT (dy) + min_y <= *root_y)
/* It fits above the pointer. */ /* It fits above the pointer. */
*root_y -= height + XINT (dy); *root_y -= height + XINT (dy);
else else
/* Put it on the top. */ /* Put it on the top. */
*root_y = 0; *root_y = min_y;
if (INTEGERP (left)) if (INTEGERP (left))
*root_x = XINT (left); *root_x = XINT (left);
else if (INTEGERP (right)) else if (INTEGERP (right))
*root_x = XINT (right) - width; *root_x = XINT (right) - width;
else if (*root_x + XINT (dx) <= 0) else if (*root_x + XINT (dx) <= min_x)
*root_x = 0; /* Can happen for negative dx */ *root_x = 0; /* Can happen for negative dx */
else if (*root_x + XINT (dx) + width else if (*root_x + XINT (dx) + width <= max_x)
<= x_display_pixel_width (FRAME_DISPLAY_INFO (f)))
/* It fits to the right of the pointer. */ /* It fits to the right of the pointer. */
*root_x += XINT (dx); *root_x += XINT (dx);
else if (width + XINT (dx) <= *root_x) else if (width + XINT (dx) + min_x <= *root_x)
/* It fits to the left of the pointer. */ /* It fits to the left of the pointer. */
*root_x -= width + XINT (dx); *root_x -= width + XINT (dx);
else else
/* Put it left-justified on the screen--it ought to fit that way. */ /* Put it left justified on the screen -- it ought to fit that way. */
*root_x = 0; *root_x = min_x;
} }

6
test/etags/ruby-src/test1.ru
View file

@ -29,9 +29,13 @@ module A
:baz, :baz,
:more :more
attr_accessor :tee attr_accessor :tee
alias_method :qux, :tee, attr_accessor :bogus alias_method :qux, :tee, attr_accessor(:bogus)
alias_method :xyz, alias_method :xyz,
:tee ; attr_reader :subtle :tee ; attr_reader :subtle
attr_reader(:foo1, :bar1, # comment
:qux1)
alias_method ( :foo2, #cmmt
:bar2)
end end
end end

12
test/lisp/filenotify-tests.el
View file

@ -66,7 +66,7 @@
"Timeout to wait for arriving events, in seconds." "Timeout to wait for arriving events, in seconds."
(cond (cond
((file-remote-p temporary-file-directory) 6) ((file-remote-p temporary-file-directory) 6)
((string-equal (file-notify--test-library) "w32notify") 20) ((string-equal (file-notify--test-library) "w32notify") 10)
((eq system-type 'cygwin) 10) ((eq system-type 'cygwin) 10)
(t 3))) (t 3)))
@ -797,10 +797,7 @@ longer than timeout seconds for the events to be delivered."
file-notify--test-tmpfile file-notify--test-tmpfile
'(change) 'file-notify--test-event-handler))) '(change) 'file-notify--test-event-handler)))
(unwind-protect (unwind-protect
;; In case of w32notify, the upper limit of events to handle (let ((n 1000)
;; seems to be 260. Reason unknown.
(let ((n (if (string-equal (file-notify--test-library) "w32notify")
250 1000))
source-file-list target-file-list source-file-list target-file-list
(default-directory file-notify--test-tmpfile)) (default-directory file-notify--test-tmpfile))
(dotimes (i n) (dotimes (i n)
@ -832,10 +829,11 @@ longer than timeout seconds for the events to be delivered."
(let ((source-file-list source-file-list) (let ((source-file-list source-file-list)
(target-file-list target-file-list)) (target-file-list target-file-list))
(while (and source-file-list target-file-list) (while (and source-file-list target-file-list)
(rename-file (pop source-file-list) (pop target-file-list) t)))) (rename-file (pop source-file-list) (pop target-file-list) t)
(read-event nil nil 0.02))))
(file-notify--test-with-events (make-list n 'deleted) (file-notify--test-with-events (make-list n 'deleted)
(dolist (file target-file-list) (dolist (file target-file-list)
(delete-file file)))) (prog1 (delete-file file) (read-event nil nil 0.02)))))
(file-notify--test-cleanup))) (file-notify--test-cleanup)))
(file-notify--deftest-remote file-notify-test06-many-events (file-notify--deftest-remote file-notify-test06-many-events

8
test/manual/etags/CTAGS.good
View file

@ -454,7 +454,7 @@ Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable is privat
Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable is$/ Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable is$/
Configure pyt-src/server.py /^class Configure(Frame, ControlEdit):$/ Configure pyt-src/server.py /^class Configure(Frame, ControlEdit):$/
ConfirmQuit pyt-src/server.py /^def ConfirmQuit(frame, context):$/ ConfirmQuit pyt-src/server.py /^def ConfirmQuit(frame, context):$/
Constant ruby-src/test1.ru 38 Constant ruby-src/test1.ru 42
ControlEdit pyt-src/server.py /^class ControlEdit(Frame):$/ ControlEdit pyt-src/server.py /^class ControlEdit(Frame):$/
Controls pyt-src/server.py /^class Controls:$/ Controls pyt-src/server.py /^class Controls:$/
CopyTextString pas-src/common.pas /^function CopyTextString;(*($/ CopyTextString pas-src/common.pas /^function CopyTextString;(*($/
@ -2555,6 +2555,7 @@ bar c-src/c.c /^void bar() {while(0) {}}$/
bar c.c 143 bar c.c 143
bar c-src/h.h 19 bar c-src/h.h 19
bar cp-src/x.cc /^XX::bar()$/ bar cp-src/x.cc /^XX::bar()$/
bar1 ruby-src/test1.ru /^ attr_reader(:foo1, :bar1, # comment$/
bar= ruby-src/test1.ru /^ attr_writer :bar,$/ bar= ruby-src/test1.ru /^ attr_writer :bar,$/
bas_syn prol-src/natded.prolog /^bas_syn(n(_)).$/ bas_syn prol-src/natded.prolog /^bas_syn(n(_)).$/
base c-src/emacs/src/lisp.h 2188 base c-src/emacs/src/lisp.h 2188
@ -3008,6 +3009,8 @@ foo f-src/entry.strange /^ character*(*) function foo()$/
foo php-src/ptest.php /^foo()$/ foo php-src/ptest.php /^foo()$/
foo ruby-src/test1.ru /^ attr_reader :foo$/ foo ruby-src/test1.ru /^ attr_reader :foo$/
foo! ruby-src/test1.ru /^ def foo!$/ foo! ruby-src/test1.ru /^ def foo!$/
foo1 ruby-src/test1.ru /^ attr_reader(:foo1, :bar1, # comment$/
foo2 ruby-src/test1.ru /^ alias_method ( :foo2, #cmmt$/
foobar c-src/c.c /^int foobar() {;}$/ foobar c-src/c.c /^int foobar() {;}$/
foobar c.c /^extern void foobar (void) __attribute__ ((section / foobar c.c /^extern void foobar (void) __attribute__ ((section /
foobar2 c-src/h.h 20 foobar2 c-src/h.h 20
@ -3880,7 +3883,8 @@ questo ../c/c.web 34
quiettest make-src/Makefile /^quiettest:$/ quiettest make-src/Makefile /^quiettest:$/
quit_char c-src/emacs/src/keyboard.c 192 quit_char c-src/emacs/src/keyboard.c 192
quit_throw_to_read_char c-src/emacs/src/keyboard.c /^quit_throw_to_read_char (bool from_signal)$/ quit_throw_to_read_char c-src/emacs/src/keyboard.c /^quit_throw_to_read_char (bool from_signal)$/
qux ruby-src/test1.ru /^ alias_method :qux, :tee, attr_accessor :bogus$/ qux ruby-src/test1.ru /^ alias_method :qux, :tee, attr_accessor(:bogus)/
qux1 ruby-src/test1.ru /^ :qux1)$/
qux= ruby-src/test1.ru /^ def qux=(tee)$/ qux= ruby-src/test1.ru /^ def qux=(tee)$/
r0 c-src/sysdep.h 54 r0 c-src/sysdep.h 54
r1 c-src/sysdep.h 55 r1 c-src/sysdep.h 55

12
test/manual/etags/ETAGS.good_1
View file

@ -3061,7 +3061,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -3084,9 +3084,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77

12
test/manual/etags/ETAGS.good_2
View file

@ -3631,7 +3631,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -3654,9 +3654,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77

12
test/manual/etags/ETAGS.good_3
View file

@ -3408,7 +3408,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -3431,9 +3431,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77

12
test/manual/etags/ETAGS.good_4
View file

@ -3225,7 +3225,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -3248,9 +3248,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77

12
test/manual/etags/ETAGS.good_5
View file

@ -4142,7 +4142,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -4165,9 +4165,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77

12
test/manual/etags/ETAGS.good_6
View file

@ -4142,7 +4142,7 @@ module ModuleExample1,0
def module_instance_method46,1051 def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131 def ModuleExample.module_class_methodmodule_class_method49,1131
ruby-src/test1.ru,785 ruby-src/test1.ru,935
class A1,0 class A1,0
def a(2,8 def a(2,8
def b(5,38 def b(5,38
@ -4165,9 +4165,13 @@ module A9,57
attr_accessor :teetee31,382 attr_accessor :teetee31,382
attr_accessor :teetee=31,382 attr_accessor :teetee=31,382
alias_method :qux,qux32,405 alias_method :qux,qux32,405
alias_method :xyz,xyz33,455 alias_method :xyz,xyz33,456
:tee ; attr_reader :subtlesubtle34,478 :tee ; attr_reader :subtlesubtle34,479
A::Constant Constant38,533 attr_reader(:foo1,foo135,523
attr_reader(:foo1, :bar1,bar135,523
:qux1)qux136,563
alias_method ( :foo2,foo237,586
A::Constant Constant42,655
tex-src/testenv.tex,52 tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77 \newcommand{\nm}\nm4,77