rpms/emacs/F-13 emacs-23.2-hideshow-comment.patch, NONE, 1.1 emacs.spec, 1.162, 1.163
Karel Klíč
kklic at fedoraproject.org
Thu May 27 17:39:12 UTC 2010
- Previous message: rpms/glite-security-trustmanager/devel README.Fedora, NONE, 1.1 glite-security-trustmanager-log4j.properties, NONE, 1.1 glite-security-trustmanager.spec, NONE, 1.1 import.log, NONE, 1.1 trustmanager-use-vomsjapi.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/glite-security-trustmanager/devel glite-security-trustmanager.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kklic
Update of /cvs/pkgs/rpms/emacs/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28832
Modified Files:
emacs.spec
Added Files:
emacs-23.2-hideshow-comment.patch
Log Message:
Add patch to fix rhbz#595546
emacs-23.2-hideshow-comment.patch:
hideshow.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE emacs-23.2-hideshow-comment.patch ---
--- lisp/progmodes/hideshow.el.orig 2010-05-12 18:28:06.543936429 +0200
+++ lisp/progmodes/hideshow.el 2010-05-12 18:27:40.212936751 +0200
@@ -691,9 +691,11 @@ Return point, or nil if original point w
;; look backward for the start of a block that contains the cursor
(while (and (re-search-backward hs-block-start-regexp nil t)
(not (setq done
- (< here (save-excursion
- (hs-forward-sexp (match-data t) 1)
- (point)))))))
+ (and (< here
+ (save-excursion
+ (hs-forward-sexp (match-data t) 1)
+ (point)))
+ (eq (hs-inside-comment-p) nil))))))
(if done
(point)
(goto-char here)
Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-13/emacs.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- emacs.spec 20 May 2010 14:02:57 -0000 1.162
+++ emacs.spec 27 May 2010 17:39:11 -0000 1.163
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -32,6 +32,9 @@ Patch3: rpm-spec-mode-utc.patch
Patch4: emacs-23.1-xdg.patch
# Accepted by upstream.
Patch5: emacs-23.2-m17ncheck.patch
+# Fix rhbz#595546
+# Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
+Patch6: emacs-23.2-hideshow-comment.patch
BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -138,6 +141,7 @@ Emacs packages or see some elisp example
%patch0 -p1 -b .glibc-open-macro
%patch4 -p1 -b .xdg
%patch5 -p1 -b .m17ncheck
+%patch6 -p0 -b .hideshow-comment
# Install site-lisp files
cp %SOURCE7 %SOURCE9 %SOURCE10 %SOURCE14 site-lisp
@@ -405,6 +409,10 @@ alternatives --install %{_bindir}/etags
%dir %{_datadir}/emacs/%{version}
%changelog
+* Thu May 27 2010 Karel Klíč <karel at agata> - 1:23.2-3
+- Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis
+ under certain circumstances
+
* Wed May 19 2010 Naveen Kumar <nkumar at redhat.com> - 1:23.2-2
- Added a desktop file for adding terminal mode to menu (RHBZ #551949)
- Previous message: rpms/glite-security-trustmanager/devel README.Fedora, NONE, 1.1 glite-security-trustmanager-log4j.properties, NONE, 1.1 glite-security-trustmanager.spec, NONE, 1.1 import.log, NONE, 1.1 trustmanager-use-vomsjapi.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/glite-security-trustmanager/devel glite-security-trustmanager.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list