From 2da85d11132e636a88d9d10de08d0539a399655c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 1 Aug 2012 17:25:15 +0000
Subject: [PATCH] Update to emacs-23.4.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10487 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml | 10 ++++++++++
 postlfs/editors/emacs.xml          | 23 ++++++-----------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/general.ent b/general.ent
index 9eca02adef..b86d8f1a06 100644
--- a/general.ent
+++ b/general.ent
@@ -196,7 +196,7 @@ $Date$
 <!-- Chapter 6 -->
 <!ENTITY bluefish-version             "2.2.3">
 <!ENTITY ed-version                   "1.6">
-<!ENTITY emacs-version                "23.4">
+<!ENTITY emacs-version                "24.1">
 <!ENTITY joe-version                  "3.7">
 <!ENTITY nano-version                 "2.3.1">
 <!ENTITY vim-version                  "7.3">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 92192906cb..1f9db5af9e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,16 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>August 1st, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to emacs-23.4.  Fixes
+          <ulink url="&blfs-ticket-root;3409">#3409</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 31st, 2012</para>
       <itemizedlist>
diff --git a/postlfs/editors/emacs.xml b/postlfs/editors/emacs.xml
index db70fe1b59..93cc0a62ef 100644
--- a/postlfs/editors/emacs.xml
+++ b/postlfs/editors/emacs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY emacs-download-http "http://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
   <!ENTITY emacs-download-ftp  "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
-  <!ENTITY emacs-md5sum        "34405165fcd978fbc8b304cbd99ccf4f">
-  <!ENTITY emacs-size          "46 MB">
-  <!ENTITY emacs-buildsize     "342 MB">
-  <!ENTITY emacs-time          "3.8 SBU">
+  <!ENTITY emacs-md5sum        "8ba0932c498bc8fb10d7ddba52227e5b">
+  <!ENTITY emacs-size          "40 MB">
+  <!ENTITY emacs-buildsize     "374 MB">
+  <!ENTITY emacs-time          "4.9 SBU">
 ]>
 
 <sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
@@ -32,7 +32,7 @@
     <para>The <application>Emacs</application> package contains an extensible,
     customizable, self-documenting real-time display editor.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -112,7 +112,7 @@ chown -v -R root:root /usr/share/emacs/&emacs-version;</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog,
+        <seg>ctags, ebrowse, emacs, emacsclient, etags, grep-changelog,
         and rcs-checkin</seg>
         <seg>None</seg>
         <seg>/usr/lib/emacs, /usr/share/emacs and /var/games/emacs</seg>
@@ -124,17 +124,6 @@ chown -v -R root:root /usr/share/emacs/&emacs-version;</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="b2m">
-        <term><command>b2m</command></term>
-        <listitem>
-          <para>is a program to convert mail files from RMAIL
-          format to Unix <quote>mbox</quote> format.</para>
-          <indexterm zone="emacs b2m">
-            <primary sortas="b-b2m">b2m</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ctags">
         <term><command>ctags</command></term>
         <listitem>