upstream

14 files changed, 318 insertions, 874 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3fd2d6bd92a..1d7438b6506 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,43 @@
+2012-07-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify export of symbols to GDB.
+        * emacs-buffer.gdb ($tagmask, $valmask): Remove.
+        (ygetptr): Adjust to recent changes in lisp.h and emacs.c,
+        by using VALMASK instead of $valmask, CHECK_LISP_OBJECT_TYPE
+        instead of gdb_use_union, and DATA_SEG_BITS instead of
+        gdb_data_seg_bits.  Also, use $ptr.i rather than $ptr.u.val.
+
+2012-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * tutorials/TUTORIAL.he: Make the first sentence display correctly
+        in a left-to-right paragraph, such as what is shown on the fancy
+        splash screen.
+
+2012-07-15  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Mention exclamation-mark and flymake.
+
+2012-07-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tutorials/TUTORIAL.es: Sync with changes in 2012-07-07T10:34:37Z!cyd@gnu.org.
+
+2012-07-07  Michael Witten  <mfwitten@gmail.com>  (tiny change)
+
+        * tutorials/TUTORIAL: Copyedits (Bug#11689).
+
+2012-06-28  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.py, emacs2.py, emacs3.py: Remove files, no longer used.
+
+2012-06-24  Lawrence Mitchell  <wence@gmx.li>
+
+        * NEWS: Move and improve the defun/defalias changes (bug#11686).
+
+2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Support higher-resolution time stamps (Bug#9000).
+        * NEWS: Mention addition of picoseconds to time stamp format.
+
 2012-06-13  Deniz Dogan  <deniz@dogan.se>
 
         * tutorials/TUTORIAL.sv: Fix grammar and a couple of typos.
@@ -43,8 +83,8 @@
 
 2012-04-27  Jambunathan K  <kjambunathan@gmail.com>
 
-        * org/OrgOdtStyles.xml (OrgDescriptionList): Modify style.  With
-        this change, in a description list, if the description paragraph
+        * org/OrgOdtStyles.xml (OrgDescriptionList): Modify style.
+        With this change, in a description list, if the description paragraph
         spawns multiple lines then it will correctly indented.
 
 2012-04-20  Glenn Morris  <rgm@gnu.org>
@@ -66,8 +106,8 @@
         * org/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*):
         New section styles. These sections are indented to the same
         level as the corresponding list entries.  These sections hold
-        tables that occur within a list.  (OrgTable): Increased
-        relative width from 90% to 96% for aesthetic reasons.
+        tables that occur within a list.  (OrgTable):
+        Increased relative width from 90% to 96% for aesthetic reasons.
 
 2012-03-16  Glenn Morris  <rgm@gnu.org>
 
@@ -125,8 +165,8 @@
 2012-01-10  Chong Yidong  <cyd@gnu.org>
 
         * tutorials/TUTORIAL: Don't give instructions for old-style X
-        scrollbars.  Use DEL terminology instead of DelBack.  Improve
-        description of graphical continuation lines and mode-line.
+        scrollbars.  Use DEL terminology instead of DelBack.
+        Improve description of graphical continuation lines and mode-line.
         Promote use of C-/ and C-SPC.  Remove discussion of flow control.
 
 2012-01-05  Glenn Morris  <rgm@gnu.org>
@@ -499,11 +539,11 @@
         POSIX does not allow "-" in Makefile variable names.
         Reported by Bruno Haible in
         <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
-        * refcards/Makefile (DIRED_REFCARDS_PDF): Renamed from
+        * refcards/Makefile (DIRED_REFCARDS_PDF): Rename from
         DIRED-REFCARDS_PDF.
-        (MISC_REFCARDS_PDF): Renamed from MISC-REFCARDS_PDF.
-        (SURVIVAL_CARDS_PDF): Renamed from SURVIVAL-CARDS_PDF.
-        (VIPER_CARDS_PDF): Renamed from VIPER-CARDS_PDF.
+        (MISC_REFCARDS_PDF): Rename from MISC-REFCARDS_PDF.
+        (SURVIVAL_CARDS_PDF): Rename from SURVIVAL-CARDS_PDF.
+        (VIPER_CARDS_PDF): Rename from VIPER-CARDS_PDF.
 
 2011-01-18  Glenn Morris  <rgm@gnu.org>
 
@@ -972,7 +1012,7 @@
 
 2009-09-27  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * NEWS: Mention new library imap-hash.el
+        * NEWS: Mention new library imap-hash.el.
 
 2009-09-22  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -1016,7 +1056,7 @@
 2009-08-08  Dmitry Dzhus  <dima@sphinx.net.ru>
 
         * images/gud/all.xpm, images/gud/thread.xpm: New icons for
-        gdb-mi.el
+        gdb-mi.el.
 
 2009-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -1967,7 +2007,7 @@
 
         * refcards/refcard.tex: Updates for printing.
         (\versionyear): Update to 2007.
-        (\copyrightnotice): Modified or unmodified ok.
+        (\copyrightnotice): Modify or unmodified ok.
         (Simple Customization): Don't use goto-line, since now it's bound.
         Also, use now-preferred (kbd ...) syntax.
 
@@ -2052,7 +2092,7 @@
 
 2007-07-02  Carsten Dominik  <dominik@science.uva.nl>
 
-        * orgcard.tex: Version 5.01
+        * orgcard.tex: Version 5.01.
 
 2007-06-27  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -2620,7 +2660,7 @@
 2006-09-15  Richard Stallman  <rms@gnu.org>
 
         * THE-GNU-PROJECT: Update with the latest footnotes
-        from www.gnu.org/gnu/the-gnu-project.html
+        from www.gnu.org/gnu/the-gnu-project.html.
 
 2006-09-15  David Kastrup  <dak@gnu.org>
 
@@ -2641,7 +2681,7 @@
 
 2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 
-        * erc.texi (Getting Started, Connecting): Changed erc-select to erc.
+        * erc.texi (Getting Started, Connecting): Change erc-select to erc.
 
 2006-09-02  Juri Linkov  <juri@jurta.org>
 
@@ -2758,8 +2798,8 @@
 
 2006-07-05  Kenichi Handa  <handa@m17n.org>
 
-        * HELLO: Add a paragraph for non-ASCII examples at the head.  Add
-        Bulgarian and Hungarian.  Add more "hello"s to Danish and Swedish.
+        * HELLO: Add a paragraph for non-ASCII examples at the head.
+        Add Bulgarian and Hungarian.  Add more "hello"s to Danish and Swedish.
 
 2006-07-03  Bill Wohler  <wohler@newt.com>
 
@@ -2905,7 +2945,7 @@
 
 2006-05-24  Carsten Dominik  <dominik@science.uva.nl>
 
-        * orgcard.tex (section{Motion}): Added the item navigation commands.
+        * orgcard.tex (section{Motion}): Add the item navigation commands.
         (section{Publishing}): New section.
         (section{Links}): Documented elisp and shell links.
 
@@ -3041,8 +3081,8 @@
         New bitmaps for new images.
 
         * images/refresh.xpm, images/sort-ascending.xpm,
-        * images/sort-descending.xpm: Update with GTK 2.x images.  Note
-        that the default GTK icons are not overridden by the GNOME theme
+        * images/sort-descending.xpm: Update with GTK 2.x images.
+        Note that the default GTK icons are not overridden by the GNOME theme
         due to a bug which was fixed in GNOME 2.15.  Once GNOME 2.16 is in
         wide circulation, then the GTK icons should be replaced with the
         equivalent GNOME icons.  Until then, we should be consistent with
@@ -3246,7 +3286,7 @@
 
 2005-11-18  Carsten Dominik  <dominik@science.uva.nl>
 
-        * orgcard.tex: Version 3.20
+        * orgcard.tex: Version 3.20.
 
 2005-11-16  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -4312,8 +4352,8 @@
 
 2001-11-22  Colin Walters  <walters@debian.org>
 
-        * PROBLEMS: Remove already applied calc info patches.  Clarify
-        that there is no such thing as Debian GNU/Linux 2.4.3.  ftpd is
+        * PROBLEMS: Remove already applied calc info patches.
+        Clarify that there is no such thing as Debian GNU/Linux 2.4.3.  ftpd is
         not handled by alternatives in Debian, the reporter surely meant
         just "--config ftp".
 
@@ -4430,8 +4470,8 @@
 
         * ps-prin1.ps: Footer implementation.  Doc fix.
         (doLineNumber): Code fix for line number color.
-        (BeginPage, BeginSheet, HeaderFramePath, HeaderFrame, HeaderText): Code
-        fix for footer implementation.
+        (BeginPage, BeginSheet, HeaderFramePath, HeaderFrame, HeaderText):
+        Code fix for footer implementation.
         (TextStart, SetFooterLines, FooterFrameStart, doFramePath)
         (FooterFramePath, doFrame, FooterFrame, FooterStart)
         (HeaderOrFooterTextLines, HeaderOrFooterText, FooterText): New funs.
@@ -4619,8 +4659,8 @@
         * ps-prin0.ps: Insert a version number comment (5.2.2).
         Indentation fix.
 
-        * ps-prin1.ps: Insert a version number comment (5.2.2).  Can
-        select page size with/without giving an error if PostScript
+        * ps-prin1.ps: Insert a version number comment (5.2.2).
+        Can select page size with/without giving an error if PostScript
         printer doesn't have this kind of page size.  Zebra Stripe
         continues or restarts on next page.  Indentation fix.
         (BeginSheet): If necessary, rescale n-up to fit on the sheet of
@@ -4831,8 +4871,8 @@
         * termcap.dat, termcap.ucb: Deleted and replaced.
 
         * termcap: New termcap file from the ncurses project; bigger,
-        better, brighter, does away with waxy yellow buildup.  Email
-        me at terminfo@ccil.org if you have any trouble with this.
+        better, brighter, does away with waxy yellow buildup.
+        Email me at terminfo@ccil.org if you have any trouble with this.
 
         * README: Changed to track above change.
 
@@ -4842,7 +4882,7 @@
 
 1995-04-26  Karl Heuer  <kwzh@nutrimat.gnu.ai.mit.edu>
 
-        * Makefile (maintainer-clean): Renamed from realclean.
+        * Makefile (maintainer-clean): Rename from realclean.
 
 1995-04-09  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -4997,7 +5037,7 @@
 
 1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
 
-        * sex.6: Added 900-line support
+        * sex.6: Added 900-line support.
 
         * NEWS: Added news about the package finder.
 
@@ -5039,8 +5079,8 @@
         * DISTRIB: The actual domestic order form is now ORDERS.USA.
         The DISTRIB text now mentions 19.
 
-        * ORDERS.USA: Created.  This is just the order form.  DISTRIB
-        has a pointer to it at the beginning.
+        * ORDERS.USA: Created.  This is just the order form.
+        DISTRIB has a pointer to it at the beginning.
 
         * EUROPE: Renamed to ORDERS.EUROPE.  DISTRIB now has a pointer
         to it at the beginning.
@@ -5121,7 +5161,7 @@
 
 1992-04-06  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * etags.c (C_entries): Removed comment saying that \" in a string
+        * etags.c (C_entries): Remove comment saying that \" in a string
         isn't recognized as magic, because it is correctly handled.
 
         * getopt.c, getopt.h: New files, from GNU C library.
@@ -5131,8 +5171,8 @@
         optind.
         (main): Argument processing loop rewritten to call getopt to get
         next option.  Options which take parameters (-o and -i) rewritten
-        to get parameter from optarg instead of argv[1].  Filename
-        preprocessing loop and update command changed similarly.
+        to get parameter from optarg instead of argv[1].
+        Filename preprocessing loop and update command changed similarly.
         * Makefile (etags, ctags): Depend on and link with getopt.h,
         getopt.o, and getopt1.o.
         (getopt.o, getopt1.o): New targets for the GNU getopt routines.
@@ -5273,8 +5313,8 @@
 1991-01-25  Jim Blandy  (jimb@churchy.ai.mit.edu)
 
         * make-docfile: Find the arguments to a C function correctly,
-        by not ignoring the character that read_c_string returns.  Don't
-        even try to find argument names for functions that take MANY
+        by not ignoring the character that read_c_string returns.
+        Don't even try to find argument names for functions that take MANY
         or UNEVALLED arguments, since they're a figment of the docstring's
         imagination.
 
@@ -5536,7 +5576,7 @@
 1988-12-31  Richard Mlynarik  (mly@rice-chex.ai.mit.edu)
 
         * env.c: Add decl for my-index.
-        * etags.c (file-entries): .oak => scheme
+        * etags.c (file-entries): .oak => scheme.
 
 1988-12-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 086e44f2bba..c5fca9de929 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -7,257 +7,35 @@ Please send Gnus bug reports to bugs@gnus.org.
 For older news, see Gnus info node "New Features".
 
 
-* Installation changes
+* New features
 
-** Upgrading from previous (stable) version if you have used No Gnus.
+** If you have the "tnef" program installed, Gnus will display ms-tnef
+   files, aka "winmail.dat".
 
-If you have tried No Gnus (the unstable Gnus branch leading to this
-release) but went back to a stable version, be careful when upgrading to
-this version.  In particular, you will probably want to remove the
-`~/News/marks' directory (perhaps selectively), so that flags are read
-from your `~/.newsrc.eld' instead of from the stale marks file, where
-this release will store flags for nntp.  See a later entry for more
-information about nntp marks.  Note that downgrading isn't safe in
-general.
+** Archives (like tar and zip files) will be automatically unpacked,
+   and the files inside the packages will be displayed as MIME parts.
 
-** Incompatibility when switching from Emacs 23 to Emacs 22 In Emacs 23,
-Gnus uses Emacs' new internal coding system `utf-8-emacs' for saving
-articles drafts and `~/.newsrc.eld'.  These files may not be read
-correctly in Emacs 22 and below.  If you want to use Gnus across
-different Emacs versions, you may set `mm-auto-save-coding-system' to
-`emacs-mule'.
+** shr has a new command `z' that cycles through image sizes.
 
-** Lisp files are now installed in `.../site-lisp/gnus/' by default.  It
-defaulted to `.../site-lisp/' formerly.  In addition to this, the new
-installer issues a warning if other Gnus installations which will shadow
-the latest one are detected.  You can then remove those shadows manually
-or remove them using `make remove-installed-shadows'.
+** `backtab' in the summary buffer now selects the previous link in
+   the article buffer.
 
-** The installation directory name is allowed to have spaces and/or tabs.
+** Using the "X-Message-SMTP-Method" header in Message buffers now
+   allows specifying how messages are to be sent.  For example:
 
-
-* New packages and libraries within Gnus
-
-** Gnus includes the Emacs Lisp SASL library.
-
-This provides a clean API to SASL mechanisms from within Emacs.  The
-user visible aspects of this, compared to the earlier situation, include
-support for DIGEST-MD5 and NTLM.   *Note Emacs SASL: (sasl)Top.
-
-** ManageSieve connections uses the SASL library by default.
-
-The primary change this brings is support for DIGEST-MD5 and NTLM, when
-the server supports it.
-
-** Gnus includes a password cache mechanism in password-cache.el.
-
-It is enabled by default (see `password-cache'), with a short timeout of
-16 seconds (see `password-cache-expiry').  If PGG is used as the PGP
-back end, the PGP passphrase is managed by this mechanism.  Passwords
-for ManageSieve connections are managed by this mechanism, after
-querying the user about whether to do so.
-
-** Using EasyPG with Gnus When EasyPG, is available, Gnus will use it
-instead of PGG.  EasyPG is an Emacs user interface to GNU Privacy Guard.
- *Note EasyPG Assistant user's manual: (epa)Top.  EasyPG is included in
-Emacs 23 and available separately as well.
-
-
-* Changes in group mode
-
-** Old intermediate incoming mail files (`Incoming*') are deleted after a
-couple of days, not immediately.  *Note Mail Source Customization::.
-(New in Gnus 5.10.10 / Emacs 22.2)
-
-
-
-* Changes in summary and article mode
-
-** Gnus now supports sticky article buffers.  Those are article buffers
-that are not reused when you select another article.  *Note Sticky
-Articles::.
-
-** Gnus can selectively display `text/html' articles with a WWW browser
-with `K H'.  *Note MIME Commands::.
-
-** International host names (IDNA) can now be decoded inside article bodies
-using `W i' (`gnus-summary-idna-message').  This requires that GNU Libidn
-(`http://www.gnu.org/software/libidn/') has been installed.
-
-** The non-ASCII group names handling has been much improved.  The back
-ends that fully support non-ASCII group names are now `nntp', `nnml',
-and `nnrss'.  Also the agent, the cache, and the marks features work
-with those back ends.  *Note Non-ASCII Group Names::.
+   X-Message-SMTP-Method: smtp smtp.fsf.org 587
 
-** Gnus now displays DNS master files sent as text/dns using dns-mode.
+** Gnus keeps track of non-existent articles for nnimap groups, so
+   that sparse IMAP folders now list a correct number of messages in
+   them.
 
-** Gnus supports new limiting commands in the Summary buffer: `/ r'
-(`gnus-summary-limit-to-replied') and `/ R'
-(`gnus-summary-limit-to-recipient').  *Note Limiting::.
-
-** You can now fetch all ticked articles from the server using `Y t'
-(`gnus-summary-insert-ticked-articles').  *Note Summary Generation
-Commands::.
-
-** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t'
-(`gnus-summary-sort-by-recipient').  *Note Summary Sorting::.
-
-** S/MIME now features LDAP user certificate searches.  You need to
-configure the server in `smime-ldap-host-list'.
-
-** URLs inside OpenPGP headers are retrieved and imported to your PGP key
-ring when you click on them.
-
-** Picons can be displayed right from the textual address, see
-`gnus-picon-style'.  *Note Picons::.
-
-** ANSI SGR control sequences can be transformed using `W A'.
-
-ANSI sequences are used in some Chinese hierarchies for highlighting
-articles (`gnus-article-treat-ansi-sequences').
-
-** Gnus now MIME decodes articles even when they lack "MIME-Version" header.
-This changes the default of `gnus-article-loose-mime'.
-
-** `gnus-decay-scores' can be a regexp matching score files.  For example,
-set it to `\\.ADAPT\\'' and only adaptive score files will be decayed.
- *Note Score Decays::.
-
-** Strings prefixing to the `To' and `Newsgroup' headers in summary lines
-when using `gnus-ignored-from-addresses' can be customized with
-`gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'.  *Note To
-From Newsgroups::.
-
-** You can replace MIME parts with external bodies.  See
-`gnus-mime-replace-part' and `gnus-article-replace-part'.  *Note MIME
-Commands::, *note Using MIME::.
-
-** The option `mm-fill-flowed' can be used to disable treatment of
-format=flowed messages.  Also, flowed text is disabled when sending
-inline PGP signed messages.  *Note Flowed text: (emacs-mime)Flowed text.
-(New in Gnus 5.10.7)
-
-** Now the new command `S W' (`gnus-article-wide-reply-with-original') for
-a wide reply in the article buffer yanks a text that is in the active
-region, if it is set, as well as the `R'
-(`gnus-article-reply-with-original') command.  Note that the `R' command
-in the article buffer no longer accepts a prefix argument, which was
-used to make it do a wide reply.  *Note Article Keymap::.
-
-** The new command `C-h b' (`gnus-article-describe-bindings') used in the
-article buffer now shows not only the article commands but also the real
-summary commands that are accessible from the article buffer.
-
-
-
-* Changes in Message mode
+** Gnus will guess the real type of MIME parts of type
+   application/octet-stream based on the file suffix.  So an
+   application/octet-stream with a name of "rms.jpg" will be displayed
+   as an image/jpeg type by default, for instance.
 
-** Gnus now supports the "hashcash" client puzzle anti-spam mechanism.  Use
-`(setq message-generate-hashcash t)' to enable.  *Note Hashcash::.
-
-** You can now drag and drop attachments to the Message buffer.  See
-`mml-dnd-protocol-alist' and `mml-dnd-attach-options'.  *Note MIME:
-(message)MIME.
-
-** The option `message-yank-empty-prefix' now controls how empty lines are
-prefixed in cited text.  *Note Insertion Variables: (message)Insertion
-Variables.
-
-** Gnus uses narrowing to hide headers in Message buffers.  The
-`References' header is hidden by default.  To make all headers visible,
-use `(setq message-hidden-headers nil)'.  *Note Message Headers:
-(message)Message Headers.
-
-** You can highlight different levels of citations like in the article
-buffer.  See `gnus-message-highlight-citation'.
-
-** `auto-fill-mode' is enabled by default in Message mode.  See
-`message-fill-column'.  *Note Message Headers: (message)Various Message
-Variables.
-
-** You can now store signature files in a special directory named
-`message-signature-directory'.
-
-** The option `message-citation-line-format' controls the format of the
-"Whomever writes:" line.  You need to set
-`message-citation-line-function' to
-`message-insert-formatted-citation-line' as well.
-
-
-* Changes in back ends
-
-** The nntp back end stores article marks in `~/News/marks'.
-
-The directory can be changed using the (customizable) variable
-`nntp-marks-directory', and marks can be disabled using the (back end)
-variable `nntp-marks-is-evil'.  The advantage of this is that you can
-copy `~/News/marks' (using rsync, scp or whatever) to another Gnus
-installation, and it will realize what articles you have read and
-marked.  The data in `~/News/marks' has priority over the same data in
-`~/.newsrc.eld'.
-
-** You can import and export your RSS subscriptions from OPML files.  *Note
-RSS::.
-
-** IMAP identity (RFC 2971) is supported.
-
-By default, Gnus does not send any information about itself, but you can
-customize it using the variable `nnimap-id'.
-
-** The `nnrss' back end now supports multilingual text.  Non-ASCII group
-names for the `nnrss' groups are also supported.  *Note RSS::.
-
-** Retrieving mail with POP3 is supported over SSL/TLS and with StartTLS.
-
-** The nnml back end allows other compression programs beside `gzip' for
-compressed message files.  *Note Mail Spool::.
-
-** The nnml back end supports group compaction.
-
-This feature, accessible via the functions `gnus-group-compact-group'
-(`G z' in the group buffer) and `gnus-server-compact-server' (`z' in the
-server buffer) renumbers all articles in a group, starting from 1 and
-removing gaps.  As a consequence, you get a correct total article count
-(until messages are deleted again).
-
-
-
-* Appearance
-
-** The tool bar has been updated to use GNOME icons.  You can also
-customize the tool bars: `M-x customize-apropos RET -tool-bar$' should
-get you started.  (Only for Emacs, not in XEmacs.)
-
-** The tool bar icons are now (de)activated correctly in the group buffer,
-see the variable `gnus-group-update-tool-bar'.  Its default value
-depends on your Emacs version.
-
-** You can change the location of XEmacs' toolbars in Gnus buffers.  See
-`gnus-use-toolbar' and `message-use-toolbar'.
-
-
-
-* Miscellaneous changes
-
-** Having edited the select-method for the foreign server in the server
-buffer is immediately reflected to the subscription of the groups which
-use the server in question.  For instance, if you change
-`nntp-via-address' into `bar.example.com' from `foo.example.com', Gnus
-will connect to the news host by way of the intermediate host
-`bar.example.com' from next time.
-
-** The `all.SCORE' file can be edited from the group buffer using `W e'.
-
-** You can set `gnus-mark-copied-or-moved-articles-as-expirable' to a
-non-`nil' value so that articles that have been read may be marked as
-expirable automatically when copying or moving them to a group that has
-auto-expire turned on.  The default is `nil' and copying and moving of
-articles behave as before; i.e., the expirable marks will be unchanged
-except that the marks will be removed when copying or moving articles to
-a group that has not turned auto-expire on.  *Note Expiring Mail::.
-
-
-
+** `nnimap-inbox' can now be a list of mail box names.
+   
 * For older news, see Gnus info node "New Features".
 
 ----------------------------------------------------------------------
diff --git a/etc/NEWS b/etc/NEWS
index a2f3b95fe41..ce44a530e26 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -61,9 +61,31 @@ check that this option enables.
 lisp/ directory.  There should not be any there anyway.  If you have
 been adding them there, put them somewhere else, eg site-lisp.
 
+---
+** The `--no-site-lisp' command line option now works for Nextstep builds.
+
 
 * Changes in Emacs 24.2
 
+** Help changes
+
+*** `C-h f' (describe-function) can now perform autoloading.
+When this command is called for an autoloaded function whose docstring
+contains a key substitution construct, that function's library is
+automatically loaded, so that the documentation can be shown
+correctly.  To disable this, set `help-enable-auto-load' to nil.
+
+*** `C-h f' now reports previously-autoloaded functions as "autoloaded",
+even after their associated libraries have been loaded (and the
+autoloads have been redefined as functions).
+
+** The function `current-time' now returns extended-format time stamps
+(HIGH LOW USEC PSEC) that use picosecond resolution; the PSEC
+component is new.  PSEC is typically a multiple of 1000 on current
+machines.  Other functions that use this format, such as
+file-attributes and format-time-string, have been changed accordingly.
+Old-format time stamps are still accepted.
+
 ** New functions `system-users', `system-groups' return lists of the user
 name, group names known to the system (where possible).
 
@@ -91,6 +113,8 @@ treated as images.
 ** Face underlining can now use a wave.
 See the "Face Attributes" section of the Elisp manual.
 
+** New fringe bitmap exclamation-mark.
+
 ** String values for `initial-buffer-choice' also apply to emacsclient
 frames, if emacsclient is only told to open a new frame without
 specifying any file to visit or expression to evaluate.
@@ -116,6 +140,10 @@ invokes `set-buffer-file-coding-system'.
 ** Setting `enable-remote-dir-locals' to non-nil allows directory
 local variables on remote hosts.
 
++++
+** `insert-char' is now a command, and `ucs-insert' an obsolete alias
+for it.
+
 
 * Editing Changes in Emacs 24.2
 
@@ -131,16 +159,30 @@ prompts for a column number.
 ** `mouse-avoidance-banish-position' can now be used to customize
 `mouse-avoidance-mode' further.
 
+** `M-=' is now bound to `count-words', not `count-words-region'.
+
 ** `C-M-f' and `C-M-b' will now move to the path name separator
 character when doing minibuffer filename prompts.
 
 ** `goto-char' is now bound to `M-g c'.
 
+** New command `C-x r M-w' (copy-rectangle-as-kill).
+It copies the region-rectangle as the last rectangle kill.
+
 ** New input method `vietnamese-vni'.
 
 
 * Changes in Specialized Modes and Packages in Emacs 24.2
 
+** Term changes
+
+The variables `term-default-fg-color' and `term-default-bg-color' are
+now deprecated in favor of the `term-face' face, that you can
+customize.  Also, it is now possible to customize how are displayed the
+ANSI terminal colors and styles by customizing the corresponding
+`term-color-<COLOR>', `term-color-underline' and `term-color-bold'
+faces.
+
 ** CL's main entry is now (require 'cl-lib).
 `cl-lib' is like the old `cl' except that it uses the namespace cleanly,
 i.e. all its definitions have the "cl-" prefix.
@@ -153,8 +195,14 @@ which have not been renamed to `cl-foo*' but just `cl-foo'.
 The old `cl' is now deprecated and is nothing more than a bunch of aliases that
 provide the old non-prefixed names.
 
-** A new mode for Python.
-This provides several new features, including:
+** Desktop
+
+*** `desktop-path' no longer includes the "." directory.  Desktop
+files are now located in ~/.emacs.d by default.
+
+** Python mode
+
+A new version of python.el, which provides several new features, including:
 per-buffer shells, better indentation, Python 3 support, and improved
 shell-interaction compatible with iPython (and virtually any other
 text based shell).
@@ -207,11 +255,15 @@ python-send-string        | python-shell-send-string
 python-switch-to-python   | python-shell-switch-to-shell
 python-describe-symbol    | python-eldoc-at-point
 
-** VHDL-mode
-- Support for ghdl (free vhdl compiler).  Now default.
-- Add/update support for VHDL-AMS packages.
-- Update to VHDL'02 standard.
-- Accept \r and \f as whitespace.
+** VHDL mode
+
+*** The free software compiler GHDL is supported (and now the default).
+
+*** Support for the VHDL-AMS packages has been added/updated.
+
+*** Updated to the 2002 revision of the VHDL standard.
+
+*** Accepts \r and \f as whitespace.
 
 ** Diff mode
 
@@ -227,6 +279,10 @@ to highlight changes in context diffs.
 ** Ediff now uses the same color scheme as Diff mode
 on high color displays.
 
+** Flymake uses fringe bitmaps to indicate errors and warnings.
+See flymake-fringe-indicator-position, flymake-error-bitmap and
+flymake-warning-bitmap.
+
 ** `sh-script'
 *** Pairing of parens/quotes uses electric-pair-mode instead of skeleton-pair.
 *** `sh-electric-here-document-mode' now controls auto-insertion of here-docs.
@@ -294,6 +350,12 @@ these commands now).
 ** erc will look up server/channel names via auth-source and use the
 channel keys found, if any.
 
+** Dired
+
+*** `dired-do-async-shell-command' executes each file sequentially
+if the command ends in `;' (when operating on multiple files).
+Otherwise, it executes the command on each file in parallel.
+
 ** FFAP
 
 *** The option `ffap-url-unwrap-remote' can now be a list of strings,
@@ -413,6 +475,12 @@ Only variables defined using `defcustom' are considered user options.
 The function `user-variable-p' is now an obsolete alias for
 `custom-variable-p'.
 
++++
+** The return values of `defalias', `defun' and `defmacro' have changed,
+and are now undefined.  For backwards compatibility, defun and
+defmacro currently return the name of the newly defined function/macro
+but this should not be relied upon.
+
 ** `face-spec-set' no longer sets frame-specific attributes when the
 third argument is a frame (that usage was obsolete since Emacs 22.2).
 
@@ -425,11 +493,20 @@ still be supported for Emacs 24.x.
 
 *** `facemenu-unlisted-faces'
 *** `rmail-decode-mime-charset'
+*** `last-input-char' and `last-command-char'
 
 
 * Lisp changes in Emacs 24.2
 
-** The return value of `defalias' has changed and is now undefined.
+** New functions `autoloadp' and `autoload-do-load'.
+
+** `function-get' fetches the property of a function, following aliases.
+
+** `toggle-read-only' accepts a second argument specifying whether to
+print a message, if called from Lisp.
+
+** CL-style generalized variables are now in core Elisp.
+`setf' is autoloaded and `push' and `pop' accept generalized variables.
 
 ** `defun' also accepts a (declare DECLS) form, like `defmacro'.
 The interpretation of the DECLS is determined by `defun-declarations-alist'.
@@ -459,6 +536,10 @@ table, but with a different prefix.
 must be in the range 1000..9999.  It now works with any year supported
 by the underlying C implementation.
 
+** New function file-name-base.
+
+** New function `tty-top-frame' returns the topmost frame of a text terminal.
+
 ** `automount-dir-prefix' is obsolete.
 ** `buffer-has-markers-at' is obsolete.
 
@@ -473,8 +554,6 @@ is detected.
 Emacs now supports mouse highlight, help-echo (in the echo area), and
 mouse-autoselect-window.
 
-** New function `tty-top-frame' returns the topmost frame of a text terminal.
-
 
 * Installation Changes in Emacs 24.1
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 078352d78f4..58f2bb9bcf2 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -255,6 +255,36 @@ result in an endless loop.
 If you need Emacs to be able to recover from closing displays, compile
 it with the Lucid toolkit instead of GTK.
 
+** Emacs crashes when you try to view a file with complex characters.
+For example, the etc/HELLO file (as shown by C-h h).
+The message "symbol lookup error: /usr/bin/emacs: undefined symbol: OTF_open"
+is shown in the terminal from which you launched Emacs.
+This problem only happens when you use a graphical display (ie not
+with -nw) and compiled Emacs with the "libotf" library for complex
+text handling.
+
+This problem occurs because unfortunately there are two libraries
+called "libotf".  One is the library for handling OpenType fonts,
+http://www.m17n.org/libotf/, which is the one that Emacs expects.
+The other is a library for Open Trace Format, and is used by some
+versions of the MPI message passing interface for parallel
+programming.
+
+For example, on RHEL6 GNU/Linux, the OpenMPI rpm provides a version
+of "libotf.so" in /usr/lib/openmpi/lib.  This directory is not
+normally in the ld search path, but if you want to use OpenMPI,
+you must issue the command "module load openmpi".  This adds
+/usr/lib/openmpi/lib to LD_LIBRARY_PATH.  If you then start Emacs from
+the same shell, you will encounter this crash.
+Ref: <URL:https://bugzilla.redhat.com/show_bug.cgi?id=806031>
+
+There is no good solution to this problem if you need to use both
+OpenMPI and Emacs with libotf support.  The best you can do is use a
+wrapper shell script (or function) "emacs" that removes the offending
+element from LD_LIBRARY_PATH before starting emacs proper.
+Or you could recompile Emacs with an -Wl,-rpath option that
+gives the location of the correct libotf.
+
 * General runtime problems
 
 ** Lisp problems
@@ -1854,8 +1884,8 @@ Emacs uses symbolic links to implement file locks.  In a directory
 with +t bit, the directory owner becomes the owner of the symbolic
 link, so that it cannot be removed by anyone else.
 
-If you don't like those useless links, you can let Emacs not to using
-file lock by adding #undef CLASH_DETECTION to config.h.
+If you don't like those useless links, you can customize
+the option `create-lockfiles'.
 
 *** FreeBSD: Getting a Meta key on the console.
 
diff --git a/etc/TODO b/etc/TODO
index 22c9d7782d8..e4c0092c7e5 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1211,6 +1211,8 @@ systems for HTML/XML files automatically."
    this.]
 
 ** Rewrite make-docfile to be clean and maintainable.
+   It might be better to replace it with Lisp, using the byte compiler.
+   http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00037.html
 
 ** Add an inferior-comint-minor-mode to capture the common set of operations
    offered by major modes that offer an associated inferior
@@ -1230,6 +1232,15 @@ systems for HTML/XML files automatically."
    button classes inherit from it.  Set the default face of the "link" button
    class to the standard "link" face.
 
+* Wishlist items:
+
+** Maybe replace etags.c with a Lisp implementation.
+http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00354.html
+
+** Maybe replace lib-src/rcs2log with a Lisp implementation.
+It wouldn't have to be a complete replacement, just enough
+for vc-rcs-update-changelog.
+
 * Other known bugs:
 
 ** `make-frame' forgets unhandled parameters, at least for X11 frames.
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 80f69c585dc..f2584a2f504 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -70,21 +70,16 @@
 
 # Code:
 
-# Force loading of symbols, enough to give us gdb_valbits etc.
+# Force loading of symbols, enough to give us VALMASK etc.
 set main
 
 # When nonzero, display some extra diagnostics in various commands
 set $yverbose = 1
 set $yfile_buffers_only = 0
 
-set $tagmask = (((long)1 << gdb_gctypebits) - 1)
-# The consing_since_gc business widens the 1 to EMACS_INT,
-# a symbol not directly visible to GDB.
-set $valmask = gdb_use_lsb ? ~($tagmask) : ((consing_since_gc - consing_since_gc + 1) << gdb_valbits) - 1
-
 define ygetptr
   set $ptr = $arg0
-  set $ptr = (gdb_use_union ? $ptr.u.val : $ptr & $valmask) | gdb_data_seg_bits
+  set $ptr = ((CHECK_LISP_OBJECT_TYPE ? $ptr.i : $ptr) & VALMASK) | DATA_SEG_BITS
 end
 
 define ybuffer-list
diff --git a/etc/emacs.py b/etc/emacs.py
deleted file mode 100644
index 24004b321fe..00000000000
--- a/etc/emacs.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""Wrapper for version-specific implementations of python.el helper
-functions """
-
-import sys
-
-if sys.version_info[0] == 3:
-    from emacs3 import *
-else:
-    from emacs2 import *
-
diff --git a/etc/emacs2.py b/etc/emacs2.py
deleted file mode 100644
index ed99a3a1409..00000000000
--- a/etc/emacs2.py
+++ /dev/null
@@ -1,236 +0,0 @@
-"""Definitions used by commands sent to inferior Python in python.el."""
-
-# Copyright (C) 2004-2012  Free Software Foundation, Inc.
-# Author: Dave Love <fx@gnu.org>
-
-# 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/>.
-
-import os, sys, traceback, inspect, __main__
-
-try:
-    set
-except:
-    from sets import Set as set
-
-__all__ = ["eexecfile", "eargs", "complete", "ehelp", "eimport", "modpath"]
-
-def format_exception (filename, should_remove_self):
-    type, value, tb = sys.exc_info ()
-    sys.last_type = type
-    sys.last_value = value
-    sys.last_traceback = tb
-    if type is SyntaxError:
-        try: # parse the error message
-            msg, (dummy_filename, lineno, offset, line) = value
-        except:
-            pass # Not the format we expect; leave it alone
-        else:
-            # Stuff in the right filename
-            value = SyntaxError(msg, (filename, lineno, offset, line))
-            sys.last_value = value
-    res = traceback.format_exception_only (type, value)
-    # There are some compilation errors which do not provide traceback so we
-    # should not massage it.
-    if should_remove_self:
-        tblist = traceback.extract_tb (tb)
-        del tblist[:1]
-        res = traceback.format_list (tblist)
-        if res:
-            res.insert(0, "Traceback (most recent call last):\n")
-        res[len(res):] = traceback.format_exception_only (type, value)
-    # traceback.print_exception(type, value, tb)
-    for line in res: print line,
-
-def eexecfile (file):
-    """Execute FILE and then remove it.
-    Execute the file within the __main__ namespace.
-    If we get an exception, print a traceback with the top frame
-    (ourselves) excluded."""
-    # We cannot use real execfile since it has a bug where the file stays
-    # locked forever (under w32) if SyntaxError occurs.
-    # --- code based on code.py and PyShell.py.
-    try:
-        try:
-            source = open (file, "r").read()
-            code = compile (source, file, "exec")
-        # Other exceptions (shouldn't be any...) will (correctly) fall
-        # through to "final".
-        except (OverflowError, SyntaxError, ValueError):
-            # FIXME: When can compile() raise anything else than
-            # SyntaxError ????
-            format_exception (file, False)
-            return
-        try:
-            exec code in __main__.__dict__
-        except:
-            format_exception (file, True)
-    finally:
-        os.remove (file)
-
-def eargs (name, imports):
-    "Get arglist of NAME for Eldoc &c."
-    try:
-        if imports: exec imports
-        parts = name.split ('.')
-        if len (parts) > 1:
-            exec 'import ' + parts[0] # might fail
-        func = eval (name)
-        if inspect.isbuiltin (func) or type(func) is type:
-            doc = func.__doc__
-            if doc.find (' ->') != -1:
-                print '_emacs_out', doc.split (' ->')[0]
-            else:
-                print '_emacs_out', doc.split ('\n')[0]
-            return
-        if inspect.ismethod (func):
-            func = func.im_func
-        if not inspect.isfunction (func):
-            print '_emacs_out '
-            return
-        (args, varargs, varkw, defaults) = inspect.getargspec (func)
-        # No space between name and arglist for consistency with builtins.
-        print '_emacs_out', \
-            func.__name__ + inspect.formatargspec (args, varargs, varkw,
-                                                   defaults)
-    except:
-        print "_emacs_out "
-
-def all_names (object):
-    """Return (an approximation to) a list of all possible attribute
-    names reachable via the attributes of OBJECT, i.e. roughly the
-    leaves of the dictionary tree under it."""
-
-    def do_object (object, names):
-        if inspect.ismodule (object):
-            do_module (object, names)
-        elif inspect.isclass (object):
-            do_class (object, names)
-        # Might have an object without its class in scope.
-        elif hasattr (object, '__class__'):
-            names.add ('__class__')
-            do_class (object.__class__, names)
-        # Probably not a good idea to try to enumerate arbitrary
-        # dictionaries...
-        return names
-
-    def do_module (module, names):
-        if hasattr (module, '__all__'): # limited export list
-            names.update(module.__all__)
-            for i in module.__all__:
-                do_object (getattr (module, i), names)
-        else:                   # use all names
-            names.update(dir (module))
-            for i in dir (module):
-                do_object (getattr (module, i), names)
-        return names
-
-    def do_class (object, names):
-        ns = dir (object)
-        names.update(ns)
-        if hasattr (object, '__bases__'): # superclasses
-            for i in object.__bases__: do_object (i, names)
-        return names
-
-    return do_object (object, set([]))
-
-def complete (name, imports):
-    """Complete TEXT in NAMESPACE and print a Lisp list of completions.
-    Exec IMPORTS first."""
-    import __main__, keyword
-
-    def class_members(object):
-        names = dir (object)
-        if hasattr (object, '__bases__'):
-            for super in object.__bases__:
-                names = class_members (super)
-        return names    
-
-    names = set([])
-    base = None
-    try:
-        dict = __main__.__dict__.copy()
-        if imports: exec imports in dict
-        l = len (name)
-        if not "." in name:
-            for src in [dir (__builtins__), keyword.kwlist, dict.keys()]:
-                for elt in src:
-                    if elt[:l] == name: names.add(elt)
-        else:
-            base = name[:name.rfind ('.')]
-            name = name[name.rfind('.')+1:]
-            try:
-                object = eval (base, dict)
-                names = set(dir (object))
-                if hasattr (object, '__class__'):
-                    names.add('__class__')
-                    names.update(class_members (object))
-            except: names = all_names (dict)
-    except: 
-        print sys.exc_info()
-        names = []
-        
-    l = len(name)
-    print '_emacs_out (',
-    for n in names:
-        if name == n[:l]:
-            if base: print '"%s.%s"' % (base, n),
-            else: print '"%s"' % n,
-    print ')'
-
-def ehelp (name, imports):
-    """Get help on string NAME.
-    First try to eval name for, e.g. user definitions where we need
-    the object.  Otherwise try the string form."""
-    locls = {}
-    if imports:
-        try: exec imports in locls
-        except: pass
-    try: help (eval (name, globals(), locls))
-    except: help (name)
-
-def eimport (mod, dir):
-    """Import module MOD with directory DIR at the head of the search path.
-    NB doesn't load from DIR if MOD shadows a system module."""
-    from __main__ import __dict__
-
-    path0 = sys.path[0]
-    sys.path[0] = dir
-    try:
-        try:
-            if __dict__.has_key(mod) and inspect.ismodule (__dict__[mod]):
-                reload (__dict__[mod])
-            else:
-                __dict__[mod] = __import__ (mod)
-        except:
-            (type, value, tb) = sys.exc_info ()
-            print "Traceback (most recent call last):"
-            traceback.print_exception (type, value, tb.tb_next)
-    finally:
-        sys.path[0] = path0
-
-def modpath (module):
-    """Return the source file for the given MODULE (or None).
-Assumes that MODULE.py and MODULE.pyc are in the same directory."""
-    try:
-        path = __import__ (module).__file__
-        if path[-4:] == '.pyc' and os.path.exists (path[0:-1]):
-            path = path[:-1]
-        print "_emacs_out", path
-    except:
-        print "_emacs_out ()"
-
-# print '_emacs_ok'             # ready for input and can call continuation
-
diff --git a/etc/emacs3.py b/etc/emacs3.py
deleted file mode 100644
index f0e4659bb6b..00000000000
--- a/etc/emacs3.py
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright (C) 2004-2012  Free Software Foundation, Inc.
-# Author: Dave Love <fx@gnu.org>
-
-# 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/>.
-
-import os, sys, traceback, inspect, imp, __main__
-
-try:
-    set
-except:
-    from sets import Set as set
-
-__all__ = ["eexecfile", "eargs", "complete", "ehelp", "eimport", "modpath"]
-
-def format_exception (filename, should_remove_self):
-    type, value, tb = sys.exc_info ()
-    sys.last_type = type
-    sys.last_value = value
-    sys.last_traceback = tb
-    if type is SyntaxError:
-        try: # parse the error message
-            msg, (dummy_filename, lineno, offset, line) = value
-        except:
-            pass # Not the format we expect; leave it alone
-        else:
-            # Stuff in the right filename
-            value = SyntaxError(msg, (filename, lineno, offset, line))
-            sys.last_value = value
-    res = traceback.format_exception_only (type, value)
-    # There are some compilation errors which do not provide traceback so we
-    # should not massage it.
-    if should_remove_self:
-        tblist = traceback.extract_tb (tb)
-        del tblist[:1]
-        res = traceback.format_list (tblist)
-        if res:
-            res.insert(0, "Traceback (most recent call last):\n")
-        res[len(res):] = traceback.format_exception_only (type, value)
-    # traceback.print_exception(type, value, tb)
-    for line in res: print(line, end=' ')
-
-def eexecfile (file):
-    """Execute FILE and then remove it.
-    Execute the file within the __main__ namespace.
-    If we get an exception, print a traceback with the top frame
-    (ourselves) excluded."""
-    # We cannot use real execfile since it has a bug where the file stays
-    # locked forever (under w32) if SyntaxError occurs.
-    # --- code based on code.py and PyShell.py.
-    try:
-        try:
-            source = open (file, "r").read()
-            code = compile (source, file, "exec")
-        # Other exceptions (shouldn't be any...) will (correctly) fall
-        # through to "final".
-        except (OverflowError, SyntaxError, ValueError):
-            # FIXME: When can compile() raise anything else than
-            # SyntaxError ????
-            format_exception (file, False)
-            return
-        try:
-            exec(code, __main__.__dict__)
-        except:
-            format_exception (file, True)
-    finally:
-        os.remove (file)
-
-def eargs (name, imports):
-    "Get arglist of NAME for Eldoc &c."
-    try:
-        if imports: exec(imports)
-        parts = name.split ('.')
-        if len (parts) > 1:
-            exec('import ' + parts[0]) # might fail
-        func = eval (name)
-        if inspect.isbuiltin (func) or type(func) is type:
-            doc = func.__doc__
-            if doc.find (' ->') != -1:
-                print('_emacs_out', doc.split (' ->')[0])
-            else:
-                print('_emacs_out', doc.split ('\n')[0])
-            return
-        if inspect.ismethod (func):
-            func = func.im_func
-        if not inspect.isfunction (func):
-            print('_emacs_out ')
-            return
-        (args, varargs, varkw, defaults) = inspect.getargspec (func)
-        # No space between name and arglist for consistency with builtins.
-        print('_emacs_out', \
-            func.__name__ + inspect.formatargspec (args, varargs, varkw,
-                                                   defaults))
-    except:
-        print("_emacs_out ")
-
-def all_names (object):
-    """Return (an approximation to) a list of all possible attribute
-    names reachable via the attributes of OBJECT, i.e. roughly the
-    leaves of the dictionary tree under it."""
-
-    def do_object (object, names):
-        if inspect.ismodule (object):
-            do_module (object, names)
-        elif inspect.isclass (object):
-            do_class (object, names)
-        # Might have an object without its class in scope.
-        elif hasattr (object, '__class__'):
-            names.add ('__class__')
-            do_class (object.__class__, names)
-        # Probably not a good idea to try to enumerate arbitrary
-        # dictionaries...
-        return names
-
-    def do_module (module, names):
-        if hasattr (module, '__all__'): # limited export list
-            names.update(module.__all__)
-            for i in module.__all__:
-                do_object (getattr (module, i), names)
-        else:                   # use all names
-            names.update(dir (module))
-            for i in dir (module):
-                do_object (getattr (module, i), names)
-        return names
-
-    def do_class (object, names):
-        ns = dir (object)
-        names.update(ns)
-        if hasattr (object, '__bases__'): # superclasses
-            for i in object.__bases__: do_object (i, names)
-        return names
-
-    return do_object (object, set([]))
-
-def complete (name, imports):
-    """Complete TEXT in NAMESPACE and print a Lisp list of completions.
-    Exec IMPORTS first."""
-    import __main__, keyword
-
-    def class_members(object):
-        names = dir (object)
-        if hasattr (object, '__bases__'):
-            for super in object.__bases__:
-                names = class_members (super)
-        return names    
-
-    names = set([])
-    base = None
-    try:
-        dict = __main__.__dict__.copy()
-        if imports: exec(imports, dict)
-        l = len (name)
-        if not "." in name:
-            for src in [dir (__builtins__), keyword.kwlist, list(dict.keys())]:
-                for elt in src:
-                    if elt[:l] == name: names.add(elt)
-        else:
-            base = name[:name.rfind ('.')]
-            name = name[name.rfind('.')+1:]
-            try:
-                object = eval (base, dict)
-                names = set(dir (object))
-                if hasattr (object, '__class__'):
-                    names.add('__class__')
-                    names.update(class_members (object))
-            except: names = all_names (dict)
-    except: 
-        print(sys.exc_info())
-        names = []
-        
-    l = len(name)
-    print('_emacs_out (', end=' ')
-    for n in names:
-        if name == n[:l]:
-            if base: print('"%s.%s"' % (base, n), end=' ')
-            else: print('"%s"' % n, end=' ')
-    print(')')
-
-def ehelp (name, imports):
-    """Get help on string NAME.
-    First try to eval name for, e.g. user definitions where we need
-    the object.  Otherwise try the string form."""
-    locls = {}
-    if imports:
-        try: exec(imports, locls)
-        except: pass
-    try: help (eval (name, globals(), locls))
-    except: help (name)
-
-def eimport (mod, dir):
-    """Import module MOD with directory DIR at the head of the search path.
-    NB doesn't load from DIR if MOD shadows a system module."""
-    from __main__ import __dict__
-
-    path0 = sys.path[0]
-    sys.path[0] = dir
-    try:
-        try:
-            if mod in __dict__ and inspect.ismodule (__dict__[mod]):
-                imp.reload (__dict__[mod])
-            else:
-                __dict__[mod] = __import__ (mod)
-        except:
-            (type, value, tb) = sys.exc_info ()
-            print("Traceback (most recent call last):")
-            traceback.print_exception (type, value, tb.tb_next)
-    finally:
-        sys.path[0] = path0
-
-def modpath (module):
-    """Return the source file for the given MODULE (or None).
-Assumes that MODULE.py and MODULE.pyc are in the same directory."""
-    try:
-        path = __import__ (module).__file__
-        if path[-4:] == '.pyc' and os.path.exists (path[0:-1]):
-            path = path[:-1]
-        print("_emacs_out", path)
-    except:
-        print("_emacs_out ()")
-
-# print '_emacs_ok'             # ready for input and can call continuation
-
diff --git a/etc/future-bug b/etc/future-bug
index fb6262dfe55..c18dd995d66 100644
--- a/etc/future-bug
+++ b/etc/future-bug
@@ -30,7 +30,7 @@ comments when you write it (sometime in 2198 as I recall).
 
 
 P.S. You'll be pleased to know that since (time-forward N) still works
-     for N >= 0, we've used it to pre-emptively update configure.in.
+     for N >= 0, we've used it to pre-emptively update configure.ac.
      Emacs now configures and builds on every platform that will ever
      be made.  It wasn't easy, but at least that's one problem out of
      the way for good.  If you'd like the patch, just ask.
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index ccd438ad629..b74d1421ee6 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -16,7 +16,7 @@ The characters ">>" at the left margin indicate directions for you to
 try using a command.  For instance:
 <<Blank lines inserted around following line by help-with-tutorial>>
 [Middle of page left blank for didactic purposes.   Text continues below]
->>  Now type C-v (View next screen) to move to the next screen.
+>> Now type C-v (View next screen) to move to the next screen.
         (go ahead, do it by holding down the CONTROL key while typing v).
         From now on, you should do this again whenever you finish
         reading the screen.
@@ -30,7 +30,7 @@ to place in the text.  You already know how to move forward one screen,
 with C-v.  To move backwards one screen, type M-v (hold down the META key
 and type v, or type <ESC>v if you do not have a META, EDIT, or ALT key).
 
->>  Try typing M-v and then C-v, a few times.
+>> Try typing M-v and then C-v, a few times.
 
 
 * SUMMARY
@@ -209,12 +209,12 @@ prefix argument, regardless of its value, makes the command do
 something different.
 
 C-v and M-v are another kind of exception.  When given an argument,
-they scroll the screen up or down by that many lines, rather than by a
-screenful.  For example, C-u 8 C-v scrolls the screen by 8 lines.
+they scroll the text up or down by that many lines, rather than by a
+screenful.  For example, C-u 8 C-v scrolls by 8 lines.
 
 >> Try typing C-u 8 C-v now.
 
-This should have scrolled the screen up by 8 lines.  If you would like
+This should have scrolled the text up by 8 lines.  If you would like
 to scroll it down again, you can give an argument to M-v.
 
 If you are using a graphical display, such as X or MS-Windows, there
@@ -281,8 +281,6 @@ other windows.
 
 >> Type C-x 1 and see the documentation listing window disappear.
 
-This command is unlike the other commands you have learned in that it
-consists of two characters.  It starts with the character CONTROL-x.
 There is a whole series of commands that start with CONTROL-x; many of
 them have to do with windows, files, buffers, and related things.
 These commands are two, three or four characters long.
@@ -337,7 +335,7 @@ Remember that most Emacs commands can be given a repeat count;
 this includes text characters.  Repeating a text character inserts
 it several times.
 
->>  Try that now -- type C-u 8 * to insert ********.
+>> Try that now -- type C-u 8 * to insert ********.
 
 You've now learned the most basic way of typing something in
 Emacs and correcting errors.  You can delete by words or lines
@@ -522,11 +520,8 @@ command
 This copies the text within Emacs into the file.  The first time you
 do this, Emacs renames the original file to a new name so that it is
 not lost.  The new name is made by adding "~" to the end of the
-original file's name.
-
-When saving is finished, Emacs displays the name of the file written.
-You should save fairly often, so that you will not lose very much
-work if the system should crash (see the section "Auto Save" below).
+original file's name.  When saving is finished, Emacs displays the
+name of the file written.
 
 >> Type C-x C-s TUTORIAL <Return>.
    This should save this tutorial to a file named TUTORIAL, and show
@@ -534,11 +529,11 @@ work if the system should crash (see the section "Auto Save" below).
 
 You can find an existing file, to view it or edit it.  You can also
 find a file which does not already exist.  This is the way to create a
-file with Emacs: find the file, which will start out empty, and then
-begin inserting the text for the file.  When you ask to "save" the
-file, Emacs will really create the file with the text that you have
-inserted.  From then on, you can consider yourself to be editing an
-already existing file.
+file with Emacs: find the file, which starts out empty, and then begin
+inserting the text for the file.  When you ask to "save" the file,
+Emacs actually creates the file with the text that you have inserted.
+From then on, you can consider yourself to be editing an already
+existing file.
 
 
 * BUFFERS
@@ -595,8 +590,8 @@ this does not save the first file.  Its changes remain inside Emacs,
 in that file's buffer.  The creation or editing of the second file's
 buffer has no effect on the first file's buffer.  This is very useful,
 but it also means that you need a convenient way to save the first
-file's buffer.  It would be a nuisance to have to switch back to
-it with C-x C-f in order to save it with C-x C-s.  So we have
+file's buffer.  Having to switch back to that buffer, in order to save
+it with C-x C-s, would be a nuisance.  So we have
 
         C-x s     Save some buffers
 
@@ -631,7 +626,7 @@ If you are using a graphical display, you don't need any special
 command to move from Emacs to another application.  You can do this
 with the mouse or with window manager commands.  However, if you're
 using a text terminal which can only show one application at a time,
-you need to "suspend" Emacs to move to any other program.
+you need to "suspend" Emacs to move to any other application.
 
 C-z is the command to exit Emacs *temporarily*--so that you can go
 back to the same Emacs session afterward.  When Emacs is running on a
@@ -640,8 +635,8 @@ but does not destroy the Emacs job.  In the most common shells, you
 can resume Emacs with the `fg' command or with `%emacs'.
 
 The time to use C-x C-c is when you are about to log out.  It's also
-the right thing to use to exit an Emacs invoked under mail handling
-programs and other miscellaneous utilities.
+the right thing to use to exit an Emacs invoked for a quick edit, such
+as by a mail handling utility.
 
 There are many C-x commands.  Here is a list of the ones you have learned:
 
@@ -656,8 +651,8 @@ There are many C-x commands.  Here is a list of the ones you have learned:
 
 Named eXtended commands are commands which are used even less
 frequently, or commands which are used only in certain modes.  An
-example is the command replace-string, which globally replaces one
-string with another.  When you type M-x, Emacs prompts you at the
+example is the command replace-string, which replaces one string with
+another in the buffer.  When you type M-x, Emacs prompts you at the
 bottom of the screen with M-x and you should type the name of the
 command; in this case, "replace-string".  Just type "repl s<TAB>" and
 Emacs will complete the name.  (<TAB> is the Tab key, usually found
@@ -671,9 +666,9 @@ argument with <Return>.
 >> Move the cursor to the blank line two lines below this one.
    Then type M-x repl s<Return>changed<Return>altered<Return>.
 
-   Notice how this line has changed: you've replaced
-   the word c-h-a-n-g-e-d with "altered" wherever it occurred,
-   after the initial position of the cursor.
+   Notice how this line has changed: you've replaced the word
+   "changed" with "altered" wherever it occurred, after the
+   initial position of the cursor.
 
 
 * AUTO SAVE
@@ -762,6 +757,7 @@ differently.
 
 To view documentation on your current major mode, type C-h m.
 
+>> Move the cursor to the line following this line.
 >> Type C-l C-l to bring this line to the top of screen.
 >> Type C-h m, to see how Text mode differs from Fundamental mode.
 >> Type C-x 1 to remove the documentation from the screen.
@@ -893,7 +889,8 @@ display, those cursors are drawn as unblinking hollow boxes.
 
 The command C-M-v is very useful when you are editing text in one
 window and using the other window just for reference.  Without leaving
-the selected window, you can scroll the other window with C-M-v.
+the selected window, you can scroll the text in the other window with
+C-M-v.
 
 C-M-v is an example of a CONTROL-META character.  If you have a META
 (or Alt) key, you can type C-M-v by holding down both CONTROL and META
@@ -1041,8 +1038,8 @@ You need to type in the name of the variable when Emacs prompts for it.
 >> Type C-h a file <Return>.
 
 This displays in another window a list of all M-x commands with "file"
-in their names.  You will see character-commands like C-x C-f listed
-beside the corresponding command names such as find-file.
+in their names.  You will see character-commands listed beside the
+corresponding command names (such as C-x C-f beside find-file).
 
 >> Type C-M-v to scroll the help window.  Do this a few times.
 
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index fe8c223551a..b48f0aa79fb 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -222,13 +222,13 @@ bandera: la presencia de un argumento prefijo, sin tener en cuenta su
 valor, hace que el comando actúe de forma diferente.
 
 C-v y M-v son otro tipo de excepción.  Cuando se les da un argumento,
-desplazan la pantalla arriba o abajo esa cantidad de líneas, en vez de
+desplazan el texto arriba o abajo esa cantidad de líneas, en vez de
 una pantalla completa.  Por ejemplo, C-u 8 C-v desplaza la pantalla 8
 líneas.
 
 >> Pruebe tecleando C-u 8 C-v ahora.
 
-Esto debió haber desplazado la pantalla hacia arriba 8 líneas.  Si
+Esto debería haber desplazado el texto hacia arriba 8 líneas.  Si
 quisiera desplazarla hacia abajo de nuevo, puede dar un argumento a
 M-v.
 
@@ -299,9 +299,7 @@ demás ventanas.
 >> Escriba C-x 1 y vea que la ventana de listado de documentación
    desaparece.
 
-Este comando es diferente a los otros que ha aprendido en que éste
-consiste de dos caracteres.  Comienza con el carácter CONTROL-x.  Hay
-toda una serie de comandos que comienzan con CONTROL-x; muchos de
+Hay toda una serie de comandos que comienzan con CONTROL-x; muchos de
 ellos tienen que ver con ventanas, archivos, buffers y cosas
 relacionadas.  Estos comandos son de una longitud de dos, tres o
 cuatro caracteres.
@@ -554,12 +552,8 @@ comando
 Esto copia el texto dentro de Emacs al archivo.  La primera vez que
 haga esto, Emacs renombrará el archivo original con un nuevo nombre
 para que éste no se pierda.  El nuevo nombre se hace agregando "~" al
-final del nombre del archivo original.
-
-Cuando guardar haya terminado, Emacs mostrará el nombre del archivo
-escrito.  Deberá guardar frecuentemente, para que no pierda mucho
-trabajo si el sistema falla (vea la sección "AUTO GUARDADO", más
-adelante).
+final del nombre del archivo original. Cuando guardar haya terminado,
+Emacs mostrará el nombre del archivo escrito.
 
 >> Teclee C-x C-s TUTORIAL.es <Return>
    Esto guardará el tutorial en un archivo llamado TUTORIAL.es, y
@@ -567,10 +561,10 @@ adelante).
 
 Puede encontrar un archivo existente, para verlo o editarlo.  También
 puede hacerlo con un archivo que no exista.  Ésta es la forma de crear
-un archivo en Emacs: encuentre el archivo, que comenzará vacío, luego
-comience a insertar el texto para ese archivo.  Cuando invoque
+un archivo en Emacs: encuentre el archivo, que está inicialmente vacío,
+luego comience a insertar el texto para ese archivo.  Cuando invoque
 "guardar" el archivo, Emacs creará realmente el archivo con el texto
-que ha insertado.  De ahí en adelante, puede considerarse estar
+que ha insertado.  De ahí en adelante, puede considerar que está
 editando un archivo existente.
 
 
@@ -631,8 +625,8 @@ archivo, esto no guarda el primer archivo.  Sus cambios permanecerán
 dentro de Emacs en ese buffer del archivo.  La creación o edición del
 segundo buffer de archivo no afecta al primero.  Esto es muy útil,
 pero también significa que necesita una forma conveniente para guardar
-el archivo del primer buffer.  Sería una molestia tener que volver a
-éste con C-x C-f para guardarlo con C-x C-s.  Así tenemos
+el archivo del primer buffer.  Tener que volver a él para guardarlo
+con C-x C-s sería una molestia.  Por tanto, tenemos
 
         C-x s   Guardar algunos buffers
 
@@ -667,7 +661,7 @@ Si está utilizando una pantalla gráfica, no necesita ningún comando
 especial para cambiar de Emacs a otra aplicación.  Puede hacerlo con
 el ratón, o mediante el gestor de ventanas.  Sin embargo, si está
 usando una terminal que solo puede mostrar una aplicación a la vez,
-tendrá que "suspender" Emacs para poder acceder a otros programas.
+tendrá que "suspender" Emacs para poder acceder a otras aplicaciones.
 
 C-z es el comando para salir de Emacs *temporalmente*: para que pueda
 regresar a la misma sesión de Emacs después.  Cuando Emacs está
@@ -677,8 +671,9 @@ intérpretes de comandos más comunes, puede reanudar Emacs con el
 comando `fg' o con `%emacs'.
 
 El momento para usar C-x C-c es cuando está listo para salir del
-sistema.  Es además el paso correcto para salir de un Emacs llamado
-bajo programas de gestión de correo y otras utilidades diversas.
+sistema.  Es además el paso correcto para salir de un Emacs invocado
+para editar algo rápidamente, como por ejemplo desde un programa de
+gestión de correo.
 
 Existen muchos comandos C-x.  He aquí la lista de los que ya ha
 aprendido:
@@ -694,14 +689,14 @@ aprendido:
 
 Los comandos eXtendidos por nombre son comandos que se utilizan aún
 con menos frecuencia, o únicamente en ciertos modos.  Un ejemplo es el
-comando replace-string, el cual substituye globalmente una cadena de
-caracteres por otra.  Cuando teclea M-x, Emacs le pregunta al final de
-la pantalla con M-x y debe escribir el nombre del comando; en este
-caso "replace-string".  Solo teclee "repl s<TAB>" y Emacs completará
-el nombre.  (<TAB> es la tecla del tabulador, que habitualmenté está
-situada sobre la tecla de bloquear mayúsculas o la de shift, en el
-lado izquierdo del teclado.)  Para aceptar el comando y ejecutarlo,
-pulse <Return>.
+comando replace-string, el cual substituye una cadena de caracteres
+por otra en todo el buffer.  Cuando teclea M-x, Emacs le pregunta al
+final de la pantalla con M-x y debe escribir el nombre del comando; en
+este caso "replace-string".  Solo teclee "repl s<TAB>" y Emacs
+completará el nombre.  (<TAB> es la tecla del tabulador, que
+habitualmenté está situada sobre la tecla de bloquear mayúsculas o la
+de shift, en el lado izquierdo del teclado.)  Para aceptar el comando
+y ejecutarlo, pulse <Return>.
 
 El comando replace-string requiere dos argumentos: la cadena de
 caracteres a reemplazar, y la cadena de caracteres para reemplazarla.
@@ -711,8 +706,8 @@ Debe terminar cada argumento con <Return>.
    A continuación escriba
    M-x repl s<Return>cambiado<Return>alterado<Return>.
 
-   Note cómo esta línea ha cambiado: ha substituido la palabra
-   c-a-m-b-i-a-d-o por "alterado" en cada ocurrencia, después de la
+   Note cómo ha cambiado la línea: ha substituido la palabra
+   "cambiado" por "alterado" en cada ocurrencia, después de la
    posición inicial del cursor.
 
 
@@ -804,7 +799,9 @@ pero funcionan de forma un poco diferente.
 
 Para ver la documentación del modo mayor actual, teclee C-h m.
 
->> Use C-l C-l para traer esta línea en la parte superior de la
+>> Mueva el cursor a la línea siguiente a la actual.
+
+>> Use C-l C-l para traer esta línea a la parte superior de la
    pantalla.
 
 >> Teclee C-h m, para ver como el modo de Texto difiere del modo
@@ -1102,9 +1099,9 @@ pregunte por ella.
 >> Teclee C-h a file <Return>.
 
 Esto muestra en otra ventana una lista de todos los comandos M-x con
-la palabra "file" en sus nombres.  Verá comandos de caracteres como
-C-x C-f listados además de los nombres de los comandos
-correspondientes tales como find-file.
+la palabra "file" en sus nombres.  Verá los comandos de caracteres
+listados junto a los nombres de los comandos correspondientes (por
+ejemplo, C-x C-f junto a find-file).
 
 >> Teclee C-M-v para desplazar la ventana de ayuda.  Haga esto unas
    cuantas veces.
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 89ec7c16f8b..7b829ccee73 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -18,10 +18,10 @@ tapez C-g. Dans ce didacticiel, les caractères ">>" en marge gauche
 indiquent les directions à suivre pour essayer une commande. Ainsi :
 <<Lignes blanches insérées après cette ligne par help-with-tutorial>>
 [Centre de page delibérément vide. Le texte continue ci-dessous.]
->>  Tapez C-v (Voir l'écran suivant) pour passer à l'écran suivant
-    (faites-le, pressez la touche CTRL tout en pressant la touche v).
-    À partir de maintenant, vous devrez le faire à chaque fois que
-    vous avez fini de lire l'écran.
+>> Tapez C-v (Voir l'écran suivant) pour passer à l'écran suivant
+     (faites-le, pressez la touche CTRL tout en pressant la touche v).
+     À partir de maintenant, vous devrez le faire à chaque fois que
+     vous avez fini de lire l'écran.
 
 Vous remarquerez qu'il y a un recouvrement de deux lignes lorsque l'on
 passe d'un écran à un autre : cela permet une certaine continuité dans
@@ -33,7 +33,7 @@ C-v. Pour revenir un écran en arrière, tapez M-v (pressez la touche
 META tout en appuyant sur v ou faites <ESC>v si vous n'avez pas de
 touche META, EDIT ou ALT).
 
->>  Faites M-v, puis C-v plusieurs fois.
+>> Faites M-v, puis C-v plusieurs fois.
 
 
 * RÉSUMÉ
@@ -228,13 +228,13 @@ d'un paramètre préfixe, quelle que soit sa valeur, force la commande à
 agir différemment.
 
 C-v et M-v constituent un autre type d'exception. Lorsqu'on leur donne
-un paramètre, elles font défiler l'écran vers le haut ou vers le bas
+un paramètre, elles font défiler le texte vers le haut ou vers le bas
 du nombre de lignes indiqué au lieu de passer d'un écran complet à
-l'autre. C-u 8 C-v, par exemple, fait défiler l'écran de 8 lignes.
+l'autre. C-u 8 C-v, par exemple, fait défiler le texte de 8 lignes.
 
 >> Faites C-u 8 C-v.
 
-Cela a dû déplacer l'écran de 8 lignes vers le haut. Si vous voulez
+Cela a dû déplacer le texte de 8 lignes vers le haut. Si vous voulez
 redescendre de 8 lignes, il suffit de passer ce nombre comme paramètre
 de M-v.
 
@@ -307,11 +307,10 @@ supprime toutes les autres fenêtres.
 
 >> Faites C-x 1 et la fenêtre de documentation disparaît.
 
-Cette commande est différente de celles que nous avons déjà vues car
-elle est formée de deux caractères. Elle commence par le caractère
-CONTROLE-x, comme le font de nombreuses commandes de manipulation de
-fenêtres, fichiers, tampons et autres entités associées. Ces commandes
-font deux, trois ou quatre caractères.
+Il y a toute une série de commandes qui commencent par CONTROL-x;
+nombre d'entre elles ont à voir avec la manipulation de fenêtres, 
+fichiers, tampons et autres entités associées. Ces commandes font 
+deux, trois ou quatre caractères de long.
 
 
 * INSERTION ET SUPPRESSION
@@ -370,7 +369,7 @@ Rappelez-vous que la plupart des commandes Emacs peuvent utiliser un
 nombre de répétitions ; les caractères de texte font de même. La
 répétition d'un caractère de texte l'insère plusieurs fois.
 
->>  Faites C-u 8 * pour insérer ********.
+>> Faites C-u 8 * pour insérer ********.
 
 Vous connaissez maintenant la méthode la plus simple pour taper du
 texte dans Emacs et pour corriger les erreurs. Vous pouvez également
@@ -572,11 +571,8 @@ deviennent permanentes, faites :
 Cette commande copie dans le fichier le texte qui est dans Emacs. La
 première fois, Emacs renomme le fichier original afin qu'il ne soit
 pas perdu. Le nom de cette sauvegarde est construit en ajoutant « ~ »
-à la fin du nom initial.
-
-Lorsque la sauvegarde est finie, Emacs affiche le nom du fichier
-écrit. Sauvegardez à intervalles réguliers afin de perdre le moins
-possible de travail au cas où votre système se planterait.
+à la fin du nom initial. Lorsque la sauvegarde est finie, Emacs
+affiche le nom du fichier écrit. 
 
 >> Faites C-x C-s pour sauvegarder votre copie du didacticiel.
    Cela devrait écrire "Wrote ...TUTORIAL.fr" en bas de l'écran.
@@ -694,7 +690,7 @@ commande spéciale pour vous déplacer d'Emacs à une autre application.
 Vous pouvez le faire à l'aide de la souris ou avec les commandes du
 gestionnaire de fenêtres.  Cependant, si vous utilisez un terminal
 texte ne pouvant afficher qu'une application à la fois, vous devez
-« suspendre » Emacs pour passer à n'importe quel autre programme.
+« suspendre » Emacs pour passer à n'importe quelle autre application.
 
 C-z est la commande permettant de quitter *temporairement* Emacs --
 afin de pouvoir revenir à la même session plus tard. Sur les systèmes
@@ -704,7 +700,8 @@ vous pouvez revenir à Emacs en faisant la commande 'fg' ou '%emacs'.
 
 Le moment idéal pour utiliser C-x C-c est lorsque l'on se
 déconnecte. C'est aussi la commande adaptée pour sortir d'un Emacs
-invoqué par un programme de courrier ou tout autre utilitaire.
+invoqué pour une modification rapide, par exemple par un programme de
+courrier ou tout autre utilitaire.
 
 Il existe de nombreuses commandes C-x. Voici une liste de celles que
 vous avez apprises :
@@ -719,7 +716,7 @@ vous avez apprises :
 Les eXtensions de commandes nommées sont des commandes utilisées
 encore moins souvent, ou des commandes qui ne servent que dans
 certains modes. Un exemple est la commande replace-string, qui
-remplace globalement une chaîne par une autre. Lorsque vous faites
+remplace une chaîne par une autre dans un tampon. Lorsque vous faites
 M-x, Emacs affiche M-x en bas de l'écran et vous demande de taper le
 nom de la commande, « replace-string » ici. Contentez-vous de faire
 «repl s<TAB> » et Emacs complétera le nom (<TAB> représente la touche
@@ -735,7 +732,7 @@ paramètre par <Entrée>.
    Puis, faites M-x repl s<Entrée>changée<Entrée>modifiée<Entrée>.
 
    Notez comment cette ligne a été changée : vous avez remplacé le mot
-   c-h-a-n-g-é-e par « modifiée » à chaque fois qu'il apparaissait après
+   « changée » par « modifiée » à chaque fois qu'il apparaissait après
    la position initiale du curseur.
 
 
@@ -949,7 +946,7 @@ manuel d'Emacs contient un Glossaire des termes d'Emacs.)
    fenêtres. Toutes les deux affichent ce didacticiel et le curseur
    reste dans celle du haut.
 
->> Faites C-M-v pour faire défiler la fenêtre du bas
+>> Faites C-M-v pour faire défiler le texte de la fenêtre du bas
    (Si vous n'avez pas de touche Meta, faites <ESC> C-v).
 
 >> Tapez C-x o (« o » pour « other ») afin de placer le curseur dans
@@ -1123,9 +1120,9 @@ Voici d'autres options utiles de C-h :
 >> Faites C-h a file<Entrée>.
 
 Cela affiche dans une autre fenêtre une liste de toutes les commandes
-M-x ayant « file » dans leurs noms. Vous verrez des commandes
-caractères, comme C-x C-f, apparaître à côté des noms de commandes qui
-leur correspondent, comme find-file.
+M-x ayant « file » dans leurs noms. Vous verrez listée des commandes
+caractères à côté des noms de commandes qui leur correspondent (comme 
+C-x C-f à côté de find-file).
 
 >> Faites C-M-v pour faire défiler la fenêtre d'aide. Faites-le
    plusieurs fois.
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index cb82f87f765..e0c85a379a9 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1,4 +1,4 @@
-שיעור ר�שון בשימוש ב־Emacs. זכויות שימוש ר�ה בסוף המסמך.
+שיעור ר�שון בשימוש ב־‫Emacs‬. זכויות שימוש ר�ה בסוף המסמך.
 
 פקודות רבות של Emacs משתמשות במקש CONTROL (לפעמי� הו� מסומן ב־CTRL �ו CTL)
 �ו במקש META (לפעמי� מסומן EDIT �ו ALT). במקו� לציין �ת כל השמות ה�פשריי