Merge from origin/emacs-26

34fcfc5 (origin/emacs-26, emacs-26) * lisp/emacs-lisp/inline.el (defi...
f7a62c2 Fix doc string of 'footnote-style-alist'
c3b6742 Improve documentation of selecting windows
861d110 Improve documentation of records
22b3075 * etc/NEWS: Mention the removal of pinentry.el.  (Bug#27445)
689526b Fix interactive spec of 'semantic-ia-show-variants'
90ca37f Fix documentation of 'mouse-drag-and-drop-region' and friends
d60faf3 Improve detection of speller version in ispell.el
a0e3b06 Document 'mouse-drag-and-drop-region' options and mention the...
164e84c Fix uses of 'nil' and 'non-nil' in manuals and a few more min...
798f07f Document that mode commands should be idempotent.
ad2a47c ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.
88ddf53 Fontify a CPP construct correctly when a comment follows with...
de7de9c Prevent infloop in redisplay on TTY frames
293720e Fix loss of documentation face in certain CC Mode doc comment...

# Conflicts:
#	etc/NEWS
#	lisp/mail/footnote.el

9 files changed, 49 insertions, 114 deletions

diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 625c3ae9757..7ca29bd24b9 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -252,7 +252,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
 ;;;###autoload
 (defun semantic-ia-show-variants (point)
   "Display a list of all variants for the symbol under POINT."
-  (interactive "P")
+  (interactive "d")
   (let* ((ctxt (semantic-analyze-current-context point))
          (comp nil))
 
diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el
index ff27158f836..b9f63c94474 100644
--- a/lisp/emacs-lisp/inline.el
+++ b/lisp/emacs-lisp/inline.el
@@ -124,6 +124,10 @@ After VARS is handled, BODY is evaluated in the new environment."
 
 ;;;###autoload
 (defmacro define-inline (name args &rest body)
+  "Define an inline function NAME with arguments ARGS and body in BODY.
+
+This is like `defmacro', but has several advantages.
+See Info node `(elisp)Defining Functions' for more details."
   ;; FIXME: How can this work with CL arglists?
   (declare (indent defun) (debug defun) (doc-string 3))
   (let ((doc (if (stringp (car-safe body)) (list (pop body))))
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index d82f7410207..0c39f62f3ee 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -366,9 +366,7 @@ Proceeds from `י' to `כ', from `צ' to `ק'. After `ת', rolls over to `א'."
   "Styles of footnote tags available.
 By default, Arabic numbers, English letters, Roman Numerals,
 Latin and Unicode superscript characters, and Hebrew numerals
-are available.
-See footnote-han.el, footnote-greek.el and footnote-hebrew.el for more
-exciting styles.")
+are available.")
 
 (defcustom footnote-style 'numeric
   "Default style used for footnoting.
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 973d97c2560..e837ce1973b 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1414,59 +1414,6 @@ with value CHAR in the region [FROM to)."
 
 ;;;;;;;;;;;;;;;
 
-(defconst c-cpp-delimiter '(14)) ; generic comment syntax
-;; This is the value of the `category' text property placed on every #
-;; which introduces a CPP construct and every EOL (or EOB, or character
-;; preceding //, etc.) which terminates it.  We can instantly "comment
-;; out" all CPP constructs by giving `c-cpp-delimiter' a syntax-table
-;; property '(14) (generic comment delimiter).
-(defmacro c-set-cpp-delimiters (beg end)
-  ;; This macro does a hidden buffer change.
-  `(progn
-     (c-put-char-property ,beg 'category 'c-cpp-delimiter)
-     (if (< ,end (point-max))
-         (c-put-char-property ,end 'category 'c-cpp-delimiter))))
-(defmacro c-clear-cpp-delimiters (beg end)
-  ;; This macro does a hidden buffer change.
-  `(progn
-     (c-clear-char-property ,beg 'category)
-     (if (< ,end (point-max))
-         (c-clear-char-property ,end 'category))))
-
-(defsubst c-comment-out-cpps ()
-  ;; Render all preprocessor constructs syntactically commented out.
-  (put 'c-cpp-delimiter 'syntax-table c-cpp-delimiter))
-(defsubst c-uncomment-out-cpps ()
-  ;; Restore the syntactic visibility of preprocessor constructs.
-  (put 'c-cpp-delimiter 'syntax-table nil))
-
-(defmacro c-with-cpps-commented-out (&rest forms)
-  ;; Execute FORMS... whilst the syntactic effect of all characters in
-  ;; all CPP regions is suppressed.  In particular, this is to suppress
-  ;; the syntactic significance of parens/braces/brackets to functions
-  ;; such as `scan-lists' and `parse-partial-sexp'.
-  `(unwind-protect
-       (c-save-buffer-state ()
-           (c-comment-out-cpps)
-           ,@forms)
-     (c-save-buffer-state ()
-       (c-uncomment-out-cpps))))
-
-(defmacro c-with-all-but-one-cpps-commented-out (beg end &rest forms)
-  ;; Execute FORMS... whilst the syntactic effect of all characters in
-  ;; every CPP region APART FROM THE ONE BETWEEN BEG and END is
-  ;; suppressed.
-  `(unwind-protect
-       (c-save-buffer-state ()
-         (save-restriction
-           (widen)
-           (c-clear-cpp-delimiters ,beg ,end))
-         ,`(c-with-cpps-commented-out ,@forms))
-     (c-save-buffer-state ()
-       (save-restriction
-         (widen)
-         (c-set-cpp-delimiters ,beg ,end)))))
-
 (defmacro c-self-bind-state-cache (&rest forms)
   ;; Bind the state cache to itself and execute the FORMS.  Return the result
   ;; of the last FORM executed.  It is assumed that no buffer changes will
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 12ec8f74fea..7b9baee6f76 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -238,8 +238,8 @@
 ;; `c-macro-cache'.
 (defvar c-macro-cache-no-comment nil)
 (make-variable-buffer-local 'c-macro-cache-no-comment)
-;; Either nil, or the last character of the macro currently represented by
-;; `c-macro-cache' which isn't in a comment. */
+;; Either nil, or the position of a comment which is open at the end of the
+;; macro represented by `c-macro-cache'.
 
 (defun c-invalidate-macro-cache (beg _end)
   ;; Called from a before-change function.  If the change region is before or
@@ -382,8 +382,9 @@ comment at the start of cc-engine.el for more info."
     (point)))
 
 (defun c-no-comment-end-of-macro ()
-  ;; Go to the end of a CPP directive, or a pos just before which isn't in a
-  ;; comment.  For this purpose, open strings are ignored.
+  ;; Go to the start of the comment which is open at the end of the current
+  ;; CPP directive, or to the end of that directive.  For this purpose, open
+  ;; strings are ignored.
   ;;
   ;; This function must only be called from the beginning of a CPP construct.
   ;;
@@ -401,7 +402,7 @@ comment at the start of cc-engine.el for more info."
         (setq s (parse-partial-sexp here there)))
       (when (and (nth 4 s)
                  (not (eq (nth 7 s) 'syntax-table))) ; no pseudo comments.
-        (goto-char (1- (nth 8 s))))
+        (goto-char (nth 8 s)))
       (setq c-macro-cache-no-comment (point)))
     (point)))
 
@@ -3862,14 +3863,7 @@ comment at the start of cc-engine.el for more info."
   (if (eval-when-compile (memq 'category-properties c-emacs-features))
       ;; Emacs
       (c-with-<->-as-parens-suppressed
-       (if (and c-state-old-cpp-beg
-                (< c-state-old-cpp-beg here))
-           (c-with-all-but-one-cpps-commented-out
-            c-state-old-cpp-beg
-            c-state-old-cpp-end
-            (c-invalidate-state-cache-1 here))
-         (c-with-cpps-commented-out
-          (c-invalidate-state-cache-1 here))))
+       (c-invalidate-state-cache-1 here))
     ;; XEmacs
     (c-invalidate-state-cache-1 here)))
 
@@ -3902,12 +3896,7 @@ comment at the start of cc-engine.el for more info."
         (if (eval-when-compile (memq 'category-properties c-emacs-features))
             ;; Emacs
             (c-with-<->-as-parens-suppressed
-             (if (and here-cpp-beg (> here-cpp-end here-cpp-beg))
-                 (c-with-all-but-one-cpps-commented-out
-                  here-cpp-beg here-cpp-end
-                  (c-parse-state-1))
-               (c-with-cpps-commented-out
-                (c-parse-state-1))))
+             (c-parse-state-1))
           ;; XEmacs
           (c-parse-state-1))
       (setq c-state-old-cpp-beg
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 7b99c2f54e5..83038e07ca6 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -2670,8 +2670,8 @@ need for `pike-font-lock-extra-types'.")
   ;; This function might do hidden buffer changes.
 
   (let (comment-beg region-beg)
-    (if (eq (get-text-property (point) 'face)
-            'font-lock-comment-face)
+    (if (memq (get-text-property (point) 'face)
+              '(font-lock-comment-face font-lock-comment-delimiter-face))
         ;; Handle the case when the fontified region starts inside a
         ;; comment.
         (let ((start (c-literal-start)))
@@ -2691,8 +2691,15 @@ need for `pike-font-lock-extra-types'.")
                      (or (not (c-got-face-at comment-beg
                                              c-literal-faces))
                          (and (/= comment-beg (point-min))
+                              ;; Cheap check which is unreliable (the previous
+                              ;; character could be the end of a previous
+                              ;; comment).
                               (c-got-face-at (1- comment-beg)
-                                             c-literal-faces))))
+                                             c-literal-faces)
+                              ;; Expensive reliable check.
+                              (save-excursion
+                                (goto-char comment-beg)
+                                (c-in-literal)))))
               (setq comment-beg nil))
             (setq region-beg comment-beg))
 
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 169b61c3dd3..12a15873b1a 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -518,13 +518,13 @@ parameters \(point-min) and \(point-max).")
   (c objc) '(c-depropertize-new-text
              c-parse-quotes-after-change
              c-extend-font-lock-region-for-macros
-             c-neutralize-syntax-in-and-mark-CPP
+             c-neutralize-syntax-in-CPP
              c-change-expand-fl-region)
   c++ '(c-depropertize-new-text
         c-parse-quotes-after-change
         c-extend-font-lock-region-for-macros
         c-after-change-re-mark-raw-strings
-        c-neutralize-syntax-in-and-mark-CPP
+        c-neutralize-syntax-in-CPP
         c-restore-<>-properties
         c-change-expand-fl-region)
   java '(c-depropertize-new-text
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 22dea039cd1..4073a5a1b1a 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1016,15 +1016,10 @@ Note that the style variables are always made local to the buffer."
               t)
              (t nil)))))))
 
-(defun c-neutralize-syntax-in-and-mark-CPP (_begg _endd _old-len)
-  ;; (i) "Neutralize" every preprocessor line wholly or partially in the
-  ;; changed region.  "Restore" lines which were CPP lines before the change
-  ;; and are no longer so.
-  ;;
-  ;; (ii) Mark each CPP construct by placing a `category' property value
-  ;; `c-cpp-delimiter' at its start and end.  The marked characters are the
-  ;; opening # and usually the terminating EOL, but sometimes the character
-  ;; before a comment delimiter.
+(defun c-neutralize-syntax-in-CPP (_begg _endd _old-len)
+  ;; "Neutralize" every preprocessor line wholly or partially in the changed
+  ;; region.  "Restore" lines which were CPP lines before the change and are
+  ;; no longer so.
   ;;
   ;; That is, set syntax-table properties on characters that would otherwise
   ;; interact syntactically with those outside the CPP line(s).
@@ -1044,12 +1039,7 @@ Note that the style variables are always made local to the buffer."
   (c-save-buffer-state (limits)
     ;; Clear 'syntax-table properties "punctuation":
     ;; (c-clear-char-property-with-value c-new-BEG c-new-END 'syntax-table '(1))
-
-    ;; CPP "comment" markers:
-    (if (eval-when-compile (memq 'category-properties c-emacs-features));Emacs.
-        (c-clear-char-property-with-value
-         c-new-BEG c-new-END 'category 'c-cpp-delimiter))
-    ;; FIXME!!!  What about the "<" and ">" category properties?  2009-11-16
+    ;; The above is now done in `c-depropertize-CPP'.
 
     ;; Add needed properties to each CPP construct in the region.
     (goto-char c-new-BEG)
@@ -1076,11 +1066,7 @@ Note that the style variables are always made local to the buffer."
           (goto-char (match-beginning 1))
           (setq mbeg (point))
           (if (> (c-no-comment-end-of-macro) mbeg)
-              (progn
-                (c-neutralize-CPP-line mbeg (point)) ; "punctuation" properties
-                (if (eval-when-compile
-                      (memq 'category-properties c-emacs-features)) ;Emacs.
-                    (c-set-cpp-delimiters mbeg (point)))) ; "comment" markers
+              (c-neutralize-CPP-line mbeg (point)) ; "punctuation" properties
             (forward-line))           ; no infinite loop with, e.g., "#//"
           )))))
 
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 6a169622f52..25f62e317c8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -712,10 +712,10 @@ Otherwise returns the library directory name, if that is defined."
           (error "%s exited with %s %s" ispell-program-name
                  (if (stringp status) "signal" "code") status))
 
-      ;; Get relevant version strings. Only xx.yy.... format works well
+      ;; Get relevant version strings.
       (let (case-fold-search)
         (setq ispell-program-version
-              (and (search-forward-regexp "\\([0-9]+\\.[0-9\\.]+\\)" nil t)
+              (and (search-forward-regexp "\\([0-9]+\\.[0-9.]+\\)" nil t)
                    (match-string 1)))
 
         ;; Make sure these variables are (re-)initialized to the default value
@@ -725,19 +725,23 @@ Otherwise returns the library directory name, if that is defined."
 
         (goto-char (point-min))
         (or (setq ispell-really-aspell
-                  (and (search-forward-regexp
-                        "(but really Aspell \\([0-9]+\\.[0-9\\.-]+\\)?)" nil t)
-                       (match-string 1)))
+                  (and
+                   (search-forward-regexp
+                    "(but really Aspell \\([0-9]+\\.[0-9.]+\\([-._+ ]?[a-zA-Z0-9]+\\)?\\)?)"
+                    nil t)
+                   (match-string 1)))
             (setq ispell-really-hunspell
-                  (and (search-forward-regexp
-                        "(but really Hunspell \\([0-9]+\\.[0-9\\.-]+\\)?)"
-                        nil t)
-                       (match-string 1)))
+                  (and
+                   (search-forward-regexp
+                    "(but really Hunspell \\([0-9]+\\.[0-9.]+\\([-._+ ]?[a-zA-Z0-9]+\\)?\\)?)"
+                    nil t)
+                   (match-string 1)))
             (setq ispell-really-enchant
-                  (and (search-forward-regexp
-                        "(but really Enchant \\([0-9]+\\.[0-9\\.-]+\\)?)"
-                        nil t)
-                       (match-string 1)))))
+                  (and
+                   (search-forward-regexp
+                    "(but really Enchant \\([0-9]+\\.[0-9.]+\\([-._+ ]?[a-zA-Z0-9]+\\)?\\)?)"
+                    nil t)
+                   (match-string 1)))))
 
       (let* ((aspell8-minver   "0.60")
              (ispell-minver    "3.1.12")