[Emacs-diffs] master 93a4953 1/6: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 93a49534630ba2f828f55d4ddd6fc0374f589c3c
Merge: 7da1e9c 42c8768
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    42c8768 Fix .gdbinit following lisp.h changes
    720322a ; Spelling fixes
    617c556 * lisp/simple.el (shell-command): Doc fixes.
    1faade8 Fix marker adjustment for undo (Bug#29118)
---
 ChangeLog.3                  |  4 ++--
 lisp/progmodes/perl-mode.el  |  2 +-
 lisp/progmodes/ruby-mode.el  |  2 +-
 lisp/simple.el               | 20 ++++++++++----------
 src/.gdbinit                 | 24 ++++++++++++------------
 test/lisp/net/tramp-tests.el |  4 ++--
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 940379c..e7831a3 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -6941,7 +6941,7 @@
        * test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug26084):
        Add comments to explain the test logic.
        Pass '--binary' option to 'patch' program in windows environments.
-       Check explicitely that a backup is created before compare file contents.
+       Check explicitly that a backup is created before compare file contents.
 
        * test/lisp/dired-tests.el (dired-test-bug25609):
        Declare variable 'dired-dwim-target' right before the test.
@@ -13221,7 +13221,7 @@
        Remove Emacs 23 compat code from Tramp
 
        * doc/misc/tramp.texi (Remote processes): Don't mention
-       Emacs 24 explicitely.
+       Emacs 24 explicitly.
        (Frequently Asked Questions): Remove Emacs 23 from
        compatibility list.
 
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 8e7cd13..f3cb810 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -597,7 +597,7 @@ the Perl source to be checked as its standard input."
   "Perl backend for Flymake.  Launches
 `perl-flymake-command' (which see) and passes to its standard
 input the contents of the current buffer.  The output of this
-command is analysed for error and warning messages."
+command is analyzed for error and warning messages."
   (unless (executable-find (car perl-flymake-command))
     (error "Cannot find a suitable checker"))
 
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 1f4aa6d..da08bb0 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2268,7 +2268,7 @@ the Ruby source to be checked as its standard input."
   "Ruby backend for Flymake.  Launches
 `ruby-flymake-command' (which see) and passes to its standard
 input the contents of the current buffer. The output of this
