rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer

Browse Source 
- resolves: #1104012
This commit is contained in:
Jan Chaloupka 2014-08-05 10:46:49 +02:00
parent 81d89b946e
commit fd77835c53
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
emacs-24.3-macro.patch Normal file
View File

@ -0,0 +1,25 @@
From e2261aa685bf67a1596546e7aa05d922d049cb0d Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Tue, 29 Jul 2014 12:30:07 +0200
Subject: [PATCH] kbd_macro_ptr and kbd_macro_end of current_kboard initialized to kbd_macro_buffer
---
src/macros.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/macros.c b/src/macros.c
index 1eef9b6..e707784 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -65,6 +65,8 @@ macro before appending to it. */)
{
current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
current_kboard->kbd_macro_bufsize = 30;
+ current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
+ current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
}
update_mode_lines++;
if (NILP (append))
--
1.9.3

9
emacs.spec
View File

@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.3
Release: 22%{?dist}
Release: 23%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@ -41,6 +41,8 @@ Patch19: emacs-CVE-2014-3422.patch
Patch20: emacs-CVE-2014-3423.patch
Patch21: emacs-CVE-2014-3424.patch
Patch22: emacs-compiled-timestamps.patch
# BZ1104012, initialize kbd_macro_ptr and kbd_macro_end
Patch23: emacs-24.3-macro.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@ -190,6 +192,7 @@ packages that add functionality to Emacs.
%patch20 -p1 -b .CVE-2014-3423.patch
%patch21 -p1 -b .CVE-2014-3424.patch
%patch22 -p1 -b .compiled-timestamps
%patch23 -p1
# We prefer our emacs.desktop file
cp %SOURCE1 etc/emacs.desktop
@ -472,6 +475,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
* Tue Aug 05 2014 jchaloup <jchaloup@redhat.com> - 1:24.3-23
- resolves: #1104012
initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer
* Mon Aug 04 2014 Petr Hracek <phracek@redhat.com> - 1:24.3-22
- remove /usr/bin/emacs-nox from install section