Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 13 insertions, 11 deletions

diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 977f3bab6ce..550994cd7b6 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -932,9 +932,9 @@ commands."
   "Text of the copyright notice and copying permissions.")
 
 (defun texinfo-copying ()
-  "Copy the copyright notice and copying permissions from the Texinfo file,
-as indicated by the @copying ... @end copying command;
-insert the text with the @insertcopying command."
+  "Copy the copyright notice and copying permissions from Texinfo file.
+This is indicated by the \"@copying ... @end copying\" command;
+insert the text with the \"@insertcopying\" command."
   (let ((beg (progn (beginning-of-line) (point)))
         (end  (progn (re-search-forward "^@end copying[ \t]*\n") (point))))
     (setq texinfo-copying-text
@@ -944,8 +944,8 @@ insert the text with the @insertcopying command."
     (delete-region beg end)))
 
 (defun texinfo-insertcopying ()
-  "Insert the copyright notice and copying permissions from the Texinfo file,
-which are indicated by the @copying ... @end copying command."
+  "Insert the copyright notice and copying permissions from Texinfo file.
+This is indicated by the \"@copying ... @end copying\" command."
   (insert (concat "\n" texinfo-copying-text)))
 
 (put 'begin 'texinfo-format 'texinfo-format-begin)
@@ -1618,7 +1618,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
   (if (and (symbolp (car (cdr (car texinfo-stack))))
            (> 1 (length (symbol-name (car (cdr (car texinfo-stack)))))))
       (error
-       "@enumerate: Use a number or letter, eg: 1, A, a, 3, B, or d." ))
+       "@enumerate: Use a number or letter, eg: 1, A, a, 3, B, or d"))
   (texinfo-discard-line-with-args)
   (setq fill-column (- fill-column 5)))
 
@@ -1705,7 +1705,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
            (if (or (equal ?\[ (string-to-char enumerating-symbol))
                    (equal ?\{ (string-to-char enumerating-symbol)))
                (error
-                "Too many items in enumerated list; alphabet ends at Z."))
+                "Too many items in enumerated list; alphabet ends at Z"))
            (insert ?\b (format "%3s. " enumerating-symbol) ?\n)
            (setcar (cdr (car texinfo-stack))
                    (make-symbol
@@ -1714,7 +1714,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
                       (string-to-char enumerating-symbol))))))
           (t
           (error
-           "@enumerate: Use a number or letter, eg: 1, A, a, 3, B or d." )))
+           "@enumerate: Use a number or letter, eg: 1, A, a, 3, B or d")))
     (forward-line -1)))
 
 (put 'alphaenumerate 'texinfo-item 'texinfo-alphaenumerate-item)
@@ -2032,7 +2032,7 @@ commands that are defined in texinfo.tex for printed output.
      ;; Case 3: Trouble
      (t
       (error
-       "You probably need to specify column widths for @multitable correctly.")))
+       "You probably need to specify column widths for @multitable correctly")))
     ;; Check whether columns fit on page.
     (let ((desired-columns
            (+
@@ -2044,7 +2044,7 @@ commands that are defined in texinfo.tex for printed output.
             (apply #'+ texinfo-multitable-width-list))))
       (if (> desired-columns fill-column)
           (error
-           "Multi-column table width, %d chars, is greater than page width, %d chars."
+           "Multi-column table width, %d chars, is greater than page width, %d chars"
             desired-columns fill-column)))
     texinfo-multitable-width-list))
 
@@ -2546,7 +2546,9 @@ If used within a line, follow `@bullet' with braces."
    "smalllisp"
    "\\)")
   "Regexp specifying end of environments in which @kbd does not put `...'
-around argument. (See `texinfo-format-kbd-regexp')")
+around argument.
+
+See `texinfo-format-kbd-regexp'.")
 
 (put 'kbd 'texinfo-format 'texinfo-format-kbd)
 (defun texinfo-format-kbd ()