Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

8 files changed, 115 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 94f4444d38c..c845568ddcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,42 @@
+2014-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * indent.c (Fvertical_motion): Doc fix.
+        Move to the goal column, if any, with a single call to
+        move_it_in_display_line, not in two calls.  Doing this with two
+        calls causes move_it_in_display_line apply the line-prefix
+        handling twice instead of just once.  (Bug#17823)
+
+2014-06-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to OS X ACLs (Bug#17810).
+        * fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
+        ACL_TYPE_ACCESS) doesn't work.
+
+2014-06-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (read_key_sequence): Don't invoke Vprefix_help_command
+        before checking key-translation-map (bug#17659).
+
+2014-06-21  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (font_make_object): Avoid dangling pointer which may
+        crash GC (Bug#17771).
+
+2014-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
+        prototype of DGifCloseFile as appropriate for older and newer
+        versions of giflib.
+        (gif_close): New function, encapsulates the differences in the
+        calling sequence of DGifCloseFile before v5.1.0 and after it.
+        (gif_load): Call gif_close instead of DGifCloseFile.  Divulge the
+        error string where appropriate.  (Bug#17790)
+
+        * xdisp.c (Fmove_point_visually): Instead of testing for keyboard
+        macro execution, make sure point didn't move since last complete
+        redisplay, as the condition for using the glyph matrix
+        information.  (Bug#17777)
+
 2014-06-19  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Minor cleanup of fonset code.
diff --git a/src/dispextern.h b/src/dispextern.h
index e710f8e35d7..5396aeb6c8e 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2591,7 +2591,8 @@ struct it
   int vpos;
 
   /* Horizontal matrix position reached in move_it_in_display_line.
-     Only set there, not in display_line.  */
+     Only set there, not in display_line, and only when the X
+     coordinate is past first_visible_x.  */
   int hpos;
 
   /* Left fringe bitmap number (enum fringe_bitmap_type).  */
diff --git a/src/fileio.c b/src/fileio.c
index 6fe11303ded..c7736661207 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3013,6 +3013,9 @@ was unable to determine the ACL entries.  */)
   acl_t acl;
   Lisp_Object acl_string;
   char *str;
+# ifndef HAVE_ACL_TYPE_EXTENDED
+  acl_type_t ACL_TYPE_EXTENDED = ACL_TYPE_ACCESS;
+# endif
 #endif
 
   absname = expand_and_dir_to_file (filename,
@@ -3027,7 +3030,7 @@ was unable to determine the ACL entries.  */)
 #ifdef HAVE_ACL_SET_FILE
   absname = ENCODE_FILE (absname);
 
-  acl = acl_get_file (SSDATA (absname), ACL_TYPE_ACCESS);
+  acl = acl_get_file (SSDATA (absname), ACL_TYPE_EXTENDED);
   if (acl == NULL)
     return Qnil;
 
diff --git a/src/font.c b/src/font.c
index 9e472fb3e3b..251d43ba8b2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -207,6 +207,9 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
     = (struct font *) allocate_pseudovector (size, FONT_OBJECT_MAX, PVEC_FONT);
   int i;
 
+  /* GC can happen before the driver is set up,
+     so avoid dangling pointer here (Bug#17771).  */
+  font->driver = NULL;
   XSETFONT (font_object, font);
 
   if (! NILP (entity))
diff --git a/src/image.c b/src/image.c
index 3220a45a282..f8c2402bfc4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7250,7 +7250,11 @@ gif_image_p (Lisp_Object object)
 #ifdef WINDOWSNT
 
 /* GIF library details.  */
+#if 5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)
+DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *, int *));
+#else
 DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *));
+#endif
 DEF_IMGLIB_FN (int, DGifSlurp, (GifFileType *));
 #if GIFLIB_MAJOR < 5
 DEF_IMGLIB_FN (GifFileType *, DGifOpen, (void *, InputFunc));
@@ -7320,6 +7324,22 @@ gif_read_from_memory (GifFileType *file, GifByteType *buf, int len)
   return len;
 }
 
