rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=65
This commit is contained in:
Dr. Werner Fink 2011-11-28 08:48:41 +00:00 committed by Git OBS Bridge
parent 358fda74d2
commit b60834dd10
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emacs-23.3.dif
View File

@ -348,6 +348,16 @@
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/pop.c
+++ lib-src/pop.c 2011-11-28 08:38:56.235647209 +0000
@@ -29,6 +29,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
#include <sys/types.h>
+#include <ctype.h>
#ifdef WINDOWSNT
#include "ntlib.h"
#include <winsock.h>
--- lib-src/vcdiff
+++ lib-src/vcdiff 2009-08-12 13:22:18.000000000 +0000
@@ -76,6 +76,8 @@ esac
@ -1231,3 +1241,13 @@
/* Best not to include -lg, unless it is last on the command line */
#define LIBS_DEBUG
#undef LIB_GCC
--- src/sysdep.c
+++ src/sysdep.c 2011-11-28 08:46:29.903146518 +0000
@@ -131,6 +131,7 @@ extern int quit_char;
#include "dispextern.h"
#include "process.h"
#include "cm.h" /* for reset_sys_modes */
+extern void tputs P_ ((const char *, int, int (*)(int)));
/* For serial_configure and serial_open. */
extern Lisp_Object QCport, QCspeed, QCprocess;

5
emacs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 28 08:36:10 UTC 2011 - werner@suse.de
- Resolve build conflicts
-------------------------------------------------------------------
Thu Nov 24 14:01:22 UTC 2011 - werner@suse.de

5
emacs.spec
View File

@ -2847,7 +2847,6 @@ done
%{_datadir}/emacs/site-lisp/vt200-esc-fix.elc
%{_datadir}/emacs/site-lisp/xfonts.elc
%doc %{_mandir}/man1/*.1.gz
%{_datadir}/pixmaps/emacs.png
%dir /var/games/emacs/
/var/games/emacs/snake-scores
/var/games/emacs/tetris-scores
@ -2858,7 +2857,6 @@ done
%files -n emacs-x11
%defattr(-, root, root)
%{_bindir}/emacs
%{_bindir}/emacs-x11
%{_bindir}/emacs-gtk
%{appDefaultsFile}
@ -3036,7 +3034,6 @@ done
%{_datadir}/emacs/%{version}/lisp/cedet/ede/files.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/ede/generic.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/ede/linux.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/ede/loaddefs.el
%{_datadir}/emacs/%{version}/lisp/cedet/ede/locate.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/ede/make.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/ede/makefile-edit.el.gz
@ -3115,7 +3112,6 @@ done
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/java.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/lex-spp.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/lex.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/loaddefs.el
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/mru-bookmark.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/sb.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/semantic/scope.el.gz
@ -3160,7 +3156,6 @@ done
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/getset.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/insert.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/java.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/loaddefs.el
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/map.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/mode.el.gz
%{_datadir}/emacs/%{version}/lisp/cedet/srecode/semantic.el.gz