[Emacs-diffs] trunk r118276: Merge from emacs-24; up to r117663

[Glenn Morris]

------------------------------------------------------------
revno: 118276 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-03 16:49:37 -0500
message:
  Merge from emacs-24; up to r117663
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/programs.texi        
programs.texi-20091113204419-o5vbwnq5f7feedwu-6272
  etc/NEWS.24                    news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-adb.el          trampadb.el-20121204164216-03wyr5miam215d7f-1
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
  lisp/obsolete/crisp.el         crisp.el-20091113204419-o5vbwnq5f7feedwu-1097
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-10-30 05:15:28 +0000
+++ b/doc/emacs/ChangeLog       2014-11-03 21:49:37 +0000
@@ -1,3 +1,7 @@
+2014-11-03  Glenn Morris  <address@hidden>
+
+       * programs.texi (Misc for Programs): Fix typo.
+
 2014-10-30  Eli Zaretskii  <address@hidden>
 
        * frames.texi (Scroll Bars): Improve indexing of faces.

=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi   2014-08-07 11:49:36 +0000
+++ b/doc/emacs/programs.texi   2014-11-03 21:49:37 +0000
@@ -1453,7 +1453,7 @@
 @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
 @address@hidden
 @end iftex

=== modified file 'etc/NEWS.24'
--- a/etc/NEWS.24       2014-10-30 05:15:28 +0000
+++ b/etc/NEWS.24       2014-11-03 21:49:37 +0000
@@ -38,7 +38,10 @@
 *** 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 address@hidden if you disagree.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-03 21:27:24 +0000
+++ b/lisp/ChangeLog    2014-11-03 21:49:37 +0000
@@ -1,3 +1,12 @@
+2014-11-03  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/eww.el (eww-display-html): Clear `url-queue'.

=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el     2014-11-01 18:05:30 +0000
+++ b/lisp/net/tramp-adb.el     2014-11-03 21:49:37 +0000
@@ -794,11 +794,13 @@
       ;; 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 @@
 (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)

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-11-01 18:05:30 +0000
+++ b/lisp/net/tramp-sh.el      2014-11-03 21:49:37 +0000
@@ -2061,11 +2061,15 @@
 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)

=== modified file 'lisp/obsolete/crisp.el'
--- a/lisp/obsolete/crisp.el    2014-10-30 05:15:28 +0000
+++ b/lisp/obsolete/crisp.el    2014-11-03 21:49:37 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-02 18:45:50 +0000
+++ b/src/ChangeLog     2014-11-03 21:49:37 +0000
@@ -1,3 +1,13 @@
+2014-11-03  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
+
 2014-11-02  Jan Djärv  <address@hidden>
 
        * nsimage.m (allocInitFromFile:): Initialize bmRep.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2014-11-01 18:05:30 +0000
+++ b/src/nsfns.m       2014-11-03 21:49:37 +0000
@@ -639,8 +639,12 @@
     {
       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));

=== modified file 'src/window.c'
--- a/src/window.c      2014-10-04 08:20:24 +0000
+++ b/src/window.c      2014-11-03 21:49:37 +0000
@@ -4930,8 +4930,8 @@
       /* 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);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-11-01 18:05:30 +0000
+++ b/src/xdisp.c       2014-11-03 21:49:37 +0000
@@ -18803,7 +18803,10 @@
        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 @@
 
 
 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;
 }