Merge from origin/emacs-27

f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix.  (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos

# Conflicts:
#	etc/NEWS
#	lisp/arc-mode.el

16 files changed, 37 insertions, 27 deletions

diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1
index 3513c6616f0..cf641beec1f 100644
--- a/doc/emacs/ChangeLog.1
+++ b/doc/emacs/ChangeLog.1
@@ -2206,7 +2206,7 @@
 	Describe group levels more clearly.
 	(Gnus Group Buffer, Gnus Summary Buffer): New nodes, split from
 	Summary of Gnus.
-	(Document View): Copyedits.  Move zoom commads to DocView
+	(Document View): Copyedits.  Move zoom commands to DocView
 	Navigation node.
 	(DocView Navigation, DocView Searching, DocView Slicing)
 	(DocView Conversion): Nodes renamed from Navigation, etc.
@@ -10290,7 +10290,7 @@
 
 	* buffers.texi (Misc Buffer): Explain use of M-x rename-uniquely
 	for multiple compile and grep buffers.
-	(Indirect Buffers): Don't recommand clone-indirect-buffer
+	(Indirect Buffers): Don't recommend clone-indirect-buffer
 	for multiple compile and grep buffers.
 
 2004-02-29  Juanma Barranquero  <lektu@terra.es>
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index a512fd14c80..81874a04aa7 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2679,7 +2679,7 @@ basename.)
 
 Emacs can also look in an XDG-compatible location for @file{init.el},
 the default is the directory @file{~/.config/emacs}.  This can be
-overriden by setting @env{XDG_CONFIG_HOME} in your environment, its
+overridden by setting @env{XDG_CONFIG_HOME} in your environment, its
 value replaces @file{~/.config} in the name of the default XDG init
 file.  However @file{~/.emacs.d}, @file{~/.emacs}, and
 @file{~/.emacs.el} are always preferred if they exist, which means
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index a9b0da5aff6..1f10b68b8a7 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1458,7 +1458,7 @@ working tree to match the branch you switch to.  Bazaar also supports
 co-located branches, in which case the @kbd{bzr switch} command
 will switch branches in the current directory.  With Subversion, you
 switch to another branch using the @kbd{svn switch} command.  With
-Mercurial, command @kbd{hg update} is used to swith to another
+Mercurial, command @kbd{hg update} is used to switch to another
 branch.
 
   The VC command to switch to another branch in the current directory
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 40978b408ae..7d1c14c8169 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -8265,7 +8265,7 @@ different.
   Emacs provides a primitive that applications can use to detect
 instances of text whose bidirectional properties were overridden so as
 to make a left-to-right character display as if it were a
-right-to-left character, or vise versa.
+right-to-left character, or vice versa.
 
 @defun bidi-find-overridden-directionality from to &optional object
 This function looks at the text of the specified @var{object} between
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index cc18b852331..fed9612e329 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -2059,7 +2059,7 @@ I/O,,,libc}.
 @cindex nonlocal exits, in modules
 
   Emacs Lisp supports nonlocal exits, whereby program control is
-transfered from one point in a program to another remote point.
+transferred from one point in a program to another remote point.
 @xref{Nonlocal Exits}.  Thus, Lisp functions called by your module
 might exit nonlocally by calling @code{signal} or @code{throw}, and
 your module functions must handle such nonlocal exits properly.  Such
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 1652cb6989d..be2ee5721c2 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3293,7 +3293,7 @@ is disabled, @code{font-lock-face} has no effect on the display.
 also use the normal Font Lock machinery.  But if the mode does not use
 the normal Font Lock machinery, it should not set the variable
 @code{font-lock-defaults}.  In this case the @code{face} property will
-not be overriden, so using the @code{face} property could work too.
+not be overridden, so using the @code{face} property could work too.
 However, using @code{font-lock-face} is generally preferable as it
 allows the user to control the fontification by toggling
 @code{font-lock-mode}, and lets the code work regardless of whether
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index a85971bdaf6..f74e51f400e 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -502,7 +502,7 @@
 	* org.texi (@LaTeX{} specific attributes): Update manual.
 
 	* org.texi (Top, Exporting): Org has its own documentation and
