[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117071: Merge from emacs-24; up to r117082
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r117071: Merge from emacs-24; up to r117082 |
|
Date: |
Thu, 08 May 2014 03:42:06 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117071 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-07 20:41:21 -0700
message:
Merge from emacs-24; up to r117082
added:
test/automated/help-fns.el helpfns.el-20140505213058-j3jaib82defoczzx-1
modified:
doc/emacs/emacs-xtra.texi
emacsxtra.texi-20091113204419-o5vbwnq5f7feedwu-6245
doc/emacs/emacs.texi emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/elisp.texi elisp.texi-20091113204419-o5vbwnq5f7feedwu-6176
doc/lispref/internals.texi
internals.texi-20091113204419-o5vbwnq5f7feedwu-6188
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
doc/misc/ada-mode.texi
adamode.texi-20091113204419-o5vbwnq5f7feedwu-6288
doc/misc/auth.texi auth.texi-20091113204419-o5vbwnq5f7feedwu-8826
doc/misc/autotype.texi
autotype.texi-20091113204419-o5vbwnq5f7feedwu-6289
doc/misc/bovine.texi bovine.texi-20121213041604-7ylypfkjfzwpfp48-1
doc/misc/calc.texi calc.texi-20091113204419-o5vbwnq5f7feedwu-6290
doc/misc/cc-mode.texi
ccmode.texi-20091113204419-o5vbwnq5f7feedwu-6291
doc/misc/cl.texi cl.texi-20091113204419-o5vbwnq5f7feedwu-6292
doc/misc/dbus.texi dbus.texi-20091113204419-o5vbwnq5f7feedwu-7963
doc/misc/dired-x.texi
diredx.texi-20091113204419-o5vbwnq5f7feedwu-6293
doc/misc/ebrowse.texi
ebrowse.texi-20091113204419-o5vbwnq5f7feedwu-6295
doc/misc/ede.texi ede.texi-20091113204419-o5vbwnq5f7feedwu-11396
doc/misc/ediff.texi ediff.texi-20091113204419-o5vbwnq5f7feedwu-6296
doc/misc/edt.texi edt.texi-20091215194433-gyppc2fi66nhko62-2
doc/misc/eieio.texi
eieio.texi-20091113204419-o5vbwnq5f7feedwu-11397
doc/misc/emacs-gnutls.texi
emacsgnutls.texi-20120409130335-b4eu8jliwcg58u2g-1
doc/misc/emacs-mime.texi
emacsmime.texi-20091113204419-o5vbwnq5f7feedwu-6297
doc/misc/epa.texi epa.texi-20091113204419-o5vbwnq5f7feedwu-8552
doc/misc/erc.texi erc.texi-20091113204419-o5vbwnq5f7feedwu-6298
doc/misc/ert.texi ert.texi-20110112160650-056hnl9qhpjvjicy-7
doc/misc/eshell.texi
eshell.texi-20091113204419-o5vbwnq5f7feedwu-6299
doc/misc/eudc.texi eudc.texi-20091113204419-o5vbwnq5f7feedwu-6300
doc/misc/eww.texi
docmisceww.texi-20140109232239-pttr8zbv7tu1waay-1
doc/misc/flymake.texi
flymake.texi-20091113204419-o5vbwnq5f7feedwu-6302
doc/misc/forms.texi forms.texi-20091113204419-o5vbwnq5f7feedwu-6303
doc/misc/gnus-coding.texi
gnuscoding.texi-20091113204419-o5vbwnq5f7feedwu-7530
doc/misc/gnus.texi gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
doc/misc/htmlfontify.texi
htmlfontify.texi-20130104093730-y0jp8j9c2zhxijnw-1
doc/misc/idlwave.texi
idlwave.texi-20091113204419-o5vbwnq5f7feedwu-6307
doc/misc/ido.texi ido.texi-20130724222900-50gdum2iefexcdgi-1
doc/misc/info.texi info.texi-20091113204419-o5vbwnq5f7feedwu-6308
doc/misc/mairix-el.texi
mairixel.texi-20091113204419-o5vbwnq5f7feedwu-8759
doc/misc/message.texi
message.texi-20091113204419-o5vbwnq5f7feedwu-6310
doc/misc/mh-e.texi mhe.texi-20091113204419-o5vbwnq5f7feedwu-6311
doc/misc/newsticker.texi
newsticker.texi-20091113204419-o5vbwnq5f7feedwu-6312
doc/misc/nxml-mode.texi
nxmlmode.texi-20091113204419-o5vbwnq5f7feedwu-7838
doc/misc/octave-mode.texi
docmiscoctavemode.te-20131211135130-mke18k9sh7x9vmyx-1
doc/misc/org.texi org.texi-20091113204419-o5vbwnq5f7feedwu-6313
doc/misc/pcl-cvs.texi
pclcvs.texi-20091113204419-o5vbwnq5f7feedwu-6314
doc/misc/pgg.texi pgg.texi-20091113204419-o5vbwnq5f7feedwu-6315
doc/misc/rcirc.texi rcirc.texi-20091113204419-o5vbwnq5f7feedwu-6316
doc/misc/reftex.texi
reftex.texi-20091113204419-o5vbwnq5f7feedwu-6317
doc/misc/remember.texi
remember.texi-20091113204419-o5vbwnq5f7feedwu-7582
doc/misc/sasl.texi sasl.texi-20091113204419-o5vbwnq5f7feedwu-7533
doc/misc/sc.texi sc.texi-20091113204419-o5vbwnq5f7feedwu-6318
doc/misc/semantic.texi semantic.texi-20091117210551-bqxn4u9uesl3d17a-2
doc/misc/ses.texi ses.texi-20091113204419-o5vbwnq5f7feedwu-6319
doc/misc/sieve.texi sieve.texi-20091113204419-o5vbwnq5f7feedwu-6320
doc/misc/smtpmail.texi
smtpmail.texi-20091113204419-o5vbwnq5f7feedwu-6321
doc/misc/speedbar.texi
speedbar.texi-20091113204419-o5vbwnq5f7feedwu-6322
doc/misc/srecode.texi srecode.texi-20121212171353-60tnfiqymns76dq1-1
doc/misc/todo-mode.texi todomode.texi-20130804212326-csuj921rpk9gy1gz-1
doc/misc/tramp.texi tramp.texi-20091113204419-o5vbwnq5f7feedwu-6324
doc/misc/url.texi url.texi-20091113204419-o5vbwnq5f7feedwu-6326
doc/misc/vip.texi vip.texi-20091113204419-o5vbwnq5f7feedwu-6327
doc/misc/viper.texi viper.texi-20091113204419-o5vbwnq5f7feedwu-6328
doc/misc/widget.texi
widget.texi-20091113204419-o5vbwnq5f7feedwu-6329
doc/misc/wisent.texi wisent.texi-20121213044343-qrwu6ibrvum7tr3o-1
doc/misc/woman.texi woman.texi-20091113204419-o5vbwnq5f7feedwu-6330
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calendar/todo-mode.el todos.el-20120911155047-0ytqo2nidwqquefa-1
lisp/electric.el electric.el-20091113204419-o5vbwnq5f7feedwu-47
lisp/emacs-lisp/find-gc.el findgc.el-20091113204419-o5vbwnq5f7feedwu-2220
lisp/emacs-lisp/package.el package.el-20100617020707-ybavz666awsxwin6-2
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/gnus-fun.el gnusfun.el-20091113204419-o5vbwnq5f7feedwu-3243
lisp/help-fns.el helpfns.el-20091113204419-o5vbwnq5f7feedwu-2354
lisp/minibuffer.el
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622
lisp/net/browse-url.el
browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
lisp/progmodes/ruby-mode.el
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
lisp/xt-mouse.el xtmouse.el-20091113204419-o5vbwnq5f7feedwu-905
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
src/minibuf.c minibuf.c-20091113204419-o5vbwnq5f7feedwu-242
src/nsselect.m nsselect.m-20091113204419-o5vbwnq5f7feedwu-8745
src/w32fns.c w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/ruby-mode-tests.el
rubymodetests.el-20120720101201-mn39s4kfopdxj3ek-1
test/automated/vc-bzr.el vcbzr.el-20111020033852-tb09uuuxskzxqlzo-1
=== modified file 'doc/emacs/emacs-xtra.texi'
--- a/doc/emacs/emacs-xtra.texi 2014-01-01 08:31:29 +0000
+++ b/doc/emacs/emacs-xtra.texi 2014-05-07 17:34:53 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi 2014-02-28 03:02:50 +0000
+++ b/doc/emacs/emacs.texi 2014-05-07 17:34:53 +0000
@@ -33,7 +33,7 @@
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with the
Invariant Sections being ``The GNU Manifesto,'' ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE,'' with the Front-Cover texts being ``A GNU
+``GNU GENERAL PUBLIC LICENSE,'' with the Front-Cover Texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License.''
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-04-30 19:54:52 +0000
+++ b/doc/lispref/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,8 @@
+2014-05-08 Paul Eggert <address@hidden>
+
+ * internals.texi (C Dialect): New section.
+ (C Integer Types): Mention bool_bf.
+
2014-04-30 Stefan Monnier <address@hidden>
* processes.texi (Filter Functions, Sentinels): Advertise add-function.
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2014-03-18 01:19:03 +0000
+++ b/doc/lispref/elisp.texi 2014-05-07 17:34:53 +0000
@@ -105,7 +105,7 @@
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with the
Invariant Sections being ``GNU General Public License,'' with the
-Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
+Front-Cover Texts being ``A GNU Manual,'' and with the Back-Cover
Texts as in (a) below. A copy of the license is included in the
section entitled ``GNU Free Documentation License.''
=== modified file 'doc/lispref/internals.texi'
--- a/doc/lispref/internals.texi 2014-04-22 21:32:51 +0000
+++ b/doc/lispref/internals.texi 2014-05-08 03:41:21 +0000
@@ -15,6 +15,7 @@
* Pure Storage:: Kludge to make preloaded Lisp functions shareable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Memory Usage:: Info about total size of Lisp objects made so far.
+* C Dialect:: What C variant Emacs is written in.
* Writing Emacs Primitives:: Writing C code for Emacs.
* Object Internals:: Data formats of buffers, windows, processes.
* C Integer Types:: How C integer types are used inside Emacs.
@@ -575,6 +576,20 @@
Emacs session.
@end defvar
address@hidden C Dialect
address@hidden C Dialect
address@hidden C programming language
+
+The C part of Emacs is portable to C89: C99-specific features such as
address@hidden<stdbool.h>} and @samp{inline} are not used without a check,
+typically at configuration time, and the Emacs build procedure
+provides a substitute implementation if necessary. Some C99 features,
+such as declarations after statements, are too difficult to provide
+substitutes for, so they are avoided entirely.
+
+At some point in the not-too-distant future the base C dialect will
+change from C89 to C99, and eventually it will no doubt change to C11.
+
@node Writing Emacs Primitives
@section Writing Emacs Primitives
@cindex primitive function internals
@@ -1616,12 +1631,6 @@
signed integer value.
@item
-In bitfields, prefer @code{unsigned int} or @code{signed int} to
address@hidden, as @code{int} is less portable: it might be signed, and
-might not be. Single-bit bit fields are invariably @code{unsigned
-int} so that their values are 0 and 1.
-
address@hidden
Prefer @code{bool}, @code{false} and @code{true} for booleans.
Using @code{bool} can make programs easier to read and a bit faster than
using @code{int}. Although it is also OK to use @code{int}, @code{0}
@@ -1629,7 +1638,15 @@
using @code{bool}, respect the limitations of the replacement
implementation of @code{bool}, as documented in the source file
@file{lib/stdbool.in.h}, so that Emacs remains portable to pre-C99
-platforms.
+platforms. In particular, boolean bitfields should be of type
address@hidden, not @code{bool}, so that they work correctly even when
+compiling Objective C with standard GCC.
+
address@hidden
+In bitfields, prefer @code{unsigned int} or @code{signed int} to
address@hidden, as @code{int} is less portable: it might be signed, and
+might not be. Single-bit bit fields should be @code{unsigned int} or
address@hidden so that their values are 0 or 1.
@end itemize
@c FIXME Mention src/globals.h somewhere in this file?
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2014-05-04 19:37:56 +0000
+++ b/doc/misc/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,8 @@
+2014-05-08 Michael Albinus <address@hidden>
+
+ * tramp.texi (Frequently Asked Questions): Mention HISTFILE
+ setting in ~/.ssh/environment.
+
2014-05-04 Stephen Berman <address@hidden>
* todo-mode.texi: Update, improve exposition, add cross
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/ada-mode.texi 2014-05-07 17:34:53 +0000
@@ -10,7 +10,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/auth.texi 2014-05-07 17:34:53 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/autotype.texi'
--- a/doc/misc/autotype.texi 2014-05-01 23:55:25 +0000
+++ b/doc/misc/autotype.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/bovine.texi'
--- a/doc/misc/bovine.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/bovine.texi 2014-05-07 17:34:53 +0000
@@ -30,7 +30,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/calc.texi 2014-05-07 17:34:53 +0000
@@ -102,7 +102,7 @@
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with the
Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
-Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
+Front-Cover Texts being ``A GNU Manual,'' and with the Back-Cover
Texts as in (a) below. A copy of the license is included in the section
entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2014-03-18 21:14:36 +0000
+++ b/doc/misc/cc-mode.texi 2014-05-07 17:34:53 +0000
@@ -163,7 +163,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/cl.texi'
--- a/doc/misc/cl.texi 2014-04-22 03:18:15 +0000
+++ b/doc/misc/cl.texi 2014-05-08 03:41:21 +0000
@@ -13,7 +13,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/dbus.texi 2014-05-07 17:34:53 +0000
@@ -16,7 +16,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/dired-x.texi'
--- a/doc/misc/dired-x.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/dired-x.texi 2014-05-07 17:34:53 +0000
@@ -27,7 +27,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/ebrowse.texi'
--- a/doc/misc/ebrowse.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/ebrowse.texi 2014-05-07 17:34:53 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2014-03-21 07:00:21 +0000
+++ b/doc/misc/ede.texi 2014-05-07 17:34:53 +0000
@@ -13,7 +13,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/ediff.texi 2014-05-07 17:34:53 +0000
@@ -32,7 +32,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/edt.texi'
--- a/doc/misc/edt.texi 2014-02-25 08:41:47 +0000
+++ b/doc/misc/edt.texi 2014-05-07 17:34:53 +0000
@@ -13,7 +13,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/eieio.texi'
--- a/doc/misc/eieio.texi 2014-03-03 17:15:42 +0000
+++ b/doc/misc/eieio.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/emacs-gnutls.texi'
--- a/doc/misc/emacs-gnutls.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/emacs-gnutls.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi 2014-03-23 23:16:06 +0000
+++ b/doc/misc/emacs-mime.texi 2014-05-08 03:41:21 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/epa.texi 2014-05-07 17:34:53 +0000
@@ -16,7 +16,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/erc.texi 2014-05-07 17:34:53 +0000
@@ -16,7 +16,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/ert.texi'
--- a/doc/misc/ert.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/ert.texi 2014-05-07 17:34:53 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/eshell.texi 2014-05-07 17:34:53 +0000
@@ -16,7 +16,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/eudc.texi'
--- a/doc/misc/eudc.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/eudc.texi 2014-05-07 17:34:53 +0000
@@ -19,7 +19,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/eww.texi'
--- a/doc/misc/eww.texi 2014-03-12 20:57:34 +0000
+++ b/doc/misc/eww.texi 2014-05-07 17:34:53 +0000
@@ -14,7 +14,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/flymake.texi'
--- a/doc/misc/flymake.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/flymake.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/forms.texi 2014-05-07 17:34:53 +0000
@@ -25,7 +25,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/gnus-coding.texi'
--- a/doc/misc/gnus-coding.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/gnus-coding.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2014-03-23 23:16:06 +0000
+++ b/doc/misc/gnus.texi 2014-05-08 03:41:21 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/htmlfontify.texi'
--- a/doc/misc/htmlfontify.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/htmlfontify.texi 2014-05-07 17:34:53 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2014-01-27 02:02:28 +0000
+++ b/doc/misc/idlwave.texi 2014-05-07 17:34:53 +0000
@@ -29,7 +29,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/ido.texi'
--- a/doc/misc/ido.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/ido.texi 2014-05-07 17:34:53 +0000
@@ -13,7 +13,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/info.texi'
--- a/doc/misc/info.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/info.texi 2014-05-07 17:34:53 +0000
@@ -21,7 +21,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/mairix-el.texi'
--- a/doc/misc/mairix-el.texi 2014-01-01 08:31:29 +0000
+++ b/doc/misc/mairix-el.texi 2014-05-07 17:34:53 +0000
@@ -12,7 +12,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi 2014-05-04 19:37:56 +0000
+++ b/doc/misc/message.texi 2014-05-08 03:41:21 +0000
@@ -17,7 +17,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/mh-e.texi 2014-05-07 17:34:53 +0000
@@ -38,7 +38,7 @@
@item
the GNU Free Documentation License, Version 1.3 or any later version
published by the Free Software Foundation; with no Invariant Sections,
-with the Front-Cover texts being ``A GNU Manual,'' and with the
+with the Front-Cover Texts being ``A GNU Manual,'' and with the
Back-Cover Texts as in (a) below. A copy of the license is included in
the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/newsticker.texi 2014-05-07 17:34:53 +0000
@@ -20,7 +20,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/nxml-mode.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/octave-mode.texi'
--- a/doc/misc/octave-mode.texi 2014-03-12 06:52:54 +0000
+++ b/doc/misc/octave-mode.texi 2014-05-07 17:34:53 +0000
@@ -12,7 +12,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2014-04-22 14:07:45 +0000
+++ b/doc/misc/org.texi 2014-05-07 17:34:53 +0000
@@ -264,7 +264,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/pcl-cvs.texi'
--- a/doc/misc/pcl-cvs.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/pcl-cvs.texi 2014-05-07 17:34:53 +0000
@@ -13,7 +13,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/pgg.texi 2014-05-07 17:34:53 +0000
@@ -19,7 +19,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/rcirc.texi'
--- a/doc/misc/rcirc.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/rcirc.texi 2014-05-07 17:34:53 +0000
@@ -12,7 +12,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license is
included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/reftex.texi 2014-05-07 17:34:53 +0000
@@ -52,7 +52,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/remember.texi'
--- a/doc/misc/remember.texi 2014-02-22 23:14:49 +0000
+++ b/doc/misc/remember.texi 2014-05-07 17:34:53 +0000
@@ -16,7 +16,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/sasl.texi'
--- a/doc/misc/sasl.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/sasl.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/sc.texi 2014-05-07 17:34:53 +0000
@@ -21,7 +21,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/semantic.texi'
--- a/doc/misc/semantic.texi 2014-05-01 23:55:25 +0000
+++ b/doc/misc/semantic.texi 2014-05-07 17:34:53 +0000
@@ -32,7 +32,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/ses.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/sieve.texi 2014-05-07 17:34:53 +0000
@@ -18,7 +18,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/smtpmail.texi'
--- a/doc/misc/smtpmail.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/smtpmail.texi 2014-05-07 17:34:53 +0000
@@ -10,7 +10,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/speedbar.texi'
--- a/doc/misc/speedbar.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/speedbar.texi 2014-05-07 17:34:53 +0000
@@ -11,7 +11,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/srecode.texi'
--- a/doc/misc/srecode.texi 2014-01-16 06:24:06 +0000
+++ b/doc/misc/srecode.texi 2014-05-07 17:34:53 +0000
@@ -22,7 +22,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/todo-mode.texi'
--- a/doc/misc/todo-mode.texi 2014-05-02 14:17:41 +0000
+++ b/doc/misc/todo-mode.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi 2014-03-24 08:09:42 +0000
+++ b/doc/misc/tramp.texi 2014-05-07 17:34:53 +0000
@@ -72,7 +72,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
@@ -3351,6 +3351,13 @@
fi
@end example
+Furthermore, if you use an @option{ssh}-based method, you could add
+the following line to your @file{~/.ssh/environment} file:
+
address@hidden
+HISTFILE=/dev/null
address@hidden example
+
@item There are longish file names to type. How to shorten this?
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/url.texi 2014-05-07 17:34:53 +0000
@@ -29,7 +29,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2014-03-21 07:00:21 +0000
+++ b/doc/misc/vip.texi 2014-05-07 17:34:53 +0000
@@ -11,7 +11,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/viper.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/widget.texi'
--- a/doc/misc/widget.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/widget.texi 2014-05-07 17:34:53 +0000
@@ -15,7 +15,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/wisent.texi'
--- a/doc/misc/wisent.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/wisent.texi 2014-05-07 17:34:53 +0000
@@ -39,7 +39,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi 2014-03-12 20:52:34 +0000
+++ b/doc/misc/woman.texi 2014-05-07 17:34:53 +0000
@@ -21,7 +21,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-05-04 19:37:56 +0000
+++ b/lib-src/ChangeLog 2014-05-08 03:41:21 +0000
@@ -705,7 +705,7 @@
Use _Noreturn rather than NO_RETURN.
No need for separate decl merely because of _Noreturn.
-2012-06-24 Samuel Bronson <address@hidden> (tiny change)
+2012-06-24 Samuel Bronson <address@hidden>
* emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838).
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-05 10:59:24 +0000
+++ b/lisp/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,81 @@
+2014-05-08 Stefan Monnier <address@hidden>
+
+ * xt-mouse.el: Drop spurious/oddly shaped events (bug#17378).
+ (xterm-mouse--read-event-sequence-1000): Return nil if something
+ looks fishy.
+ (xterm-mouse-event): Propagate it.
+ (xterm-mouse-translate-1): Handle it.
+
+2014-05-08 Stephen Berman <address@hidden>
+
+ * calendar/todo-mode.el (todo-insert-item--apply-args): When all
+ four slots of the parameter list are filled, make sure to pass it
+ to the argument list of todo-insert-item--basic.
+
+2014-05-08 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/package.el (package-compute-transaction): Topological sort.
+ Add optional `seen' argument to detect and break infinite loops.
+
+2014-05-08 Eli Zaretskii <address@hidden>
+
+ * emacs-lisp/find-gc.el (find-gc-unsafe, find-unsafe-funcs)
+ (trace-unsafe, trace-use-tree): Make parentheses style be
+ according to Emacs style.
+
+2014-05-08 Michael Albinus <address@hidden>
+
+ * net/tramp-sh.el (tramp-remote-process-environment):
+ Remove HISTFILE and HISTSIZE; it's too late to set them here.
+ Add :version entry.
+ (tramp-open-shell): Do not let-bind `tramp-end-of-output'.
+ Add "HISTSIZE=/dev/null" to the shell's env arguments. Do not send
+ extra "PSx=..." commands.
+ (tramp-maybe-open-connection): Setenv HISTFILE to /dev/null.
+ (Bug#17295)
+
+ (tramp-uudecode): Replace the hard-coded temporary file name by a
+ format specifier.
+ (tramp-remote-coding-commands): Enhance docstring.
+ (tramp-find-inline-encoding): Replace "%t" by a temporary file
+ name. (Bug#17415)
+
+2014-05-08 Glenn Morris <address@hidden>
+
+ * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
+ (find-gc-source-files): Update some names.
+ (trace-call-tree): Simplify and update.
+ Avoid predictable temp-file names. (http://bugs.debian.org/747100)
+
+2014-05-08 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (completion--try-word-completion): Revert fix for
+ Bug#15980 (bug#17375).
+
+ * xt-mouse.el (xterm-mouse--read-event-sequence-1000): (bug#17378)
+ Always store button numbers in the same way in xterm-mouse-last;
+ Don't burp is xterm-mouse-last is not set as expected.
+ Never return negative indices.
+
+2014-05-08 Dmitry Gutov <address@hidden>
+
+ * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+ Backtrack one char if the global/char-literal var matcher hits
+ inside a string. The next char could be the beginning of an
+ expression expansion.
+
+2014-05-08 Glenn Morris <address@hidden>
+
+ * help-fns.el (describe-function-1): Test for an autoload before a
+ macro, since `macrop' works on autoloads. (Bug#17410)
+
+2014-05-08 Stefan Monnier <address@hidden>
+
+ * electric.el (electric-indent-functions-without-reindent): Add yaml.
+
+ * minibuffer.el (completion-table-with-quoting) <completion--unquote>:
+ Make sure the new point we return is within the new string (bug#17239).
+
2014-05-05 Daniel Colascione <address@hidden>
* progmodes/compile.el (compilation-error-regexp-alist-alist):
@@ -84,8 +162,8 @@
(todo-edit-done-item--param-key-alist): New defconsts.
(todo-edit-item--prompt): New variable.
(todo-edit-item--next-key): New function.
- (todo-key-bindings-t): Bind "e" to todo-edit-item. Remove
- bindings of deleted commands.
+ (todo-key-bindings-t): Bind "e" to todo-edit-item.
+ Remove bindings of deleted commands.
2014-05-04 Leo Liu <address@hidden>
=== modified file 'lisp/calendar/todo-mode.el'
--- a/lisp/calendar/todo-mode.el 2014-05-02 14:10:11 +0000
+++ b/lisp/calendar/todo-mode.el 2014-05-07 09:31:27 +0000
@@ -5360,7 +5360,8 @@
(list (car (todo-insert-item--argsleft
(todo-insert-item--this-key)
todo-insert-item--argsleft)))))
- (arglist (unless (= 4 (length args))
+ (arglist (if (= 4 (length args))
+ args
(let ((v (make-vector 4 nil)) elt)
(while args
(setq elt (pop args))
=== modified file 'lisp/electric.el'
--- a/lisp/electric.el 2014-03-21 07:19:21 +0000
+++ b/lisp/electric.el 2014-05-05 19:04:40 +0000
@@ -221,7 +221,8 @@
(defvar electric-indent-functions-without-reindent
'(indent-relative indent-to-left-margin indent-relative-maybe
py-indent-line coffee-indent-line org-indent-line yaml-indent-line
- haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent)
+ haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent
+ yaml-indent-line)
"List of indent functions that can't reindent.
If `line-indent-function' is one of those, then `electric-indent-mode' will
not try to reindent lines. It is normally better to make the major
=== modified file 'lisp/emacs-lisp/find-gc.el'
--- a/lisp/emacs-lisp/find-gc.el 2014-02-10 01:34:22 +0000
+++ b/lisp/emacs-lisp/find-gc.el 2014-05-06 10:29:37 +0000
@@ -23,14 +23,15 @@
;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
;; This expects the Emacs sources to live in find-gc-source-directory.
-;; It creates a temporary working directory /tmp/esrc.
;;; Code:
(defvar find-gc-unsafe-list nil
"The list of unsafe functions is placed here by `find-gc-unsafe'.")
-(defvar find-gc-source-directory)
+(defvar find-gc-source-directory
+ (file-name-as-directory (expand-file-name "src" source-directory))
+ "Directory containing Emacs C sources.")
(defvar find-gc-subrs-callers nil
"Alist of users of subrs, from GC testing.
@@ -59,22 +60,21 @@
"indent.c" "search.c" "regex.c" "undo.c"
"alloc.c" "data.c" "doc.c" "editfns.c"
"callint.c" "eval.c" "fns.c" "print.c" "lread.c"
- "abbrev.c" "syntax.c" "unexcoff.c"
+ "syntax.c" "unexcoff.c"
"bytecode.c" "process.c" "callproc.c" "doprnt.c"
- "x11term.c" "x11fns.c"))
+ "xterm.c" "xfns.c"))
(defun find-gc-unsafe ()
"Return a list of unsafe functions--that is, which can call GC.
-Also store it in `find-gc-unsafe'."
+Also store it in `find-gc-unsafe-list'."
(trace-call-tree nil)
(trace-use-tree)
(find-unsafe-funcs 'Fgarbage_collect)
(setq find-gc-unsafe-list
(sort find-gc-unsafe-list
(function (lambda (x y)
- (string-lessp (car x) (car y))))))
-)
+ (string-lessp (car x) (car y)))))))
;;; This does a depth-first search to find all functions that can
;;; ultimately call the function "target". The result is an a-list
@@ -84,8 +84,7 @@
(defun find-unsafe-funcs (target)
(setq find-gc-unsafe-list (list (list target)))
- (trace-unsafe target)
-)
+ (trace-unsafe target))
(defun trace-unsafe (func)
(let ((used (assq func find-gc-subrs-callers)))
@@ -96,53 +95,43 @@
(memq (car used) find-gc-noreturn-list)
(progn
(push (cons (car used) func) find-gc-unsafe-list)
- (trace-unsafe (car used))))))
-)
-
-
-
-
-(defun trace-call-tree (&optional already-setup)
+ (trace-unsafe (car used)))))))
+
+
+
+
+(defun trace-call-tree (&optional ignored)
(message "Setting up directories...")
- (or already-setup
- (progn
- ;; Gee, wouldn't a built-in "system" function be handy here.
- (call-process "csh" nil nil nil "-c" "rm -rf /tmp/esrc")
- (call-process "csh" nil nil nil "-c" "mkdir /tmp/esrc")
- (call-process "csh" nil nil nil "-c"
- (format "ln -s %s/*.[ch] /tmp/esrc"
- find-gc-source-directory))))
- (with-current-buffer (get-buffer-create "*Trace Call Tree*")
- (setq find-gc-subrs-called nil)
- (let ((case-fold-search nil)
- (files find-gc-source-files)
- name entry)
- (while files
- (message "Compiling %s..." (car files))
- (call-process "csh" nil nil nil "-c"
- (format "gcc -dr -c /tmp/esrc/%s -o /dev/null"
- (car files)))
- (erase-buffer)
- (insert-file-contents (concat "/tmp/esrc/" (car files) ".rtl"))
- (while (re-search-forward ";; Function \\|(call_insn " nil t)
- (if (= (char-after (- (point) 3)) ?o)
- (progn
- (looking-at "[a-zA-Z0-9_]+")
- (setq name (intern (buffer-substring (match-beginning 0)
- (match-end 0))))
- (message "%s : %s" (car files) name)
- (setq entry (list name)
- find-gc-subrs-called (cons entry find-gc-subrs-called)))
- (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
+ (setq find-gc-subrs-called nil)
+ (let ((case-fold-search nil)
+ (default-directory find-gc-source-directory)
+ (files find-gc-source-files)
+ name entry rtlfile)
+ (dolist (file files)
+ (message "Compiling %s..." file)
+ (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
+ "-fdump-rtl-expand" "-o" null-device "-c" file)
+ (setq rtlfile
+ (file-expand-wildcards (format "%s.*.expand" file) t))
+ (if (/= 1 (length rtlfile))
+ (message "Error compiling `%s'?" file)
+ (with-temp-buffer
+ (insert-file-contents (setq rtlfile (car rtlfile)))
+ (delete-file rtlfile)
+ (while (re-search-forward ";; Function \\|(call_insn " nil t)
+ (if (= (char-after (- (point) 3)) ?o)
(progn
- (setq name (intern (buffer-substring (match-beginning 1)
- (match-end 1))))
- (or (memq name (cdr entry))
- (setcdr entry (cons name (cdr entry))))))))
- (delete-file (concat "/tmp/esrc/" (car files) ".rtl"))
- (setq files (cdr files)))))
-)
-
+ (looking-at "[a-zA-Z0-9_]+")
+ (setq name (intern (match-string 0)))
+ (message "%s : %s" (car files) name)
+ (setq entry (list name)
+ find-gc-subrs-called
+ (cons entry find-gc-subrs-called)))
+ (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
+ (progn
+ (setq name (intern (match-string 1)))
+ (or (memq name (cdr entry))
+ (setcdr entry (cons name (cdr entry)))))))))))))
(defun trace-use-tree ()
(setq find-gc-subrs-callers (mapcar 'list (mapcar 'car
find-gc-subrs-called)))
@@ -153,8 +142,7 @@
(while (setq p2 (cdr p2))
(if (setq found (assq (car p2) find-gc-subrs-callers))
(setcdr found (cons (car (car ptr)) (cdr found)))))
- (setq ptr (cdr ptr))))
-)
+ (setq ptr (cdr ptr)))))
(provide 'find-gc)
=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el 2014-03-28 22:47:46 +0000
+++ b/lisp/emacs-lisp/package.el 2014-05-06 18:11:16 +0000
@@ -868,7 +868,7 @@
;; Also check built-in packages.
(package-built-in-p package min-version)))
-(defun package-compute-transaction (packages requirements)
+(defun package-compute-transaction (packages requirements &optional seen)
"Return a list of packages to be installed, including PACKAGES.
PACKAGES should be a list of `package-desc'.
@@ -880,7 +880,9 @@
This function recursively computes the requirements of the
packages in REQUIREMENTS, and returns a list of all the packages
that must be installed. Packages that are already installed are
-not included in this list."
+not included in this list.
+
+SEEN is used internally to detect infinite recursion."
;; FIXME: We really should use backtracking to explore the whole
;; search space (e.g. if foo require bar-1.3, and bar-1.4 requires toto-1.1
;; whereas bar-1.3 requires toto-1.0 and the user has put a hold on toto-1.0:
@@ -893,15 +895,22 @@
(dolist (pkg packages)
(if (eq next-pkg (package-desc-name pkg))
(setq already pkg)))
- (cond
- (already
+ (when already
(if (version-list-<= next-version (package-desc-version already))
- ;; Move to front, so it gets installed early enough (bug#14082).
- (setq packages (cons already (delq already packages)))
+ ;; `next-pkg' is already in `packages', but its position there
+ ;; means it might be installed too late: remove it from there, so
+ ;; we re-add it (along with its dependencies) at an earlier place
+ ;; below (bug#16994).
+ (if (memq already seen) ;Avoid inf-loop on dependency cycles.
+ (message "Dependency cycle going through %S"
+ (package-desc-full-name already))
+ (setq packages (delq already packages))
+ (setq already nil))
(error "Need package `%s-%s', but only %s is being installed"
next-pkg (package-version-join next-version)
(package-version-join (package-desc-version already)))))
-
+ (cond
+ (already nil)
((package-installed-p next-pkg next-version) nil)
(t
@@ -933,12 +942,13 @@
(t (setq found pkg-desc)))))
(unless found
(if problem
- (error problem)
+ (error "%s" problem)
(error "Package `%s-%s' is unavailable"
next-pkg (package-version-join next-version))))
(setq packages
(package-compute-transaction (cons found packages)
- (package-desc-reqs found))))))))
+ (package-desc-reqs found)
+ (cons found seen))))))))
packages)
(defun package-read-from-string (str)
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2014-05-04 19:37:56 +0000
+++ b/lisp/gnus/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,8 @@
+2014-05-08 Glenn Morris <address@hidden>
+
+ * gnus-fun.el (gnus-grab-cam-face):
+ Do not use predictable temp-file name. (http://bugs.debian.org/747100)
+
2014-05-04 Glenn Morris <address@hidden>
* gnus-registry.el (gnus-registry-install-p): Doc fix.
=== modified file 'lisp/gnus/gnus-fun.el'
--- a/lisp/gnus/gnus-fun.el 2014-03-23 23:13:36 +0000
+++ b/lisp/gnus/gnus-fun.el 2014-05-08 03:41:21 +0000
@@ -301,20 +301,21 @@
(interactive)
(shell-command "xawtv-remote snap ppm")
(let ((file nil)
+ (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
result)
(while (null (setq file (directory-files "/tftpboot/sparky/tmp"
t "snap.*ppm")))
(sleep-for 1))
(setq file (car file))
(shell-command
- (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale
-width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
- file))
+ (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale
-width 48 -height 48 | ppmtopgm >> %s"
+ file tempfile))
(let ((gnus-convert-image-to-face-command
(format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
(gnus-fun-ppm-change-string))))
- (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
+ (setq result (gnus-face-from-file tempfile)))
(delete-file file)
- ;;(delete-file "/tmp/gnus.face.ppm")
+ ;;(delete-file tempfile) ; FIXME why are we not deleting it?!
result))
(defun gnus-fun-ppm-change-string ()
=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el 2014-03-22 22:36:29 +0000
+++ b/lisp/help-fns.el 2014-05-08 03:41:21 +0000
@@ -501,6 +501,11 @@
;; aliases before functions.
(aliased
(format "an alias for `%s'" real-def))
+ ((autoloadp def)
+ (format "%s autoloaded %s"
+ (if (commandp def) "an interactive" "an")
+ (if (eq (nth 4 def) 'keymap) "keymap"
+ (if (nth 4 def) "Lisp macro" "Lisp function"))))
((or (eq (car-safe def) 'macro)
;; For advised macros, def is a lambda
;; expression or a byte-code-function-p, so we
@@ -513,11 +518,6 @@
(concat beg "Lisp function"))
((eq (car-safe def) 'closure)
(concat beg "Lisp closure"))
- ((autoloadp def)
- (format "%s autoloaded %s"
- (if (commandp def) "an interactive" "an")
- (if (eq (nth 4 def) 'keymap) "keymap"
- (if (nth 4 def) "Lisp macro" "Lisp function"))))
((keymapp def)
(let ((is-full nil)
(elts (cdr-safe def)))
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2014-05-04 19:37:56 +0000
+++ b/lisp/minibuffer.el 2014-05-08 03:41:21 +0000
@@ -519,11 +519,35 @@
completions))
((eq action 'completion--unquote)
- (let ((ustring (funcall unquote string))
- (uprefix (funcall unquote (substring string 0 pred))))
- ;; We presume (more or less) that `concat' and `unquote' commute.
- (cl-assert (string-prefix-p uprefix ustring))
- (list ustring table (length uprefix)
+ ;; PRED is really a POINT in STRING.
+ ;; We should return a new set (STRING TABLE POINT REQUOTE)
+ ;; where STRING is a new (unquoted) STRING to match against the new TABLE
+ ;; using a new POINT inside it, and REQUOTE is a requoting function which
+ ;; should reverse the unquoting, (i.e. it receives the completion result
+ ;; of using the new TABLE and should turn it into the corresponding
+ ;; quoted result).
+ (let* ((qpos pred)
+ (ustring (funcall unquote string))
+ (uprefix (funcall unquote (substring string 0 qpos)))
+ ;; FIXME: we really should pass `qpos' to `unuote' and have that
+ ;; function give us the corresponding `uqpos'. But for now we
+ ;; presume (more or less) that `concat' and `unquote' commute.
+ (uqpos (if (string-prefix-p uprefix ustring)
+ ;; Yay!! They do seem to commute!
+ (length uprefix)
+ ;; They don't commute this time! :-(
+ ;; Maybe qpos is in some text that disappears in the
+ ;; ustring (bug#17239). Let's try a second chance guess.
+ (let ((usuffix (funcall unquote (substring string qpos))))
+ (if (string-suffix-p usuffix ustring)
+ ;; Yay!! They still "commute" in a sense!
+ (- (length ustring) (length usuffix))
+ ;; Still no luck! Let's just choose *some* position
+ ;; within ustring.
+ (/ (+ (min (length uprefix) (length ustring))
+ (max (- (length ustring) (length usuffix)) 0))
+ 2))))))
+ (list ustring table uqpos
(lambda (unquoted-result op)
(pcase op
(1 ;;try
@@ -853,6 +877,7 @@
(setq string (pop new))
(setq table (pop new))
(setq point (pop new))
+ (cl-assert (<= point (length string)))
(pop new))))
(result
(completion--some (lambda (style)
@@ -1365,19 +1390,18 @@
;; instead, but it was too blunt, leading to situations where SPC
;; was the only insertable char at point but minibuffer-complete-word
;; refused inserting it.
- (let* ((exts (mapcar (lambda (str) (propertize str
'completion-try-word t))
- '(" " "-")))
- (before (substring string 0 point))
- (after (substring string point))
- (comps
- (delete nil
- (mapcar (lambda (ext)
- (completion-try-completion
- (concat before ext after)
- table predicate (1+ point) md))
- exts))))
- (when (and (null (cdr comps)) (consp (car comps)))
- (setq comp (car comps)))))
+ (let ((exts (mapcar (lambda (str) (propertize str 'completion-try-word
t))
+ '(" " "-")))
+ (before (substring string 0 point))
+ (after (substring string point))
+ tem)
+ ;; If both " " and "-" lead to completions, prefer " " so SPC behaves
+ ;; a bit more like a self-inserting key (bug#17375).
+ (while (and exts (not (consp tem)))
+ (setq tem (completion-try-completion
+ (concat before (pop exts) after)
+ table predicate (1+ point) md)))
+ (if (consp tem) (setq comp tem))))
;; Completing a single word is actually more difficult than completing
;; as much as possible, because we first have to find the "current
=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el 2014-02-10 01:34:22 +0000
+++ b/lisp/net/browse-url.el 2014-05-06 03:55:54 +0000
@@ -1340,6 +1340,9 @@
(kill-buffer nil)))
(if (and pid (zerop (signal-process pid 0))) ; Mosaic running
(save-excursion
+ ;; This is a predictable temp-file name, which is bad,
+ ;; but it is what Mosaic uses/used.
+ ;; So it's not Emacs's problem. http://bugs.debian.org/747100
(find-file (format "/tmp/Mosaic.%d" pid))
(erase-buffer)
(insert (if (browse-url-maybe-new-window new-window)
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2014-04-22 10:43:01 +0000
+++ b/lisp/net/tramp-sh.el 2014-05-06 09:51:05 +0000
@@ -425,7 +425,7 @@
;;;###tramp-autoload
(defcustom tramp-remote-process-environment
- `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "TMOUT=0" "LC_CTYPE=''"
+ `("TMOUT=0" "LC_CTYPE=''"
,(format "TERM=%s" tramp-terminal-type)
"EMACS=t" ;; Deprecated.
,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
@@ -440,6 +440,7 @@
Special handling is applied to the PATH environment, which should
not be set here. Instead, it should be set via `tramp-remote-path'."
:group 'tramp
+ :version "24.4"
:type '(repeat string))
(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
@@ -491,9 +492,9 @@
See `tramp-actions-before-shell' for more info.")
(defconst tramp-uudecode
- "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
-cat /tmp/tramp.$$
-rm -f /tmp/tramp.$$"
+ "(echo begin 600 %t; tail -n +2) | uudecode
+cat %t
+rm -f %t"
"Shell function to implement `uudecode' to standard output.
Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
for this or `uudecode -p', but some systems don't, and for them
@@ -3726,8 +3727,7 @@
(with-tramp-progress-reporter
vec 5 (format "Opening remote shell `%s'" shell)
;; Find arguments for this shell.
- (let ((tramp-end-of-output tramp-initial-end-of-output)
- (alist tramp-sh-extra-args)
+ (let ((alist tramp-sh-extra-args)
item extra-args)
(while (and alist (null extra-args))
(setq item (pop alist))
@@ -3735,18 +3735,12 @@
(setq extra-args (cdr item))))
(tramp-send-command
vec (format
- "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s %s"
+ "exec env ENV='' HISTFILE=/dev/null PROMPT_COMMAND='' PS1=%s PS2=''
PS3='' %s %s"
(tramp-shell-quote-argument tramp-end-of-output)
shell (or extra-args ""))
t))
(tramp-set-connection-property
- (tramp-get-connection-process vec) "remote-shell" shell)
- ;; Setting prompts.
- (tramp-send-command
- vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
- (tramp-send-command vec "PS2=''" t)
- (tramp-send-command vec "PS3=''" t)
- (tramp-send-command vec "PROMPT_COMMAND=''" t)))
+ (tramp-get-connection-process vec) "remote-shell" shell)))
(defun tramp-find-shell (vec)
"Opens a shell on the remote host which groks tilde expansion."
@@ -4045,7 +4039,7 @@
\(FORMAT ENCODING DECODING [TEST]\)
-FORMAT is symbol describing the encoding/decoding format. It can be
+FORMAT is a symbol describing the encoding/decoding format. It can be
`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
ENCODING and DECODING can be strings, giving commands, or symbols,
@@ -4055,9 +4049,11 @@
specifier is not present, the input should be read from standard
input.
-If they are variables, this variable is a string containing a Perl
-implementation for this functionality. This Perl program will be transferred
-to the remote host, and it is available as shell function with the same name.
+If they are variables, this variable is a string containing a
+Perl or Shell implementation for this functionality. This
+program will be transferred to the remote host, and it is
+available as shell function with the same name. A \"%t\" format
+specifier in the variable value denotes a temporary file.
The optional TEST command can be used for further tests, whether
ENCODING and DECODING are applicable.")
@@ -4136,10 +4132,25 @@
(throw 'wont-work-remote nil))
(when (not (stringp rem-dec))
- (let ((name (symbol-name rem-dec)))
+ (let ((name (symbol-name rem-dec))
+ (value (symbol-value rem-dec))
+ tmpfile)
(while (string-match (regexp-quote "-") name)
(setq name (replace-match "_" nil t name)))
- (tramp-maybe-send-script vec (symbol-value rem-dec) name)
+ (when (string-match "%t" value)
+ (setq tmpfile
+ (make-temp-name
+ (expand-file-name
+ tramp-temp-name-prefix
+ (tramp-get-remote-tmpdir vec)))
+ value
+ (format-spec
+ value
+ (format-spec-make
+ ?t
+ (tramp-file-name-handler
+ 'file-remote-p tmpfile 'localname)))))
+ (tramp-maybe-send-script vec value name)
(setq rem-dec name)))
(tramp-message
vec 5
@@ -4456,6 +4467,7 @@
(delete-process p))
(setenv "TERM" tramp-terminal-type)
(setenv "LC_ALL" "en_US.utf8")
+ (setenv "HISTFILE" "/dev/null")
(setenv "PROMPT_COMMAND")
(setenv "PS1" tramp-initial-end-of-output)
(let* ((target-alist (tramp-compute-multi-hops vec))
=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el 2014-04-09 00:14:37 +0000
+++ b/lisp/progmodes/ruby-mode.el 2014-05-05 23:18:18 +0000
@@ -1804,9 +1804,10 @@
;; $' $" $` .... are variables.
;; ?' ?" ?` are character literals (one-char strings in 1.9+).
("\\([?$]\\)[#\"'`]"
- (1 (unless (save-excursion
- ;; Not within a string.
- (nth 3 (syntax-ppss (match-beginning 0))))
+ (1 (if (save-excursion
+ (nth 3 (syntax-ppss (match-beginning 0))))
+ ;; Within a string, skip.
+ (goto-char (match-end 1))
(string-to-syntax "\\"))))
;; Part of symbol when at the end of a method name.
("[!?]"
=== modified file 'lisp/xt-mouse.el'
--- a/lisp/xt-mouse.el 2014-04-17 07:54:23 +0000
+++ b/lisp/xt-mouse.el 2014-05-08 03:41:21 +0000
@@ -63,8 +63,8 @@
(defun xterm-mouse-translate-1 (&optional extension)
(save-excursion
- (save-window-excursion
- (deactivate-mark)
+ (save-window-excursion ;FIXME: Why?
+ (deactivate-mark) ;FIXME: Why?
(let* ((xterm-mouse-last nil)
(down (xterm-mouse-event extension))
(down-command (nth 0 down))
@@ -73,10 +73,10 @@
(down-binding (key-binding (if (symbolp down-where)
(vector down-where down-command)
(vector down-command))))
- (is-click (string-match "^mouse" (symbol-name (car down)))))
+ (is-down (string-match "down" (symbol-name (car down)))))
;; Retrieve the expected preface for the up-event.
- (unless is-click
+ (unless is-down
(unless (cond ((null extension)
(and (eq (read-event) ?\e)
(eq (read-event) ?\[)
@@ -88,14 +88,17 @@
(error "Unexpected escape sequence from XTerm")))
;; Process the up-event.
- (let* ((click (if is-click down (xterm-mouse-event extension)))
+ (let* ((click (if is-down (xterm-mouse-event extension) down))
(click-data (nth 1 click))
(click-where (nth 1 click-data)))
- (if (memq down-binding '(nil ignore))
- (if (and (symbolp click-where)
- (consp click-where))
- (vector (list click-where click-data) click)
- (vector click))
+ (cond
+ ((null down) nil)
+ ((memq down-binding '(nil ignore))
+ (if (and (symbolp click-where)
+ (consp click-where))
+ (vector (list click-where click-data) click)
+ (vector click)))
+ (t
(setq unread-command-events
(append (if (eq down-where click-where)
(list click)
@@ -114,7 +117,7 @@
(if (and (symbolp down-where)
(consp down-where))
(vector (list down-where down-data) down)
- (vector down))))))))
+ (vector down)))))))))
;; These two variables have been converted to terminal parameters.
;;
@@ -153,7 +156,8 @@
;; Normal terminal mouse click reporting: expect three bytes, of the
;; form <BUTTON+32> <X+32> <Y+32>. Return a list (EVENT-TYPE X Y).
(defun xterm-mouse--read-event-sequence-1000 ()
- (list (let ((code (- (read-event) 32)))
+ (let* ((code (- (read-event) 32))
+ (type
(intern
;; For buttons > 3, the release-event looks differently
;; (see xc/programs/xterm/button.c, function EditorButton),
@@ -161,21 +165,21 @@
(cond ((>= code 64)
(format "mouse-%d" (- code 60)))
((memq code '(8 9 10))
- (setq xterm-mouse-last code)
+ (setq xterm-mouse-last (- code 8))
(format "M-down-mouse-%d" (- code 7)))
- ((= code 11)
- (format "M-mouse-%d" (- xterm-mouse-last 7)))
- ((= code 3)
- ;; For buttons > 5 xterm only reports a
- ;; button-release event. Avoid error by mapping
- ;; them all to mouse-1.
- (format "mouse-%d" (+ 1 (or xterm-mouse-last 0))))
- (t
+ ((and (= code 11) xterm-mouse-last)
+ (format "M-mouse-%d" (1+ xterm-mouse-last)))
+ ((and (= code 3) xterm-mouse-last)
+ ;; For buttons > 5 xterm only reports a button-release event.
+ ;; Drop them since they're not usable and can be spurious.
+ (format "mouse-%d" (1+ xterm-mouse-last)))
+ ((memq code '(0 1 2))
(setq xterm-mouse-last code)
(format "down-mouse-%d" (+ 1 code))))))
- ;; x and y coordinates
- (- (read-event) 33)
- (- (read-event) 33)))
+ (x (- (read-event) 33))
+ (y (- (read-event) 33)))
+ (and type (wholenump x) (wholenump y)
+ (list type x y))))
;; XTerm's 1006-mode terminal mouse click reporting has the form
;; <BUTTON> ; <X> ; <Y> <M or m>, where the button and ordinates are
@@ -222,32 +226,33 @@
((eq extension 1006)
(xterm-mouse--read-event-sequence-1006))
(t
- (error "Unsupported XTerm mouse protocol"))))
- (type (nth 0 click))
- (x (nth 1 click))
- (y (nth 2 click))
- ;; Emulate timestamp information. This is accurate enough
- ;; for default value of mouse-1-click-follows-link (450msec).
- (timestamp (xterm-mouse-truncate-wrap
- (* 1000
- (- (float-time)
- (or xt-mouse-epoch
- (setq xt-mouse-epoch (float-time)))))))
- (w (window-at x y))
- (ltrb (window-edges w))
- (left (nth 0 ltrb))
- (top (nth 1 ltrb)))
- (set-terminal-parameter nil 'xterm-mouse-x x)
- (set-terminal-parameter nil 'xterm-mouse-y y)
- (setq
- last-input-event
- (list type
- (let ((event (if w
- (posn-at-x-y (- x left) (- y top) w t)
- (append (list nil 'menu-bar)
- (nthcdr 2 (posn-at-x-y x y))))))
- (setcar (nthcdr 3 event) timestamp)
- event)))))
+ (error "Unsupported XTerm mouse protocol")))))
+ (when click
+ (let* ((type (nth 0 click))
+ (x (nth 1 click))
+ (y (nth 2 click))
+ ;; Emulate timestamp information. This is accurate enough
+ ;; for default value of mouse-1-click-follows-link (450msec).
+ (timestamp (xterm-mouse-truncate-wrap
+ (* 1000
+ (- (float-time)
+ (or xt-mouse-epoch
+ (setq xt-mouse-epoch (float-time)))))))
+ (w (window-at x y))
+ (ltrb (window-edges w))
+ (left (nth 0 ltrb))
+ (top (nth 1 ltrb)))
+ (set-terminal-parameter nil 'xterm-mouse-x x)
+ (set-terminal-parameter nil 'xterm-mouse-y y)
+ (setq
+ last-input-event
+ (list type
+ (let ((event (if w
+ (posn-at-x-y (- x left) (- y top) w t)
+ (append (list nil 'menu-bar)
+ (nthcdr 2 (posn-at-x-y x y))))))
+ (setcar (nthcdr 3 event) timestamp)
+ event)))))))
;;;###autoload
(define-minor-mode xterm-mouse-mode
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-07 18:20:18 +0000
+++ b/src/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,29 @@
+2014-05-08 Paul Eggert <address@hidden>
+
+ * minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430).
+
+2014-05-08 Jarek Czekalski <address@hidden>
+
+ Fix initialization of minibuffer history variable (Bug#17430).
+ * minibuf.c (read_minibuf): Initialize histval to Qnil if unbound.
+ Move the initialization up to prevent any "value void" message.
+
+2014-05-08 Samuel Bronson <address@hidden>
+
+ * keyboard.c (Frecursive_edit): Ensure inc&dec of command_loop_level
+ are matched (bug#17413).
+
+2014-05-08 Jarek Czekalski <address@hidden>
+
+ Stop tooltips pulling Emacs window to front (Bug#17408).
+ * w32fns.c (Fx_show_tip): Add SWP_NOOWNERZORDER flag to
+ SetWindowPos invocations.
+
+2014-05-08 Jan Djärv <address@hidden>
+
+ * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
+ not initialized (Bug#17398).
+
2014-05-07 Paul Eggert <address@hidden>
* image.c: Include <png.h> before <setjmp.h> (Bug#17429).
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2014-04-24 03:59:19 +0000
+++ b/src/keyboard.c 2014-05-08 03:41:21 +0000
@@ -825,22 +825,25 @@
if (input_blocked_p ())
return Qnil;
- command_loop_level++;
- update_mode_lines = 17;
-
- if (command_loop_level
+ if (command_loop_level >= 0
&& current_buffer != XBUFFER (XWINDOW (selected_window)->contents))
buffer = Fcurrent_buffer ();
else
buffer = Qnil;
+ /* Don't do anything interesting between the increment and the
+ record_unwind_protect! Otherwise, we could get distracted and
+ never decrement the counter again. */
+ command_loop_level++;
+ update_mode_lines = 17;
+ record_unwind_protect (recursive_edit_unwind, buffer);
+
/* If we leave recursive_edit_1 below with a `throw' for instance,
like it is done in the splash screen display, we have to
make sure that we restore single_kboard as command_loop_1
would have done if it were left normally. */
if (command_loop_level > 0)
temporarily_switch_to_single_kboard (SELECTED_FRAME ());
- record_unwind_protect (recursive_edit_unwind, buffer);
recursive_edit_1 ();
return unbind_to (count, Qnil);
=== modified file 'src/minibuf.c'
--- a/src/minibuf.c 2014-03-21 17:04:50 +0000
+++ b/src/minibuf.c 2014-05-08 03:41:21 +0000
@@ -384,6 +384,7 @@
EMACS_INT pos = 0;
/* String to add to the history. */
Lisp_Object histstring;
+ Lisp_Object histval;
Lisp_Object empty_minibuf;
Lisp_Object dummy, frame;
@@ -535,6 +536,14 @@
if (!NILP (Vminibuffer_completing_file_name))
Vminibuffer_completing_file_name = Qlambda;
+ /* If variable is unbound, make it nil. */
+ histval = find_symbol_value (Vminibuffer_history_variable);
+ if (EQ (histval, Qunbound))
+ {
+ Fset (Vminibuffer_history_variable, Qnil);
+ histval = Qnil;
+ }
+
if (inherit_input_method)
{
/* `current-input-method' is buffer local. So, remember it in
@@ -703,13 +712,6 @@
{
/* If the caller wanted to save the value read on a history list,
then do so if the value is not already the front of the list. */
- Lisp_Object histval;
-
- /* If variable is unbound, make it nil. */
-
- histval = find_symbol_value (Vminibuffer_history_variable);
- if (EQ (histval, Qunbound))
- Fset (Vminibuffer_history_variable, Qnil);
/* The value of the history variable must be a cons or nil. Other
values are unacceptable. We silently ignore these values. */
=== modified file 'src/nsselect.m'
--- a/src/nsselect.m 2014-02-10 22:15:54 +0000
+++ b/src/nsselect.m 2014-05-05 17:37:43 +0000
@@ -429,7 +429,9 @@
id pb;
NSArray *types;
- check_window_system (NULL);
+ if (!window_system_available (NULL))
+ return Qnil;
+
CHECK_SYMBOL (selection);
if (EQ (selection, Qnil)) selection = QPRIMARY;
if (EQ (selection, Qt)) selection = QSECONDARY;
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2014-04-03 20:46:04 +0000
+++ b/src/w32fns.c 2014-05-08 03:41:21 +0000
@@ -6035,12 +6035,13 @@
/* Put tooltip in topmost group and in position. */
SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
root_x, root_y, 0, 0,
- SWP_NOSIZE | SWP_NOACTIVATE);
+ SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
/* Ensure tooltip is on top of other topmost windows (eg menus). */
SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP,
0, 0, 0, 0,
- SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+ SWP_NOMOVE | SWP_NOSIZE
+ | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
unblock_input ();
goto start_timer;
@@ -6238,12 +6239,13 @@
SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
root_x, root_y,
rect.right - rect.left + FRAME_COLUMN_WIDTH (f),
- rect.bottom - rect.top, SWP_NOACTIVATE);
+ rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOOWNERZORDER);
/* Ensure tooltip is on top of other topmost windows (eg menus). */
SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP,
0, 0, 0, 0,
- SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+ SWP_NOMOVE | SWP_NOSIZE
+ | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
/* Let redisplay know that we have made the frame visible already. */
SET_FRAME_VISIBLE (f, 1);
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-05-03 14:42:26 +0000
+++ b/test/ChangeLog 2014-05-08 03:41:21 +0000
@@ -1,3 +1,17 @@
+2014-05-08 Glenn Morris <address@hidden>
+
+ * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
+ (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+
+2014-05-08 Dmitry Gutov <address@hidden>
+
+ * automated/ruby-mode-tests.el (ruby-interpolation-after-dollar-sign):
+ New test.
+
+2014-05-08 Glenn Morris <address@hidden>
+
+ * automated/help-fns.el: New file.
+
2014-05-01 Barry O'Reilly <address@hidden>
* automated/undo-tests.el (undo-test-region-deletion): New test to
=== added file 'test/automated/help-fns.el'
--- a/test/automated/help-fns.el 1970-01-01 00:00:00 +0000
+++ b/test/automated/help-fns.el 2014-05-05 21:33:07 +0000
@@ -0,0 +1,37 @@
+;;; help-fns.el --- tests for help-fns.el
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Maintainer: address@hidden
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+
+(autoload 'help-fns-test--macro "help-fns" nil nil t)
+
+(ert-deftest help-fns-test-bug17410 ()
+ "Test for http://debbugs.gnu.org/17410 ."
+ (describe-function 'help-fns-test--macro)
+ (with-current-buffer "*Help*"
+ (goto-char (point-min))
+ (should (search-forward "autoloaded Lisp macro" (line-end-position)))))
+
+;;; help-fns.el ends here
=== modified file 'test/automated/ruby-mode-tests.el'
--- a/test/automated/ruby-mode-tests.el 2014-01-31 17:13:49 +0000
+++ b/test/automated/ruby-mode-tests.el 2014-05-05 23:18:18 +0000
@@ -452,6 +452,10 @@
(ruby-assert-face "%w{foo address@hidden" 8 font-lock-string-face)
(ruby-assert-face "%s{foo address@hidden" 8 font-lock-string-face))
+(ert-deftest ruby-interpolation-after-dollar-sign ()
+ (ruby-assert-face "\"$#{balance}\"" 2 'font-lock-string-face)
+ (ruby-assert-face "\"$#{balance}\"" 3 'font-lock-variable-name-face))
+
(ert-deftest ruby-no-unknown-percent-literals ()
;; No folding of case.
(ruby-assert-face "%S{foo}" 4 nil)
=== modified file 'test/automated/vc-bzr.el'
--- a/test/automated/vc-bzr.el 2014-02-10 01:34:22 +0000
+++ b/test/automated/vc-bzr.el 2014-05-08 03:34:20 +0000
@@ -33,7 +33,9 @@
(skip-unless (executable-find vc-bzr-program))
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(ignored-dir (expand-file-name "ignored-dir" tempdir))
- (default-directory (file-name-as-directory tempdir)))
+ (default-directory (file-name-as-directory tempdir))
+ (process-environment (cons (format "BZR_LOG=%s" null-device)
+ process-environment)))
(unwind-protect
(progn
(make-directory ignored-dir)
@@ -64,7 +66,9 @@
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(subdir (expand-file-name "subdir" tempdir))
(file (expand-file-name "file" tempdir))
- (default-directory (file-name-as-directory tempdir)))
+ (default-directory (file-name-as-directory tempdir))
+ (process-environment (cons (format "BZR_LOG=%s" null-device)
+ process-environment)))
(unwind-protect
(progn
(call-process vc-bzr-program nil nil nil "init")
@@ -100,7 +104,9 @@
(let* ((tempdir (make-temp-file "vc-bzr-test" t))
(file (expand-file-name "foo.el" tempdir))
(default-directory (file-name-as-directory tempdir))
- (generated-autoload-file (expand-file-name "loaddefs.el" tempdir)))
+ (generated-autoload-file (expand-file-name "loaddefs.el" tempdir))
+ (process-environment (cons (format "BZR_LOG=%s" null-device)
+ process-environment)))
(unwind-protect
(progn
(call-process vc-bzr-program nil nil nil "init")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117071: Merge from emacs-24; up to r117082,
Glenn Morris <=