-command is analysed for error and warning messages."
+command is analyzed for error and warning messages."
   (unless (executable-find (car ruby-flymake-command))
     (error "Cannot find a suitable checker"))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index e09ddd2..22a8e25 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2570,10 +2570,10 @@ Return what remains of the list."
              (setq did-apply t)))
           ;; Element (STRING . POS) means STRING was deleted.
           (`(,(and string (pred stringp)) . ,(and pos (pred integerp)))
-           (when (let ((apos (abs pos)))
-                   (or (< apos (point-min)) (> apos (point-max))))
-             (error "Changes to be undone are outside visible portion of 
buffer"))
-           (let (valid-marker-adjustments)
+           (let ((valid-marker-adjustments nil)
+                 (apos (abs pos)))
+             (when (or (< apos (point-min)) (> apos (point-max)))
+               (error "Changes to be undone are outside visible portion of 
buffer"))
              ;; Check that marker adjustments which were recorded
              ;; with the (STRING . POS) record are still valid, ie
              ;; the markers haven't moved.  We check their validity
@@ -2584,7 +2584,7 @@ Return what remains of the list."
                (let* ((marker-adj (pop list))
                       (m (car marker-adj)))
                  (and (eq (marker-buffer m) (current-buffer))
-                      (= pos m)
+                      (= apos m)
                       (push marker-adj valid-marker-adjustments))))
              ;; Insert string and adjust point
              (if (< pos 0)
@@ -3398,10 +3398,10 @@ The optional second argument OUTPUT-BUFFER, if non-nil,
 says to put the output in some other buffer.
 If OUTPUT-BUFFER is a buffer or buffer name, erase that buffer
 and insert the output there; a non-nil value of
-`shell-command-dont-erase-buffer' prevent to erase the buffer.
-If OUTPUT-BUFFER is not a buffer and not nil, insert the output
-in current buffer after point leaving mark after it.
-This cannot be done asynchronously.
+`shell-command-dont-erase-buffer' prevents the buffer from being
+erased.  If OUTPUT-BUFFER is not a buffer and not nil, insert the
+output in current buffer after point leaving mark after it.  This
+cannot be done asynchronously.
 
 If the command terminates without error, but generates output,
 and you did not specify \"insert it in the current buffer\",
@@ -3409,7 +3409,7 @@ the output can be displayed in the echo area or in its 
buffer.
 If the output is short enough to display in the echo area
 \(determined by the variable `max-mini-window-height' if
 `resize-mini-windows' is non-nil), it is shown there.
-Otherwise,the buffer containing the output is displayed.
+Otherwise, the buffer containing the output is displayed.
 
 If there is output and an error, and you did not specify \"insert it
 in the current buffer\", a message about the error goes at the end
diff --git a/src/.gdbinit b/src/.gdbinit
index 60f6348..48bb5df 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -78,7 +78,7 @@ end
 # Access the name of a symbol
 define xsymname
   xgetsym $arg0
-  set $symname = $ptr->name
+  set $symname = $ptr->u.s.name
 end
 
 # Set up something to print out s-expressions.
@@ -376,7 +376,7 @@ define pwinx
   xgetptr $w->buffer
   set $tem = (struct buffer *) $ptr
   xgetptr $tem->name_
-  printf "%s", ((struct Lisp_String *) $ptr)->data
+  printf "%s", ((struct Lisp_String *) $ptr)->u.s.data
   printf "\n"
   xgetptr $w->start
   set $tem = (struct Lisp_Marker *) $ptr
@@ -504,7 +504,7 @@ define pgx
   xgettype ($g.object)
   if ($type == Lisp_String)
     xgetptr $g.object
-    printf " str=0x%x[%d]", ((struct Lisp_String *)$ptr)->data, $g.charpos
+    printf " str=0x%x[%d]", ((struct Lisp_String *)$ptr)->u.s.data, $g.charpos
   else
     printf " pos=%d", $g.charpos
   end
@@ -896,7 +896,7 @@ define xbuffer
   xgetptr $
   print (struct buffer *) $ptr
   xgetptr $->name_
-  output ((struct Lisp_String *) $ptr)->data
+  output ((struct Lisp_String *) $ptr)->u.s.data
   echo \n
 end
 document xbuffer
@@ -935,7 +935,7 @@ end
 define xcar
   xgetptr $
   xgettype $
-  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car : 0)
+  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.s.car : 0)
 end
 document xcar
 Assume that $ is an Emacs Lisp pair and print its car.
@@ -944,7 +944,7 @@ end
 define xcdr
   xgetptr $
   xgettype $
-  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr : 0)
+  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.s.u.cdr : 0)
 end
 document xcdr
 Assume that $ is an Emacs Lisp pair and print its cdr.
@@ -957,9 +957,9 @@ define xlist
   set $nil = $ptr
   set $i = 0
   while $cons != $nil && $i < 10
-    p/x $cons->car
+    p/x $cons->u.s.car
     xpr
-    xgetptr $cons->u.cdr
+    xgetptr $cons->u.s.u.cdr
     set $cons = (struct Lisp_Cons *) $ptr
     set $i = $i + 1
     printf "---\n"
@@ -1072,13 +1072,13 @@ Print $ as a lisp object of any type.
 end
 
 define xprintstr
-  set $data = (char *) $arg0->data
-  set $strsize = ($arg0->size_byte < 0) ? ($arg0->size & ~ARRAY_MARK_FLAG) : 
$arg0->size_byte
+  set $data = (char *) $arg0->u.s.data
+  set $strsize = ($arg0->u.s.size_byte < 0) ? ($arg0->u.s.size & 
~ARRAY_MARK_FLAG) : $arg0->u.s.size_byte
   # GDB doesn't like zero repetition counts
   if $strsize == 0
     output ""
   else
-    output ($arg0->size > 1000) ? 0 : ($data[0])@($strsize)
+    output ($arg0->u.s.size > 1000) ? 0 : ($data[0])@($strsize)
   end
 end
 
@@ -1255,7 +1255,7 @@ commands
   xsymname globals.f_Vinitial_window_system
   xgetptr $symname
   set $tem = (struct Lisp_String *) $ptr
-  set $tem = (char *) $tem->data
+  set $tem = (char *) $tem->u.s.data
   # If we are running in synchronous mode, we want a chance to look
   # around before Emacs exits.  Perhaps we should put the break
   # somewhere else instead...
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8073552..a5bce17 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3070,7 +3070,7 @@ This tests also `make-symbolic-link', `file-truename' and 
`add-name-to-file'."
            (should (file-selinux-context tmp-name3))
            ;; We cannot expect that copying over file system
            ;; boundaries keeps SELinux context.  So we copy it
-           ;; explicitely.
+           ;; explicitly.
            (should
             (set-file-selinux-context
              tmp-name3 (file-selinux-context tmp-name1)))
@@ -3104,7 +3104,7 @@ This tests also `make-symbolic-link', `file-truename' and 
`add-name-to-file'."
            (should (file-selinux-context tmp-name1))
            ;; We cannot expect that copying over file system
            ;; boundaries keeps SELinux context.  So we copy it
-           ;; explicitely.
+           ;; explicitly.
            (should
             (set-file-selinux-context
              tmp-name1 (file-selinux-context tmp-name3)))