-	should therefore be removed from "Other build-in back-ends".
+	should therefore be removed from "Other built-in back-ends".
 
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -1161,7 +1161,7 @@
 	(Special agenda views): Mention the "agenda*" agenda view.
 
 	* org.texi (Repeated tasks): Document how to ignore a repeater
-	when using both a scheduled and a deadline timetamp.
+	when using both a scheduled and a deadline timestamp.
 
 	* org.texi (Global and local cycling): Wrap in a new subsection.
 	(Initial visibility, Catching invisible edits): New subsections.
@@ -3515,7 +3515,7 @@
 2012-01-03  Rafael Laboissiere  <rafael@laboissiere.net>  (tiny change)
 
 	* org.texi (External links): Add footnote on how the behavior
-	of the text search in Org files are controled by the variable
+	of the text search in Org files are controlled by the variable
 	`org-link-search-must-match-exact-headline'.
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>
@@ -6262,7 +6262,7 @@
 	information - it's hard to keep up-to-date, and adds nothing.
 	Similarly with direct links to mailing lists.
 	(Spell-checkers): Rename node from Ispell.  Mention Aspell and Hunspell.
-	(Mailcrypt): Remove section - mailcrypt has not been updated in mnay
+	(Mailcrypt): Remove section - mailcrypt has not been updated in many
 	years, and Emacs comes with tools for this now.
 	(Patch): Remove section - this is a standard tool.
 	(Using function keys under X): Remove section.
@@ -6493,7 +6493,7 @@
 	specified in a property.
 	(Text areas in HTML export): New section.
 	(External links): Add examples for text search and ID links.
-	(Built-in table editor): Remove the descriptio of `C-c
+	(Built-in table editor): Remove the description of `C-c
 	C-q', it not longer works.
 	(Literal examples): Document that a space must follow
 	the colon in short examples.
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 412176986cc..63e3595a509 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -2436,7 +2436,7 @@ Argument @var{THIS} is the project to convert @var{PATH} to.
 @end deffn
 
 @deffn Method ede-name :AFTER this
-Return the name of @var{THIS} targt.
+Return the name of @var{THIS} target.
 @end deffn
 
 @deffn Method ede-target-buffer-in-sourcelist :AFTER this buffer source
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 19dcb19de74..c7bf99c6413 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -465,7 +465,7 @@ string containing the text contained between those positions (if any),
 after the change was performed.
 
 @item @code{:changes-start} and @code{:changes-end}
-The value is, repectively, the minimum and maximum buffer positions
+The value is, respectively, the minimum and maximum buffer positions
 touched by the recent changes.  These are provided for convenience and
 only if @code{:recent-changes} is also provided.
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 806a1ddf684..5e84a36d515 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3150,7 +3150,7 @@ to user @code{root} on host @code{remotehost}, starting with an
 @option{ssh} session on host @code{remotehost}:
 @samp{@value{prefix}ssh@value{postfixhop}%h|su@value{postfixhop}remotehost@value{postfix}}.
 
-On the other hand, if a trailing hop does not specifiy a host name,
+On the other hand, if a trailing hop does not specify a host name,
 the host name of the previous hop is reused. Therefore, the following
 file name is equivalent to the previous example:
 @samp{@value{prefix}ssh@value{postfixhop}remotehost|su@value{postfixhop}@value{postfix}}.
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 8ca61a0a3bb..c4ff83bb706 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1944,7 +1944,7 @@ It's Beat CCA Week.
     described by dot and mark, at its corners;
     the existing text is pushed to the right.
   clear-rectangle:
-    replace the rectangle described by dot ane mark
+    replace the rectangle described by dot and mark
     with blanks.  The previous text is deleted.
   delete-rectangle:
     delete the text of the specified rectangle,
diff --git a/etc/NEWS.27 b/etc/NEWS.27
index 32ac05df43f..149bd32fc01 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -1101,7 +1101,7 @@ prefer to rely upon existing Emacs facilities for formatting code but
 the 'sql-indent' package provides facilities to aid more casual SQL
 developers layout queries and complex expressions.
 
-**** 'sql-use-indent-support' (default t) enables SQL indention support.
+**** 'sql-use-indent-support' (default t) enables SQL indentation support.
 The 'sql-indent' package from ELPA must be installed to get the
 indentation support in 'sql-mode' and 'sql-interactive-mode'.
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index ae85fc55add..c998a8a1f1a 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1920,10 +1920,10 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
   (search-backward-regexp "[P]K\005\006")
   (let ((p (archive-l-e (+ (point) 16) 4))
         files)
-    (when (= p -1)
-      ;; If the offset of end-of-central-directory is -1, this is a
-      ;; Zip64 extended ZIP file format, and we need to glean the info
-      ;; from Zip64 records instead.
+    (when (or (= p #xffffffff) (= p -1))
+      ;; If the offset of end-of-central-directory is 0xFFFFFFFF, this
+      ;; is a Zip64 extended ZIP file format, and we need to glean the
+      ;; info from Zip64 records instead.
       ;;
       ;; First, find the Zip64 end-of-central-directory locator.
       (search-backward "PK\006\007")
@@ -1949,6 +1949,15 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
              (efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen))))
 			(decode-coding-string
 			 str archive-file-name-coding-system)))
+             (ucsize  (if (and (or (= ucsize #xffffffff) (= ucsize -1))
+                               (> exlen 0))
+                          ;; APPNOTE.TXT, para 4.5.3: the Extra Field
+                          ;; begins with 2 bytes of signature
+                          ;; (\000\001), followed by 2 bytes that give
+                          ;; the size of the extra block, followed by
+                          ;; an 8-byte uncompressed size.
+                          (archive-l-e (+ p 46 fnlen 4) 8)
+                        ucsize))
 	     (isdir   (and (= ucsize 0)
 			   (string= (file-name-nondirectory efnname) "")))
 	     (mode    (cond ((memq creator '(2 3)) ; Unix
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 0fe651ace34..c386b7c8012 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -136,9 +136,9 @@ patterns."
 (put 'hi-lock-file-patterns-policy 'risky-local-variable t)
 
 (defcustom hi-lock-auto-select-face nil
-  "Non-nil means highlighting commands do not prompt for the face to use.
-Instead, each hi-lock command will cycle through the faces in
-`hi-lock-face-defaults'."
+  "When nil, highlighting commands prompt for the face to use.
+When non-nil, highlighting command determine the faces to use
+by cycling through the faces in `hi-lock-face-defaults'."
   :type 'boolean
   :version "24.4")
 
diff --git a/make-dist b/make-dist
index 6901a4cfa1c..de4f343ddd4 100755
--- a/make-dist
+++ b/make-dist
@@ -110,7 +110,7 @@ while [ $# -gt 0 ]; do
      ;;
 
     ## Include the test/ directory.
-    ## This is for backward compability to when --no-tests was the default.
+    ## This is for backward compatibility to when --no-tests was the default.
     "--tests")
       with_tests=yes
      ;;
diff --git a/src/xdisp.c b/src/xdisp.c
index ecd23e0d0fc..152946363ed 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22824,10 +22824,11 @@ display_count_lines_visually (struct it *it)
 	  SET_TEXT_POS (from, PT, PT_BYTE);
 	  to = IT_CHARPOS (*it);
 	}
-      start_display (&tem_it, it->w, from);
       /* Need to disable visual mode temporarily, since otherwise the
-	 call to move_it_to will cause infinite recursion.  */
+	 call to move_it_to below and inside start_display will cause
+	 infinite recursion.  */
       specbind (Qdisplay_line_numbers, Qrelative);
+      start_display (&tem_it, it->w, from);
       /* Some redisplay optimizations could invoke us very far from
 	 PT, which will make the caller painfully slow.  There should
 	 be no need to go too far beyond the window's bottom, as any