Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

11 files changed, 66 insertions, 19 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index adf61e833b3..9dc3af97788 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-03  Glenn Morris  <rgm@gnu.org>
+
+        * programs.texi (Misc for Programs): Fix typo.
+
 2014-10-30  Eli Zaretskii  <eliz@gnu.org>
 
         * frames.texi (Scroll Bars): Improve indexing of faces.
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 4c80449c2a2..f2ca386b49e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1453,7 +1453,7 @@ creates.
 @findex superword-mode
  Superword mode is a buffer-local minor mode that causes editing and
 motion commands to treat symbols (e.g., @samp{this_is_a_symbol}) as words.
-When Subword mode is enabled, the minor mode indicator
+When Superword mode is enabled, the minor mode indicator
 @iftex
 @samp{@math{^2}}
 @end iftex
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 8c039a55a2f..3d580ee36c4 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -38,7 +38,10 @@ don't take "&rest args" any more.
 *** cc-compat.el
 
 ---
-*** crisp.el, tpu-edt.el, ws-mode.el
+*** crisp.el - moved to elpa.gnu.org.
+
+---
+*** tpu-edt.el, ws-mode.el
 These emulations of old editors are believed to be no longer relevant
  - contact emacs-devel@gnu.org if you disagree.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94725c0b56..05c8ce4d83a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a
+        local copy of FILENAME, when it is remote.  (Bug#18751)
+
+        * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
+        an error when the command fails; the return code must indicate.
+        (tramp-adb-send-command-and-check): Fix docstring.
+
 2014-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/eww.el (eww-display-html): Clear `url-queue'.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 88e52fe0199..639f07b2f1d 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -794,11 +794,13 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
       ;; directory.
       (condition-case nil
           (progn
-            (setq ret 0)
-            (tramp-adb-barf-unless-okay
-             v (format "(cd %s; %s)"
-                       (tramp-shell-quote-argument localname) command)
-             "")
+            (setq ret
+                  (if (tramp-adb-send-command-and-check
+                       v
+                       (format "(cd %s; %s)"
+                               (tramp-shell-quote-argument localname) command))
+                      ;; Set return status accordingly.
+                      0 1))
             ;; We should add the output anyway.
             (when outbuf
               (with-current-buffer outbuf
@@ -1031,8 +1033,9 @@ This happens for Android >= 4.0."
 (defun tramp-adb-send-command-and-check
   (vec command)
   "Run COMMAND and check its exit status.
-Sends `echo $?' along with the COMMAND for checking the exit status.  If
-COMMAND is nil, just sends `echo $?'.  Returns the exit status found."
+Sends `echo $?' along with the COMMAND for checking the exit
+status.  If COMMAND is nil, just sends `echo $?'.  Returns nil if
+the exit status is not equal 0, and t otherwise."
   (tramp-adb-send-command
    vec (if command
            (format "%s; echo tramp_exit_status $?" command)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e120aedfc01..a72a79a7797 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2061,11 +2061,15 @@ FILENAME is the source file, NEWNAME the target file.
 KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
   (with-temp-buffer
     ;; We must disable multibyte, because binary data shall not be
-    ;; converted.
+    ;; converted.  `insert-file-contents-literally' does not support
+    ;; file name handlers for GNU Emacs; we must create a local copy
+    ;; therefore.
     (set-buffer-multibyte nil)
     (let ((coding-system-for-read 'binary)
-          (jka-compr-inhibit t))
-      (insert-file-contents-literally filename))
+          (jka-compr-inhibit t)
+          (tmpfile (file-local-copy filename)))
+      (insert-file-contents-literally (or tmpfile filename))
+      (when tmpfile (delete-file tmpfile)))
     ;; We don't want the target file to be compressed, so we let-bind
     ;; `jka-compr-inhibit' to t.
     (let ((coding-system-for-write 'binary)
diff --git a/lisp/obsolete/crisp.el b/lisp/obsolete/crisp.el
index 47cf898190b..b9c2fc63a52 100644
--- a/lisp/obsolete/crisp.el
+++ b/lisp/obsolete/crisp.el
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; *Note: This package has now moved to elpa.gnu.org.*
+
 ;; Keybindings and minor functions to duplicate the functionality and
 ;; finger-feel of the CRiSP/Brief editor.  This package is designed to
 ;; facilitate transitioning from Brief to (XE|E)macs with a minimum
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f719681afb..6b62a60f7b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
+        (Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI
+        frame; instead, print an error message.
+
+2014-11-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
+
 2014-11-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsimage.m (allocInitFromFile:): Initialize bmRep.
diff --git a/src/nsfns.m b/src/nsfns.m
index ce859e8333d..1537adbc56d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -639,8 +639,12 @@ ns_set_doc_edited (void)
     {
       BOOL edited = NO;
       struct frame *f = XFRAME (frame);
-      struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
-      NSView *view = FRAME_NS_VIEW (f);
+      struct window *w;
+      NSView *view;
+
+      if (! FRAME_NS_P (f)) continue;
+      w = XWINDOW (FRAME_SELECTED_WINDOW (f));
+      view = FRAME_NS_VIEW (f);
       if (!MINI_WINDOW_P (w))
         edited = ! NILP (Fbuffer_modified_p (w->contents)) &&
           ! NILP (Fbuffer_file_name (w->contents));
diff --git a/src/window.c b/src/window.c
index 0b0f2140a58..2c9292d5b02 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4930,8 +4930,8 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
       /* The function move_iterator_vertically may move over more than
          the specified y-distance.  If it->w is small, e.g. a
          mini-buffer window, we may end up in front of the window's
-         display area.  This is the case when Start displaying at the
-         start of the line containing PT in this case.  */
+         display area.  Start displaying at the start of the line
+         containing PT in this case.  */
       if (it.current_y <= 0)
         {
           init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
diff --git a/src/xdisp.c b/src/xdisp.c
index 228b6cb586d..2cdbade3062 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18803,7 +18803,10 @@ DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
        doc: /* Dump the current matrix of the selected window to stderr.
 Shows contents of glyph row structures.  With non-nil
 parameter GLYPHS, dump glyphs as well.  If GLYPHS is 1 show
-glyphs in short form, otherwise show glyphs in long form.  */)
+glyphs in short form, otherwise show glyphs in long form.
+
+Interactively, no argument means show glyphs in short form;
+with numeric argument, its value is passed as the GLYPHS flag.  */)
   (Lisp_Object glyphs)
 {
   struct window *w = XWINDOW (selected_window);
@@ -18821,11 +18824,16 @@ glyphs in short form, otherwise show glyphs in long form.  */)
 
 
 DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
-       Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */)
+       Sdump_frame_glyph_matrix, 0, 0, "", doc: /* Dump the current glyph matrix of the selected frame to stderr.
+Only text-mode frames have frame glyph matrices.  */)
   (void)
 {
   struct frame *f = XFRAME (selected_frame);
-  dump_glyph_matrix (f->current_matrix, 1);
+
+  if (f->current_matrix)
+    dump_glyph_matrix (f->current_matrix, 1);
+  else
+    fprintf (stderr, "*** This frame doesn't have a frame glyph matrix ***\n");
   return Qnil;
 }