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)

4 files changed, 23 insertions, 21 deletions

diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index 0a32bc40298..093ba080e89 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.39 2011/11/23 02:02:15 minskim Exp $
+# $NetBSD: Makefile.common,v 1.40 2011/11/30 04:29:09 minskim Exp $
 
-DISTNAME=	emacs-snapshot_20111121.orig
+DISTNAME=	emacs-snapshot_20111128.orig
 PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=	editors
 MASTER_SITES=	http://emacs.naquadah.org/unstable/
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index 7f7f038fe48..82289c5668a 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.43 2011/11/23 02:02:15 minskim Exp $
+$NetBSD: distinfo,v 1.44 2011/11/30 04:29:09 minskim Exp $
 
-SHA1 (emacs-snapshot_20111121.orig.tar.xz) = 01f3898f18a257ff1505ac698f02c9d4f097b0d5
-RMD160 (emacs-snapshot_20111121.orig.tar.xz) = 0b67ff0c959c68371d26de8f8fb2a22259ef2187
-Size (emacs-snapshot_20111121.orig.tar.xz) = 23297296 bytes
-SHA1 (patch-aa) = 052ea84f7e3b35d1aba08bd641d7250ec07d09aa
+SHA1 (emacs-snapshot_20111128.orig.tar.xz) = 3dfef9d7bab6472e77ad2bb727f4e2b38a41cfca
+RMD160 (emacs-snapshot_20111128.orig.tar.xz) = b0d462a2de32346f50c7a317ac59aaceefad3cc5
+Size (emacs-snapshot_20111128.orig.tar.xz) = 23300368 bytes
+SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545
 SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
 SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
 SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
 SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
+SHA1 (patch-lib-src_emacsclient.c) = 4cdfecb23cb3475c5100f818dcbd9e7aeb863e2d
diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa
index a7165f7b2f0..ed35fddcb4a 100644
--- a/editors/emacs-snapshot/patches/patch-aa
+++ b/editors/emacs-snapshot/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2011/03/01 04:12:45 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/30 04:29:10 minskim Exp $
 
---- configure.in.orig	2010-06-02 16:53:45.000000000 +0000
+--- configure.in.orig	2011-11-28 09:24:08.000000000 +0000
 +++ configure.in
-@@ -403,6 +403,14 @@ case "${canonical}" in
+@@ -438,6 +438,14 @@ case "${canonical}" in
        sparc64-*)        machine=sparc ;;
      esac
    ;;
@@ -17,14 +17,3 @@ $NetBSD: patch-aa,v 1.2 2011/03/01 04:12:45 minskim Exp $
  
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
-@@ -1527,9 +1535,9 @@ if test "${HAVE_NS}" = yes; then
-   window_system=nextstep
-   with_xft=no
-   # set up packaging dirs
-+  if test "${EN_NS_SELF_CONTAINED}" = yes; then
-   exec_prefix=${ns_appbindir}
-   libexecdir=${ns_appbindir}/libexec
--  if test "${EN_NS_SELF_CONTAINED}" = yes; then
-      prefix=${ns_appresdir}
-   fi
-   ns_frag=$srcdir/src/ns.mk
diff --git a/editors/emacs-snapshot/patches/patch-lib-src_emacsclient.c b/editors/emacs-snapshot/patches/patch-lib-src_emacsclient.c
new file mode 100644
index 00000000000..6202b323c9a
--- /dev/null
+++ b/editors/emacs-snapshot/patches/patch-lib-src_emacsclient.c
@@ -0,0 +1,12 @@
+$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++)
+         {