ulm 15/06/09 18:47:53 Modified: protobuf-2.5.0-emacs-24.4.patch Log: Fix build failure with Emacs 24.5, bug 545486. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.2 dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch?r1=1.1&r2=1.2 Index: protobuf-2.5.0-emacs-24.4.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- protobuf-2.5.0-emacs-24.4.patch 28 Nov 2014 16:53:11 -0000 1.1 +++ protobuf-2.5.0-emacs-24.4.patch 9 Jun 2015 18:47:53 -0000 1.2 @@ -4,14 +4,11 @@ --- protobuf-2.5.0/editors/protobuf-mode.el +++ protobuf-2.5.0/editors/protobuf-mode.el -@@ -66,6 +66,10 @@ +@@ -66,6 +66,7 @@ (require 'cc-mode) - + (eval-when-compile -+ (and (= emacs-major-version 24) -+ (= emacs-minor-version 4) -+ (null emacs-repository-version) -+ (require 'cl)) ++ (require 'cl) (require 'cc-langs) (require 'cc-fonts)) - +
