Wed Nov 30 04:29:10 2011 UTC ()
Update emacs-snapshot to 24.0.91.20111128.

Changes:
        * whitespace.el (whitespace-newline): Use a different foreground
        color for 16-color light-background displays.

        * server.el (server-eval-and-print): Allow C-g (bug#6585).

        * xdisp.c (redisplay_window): If cursor row is not fully visible
        after recentering, and scroll-conservatively is set to a large
        number, scroll window by a few more lines to make the cursor fully
        visible and out of scroll-margin.  (Bug#10105)
        (start_display): Don't move to the next line if the display should
        start at a newline that is part of a display vector or an overlay
        string.  (Bug#10119)


(minskim)
diff -r1.39 -r1.40 pkgsrc/editors/emacs-snapshot/Makefile.common
diff -r1.43 -r1.44 pkgsrc/editors/emacs-snapshot/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/emacs-snapshot/patches/patch-aa
diff -r0 -r1.1 pkgsrc/editors/emacs-snapshot/patches/patch-lib-src_emacsclient.c
cvs diff -r1.39 -r1.40 pkgsrc/editors/emacs-snapshot/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/Attic/Makefile.common 2011/11/23 02:02:15 1.39
+++ pkgsrc/editors/emacs-snapshot/Attic/Makefile.common 2011/11/30 04:29:09 1.40
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.common,v 1.39 2011/11/23 02:02:15 minskim Exp $ 1# $NetBSD: Makefile.common,v 1.40 2011/11/30 04:29:09 minskim Exp $
2 2
3DISTNAME= emacs-snapshot_20111121.orig 3DISTNAME= emacs-snapshot_20111128.orig
4PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//} 4PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= http://emacs.naquadah.org/unstable/ 6MASTER_SITES= http://emacs.naquadah.org/unstable/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 10HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
11COMMENT= GNU editing macros (development version) 11COMMENT= GNU editing macros (development version)
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15SETGIDGAME= yes 15SETGIDGAME= yes
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
cvs diff -r1.43 -r1.44 pkgsrc/editors/emacs-snapshot/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/distinfo 2011/11/23 02:02:15 1.43
+++ pkgsrc/editors/emacs-snapshot/distinfo 2011/11/30 04:29:09 1.44
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.43 2011/11/23 02:02:15 minskim Exp $ 1$NetBSD: distinfo,v 1.44 2011/11/30 04:29:09 minskim Exp $
2 2
3SHA1 (emacs-snapshot_20111121.orig.tar.xz) = 01f3898f18a257ff1505ac698f02c9d4f097b0d5 3SHA1 (emacs-snapshot_20111128.orig.tar.xz) = 3dfef9d7bab6472e77ad2bb727f4e2b38a41cfca
4RMD160 (emacs-snapshot_20111121.orig.tar.xz) = 0b67ff0c959c68371d26de8f8fb2a22259ef2187 4RMD160 (emacs-snapshot_20111128.orig.tar.xz) = b0d462a2de32346f50c7a317ac59aaceefad3cc5
5Size (emacs-snapshot_20111121.orig.tar.xz) = 23297296 bytes 5Size (emacs-snapshot_20111128.orig.tar.xz) = 23300368 bytes
6SHA1 (patch-aa) = 052ea84f7e3b35d1aba08bd641d7250ec07d09aa 6SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545
7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3 7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae 8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed 10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
 11SHA1 (patch-lib-src_emacsclient.c) = 4cdfecb23cb3475c5100f818dcbd9e7aeb863e2d
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa 2011/03/01 04:12:45 1.2
+++ pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa 2011/11/30 04:29:10 1.3
@@ -1,30 +1,19 @@ @@ -1,30 +1,19 @@
1$NetBSD: patch-aa,v 1.2 2011/03/01 04:12:45 minskim Exp $ 1$NetBSD: patch-aa,v 1.3 2011/11/30 04:29:10 minskim Exp $
2 2
3--- configure.in.orig 2010-06-02 16:53:45.000000000 +0000 3--- configure.in.orig 2011-11-28 09:24:08.000000000 +0000
4+++ configure.in 4+++ configure.in
5@@ -403,6 +403,14 @@ case "${canonical}" in 5@@ -438,6 +438,14 @@ case "${canonical}" in
6 sparc64-*) machine=sparc ;; 6 sparc64-*) machine=sparc ;;
7 esac 7 esac
8 ;; 8 ;;
9+ ## DragonFly ports 9+ ## DragonFly ports
10+ *-*-dragonfly*) 10+ *-*-dragonfly*)
11+ opsys=dragonfly 11+ opsys=dragonfly
12+ case "${canonical}" in 12+ case "${canonical}" in
13+ i[3456]86-*-dragonfly*) machine=intel386 ;; 13+ i[3456]86-*-dragonfly*) machine=intel386 ;;
14+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 14+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
15+ esac 15+ esac
16+ ;; 16+ ;;
17  17
18 ## FreeBSD kernel + glibc based userland 18 ## FreeBSD kernel + glibc based userland
19 *-*-kfreebsd*gnu* ) 19 *-*-kfreebsd*gnu* )
20@@ -1527,9 +1535,9 @@ if test "${HAVE_NS}" = yes; then 
21 window_system=nextstep 
22 with_xft=no 
23 # set up packaging dirs 
24+ if test "${EN_NS_SELF_CONTAINED}" = yes; then 
25 exec_prefix=${ns_appbindir} 
26 libexecdir=${ns_appbindir}/libexec 
27- if test "${EN_NS_SELF_CONTAINED}" = yes; then 
28 prefix=${ns_appresdir} 
29 fi 
30 ns_frag=$srcdir/src/ns.mk 
File Added: pkgsrc/editors/emacs-snapshot/patches/Attic/patch-lib-src_emacsclient.c
$NetBSD: patch-lib-src_emacsclient.c,v 1.1 2011/11/30 04:29:10 minskim Exp $

--- lib-src/emacsclient.c.orig	2011-11-28 09:24:08.000000000 +0000
+++ lib-src/emacsclient.c
@@ -1635,6 +1635,7 @@ main (int argc, char **argv)
   /* Send over our environment and current directory. */
   if (!current_frame)
     {
+      extern char **environ;
       int i;
       for (i = 0; environ[i]; i++)
         {