Skip to content

Commit b1e43d4

Browse files
author
Yuuki Harano
committed
Merge branch 'master' of https://github.com/emacs-mirror/emacs
2 parents a612275 + 39c0795 commit b1e43d4

File tree

420 files changed

+11055
-8913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+11055
-8913
lines changed

CONTRIBUTE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ such patch without additional remarks, you can use a command like
5959
The Emacs issue tracker at https://debbugs.gnu.org lets you view bug
6060
reports and search the database for bugs matching several criteria.
6161
Messages posted to the [email protected] mailing list, mentioned
62-
above, are recorded by the tracker with the corresponding bugs/issues.
62+
above, are recorded by the tracker with the corresponding
63+
bugs/issues. If a message to the bug tracker contains a patch, please
64+
include the string "[PATCH]" in the subject of the message in order to
65+
let the bug tracker tag the bug properly.
6366

6467
GNU ELPA has a 'debbugs' package that allows accessing the tracker
6568
database from Emacs.

ChangeLog.3

Lines changed: 271 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,273 @@
1+
2019-03-20 Eli Zaretskii <[email protected]>
2+
3+
Improve indexing of the user manual
4+
5+
* doc/emacs/search.texi (Word Search): Improve indexing of
6+
"M-s M-w".
7+
8+
2019-03-19 Basil L. Contovounesios <[email protected]>
9+
10+
Fix url-copy-file arglist
11+
12+
* lisp/url/url-handlers.el: Silence byte-compiler.
13+
(url-copy-file): Add 6th argument following change to copy-file in
14+
2012-12-16T19:22:27+01:[email protected]. (bug#4410)
15+
16+
2019-03-19 Eli Zaretskii <[email protected]>
17+
18+
Fix downloading updates for packages with non-ASCII descriptions
19+
20+
* lisp/emacs-lisp/package.el (package--download-one-archive):
21+
Make sure archive contents are written using UTF-8 encoding.
22+
(Bug#34909)
23+
(list-packages): Set buffer's encoding to UTF-8.
24+
25+
2019-03-18 Nicolas Petton <[email protected]>
26+
27+
* etc/NEWS: Remove temporary markers.
28+
29+
2019-03-15 Alan Mackenzie <[email protected]>
30+
31+
* doc/misc/cc-mode.texi (Config Basics): in @itemize, @asis -> @w{}
32+
33+
2019-03-15 Eli Zaretskii <[email protected]>
34+
35+
Don't clobber 'comint-input-autoexpand' in 'read-shell-command'
36+
37+
* lisp/shell.el (shell-completion-vars): Set only the
38+
buffer-local value of 'comint-input-autoexpand'. (Bug#34815)
39+
40+
2019-03-13 Martin Rudalics <[email protected]>
41+
42+
Document restrictions when setting window margins, fringes or scroll bars
43+
44+
* src/window.c (Fset_window_margins, Fset_window_fringes)
45+
(Fset_window_scroll_bars): In doc-strings tell that a window
46+
must be large enough to accommodate fringes, sroll bars and
47+
margins of the desired size.
48+
* doc/lispref/display.texi (Fringe Size/Pos, Scroll Bars)
49+
(Display Margins): Tell that windows must be large enough to
50+
accommodate fringes, sroll bars and margins of the desired
51+
size.
52+
53+
2019-03-10 Eli Zaretskii <[email protected]>
54+
55+
More improvements for 'read-buffer's doc string
56+
57+
* src/minibuf.c (Fread_buffer): Further improve the doc
58+
string. (Bug#347694)
59+
60+
2019-03-10 Alan Mackenzie <[email protected]>
61+
62+
* lisp/progmodes/cc-defs.el: Update c-version to 5.33.2 for Emacs 26.2
63+
64+
2019-03-09 Eli Zaretskii <[email protected]>
65+
66+
* src/minibuf.c (Fread_buffer): Minor doc fixes. (Bug#34749)
67+
68+
2019-03-09 Eli Zaretskii <[email protected]>
69+
70+
Fix markup of fake keys in the ELisp manual
71+
72+
* doc/lispref/keymaps.texi (Menu Bar, Tool Bar): Fix markup of
73+
fake keys. (Bug#34785)
74+
75+
2019-03-09 Eli Zaretskii <[email protected]>
76+
77+
Avoid errors in Auto Revert mode
78+
79+
* lisp/autorevert.el (auto-revert-buffers): Cancel
80+
auto-revert-timer only if it is non-nil. This avoids errors
81+
on first invocation of Auto-Revert mode.
82+
83+
2019-03-09 Michael Albinus <[email protected]>
84+
85+
Mention empty strings in file name expansion, emacs lisp reference
86+
87+
* doc/lispref/files.texi (Files, File Name Expansion):
88+
Mention also empty strings.
89+
90+
2019-03-08 Alan Mackenzie <[email protected]>
91+
92+
cc-mode.texi: Work around makeinfo alignment bug. Fix problem with ss index
93+
94+
* doc/misc/cc-mode.texi (top level): Using txicommandconditionals to
95+
differentiate between the C and perl versions of Texinfo, create an "ss
96+
index" unless we are both using the C Texinfo and are building the .dvi output
97+
format.
98+
(Config Basics): Work around a perl Texinfo alignment bug by writing a
99+
separate version of an item list structure for this version, simplifying it
100+
considerably.
101+
102+
2019-03-08 Martin Rudalics <[email protected]>
103+
104+
Warn against recursive invocations of 'buffer-list-update-hook' (Bug#34765)
105+
106+
* src/buffer.c (Vbuffer_list_update_hook):
107+
* doc/lispref/buffers.texi (Buffer List): Warn against
108+
recursive invocations of 'buffer-list-update-hook' (Bug#34765).
109+
110+
2019-03-08 Martin Rudalics <[email protected]>
111+
112+
Provide more details in doc-string of 'delete-windows-on' (Bug#34749)
113+
114+
* lisp/window.el (delete-windows-on): Provide more details in
115+
doc-string (Bug#34749).
116+
117+
2019-03-08 Eli Zaretskii <[email protected]>
118+
119+
Improve documentation of 'delete-windows-on'
120+
121+
* doc/emacs/windows.texi (Change Window): Document
122+
'delete-windows-on'.
123+
124+
* lisp/window.el (delete-windows-on): Doc fix. (Bug#34749)
125+
126+
2019-03-08 Eli Zaretskii <[email protected]>
127+
128+
* lisp/frame.el (make-frame-command): Doc fix. (Bug#34715)
129+
130+
2019-03-07 Eli Zaretskii <[email protected]>
131+
132+
Avoid undefined behavior in gdb-mi.el
133+
134+
* lisp/progmodes/gdb-mi.el (gdb-send): Don't call match-string
135+
if this is not a control command. (Bug#34769)
136+
137+
2019-03-06 Martin Rudalics <[email protected]>
138+
139+
* lisp/window.el (fit-frame-to-buffer): Make doc-string more accurate.
140+
141+
2019-03-05 Basil L. Contovounesios <[email protected]>
142+
143+
Minor spelling and grammar fixes (bug#34756)
144+
145+
doc/misc/cc-mode.texi (Style Variables, Customizing Indentation):
146+
doc/misc/ede.texi (Extending EDE, ede-project-placeholder)
147+
(ede-target, ede-proj-target, ede-compilation-program, ede-compiler)
148+
(ede-linker): Remove apostrophe from possessive "it's".
149+
doc/lispintro/emacs-lisp-intro.texi (Find a File):
150+
doc/misc/gnus-faq.texi (FAQ 2-2): Write "an other" as a single word.
151+
doc/misc/gnus.texi (Article Buttons):
152+
lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist)
153+
(gnus-button-mid-or-mail-heuristic): Write singular number of
154+
Message-IDs, rather than plural.
155+
lisp/gnus/message.el (message-user-fqdn): Capitalize initialism.
156+
157+
2019-03-04 Eli Zaretskii <[email protected]>
158+
159+
Minor improvement of documentation of '(when CONDITION . SPEC)'
160+
161+
* doc/lispref/display.texi (Other Display Specs): Add a caveat
162+
to using the '(when CONDITION . SPEC)' display specs.
163+
164+
2019-03-02 Eli Zaretskii <[email protected]>
165+
166+
Improve documentation of 'auto-coding-functions'
167+
168+
* doc/lispref/nonascii.texi (Default Coding Systems): Clarify
169+
that the functions in 'auto-coding-functions' are called both
170+
for decoding and for encoding.
171+
172+
* lisp/international/mule.el (auto-coding-functions): Doc fix.
173+
174+
2019-03-02 Eli Zaretskii <[email protected]>
175+
176+
Fix visiting XML files with non-Unix EOL format
177+
178+
* lisp/international/mule.el (sgml-xml-auto-coding-function)
179+
(sgml-html-meta-auto-coding-function): Don't use
180+
'buffer-file-coding-system' if the buffer is unibyte.
181+
(Bug#34704)
182+
183+
2019-03-02 Basil L. Contovounesios <[email protected]>
184+
185+
Update example major mode code in Elisp manual
186+
187+
* doc/lispref/modes.texi (Example Major Modes): Update code examples
188+
to reflect current state of lisp/textmodes/text-mode.el and
189+
lisp/emacs-lisp/lisp-mode.el. (bug#34671)
190+
191+
2019-03-01 Eli Zaretskii <[email protected]>
192+
193+
Fix a typo in the Calc manual
194+
195+
* doc/misc/calc.texi (Algebraic Tutorial): Fix parentheses in
196+
@example. (Bug#34689)
197+
198+
2019-03-01 Eli Zaretskii <[email protected]>
199+
200+
Minor improvement in cross-references of the ELisp manual
201+
202+
* doc/lispref/modes.texi (Minor Mode Conventions): Add
203+
cross-references to related major-mode descriptions. (Bug#34678)
204+
205+
2019-03-01 Tobias Bading <[email protected]> (tiny change)
206+
207+
Fix last change on 'compilation-parse-errors'
208+
209+
* lisp/progmodes/compile.el (compilation-parse-errors): Fix
210+
previous change in this function. (Bug#34479)
211+
212+
2019-02-25 Dmitry Gutov <[email protected]>
213+
214+
Backport: js--re-search-backward-inner: Fix infloop
215+
216+
Fix JS indentation infloop reported in
217+
https://github.com/mooz/js2-mode/issues/513.
218+
219+
* lisp/progmodes/js.el (js--re-search-backward-inner): Account for
220+
multiline string literals.
221+
* test/manual/indent/js.js: New test example.
222+
223+
(cherry picked from commit b01a4295c2f9bb58858880e4e28b05cc8396791c)
224+
225+
2019-02-23 Eli Zaretskii <[email protected]>
226+
227+
Minor improvement for docs of completion
228+
229+
* doc/lispref/minibuf.texi (Completion Commands)
230+
(Completion in Buffers, Programmed Completion): Add to text
231+
that references completion tables a cross-reference to where
232+
"completion table" is described.
233+
(Programmed Completion): Fix the description of
234+
'completion-table-dynamic'. Add more cross-references.
235+
236+
2019-02-22 Ken Brown <[email protected]>
237+
238+
Disable the timerfd interface on Cygwin
239+
240+
* configure.ac (emacs_cv_have_timerfd): Set to "no" on Cygwin.
241+
242+
2019-02-22 Eli Zaretskii <[email protected]>
243+
244+
Fix a typo in the doc string of 'regex-opt'
245+
246+
* lisp/emacs-lisp/regexp-opt.el (regexp-opt): Fix example in
247+
the doc string. (Bug#34596)
248+
249+
2019-02-21 Michael Albinus <[email protected]>
250+
251+
Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192)
252+
253+
* doc/misc/tramp.texi (Frequently Asked Questions): Warn about
254+
bash 5.0.0 and HISTSIZE=0. (Bug#34192)
255+
256+
2019-02-20 Nicolas Petton <[email protected]>
257+
258+
Bump Emacs version to 26.1.92
259+
260+
* README:
261+
* configure.ac:
262+
* msdos/sed2v2.inp:
263+
* nt/README.W32: Bump Emacs version to 26.1.92.
264+
265+
2019-02-20 Nicolas Petton <[email protected]>
266+
267+
* ; ChangeLog.3 update
268+
269+
* etc/AUTHORS: Update.
270+
1271
2019-02-20 Glenn Morris <[email protected]>
2272

3273
Remove .art from the default list of ImageMagick extensions
@@ -64676,7 +64946,7 @@
6467664946

6467764947
This file records repository revisions from
6467864948
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
64679-
commit a19bfb7a5e3557a69824cdbe7d414f5ef422555c (inclusive).
64949+
commit 0f523deec1c1e9e2a5a3474f912aa2183d3fe33d (inclusive).
6468064950
See ChangeLog.1 for earlier changes.
6468164951

6468264952
;; Local Variables:

INSTALL

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,12 @@ features enabled, you can combine --without-all with --with-FEATURE.
318318
For example, you can use --without-all --without-x --with-dbus to
319319
build with D-Bus support and nothing more.
320320

321+
Use --with-gnutls=ifavailable to use GnuTLS if available but go ahead
322+
and build without it if not available. This overrides Emacs's default
323+
behavior of refusing to build if GnuTLS is absent. When X11 support
324+
is enabled, the libraries for gif, jpeg, png, tiff, and xpm are in the
325+
same strongly-recommended category as GnuTLS, and have similar options.
326+
321327
Use --with-wide-int to implement Emacs values with the type 'long long',
322328
even on hosts where a narrower type would do. With this option, on a
323329
typical 32-bit host, Emacs integers have 62 bits instead of 30.

admin/admin.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Root must be the root of an Emacs source tree."
144144
(unless (> (length newversion) 2) ; pretest or release candidate?
145145
(with-temp-buffer
146146
(insert-file-contents newsfile)
147-
(if (re-search-forward "^\\(+++ *\\|--- *\\)$" nil t)
147+
(if (re-search-forward "^\\(\\+\\+\\+ *\\|--- *\\)$" nil t)
148148
(display-warning 'admin
149149
"NEWS file still contains temporary markup.
150150
Documentation changes might not have been completed!"))))

admin/gitmerge.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ Returns non-nil if conflicts remain."
294294
((derived-mode-p 'change-log-mode)
295295
;; Fix up dates before resolving the conflicts.
296296
(goto-char (point-min))
297-
(let ((diff-auto-refine-mode nil))
297+
(let ((diff-refine nil))
298298
(while (re-search-forward smerge-begin-re nil t)
299299
(smerge-match-conflict)
300300
(smerge-ensure-match 3)

admin/notes/bugtracker

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -241,21 +241,29 @@ report, and Bcc: the control server (note the commands have no effect
241241
if you just send them to the bug-report number). Bcc: is better than Cc:
242242
in case people use Reply-To-All in response.
243243

244+
For the full documentation of control commands, see
245+
https://debbugs.gnu.org/server-control.html
246+
244247
Some useful control commands:
245248

249+
*** To close a bug and indicate in what Emacs version it was fixed
250+
close 123 VERSION
251+
252+
where VERSION is XX.YY numerical version number, like 42.1.
253+
246254
*** To reopen a closed bug:
247255
reopen 123
248256

249257
*** Bugs can be tagged in various ways (eg wontfix, patch, etc).
250258
The available tags are:
251-
patch wontfix moreinfo unreproducible fixed notabug
259+
patch wontfix moreinfo unreproducible fixed notabug security confirmed
252260
See https://debbugs.gnu.org/Developer#tags
253261
The list of tags can be prefixed with +, - or =, meaning to add (the
254262
default), remove, or reset the tags. E.g.:
255263

256264
tags 123 + wontfix
257265

258-
** URL shortcuts
266+
*** URL shortcuts
259267

260268
https://debbugs.gnu.org/...
261269

@@ -266,7 +274,7 @@ from:[email protected]
266274
severity:severity # all bugs of given severity
267275
tag:tag # all bugs with given tag
268276

269-
** Usertags
277+
*** Usertags
270278

271279
See <http://wiki.debian.org/bugs.debian.org/usertags>
272280

@@ -410,21 +418,21 @@ reassign 1234 emacs
410418
Note that reassigning clears the list of found versions, even if the
411419
new packages includes the original one.
412420

413-
** To remove spam from the tracker, move it to the 'spam' pseudo-package:
421+
*** To remove spam from the tracker, move it to the 'spam' pseudo-package:
414422
reassign 123 spam
415423

416424
(Should not be necessary any more, now that the input is moderated.)
417425

418-
** To change the title of a bug:
426+
*** To change the title of a bug:
419427
retitle 123 Some New Title
420428

421-
** To change the submitter address:
429+
*** To change the submitter address:
422430
submitter 123 [email protected]
423431

424432
Note that it does not seem to work to specify "Submitter:" in the
425433
pseudo-header when first reporting a bug.
426434

427-
** How does archiving work?
435+
*** How does archiving work?
428436
You can still send mail to a bug after it is closed. After 28 days with
429437
no activity, the bug is archived, at which point no more changes can
430438
be made. If you try to send mail to the bug after that (or merge with

0 commit comments

Comments
 (0)