+static int
+gif_close (GifFileType *gif, int *err)
+{
+  int retval;
+
+#if 5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)
+  retval = fn_DGifCloseFile (gif, err);
+#else
+  retval = fn_DGifCloseFile (gif);
+#if GIFLIB_MAJOR >= 5
+  if (err)
+    *err = gif->Error;
+#endif
+#endif
+  return retval;
+}
 
 /* Load GIF image IMG for use on frame F.  Value is true if
    successful.  */
@@ -7344,9 +7364,7 @@ gif_load (struct frame *f, struct image *img)
   Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL);
   unsigned long bgcolor = 0;
   EMACS_INT idx;
-#if GIFLIB_MAJOR >= 5
   int gif_err;
-#endif
 
   if (NILP (specified_data))
     {
@@ -7414,7 +7432,7 @@ gif_load (struct frame *f, struct image *img)
   if (!check_image_size (f, gif->SWidth, gif->SHeight))
     {
       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
-      fn_DGifCloseFile (gif);
+      gif_close (gif, NULL);
       return 0;
     }
 
@@ -7423,7 +7441,7 @@ gif_load (struct frame *f, struct image *img)
   if (rc == GIF_ERROR || gif->ImageCount <= 0)
     {
       image_error ("Error reading `%s'", img->spec, Qnil);
-      fn_DGifCloseFile (gif);
+      gif_close (gif, NULL);
       return 0;
     }
 
@@ -7435,7 +7453,7 @@ gif_load (struct frame *f, struct image *img)
       {
         image_error ("Invalid image number `%s' in image `%s'",
                      image_number, img->spec);
-        fn_DGifCloseFile (gif);
+        gif_close (gif, NULL);
         return 0;
       }
   }
@@ -7453,7 +7471,7 @@ gif_load (struct frame *f, struct image *img)
   if (!check_image_size (f, width, height))
     {
       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
-      fn_DGifCloseFile (gif);
+      gif_close (gif, NULL);
       return 0;
     }
 
@@ -7471,7 +7489,7 @@ gif_load (struct frame *f, struct image *img)
              && 0 <= subimg_left && subimg_left <= width - subimg_width))
         {
           image_error ("Subimage does not fit in image", Qnil, Qnil);
-          fn_DGifCloseFile (gif);
+          gif_close (gif, NULL);
           return 0;
         }
     }
@@ -7479,7 +7497,7 @@ gif_load (struct frame *f, struct image *img)
   /* Create the X image and pixmap.  */
   if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0))
     {
-      fn_DGifCloseFile (gif);
+      gif_close (gif, NULL);
       return 0;
     }
 
@@ -7650,7 +7668,18 @@ gif_load (struct frame *f, struct image *img)
                             Fcons (make_number (gif->ImageCount),
                                    img->lisp_data));
 
-  fn_DGifCloseFile (gif);
+  if (gif_close (gif, &gif_err) == GIF_ERROR)
+    {
+#if 5 <= GIFLIB_MAJOR
+      char *error_text = fn_GifErrorString (gif_err);
+
+      if (error_text)
+        image_error ("Error closing `%s': %s",
+                     img->spec, build_string (error_text));
+#else
+      image_error ("Error closing `%s'", img->spec, Qnil);
+#endif
+    }
 
   /* Maybe fill in the background field while we have ximg handy. */
   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
diff --git a/src/indent.c b/src/indent.c
index dc862518924..711792f75cd 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1944,9 +1944,12 @@ The optional second argument WINDOW specifies the window to use for
 parameters such as width, horizontal scrolling, and so on.
 The default is to use the selected window's parameters.
 
