diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 7a6c7f391b9..2fea79b2bb3 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1980,7 +1980,7 @@ The command @kbd{M-x display-line-numbers-mode} provides a convenient way to turn on display of line numbers. This mode has a globalized variant, @code{global-display-line-numbers-mode}. The user option @code{display-line-numbers-type} controls which sub-mode of -line-number display, described above, will these modes activate. +line-number display, described above, these modes will activate. @noindent Note that line numbers are not displayed in the minibuffer and in the diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index dba941cfd57..d7682a4a624 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it @@ -1110,7 +1110,7 @@ mentre fai riferimento al testo di aiuto e poi usare un C-x 1. Ecco altre utili opzioni di C-h: - C-h x Descrive un comando. Inserisci il nome della comando. + C-h x Descrive un comando. Inserisci il nome del comando. >> Prova con C-h x previous-line . Questo mostrerĂ  tutte le informazioni che Emacs possiede sulla diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el index 6fe1ade7a06..0180e9e53cc 100644 --- a/lisp/emacs-lisp/ert-x.el +++ b/lisp/emacs-lisp/ert-x.el @@ -96,7 +96,7 @@ ERT--THUNK with that buffer as current." To be used in ERT tests. If BODY finishes successfully, the test buffer is killed; if there is an error, the test buffer is kept -around on error for further inspection. Its name is derived from +around for further inspection. Its name is derived from the name of the test and the result of NAME-FORM." (declare (debug ((":name" form) def-body)) (indent 1)) diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index 9fe41f67866..8646998deb9 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -214,7 +214,7 @@ This can be either \"inline\" or \"attachment\".") "$" ,#'mm-uu-org-src-code-block-extract)) "A list of specifications for non-MIME attachments. -Each element consist of a `mm-uu-entry'. +Each element consists of a `mm-uu-entry'. The functions in the last 3 slots of this type can make use of the following dynamically-scoped variables: `file-name', `start-point', and `end-point'. diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index a985a212557..29e16c419be 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -41,11 +41,11 @@ ;; + The key sequence 'C-c ! a C-y C-c ! b' should auto-fill the ;; footnote in adaptive fill mode. This does not seem to be a bug in ;; `adaptive-fill' because it behaves that way on all point movements -;; + Handle footmode mode elegantly in all modes, even if that means refuses to +;; + Handle footnote mode elegantly in all modes, even if that means refusing to ;; accept the burden. For example, in a programming language mode, footnotes ;; should be commented. -;; + Manually autofilling the a first footnote should not cause it to -;; wrap into the footnote section tag +;; + Manually autofilling the first footnote should not cause it to +;; wrap into the footnote section tag. ;; + Current solution adds a second newline after the section tag, so it is ;; clearly a separate paragraph. There may be stylistic objections to this. ;; + Footnotes with multiple paragraphs should not have their first diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 251d5191cb2..8268b2d1676 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -1073,9 +1073,9 @@ E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\" tramp-prefix-port-format ":" (cond ((member host devices) host) ;; This is the case when the host is connected to the default port. - ((member (format "%s%s%d" host tramp-prefix-port-format port) + ((member (format "%s%s%s" host tramp-prefix-port-format port) devices) - (format "%s:%d" host port)) + (format "%s:%s" host port)) ;; An empty host name shall be mapped as well, when there ;; is exactly one entry in `devices'. ((and (zerop (length host)) (= (length devices) 1)) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 8205218ce11..4d2554c0870 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1415,7 +1415,7 @@ If FORCE is non-nil and no process found, create one." (pop-to-buffer (process-buffer (sh-shell-process t)) display-comint-buffer-action)) (defun sh-send-text (text) - "Send the text to the `sh-shell-process'." + "Send TEXT to `sh-shell-process'." (comint-send-string (sh-shell-process t) (concat text "\n"))) (defun sh-cd-here () diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index dc26a3c1b7f..d4acbe24ebb 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -165,7 +165,7 @@ manually with \\[dns-mode-soa-increment-serial]." ;;;###autoload (define-derived-mode dns-mode text-mode "DNS" "Major mode for viewing and editing DNS master files. -This mode is inherited from text mode. It add syntax +This mode is derived from text mode. It adds syntax highlighting, and some commands for handling DNS master files. Its keymap inherits from `text-mode' and it has the same variables for customizing indentation. It has its own abbrev