Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

3 files changed, 58 insertions, 6 deletions

diff --git a/src/image.c b/src/image.c
index d408cd1d71f..3ba3d572b05 100644
--- a/src/image.c
+++ b/src/image.c
@@ -10208,7 +10208,7 @@ DEF_DLL_FN (void, rsvg_handle_set_dpi_x_y,
             (RsvgHandle * handle, double dpi_x, double dpi_y));
 
 #  if LIBRSVG_CHECK_VERSION (2, 52, 1)
-DEF_DLL_FN (void, rsvg_handle_get_intrinsic_size_in_pixels,
+DEF_DLL_FN (gboolean, rsvg_handle_get_intrinsic_size_in_pixels,
             (RsvgHandle *, gdouble *, gdouble *));
 #  endif
 #  if LIBRSVG_CHECK_VERSION (2, 46, 0)
diff --git a/src/nsfns.m b/src/nsfns.m
index c2791aa15a9..81019fce09d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2362,6 +2362,47 @@ ns_get_string_resource (void *_rdb, const char *name, const char *class)
    ========================================================================== */
 
 
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+/* Moving files to the system recycle bin.
+   Used by `move-file-to-trash' instead of the default moving to ~/.Trash  */
+DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash,
+       Ssystem_move_file_to_trash, 1, 1, 0,
+       doc: /* Move file or directory named FILENAME to the recycle bin.  */)
+  (Lisp_Object filename)
+{
+  Lisp_Object handler;
+  Lisp_Object operation;
+
+  operation = Qdelete_file;
+  if (!NILP (Ffile_directory_p (filename))
+      && NILP (Ffile_symlink_p (filename)))
+    {
+      operation = intern ("delete-directory");
+      filename = Fdirectory_file_name (filename);
+    }
+
+  /* Must have fully qualified file names for moving files to Trash. */
+  filename = Fexpand_file_name (filename, Qnil);
+
+  handler = Ffind_file_name_handler (filename, operation);
+  if (!NILP (handler))
+    return call2 (handler, operation, filename);
+  else
+    {
+      NSFileManager *fm = [NSFileManager defaultManager];
+      BOOL result = NO;
+      NSURL *fileURL = [NSURL fileURLWithPath:[NSString stringWithLispString:filename]
+                                  isDirectory:!NILP (Ffile_directory_p (filename))];
+      if ([fm respondsToSelector:@selector(trashItemAtURL:resultingItemURL:error:)])
+        result = [fm trashItemAtURL:fileURL resultingItemURL:nil error:nil];
+
+      if (!result)
+        report_file_error ("Removing old name", list1 (filename));
+    }
+  return Qnil;
+}
+#endif
+
 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
        doc: /* SKIP: real doc in xfns.c.  */)
      (Lisp_Object color, Lisp_Object frame)
@@ -3243,6 +3284,10 @@ Default is t.  */);
   defsubr (&Sx_show_tip);
   defsubr (&Sx_hide_tip);
 
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+  defsubr (&Ssystem_move_file_to_trash);
+#endif
+
   as_status = 0;
   as_script = Qnil;
   staticpro (&as_script);
diff --git a/src/xdisp.c b/src/xdisp.c
index 0e1e29eafe0..080c9063cd7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5822,8 +5822,15 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
           if (CONSP (XCDR (XCDR (spec))))
             {
               Lisp_Object face_name = XCAR (XCDR (XCDR (spec)));
-              int face_id2 = lookup_derived_face (it->w, it->f, face_name,
-                                                  FRINGE_FACE_ID, false);
+              int face_id2;
+              /* Don't allow quitting from lookup_derived_face, for when
+                 we are displaying a non-selected window, and the buffer's
+                 point was temporarily moved to the window-point.  */
+              ptrdiff_t count1 = SPECPDL_INDEX ();
+              specbind (Qinhibit_quit, Qt);
+              face_id2 = lookup_derived_face (it->w, it->f, face_name,
+                                              FRINGE_FACE_ID, false);
+              unbind_to (count1, Qnil);
               if (face_id2 >= 0)
                 face_id = face_id2;
             }
@@ -17699,9 +17706,9 @@ cursor_row_fully_visible_p (struct window *w, bool force_p,
 
 enum
 {
-  SCROLLING_SUCCESS,
-  SCROLLING_FAILED,
-  SCROLLING_NEED_LARGER_MATRICES
+  SCROLLING_SUCCESS = 1,
+  SCROLLING_FAILED = 0,
+  SCROLLING_NEED_LARGER_MATRICES = -1
 };
 
 /* If scroll-conservatively is more than this, never recenter.