Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

3 files changed, 8 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5976265ef85..a3098114388 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * fringe.c (update_window_fringes): Remove unused variables.
+
+        * unexmacosx.c (copy_data_segment): Also copy __got section.
+        (Bug#8223)
+
 2011-03-12  Eli Zaretskii  <eliz@gnu.org>
 
         * termcap.c [MSDOS]: Include "msdos.h.
diff --git a/src/fringe.c b/src/fringe.c
index 82fc38aee8a..ce75df766ee 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -954,18 +954,10 @@ update_window_fringes (struct window *w, int keep_current_p)
            y < yb && rn < nrows;
            y += row->height, ++rn)
         {
-          unsigned indicate_bob_p, indicate_top_line_p;
-          unsigned indicate_eob_p, indicate_bottom_line_p;
-
           row = w->desired_matrix->rows + rn;
           if (!row->enabled_p)
             row = w->current_matrix->rows + rn;
 
-          indicate_bob_p = row->indicate_bob_p;
-          indicate_top_line_p = row->indicate_top_line_p;
-          indicate_eob_p = row->indicate_eob_p;
-          indicate_bottom_line_p = row->indicate_bottom_line_p;
-
           row->indicate_bob_p = row->indicate_top_line_p = 0;
           row->indicate_eob_p = row->indicate_bottom_line_p = 0;
 
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 7a55498085d..2e46c063e95 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -828,6 +828,7 @@ copy_data_segment (struct load_command *lc)
         }
       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
                || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
+               || strncmp (sectp->sectname, "__got", 16) == 0
                || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
                || strncmp (sectp->sectname, "__dyld", 16) == 0
                || strncmp (sectp->sectname, "__const", 16) == 0