-LINES can optionally take the form (COLS . LINES), in which case
-the motion will not stop at the start of a screen line but on
-its column COLS (if such exists on that line, that is).
+LINES can optionally take the form (COLS . LINES), in which case the
+motion will not stop at the start of a screen line but COLS column
+from the visual start of the line (if such exists on that line, that
+is).  If the line is scrolled horizontally, COLS is interpreted
+visually, i.e., as addition to the columns of text beyond the left
+edge of the window.
 
 `vertical-motion' always uses the current buffer,
 regardless of which buffer is displayed in WINDOW.
@@ -2126,20 +2129,14 @@ whether or not it is currently displayed in some window.  */)
             }
         }
 
-      /* Move to the goal column, if one was specified.  */
+      /* Move to the goal column, if one was specified.  If the window
+         was originally hscrolled, the goal column is interpreted as
+         an addition to the hscroll amount.  */
       if (!NILP (lcols))
         {
-          /* If the window was originally hscrolled, move forward by
-             the hscrolled amount first.  */
-          if (first_x > 0)
-            {
-              move_it_in_display_line (&it, ZV, first_x, MOVE_TO_X);
-              it.current_x = 0;
-            }
-          move_it_in_display_line
-            (&it, ZV,
-             (int)(cols * FRAME_COLUMN_WIDTH (XFRAME (w->frame)) + 0.5),
-             MOVE_TO_X);
+          int to_x = (int)(cols * FRAME_COLUMN_WIDTH (XFRAME (w->frame)) + 0.5);
+
+          move_it_in_display_line (&it, ZV, first_x + to_x, MOVE_TO_X);
         }
 
       SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
diff --git a/src/keyboard.c b/src/keyboard.c
index 3e5e405d66e..1da300b77cc 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2181,7 +2181,7 @@ show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
 
 
 
-/* Input of single characters from keyboard */
+/* Input of single characters from keyboard.  */
 
 static Lisp_Object kbd_buffer_get_event (KBOARD **kbp, bool *used_mouse_menu,
                                          struct timespec *end_time);
@@ -9382,16 +9382,6 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
           first_unbound = min (t, first_unbound);
 
           head = EVENT_HEAD (key);
-          if (help_char_p (head) && t > 0)
-            {
-              read_key_sequence_cmd = Vprefix_help_command;
-              keybuf[t++] = key;
-              last_nonmenu_event = key;
-              /* The Microsoft C compiler can't handle the goto that
-                 would go here.  */
-              dummyflag = 1;
-              break;
-            }
 
           if (SYMBOLP (head))
             {
@@ -9649,6 +9639,17 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
 
           goto replay_sequence;
         }
+
+      if (NILP (current_binding)
+          && help_char_p (EVENT_HEAD (key)) && t > 1)
+            {
+              read_key_sequence_cmd = Vprefix_help_command;
+              /* The Microsoft C compiler can't handle the goto that
+                 would go here.  */
+              dummyflag = 1;
+              break;
+            }
+
       /* If KEY is not defined in any of the keymaps,
          and cannot be part of a function key or translation,
          and is a shifted function key,
diff --git a/src/xdisp.c b/src/xdisp.c
index 70e4d1b5e59..8711487780c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15790,7 +15790,7 @@ set_vertical_scroll_bar (struct window *w)
       redisplay itself, when it decides that the previous window start
       point is fine and should be kept.  Search for "goto force_start"
       below to see the details.  Like the values of window-start
-      specified outside of redisply, these internally deduced values
+      specified outside of redisplay, these internally-deduced values
       are tested for feasibility, and ignored if found to be
       unfeasible.
 
@@ -20741,12 +20741,15 @@ Value is the new character position of point.  */)
      recorded in the glyphs, at least as long as the goal is on the
      screen.  */
   if (w->window_end_valid
-      && NILP (Vexecuting_kbd_macro)
       && !windows_or_buffers_changed
       && b
       && !b->clip_changed
       && !b->prevent_redisplay_optimizations_p
       && !window_outdated (w)
+      /* We rely below on the cursor coordinates to be up to date, but
+         we cannot trust them if some command moved point since the
+         last complete redisplay.  */
+      && w->last_point == BUF_PT (b)
       && w->cursor.vpos >= 0
       && w->cursor.vpos < w->current_matrix->nrows
       && (row = MATRIX_ROW (w->current_matrix, w->cursor.vpos))->enabled_p)