[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master df1630ad3b8 1/3: Merge from savannah/emacs-30
|
From: |
Po Lu |
|
Subject: |
master df1630ad3b8 1/3: Merge from savannah/emacs-30 |
|
Date: |
Mon, 8 Jul 2024 03:44:23 -0400 (EDT) |
branch: master
commit df1630ad3b85538b86f054073364c9ba0c989909
Merge: 4d21dff5714 f4c0459ed3e
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge from savannah/emacs-30
f4c0459ed3e Fix Tramp parser
47c79b62dd0 Checkdoc fixes in progmodes
6757f8e67d3 Checkdoc fixes in Org Mode
9fcee3c1d1e Clarify `checkdoc-max-keyref-before-warn` docstring
b249f022f12 * lisp/files.el (insert-directory): Quote switches in wil...
8911d53ce5d Fix uses of 'dired-omit-mode' (bug#71905)
---
lisp/dired.el | 2 +-
lisp/emacs-lisp/checkdoc.el | 17 +++++++++--------
lisp/files.el | 26 +++++++++++++++-----------
lisp/net/tramp.el | 21 ++++++++++++++++-----
lisp/org/ob-core.el | 2 ++
lisp/org/ob-exp.el | 2 ++
lisp/org/ob-lob.el | 2 ++
lisp/org/ob-plantuml.el | 2 +-
lisp/org/ob-python.el | 6 +++---
lisp/org/ob-scheme.el | 4 ++--
lisp/org/ob-tangle.el | 9 ++++-----
lisp/org/ob.el | 2 ++
lisp/org/org-agenda.el | 6 +++---
lisp/org/org-clock.el | 4 ++--
lisp/org/org-element-ast.el | 2 +-
lisp/org/org-faces.el | 4 ++--
lisp/org/org-fold-core.el | 4 ++--
lisp/org/org-fold.el | 3 +--
lisp/org/org-goto.el | 2 ++
lisp/org/org-habit.el | 2 +-
lisp/org/org-inlinetask.el | 2 +-
lisp/org/org-macs.el | 2 +-
lisp/org/org-mobile.el | 2 +-
lisp/org/org-mouse.el | 2 +-
lisp/org/org-refile.el | 4 ++--
lisp/org/org-src.el | 8 ++++----
lisp/org/org-table.el | 6 +++---
lisp/org/org.el | 20 ++++++++++----------
lisp/org/ox-icalendar.el | 4 ++--
lisp/org/ox-latex.el | 6 +++---
lisp/org/ox-publish.el | 2 +-
lisp/org/ox.el | 2 +-
lisp/progmodes/cperl-mode.el | 8 ++++----
lisp/progmodes/eglot.el | 10 +++++-----
lisp/progmodes/etags.el | 4 ++--
lisp/progmodes/flymake.el | 2 +-
lisp/progmodes/gdb-mi.el | 8 ++++----
lisp/progmodes/hideif.el | 2 +-
lisp/progmodes/idlw-help.el | 4 ++--
lisp/progmodes/idlwave.el | 2 +-
lisp/progmodes/java-ts-mode.el | 4 ++--
lisp/progmodes/js.el | 2 +-
lisp/progmodes/pascal.el | 8 +++++---
lisp/progmodes/python.el | 4 ++--
lisp/progmodes/ruby-mode.el | 6 +++---
lisp/progmodes/rust-ts-mode.el | 2 +-
lisp/progmodes/verilog-mode.el | 6 +++---
lisp/progmodes/xref.el | 2 +-
test/lisp/net/tramp-tests.el | 24 ++++++++++++++++++++++++
49 files changed, 165 insertions(+), 115 deletions(-)
diff --git a/lisp/dired.el b/lisp/dired.el
index baac246dd5e..33b79cbef85 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -5183,7 +5183,7 @@ Interactively with prefix argument, read FILE-NAME."
(dired-goto-file file))
;; Toggle omitting, if it is on, and try again.
(when (bound-and-true-p dired-omit-mode)
- (dired-omit-mode)
+ (dired-omit-mode -1)
(dired-goto-file file)))))))))
;;;###autoload
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index de6f0258e97..252dd5cbf83 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -262,14 +262,15 @@ with these words enabled."
;;;###autoload(put 'checkdoc-ispell-list-words 'safe-local-variable
#'list-of-strings-p)
(defcustom checkdoc-max-keyref-before-warn nil
- "If non-nil, number of \\\\=[command-to-keystroke] tokens allowed in a doc
string.
-Any more than this and a warning is generated suggesting that the construct
-\\\\={mapvar} be used instead. If the value is nil, never warn.
-
-It used to not be practical to use `\\\\=[...]' very many times,
-because display of the documentation string would become slow.
-This is not an issue on modern machines, unless you have
-thousands of substitutions."
+ "Maximum number of \\\\=[command-to-keystroke] tokens allowed in a doc
string.
+
+Any more than this and a warning is generated suggesting that the
+construct \\\\={mapvar} be used instead. If the value is nil, never
+warn.
+
+It used to be impractical to use `\\\\=[...]' very many times, because
+display of the documentation string would become slow. This is not an
+issue on modern machines, unless you have thousands of substitutions."
:type '(choice (const nil)
integer)
:version "28.1")
diff --git a/lisp/files.el b/lisp/files.el
index c518273bd29..e552f3ac413 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7263,7 +7263,7 @@ auto-save file, if that is more recent than the visited
file."
(after-find-file nil nil t))
(t (user-error "Recover-file canceled")))))
-(defvar dired-mode-hook)
+(declare-function dired-omit-mode "dired-x" (&optional arg))
(defun recover-session ()
"Recover auto save files from a previous Emacs session.
@@ -7284,14 +7284,12 @@ Then you'll be asked about a number of files to
recover."
(concat "\\`" (regexp-quote nd)))
t)
(error "No previous sessions to recover")))
- (require 'dired)
- (let ((ls-lisp-support-shell-wildcards t)
- ;; Ensure that we don't omit the session files as the user may
- ;; have (as suggested by the manual) `dired-omit-mode' in the
- ;; hook.
- (dired-mode-hook (delete 'dired-omit-mode dired-mode-hook)))
+ (let ((ls-lisp-support-shell-wildcards t))
(dired (concat auto-save-list-file-prefix "*")
- (concat (connection-local-value dired-listing-switches) " -t")))
+ (concat (connection-local-value dired-listing-switches) " -t"))
+ ;; Toggle omitting, if it is on.
+ (when (bound-and-true-p dired-omit-mode)
+ (dired-omit-mode -1)))
(use-local-map (nconc (make-sparse-keymap) (current-local-map)))
(define-key (current-local-map) "\C-c\C-c" 'recover-session-finish)
(save-excursion
@@ -8195,9 +8193,15 @@ normally equivalent short `-D' option is just passed on
to
"\\") ; Disregard Unix shell aliases!
insert-directory-program
" -d "
- (if (stringp switches)
- switches
- (mapconcat #'identity switches " "))
+ ;; Quote switches that require quoting
+ ;; such as "--block-size='1". But don't
+ ;; quote switches that use patterns
+ ;; such as "--ignore=PATTERN" (bug#71935).
+ (mapconcat #'shell-quote-wildcard-pattern
+ (if (stringp switches)
+ (split-string-and-unquote
switches)
+ switches)
+ " ")
" -- "
;; Quote some characters that have
;; special meanings in shells; but
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f97ed66c58b..abde62d4371 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -78,6 +78,7 @@
(defvar tramp-postfix-ipv6-regexp)
(defvar tramp-postfix-host-format)
(defvar tramp-postfix-host-regexp)
+(defvar tramp-host-with-port-regexp)
(defvar tramp-remote-file-name-spec-regexp)
(defvar tramp-file-name-structure)
(defvar tramp-file-name-regexp)
@@ -878,6 +879,7 @@ to be set, depending on VALUE."
tramp-postfix-ipv6-regexp (tramp-build-postfix-ipv6-regexp)
tramp-postfix-host-format (tramp-build-postfix-host-format)
tramp-postfix-host-regexp (tramp-build-postfix-host-regexp)
+ tramp-host-with-port-regexp (tramp-build-host-with-port-regexp)
tramp-remote-file-name-spec-regexp
(tramp-build-remote-file-name-spec-regexp)
tramp-file-name-structure (tramp-build-file-name-structure)
@@ -955,7 +957,8 @@ The `ftp' syntax does not support methods.")
"Return `tramp-postfix-method-format' according to `tramp-syntax'."
(tramp-lookup-syntax tramp-postfix-method-format-alist))
-(defvar tramp-postfix-method-format nil ; Init'd when defining `tramp-syntax'!
+(defvar tramp-postfix-method-format
+ nil ; Initialized when defining `tramp-syntax'!
"String matching delimiter between method and user or host names.
The `ftp' syntax does not support methods.
Used in `tramp-make-tramp-file-name'.")
@@ -964,7 +967,8 @@ Used in `tramp-make-tramp-file-name'.")
"Return `tramp-postfix-method-regexp'."
(rx (literal (tramp-build-postfix-method-format))))
-(defvar tramp-postfix-method-regexp nil ; Init'd when defining `tramp-syntax'!
+(defvar tramp-postfix-method-regexp
+ nil ; Initialized when defining `tramp-syntax'!
"Regexp matching delimiter between method and user or host names.
Derived from `tramp-postfix-method-format'.")
@@ -1059,11 +1063,18 @@ Derived from `tramp-prefix-port-format'.")
(defconst tramp-port-regexp (rx (+ digit))
"Regexp matching port numbers.")
-(defconst tramp-host-with-port-regexp
+(defun tramp-build-host-with-port-regexp ()
+ "Return `tramp-host-with-port-regexp'."
(rx
- (group (regexp tramp-host-regexp))
+ (group (| (regexp tramp-host-regexp)
+ (: (regexp tramp-prefix-ipv6-regexp)
+ (? (regexp tramp-ipv6-regexp))
+ (regexp tramp-postfix-ipv6-regexp))))
(regexp tramp-prefix-port-regexp)
- (group (regexp tramp-port-regexp)))
+ (group (regexp tramp-port-regexp))))
+
+(defvar tramp-host-with-port-regexp
+ nil ; Initialized when defining `tramp-syntax'!
"Regexp matching host names with port numbers.")
(defconst tramp-postfix-hop-format "|"
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index bd96556846f..60f213fe751 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -22,6 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
;;; Code:
(require 'org-macs)
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 5516530c5b7..30b2a42a6c4 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -22,6 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
;;; Code:
(require 'org-macs)
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 110675fc561..eaa66872f1f 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -22,6 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
;;; Code:
(require 'org-macs)
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index 17b9d140832..229b4bad2c8 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -116,7 +116,7 @@ This function is called by `org-babel-execute-src-block'."
(let* ((do-export (member "file" (cdr (assq :result-params params))))
(out-file (if do-export
(or (cdr (assq :file params))
- (error "No :file provided but :results set to file.
For plain text output, set :results to verbatim"))
+ (error "No :file provided but :results set to file.
For plain text output, set :results to verbatim"))
(org-babel-temp-file "plantuml-" ".txt")))
(cmdline (cdr (assq :cmdline params)))
(in-file (org-babel-temp-file "plantuml-"))
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 1afbcb5ded5..8a3c24f7038 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -279,7 +279,7 @@ be removed after minimum supported version reaches emacs29."
This checks `org-babel-python-command', and then
`org-babel-python-command-session' (if IS-SESSION) or
`org-babel-python-command-nonsession' (if not IS-SESSION). If
-IS-SESSION, this might return `nil', which means to use
+IS-SESSION, this might return nil, which means to use
`python-shell-calculate-command'."
(or (unless (eq org-babel-python-command 'auto)
org-babel-python-command)
@@ -300,7 +300,7 @@ unless the Python session was created outside Org."
(defun org-babel-python-initiate-session-by-key (&optional session)
"Initiate a python session.
If there is not a current inferior-process-buffer matching
-SESSION then create it. If inferior process already
+SESSION then create it. If inferior process already
exists (e.g. if it was manually started with `run-python'), make
sure it's configured to work with ob-python. If session has
already been configured as such, do nothing. Return the
@@ -356,7 +356,7 @@ initialized session."
(defun org-babel-python-initiate-session (&optional session _params)
"Initiate Python session named SESSION according to PARAMS.
If there is not a current inferior-process-buffer matching
-SESSION then create it. If inferior process already
+SESSION then create it. If inferior process already
exists (e.g. if it was manually started with `run-python'), make
sure it's configured to work with ob-python. If session has
already been configured as such, do nothing."
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index 3f04667f276..29fdcd1ec6d 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -143,14 +143,14 @@ If the variables HOST and PORT are set, connect to the
running Scheme REPL."
(current-buffer)))))
(defun org-babel-scheme-make-session-name (buffer name impl)
- "Generate a name for the session buffer.
+ "Generate a NAME for the session BUFFER.
For a named session, the buffer name will be the session name.
If the session is unnamed (nil), generate a name.
If the session is `none', use nil for the session name, and
-org-babel-scheme-execute-with-geiser will use a temporary session."
+`org-babel-scheme-execute-with-geiser' will use a temporary session."
(cond ((not name) (concat buffer " " (symbol-name impl) " REPL"))
((string= name "none") nil)
(name)))
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index c89763efad7..fe143b039ff 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -184,8 +184,7 @@ replace contents otherwise."
:safe t)
(defun org-babel-find-file-noselect-refresh (file)
- "Find file ensuring that the latest changes on disk are
-represented in the file."
+ "Find file ensuring that the latest changes on disk are represented in the
file."
(find-file-noselect file 'nowarn)
(with-current-buffer (get-file-buffer file)
(revert-buffer t t t)))
@@ -386,10 +385,10 @@ The following forms are currently recognized:
((integerp mode)
(if (string-match-p "^[0-7][0-7][0-7]$" (format "%o" mode))
mode
- (user-error "%1$o is not a valid file mode octal. \
+ (user-error "%1$o is not a valid file mode octal. \
Did you give the decimal value %1$d by mistake?" mode)))
((not (stringp mode))
- (error "File mode %S not recognized as a valid format." mode))
+ (error "File mode %S not recognized as a valid format" mode))
((string-match-p "^o0?[0-7][0-7][0-7]$" mode)
(string-to-number (replace-regexp-in-string "^o" "" mode) 8))
((string-match-p
"^[ugoa]*\\(?:[+=-][rwxXstugo]*\\)+\\(,[ugoa]*\\(?:[+=-][rwxXstugo]*\\)+\\)*$"
mode)
@@ -400,7 +399,7 @@ Did you give the decimal value %1$d by mistake?" mode)))
",g=" (delete ?- (substring mode 3
6))
",o=" (delete ?- (substring mode 6
9)))
0))
- (t (error "File mode %S not recognized as a valid format. See
`org-babel-interpret-file-mode'." mode))))
+ (t (error "File mode %S not recognized as a valid format. See
`org-babel-interpret-file-mode'" mode))))
(defun org-babel-tangle-clean ()
"Remove comments inserted by `org-babel-tangle'.
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index d3a29b83351..064faafd7cf 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -21,6 +21,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
;;; Code:
(require 'org-macs)
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 10f25be8a8d..b2a5ff92734 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1041,7 +1041,7 @@ headlines as the agenda display heavily relies on them."
:type 'hook)
(defcustom org-agenda-mouse-1-follows-link nil
- "Non-nil means mouse-1 on a link will follow the link in the agenda.
+ "Non-nil means \\`mouse-1' on a link will follow the link in the agenda.
A longer mouse click will still set point. Needs to be set
before org.el is loaded."
:group 'org-agenda-startup
@@ -1100,7 +1100,7 @@ removed from entry text before it is shown in the agenda."
:type 'string)
(defcustom org-agenda-start-with-archives-mode nil
- "Initial value of archive-mode in a newly created agenda window.
+ "Initial value of archive mode in a newly created agenda window.
See `org-agenda-archives-mode' for acceptable values and their
meaning."
:group 'org-agenda-startup
@@ -9190,7 +9190,7 @@ When called with a prefix argument, include all archive
files as well."
(org-agenda-do-context-action))
(defun org-agenda-previous-line ()
- "Move cursor to the previous line, and show if follow-mode is active."
+ "Move cursor to the previous line, and show if follow mode is active."
(interactive)
(call-interactively 'previous-line)
(org-agenda-do-context-action))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index c6fd507b08b..316cd7eee4b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -3261,7 +3261,7 @@ The details of what will be saved are regulated by the
variable
(and (buffer-live-p b)
(buffer-file-name b)
(or (not org-clock-persist-query-save)
- (y-or-n-p (format "Save current clock (%s) "
+ (y-or-n-p (format "Save current clock (%s)?"
org-clock-heading))))))
(insert
(format "(setq org-clock-stored-resume-clock '(%S . %d))\n"
@@ -3301,7 +3301,7 @@ The details of what will be saved are regulated by the
variable
(`(,(and file (pred file-exists-p)) . ,position)
(with-current-buffer (find-file-noselect file)
(when (or (not org-clock-persist-query-resume)
- (y-or-n-p (format "Resume clock (%s) "
+ (y-or-n-p (format "Resume clock (%s)?"
(save-excursion
(goto-char position)
(org-get-heading t t)))))
diff --git a/lisp/org/org-element-ast.el b/lisp/org/org-element-ast.el
index 2c767e1ad24..f3f74928004 100644
--- a/lisp/org/org-element-ast.el
+++ b/lisp/org/org-element-ast.el
@@ -231,7 +231,7 @@ when NODE is an anonymous node."
(define-inline org-element-type-p (node types)
"Return non-nil when NODE type is one of TYPES.
- TYPES can be a type symbol or a list of symbols."
+TYPES can be a type symbol or a list of symbols."
(inline-letevals (node types)
(if (listp (inline-const-val types))
(inline-quote (memq (org-element-type ,node t) ,types))
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 785fb22dbc0..21b23b641ca 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -690,8 +690,8 @@ If it is less than 8, the level-1 face gets reused for
level N+1 etc."
(defcustom org-cycle-level-faces t
"Non-nil means level styles cycle after level `org-n-level-faces'.
Then so level org-n-level-faces+1 is styled like level 1.
-If nil, then all levels >= org-n-level-faces are styled like
-level org-n-level-faces."
+If nil, then all levels >= `org-n-level-faces' are styled like
+level `org-n-level-faces'."
:group 'org-appearance
:group 'org-faces
:version "24.1"
diff --git a/lisp/org/org-fold-core.el b/lisp/org/org-fold-core.el
index 8372b86b087..4eb875aff2f 100644
--- a/lisp/org/org-fold-core.el
+++ b/lisp/org/org-fold-core.el
@@ -160,7 +160,7 @@
;; If one wants to search invisible text without using the provided
;; functions, it is important to keep in mind that 'invisible text
;; property may have multiple possible values (not just nil and
-;; t). Hence, (next-single-char-property-change pos 'invisible) is not
+;; t). Hence, (next-single-char-property-change pos 'invisible) is not
;; guaranteed to return the boundary of invisible/visible text.
;;; Interactive searching inside folded text (via isearch)
@@ -1172,7 +1172,7 @@ because otherwise all these markers will point to
nowhere."
This is used to allow searching in regions hidden via text properties.
As for [2020-05-09 Sat], Isearch only has special handling of hidden overlays.
Any text hidden via text properties is not revealed even if `search-invisible'
-is set to `t'.")
+is set to t.")
(defvar-local org-fold-core--isearch-local-regions (make-hash-table :test
'equal)
"Hash table storing temporarily shown folds from isearch matches.")
diff --git a/lisp/org/org-fold.el b/lisp/org/org-fold.el
index 1b62168c483..33b43fd3b56 100644
--- a/lisp/org/org-fold.el
+++ b/lisp/org/org-fold.el
@@ -733,8 +733,7 @@ go to the parent and show the entire tree."
;;; Handling changes in folded elements
(defun org-fold--extend-changed-region (from to)
- "Consider folded regions in the next/previous line when fixing
-region visibility.
+ "Consider folded regions in the next/previous line when fixing region
visibility.
This function is intended to be used as a member of
`org-fold-core-extend-changed-region-functions'."
;; If the edit is done in the first line of a folded drawer/block,
diff --git a/lisp/org/org-goto.el b/lisp/org/org-goto.el
index 5e4c05a7683..cb74942a5e7 100644
--- a/lisp/org/org-goto.el
+++ b/lisp/org/org-goto.el
@@ -20,6 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;;; Commentary:
+
;;; Code:
(require 'org-macs)
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index e17ee27fc6f..8b344f0c99f 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -69,7 +69,7 @@ relative to the current effective date."
:type 'boolean)
(defcustom org-habit-show-all-today nil
- "If non-nil, will show the consistency graph of all habits on
+ "If non-nil, show the consistency graph of all habits on
today's agenda, even if they are not scheduled."
:group 'org-habit
:type 'boolean)
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index a4136a13d2c..3292250cd69 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -172,7 +172,7 @@ The number of levels is controlled by
`org-inlinetask-min-level'."
(not (org-inlinetask-end-p))))
(defun org-inlinetask-in-task-p ()
- "Return true if point is inside an inline task."
+ "Return non-nil if point is inside an inline task."
(save-excursion
(forward-line 0)
(let ((case-fold-search t))
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 694e747b04e..a6ff0e54512 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -1228,7 +1228,7 @@ This function forces `tab-width' value because it is used
as a part of
the parser, to ensure parser consistency when calculating list
indentation."
`(progn
- (unless (= 8 tab-width) (error "Tab width in Org files must be 8, not %d.
Please adjust your `tab-width' settings for Org mode." tab-width))
+ (unless (= 8 tab-width) (error "Tab width in Org files must be 8, not %d.
Please adjust your `tab-width' settings for Org mode" tab-width))
(string-width (buffer-substring-no-properties
(line-beginning-position) (point)))))
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 82f97fd3635..2a6dd4e7986 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -392,7 +392,7 @@ agenda view showing the flagged items."
(org-agenda nil "?"))))))
(defun org-mobile-check-setup ()
- "Check if org-mobile-directory has been set up."
+ "Check if `org-mobile-directory' has been set up."
(org-mobile-cleanup-encryption-tempfile)
(unless (and org-directory
(stringp org-directory)
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 6bc7f788fb9..322d9868266 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -561,7 +561,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
(save-excursion (org-apply-on-list wrap-fun nil)))))
(defun org-mouse-bolp ()
- "Return true if there only spaces, tabs, and `*' before point.
+ "Return non-nil if there only spaces, tabs, and `*' before point.
This means, between the beginning of line and the point."
(save-excursion
(skip-chars-backward " \t*") (bolp)))
diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index 391e2402859..9dea34449a7 100644
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -470,8 +470,8 @@ See also `org-refile-use-outline-path'.
If you are using target caching (see `org-refile-use-cache'), you
have to clear the target cache in order to find new targets.
-This can be done with a `0' prefix (`C-0 C-c C-w') or a triple
-prefix argument (`C-u C-u C-u C-c C-w')."
+This can be done with a `0' prefix (\\`C-0 C-c C-w') or a triple
+prefix argument (\\`C-u C-u C-u C-c C-w')."
(interactive "P")
(if (member arg '(0 (64)))
(org-refile-cache-clear)
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 262bd462814..0a9062f053a 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -950,16 +950,16 @@ remotely with point temporarily at the start of the code
block in
the Org buffer.
This command is not bound to a key by default, to avoid conflicts
-with language major mode bindings. To bind it to C-c @ in all
+with language major mode bindings. To bind it to \\`C-c @' in all
language major modes, you could use
(add-hook \\='org-src-mode-hook
(lambda () (define-key org-src-mode-map \"\\C-c@\"
\\='org-src-do-key-sequence-at-code-block)))
-In that case, for example, C-c @ t issued in code edit buffers
-would tangle the current Org code block, C-c @ e would execute
-the block and C-c @ h would display the other available
+In that case, for example, \\`C-c @ t' issued in code edit buffers
+would tangle the current Org code block, \\`C-c @ e' would execute
+the block and \\`C-c @ h' would display the other available
Org-babel commands."
(interactive "kOrg-babel key: ")
(if (equal key (kbd "C-g")) (keyboard-quit)
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 4a2623b5538..8a0943a48b9 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -622,7 +622,7 @@ This variable is set by `org-before-change-function'.
`org-table-align' sets it back to nil.")
(defvar orgtbl-after-send-table-hook nil
- "Hook for functions attaching to `C-c C-c', if the table is sent.
+ "Hook for functions attaching to \\`C-c C-c', if the table is sent.
This can be used to add additional functionality after the table is sent
to the receiver position, otherwise, if table is not sent, the functions
are not run.")
@@ -5423,7 +5423,7 @@ conflicting binding to this key outside `orgtbl-mode'."
(org-table-next-row)))
(defun orgtbl-self-insert-command (N)
- "Like `self-insert-command', use overwrite-mode for whitespace in tables.
+ "Like `self-insert-command', use `overwrite-mode' for whitespace in tables.
If the cursor is in a table looking at whitespace, the whitespace is
overwritten, and the table is not marked as requiring realignment."
(interactive "p")
@@ -6156,7 +6156,7 @@ supported. It is also possible to use the following one:
;;;###autoload
(defun orgtbl-to-orgtbl (table params)
- "Convert the `orgtbl-mode' TABLE into another orgtbl-mode table.
+ "Convert the `orgtbl-mode' TABLE into another `orgtbl-mode' table.
TABLE is a list, each entry either the symbol `hline' for
a horizontal separator line, or a list of fields for that line.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 718d53d641b..96b0e0b0ce1 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2670,7 +2670,7 @@ is non-nil."
(defcustom org-read-date-popup-calendar t
"Non-nil means pop up a calendar when prompting for a date.
-In the calendar, the date can be selected with mouse-1. However, the
+In the calendar, the date can be selected with \\`mouse-1'. However, the
minibuffer will also be active, and you can simply enter the date as well.
When nil, only the minibuffer will be available."
:group 'org-time
@@ -4855,7 +4855,7 @@ Respect keys that are already there."
(defvar org-selected-window nil
"Used in various places to store a window configuration.")
(defvar org-finish-function nil
- "Function to be called when `C-c C-c' is used.
+ "Function to be called when \\`C-c C-c' is used.
This is for getting out of special buffers like capture.")
(defvar org-last-state)
@@ -11008,7 +11008,7 @@ containing the regular expression and the callback,
onto the list.
The list can contain several entries if `org-occur' has been called
several time with the KEEP-PREVIOUS argument. Otherwise, this list
will only contain one set of parameters. When the highlights are
-removed (for example with `C-c C-c', or with the next edit (depending
+removed (for example with \\`C-c C-c', or with the next edit (depending
on `org-remove-highlights-with-change'), this variable is emptied
as well.")
@@ -17087,7 +17087,7 @@ Set `org-speed-command' to the appropriate command as a
side effect."
(make-string 1 (aref kv (1- (length kv)))))))))
(defun org-self-insert-command (N)
- "Like `self-insert-command', use overwrite-mode for whitespace in tables.
+ "Like `self-insert-command', use `overwrite-mode' for whitespace in tables.
If the cursor is in a table looking at whitespace, the whitespace is
overwritten, and the table is not marked as requiring realignment."
(interactive "p")
@@ -17236,9 +17236,9 @@ word constituents."
(call-interactively 'transpose-words)))
(defvar org-ctrl-c-ctrl-c-hook nil
- "Hook for functions attaching themselves to `C-c C-c'.
+ "Hook for functions attaching themselves to \\`C-c C-c'.
-This can be used to add additional functionality to the `C-c C-c'
+This can be used to add additional functionality to the \\`C-c C-c'
key which executes context-dependent commands. This hook is run
before any other test, while `org-ctrl-c-ctrl-c-final-hook' is
run after the last test.
@@ -17249,9 +17249,9 @@ it should do its thing and then return a non-nil value.
If the
context is wrong, just do nothing and return nil.")
(defvar org-ctrl-c-ctrl-c-final-hook nil
- "Hook for functions attaching themselves to `C-c C-c'.
+ "Hook for functions attaching themselves to \\`C-c C-c'.
-This can be used to add additional functionality to the `C-c C-c'
+This can be used to add additional functionality to the \\`C-c C-c'
key which executes context-dependent commands. This hook is run
after any other test, while `org-ctrl-c-ctrl-c-hook' is run
before the first test.
@@ -19065,7 +19065,7 @@ appear in the form of file names, tags, todo states or
search strings.
If you answer \"yes\" to the prompt, you might want to check and remove
such private information before sending the email.")
(add-text-properties (point-min) (point-max) '(face org-warning))
- (when (yes-or-no-p "Include your Org configuration and Org warning log
")
+ (when (yes-or-no-p "Include your Org configuration and Org warning
log?")
(mapatoms
(lambda (v)
(and (boundp v)
@@ -21803,7 +21803,7 @@ It also provides the following special moves for
convenience:
arg))
(defvar org--single-lines-list-is-paragraph t
- "Treat plain lists with single line items as a whole paragraph")
+ "Treat plain lists with single line items as a whole paragraph.")
(defun org--paragraph-at-point ()
"Return paragraph, or equivalent, element at point.
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index 9921865ad51..858d146d6d9 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -932,14 +932,14 @@ Return VTODO component as a string."
:repeater-unit dl)))))
;; TODO Implement via RDATE with changing DURATION
(org-display-warning "Not yet implemented: \
-different repeaters on SCHEDULED and DEADLINE. Skipping.")
+different repeaters on SCHEDULED and DEADLINE. Skipping.")
nil)
;; DEADLINE has repeater but SCHEDULED doesn't
((and dl-repeat-p (and sc (not sc-repeat-p)))
;; TODO SCHEDULED should only apply to first instance;
;; use RDATE with custom DURATION to implement that
(org-display-warning "Not yet implemented: \
-repeater on DEADLINE but not SCHEDULED. Skipping.")
+repeater on DEADLINE but not SCHEDULED. Skipping.")
nil)
((or sc-repeat-p dl-repeat-p)
(concat
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index a34646763a6..fcb0e20dc7e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -1391,7 +1391,7 @@ default values of which are given by
`org-latex-engraved-preamble' and
"\n"))
(t (funcall gen-theme-spec engraved-theme))))
(funcall gen-theme-spec engraved-theme))
- (warn "Cannot engrave source blocks. Consider installing
`engrave-faces'.")
+ (warn "Cannot engrave source blocks. Consider installing
`engrave-faces'.")
"% WARNING syntax highlighting unavailable as engrave-faces-latex was
missing.\n")
"\n")))
@@ -3548,7 +3548,7 @@ and FLOAT are extracted from SRC-BLOCK and INFO in
`org-latex-src-block'."
When the THEME symbol is non-nil, that theme will be used.
When INLINE is nil, a Verbatim environment wrapped in a Code
-environment will be used. When t, a Verb command will be used.
+environment will be used. When t, a Verb command will be used.
When OPTIONS is provided, as either a string or list of key-value
pairs accepted by `org-latex--make-option-string', it is passed
@@ -3591,7 +3591,7 @@ to the Verbatim environment or Verb command."
engraved-wrapped
"}")
engraved-wrapped))
- (user-error "Cannot engrave code as `engrave-faces-latex' is
unavailable.")))
+ (user-error "Cannot engrave code as `engrave-faces-latex' is
unavailable")))
(cl-defun org-latex-src-block--engraved
(&key src-block info lang caption caption-above-p num-start retain-labels
attributes float &allow-other-keys)
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 13f9b6b53b4..9f943cedc34 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -88,7 +88,7 @@ cdr of each element is in one of the following forms:
(:components (\"project-1\" \"project-2\" ...))
-When the CDR of an element of org-publish-project-alist is in
+When the CDR of an element of `org-publish-project-alist' is in
this second form, the elements of the list after `:components'
are taken to be components of the project, which group together
files requiring different publishing options. When you publish
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 6fa21be9063..75839e6c88a 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -1931,7 +1931,7 @@ Return a string."
(progn ,@body)
(org-link-broken
(pcase (plist-get info :with-broken-links)
- (`nil (user-error "Org export aborted. Unable to resolve
link: %S\nSee `org-export-with-broken-links'." (nth 1 err)))
+ (`nil (user-error "Org export aborted. Unable to resolve
link: %S\nSee `org-export-with-broken-links'" (nth 1 err)))
(`mark (org-export-data
(format "[BROKEN LINK: %s]" (nth 1 err)) info))
(_ nil))))))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 68ad7eda9a7..217125e1599 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -161,13 +161,13 @@ for constructs with multiline
if/unless/while/until/for/foreach condition."
:group 'cperl-autoinsert-details)
(defcustom cperl-file-style nil
- "Indentation style to use in cperl-mode.
+ "Indentation style to use in `cperl-mode'.
Setting this option will override options as given in
`cperl-style-alist' for the keyword provided here. If nil, then
the individual options as customized are used.
\"PBP\" is the style recommended in the Book \"Perl Best
Practices\" by Damian Conway. \"CPerl\" is the traditional style
-of cperl-mode, and \"PerlStyle\" follows the Perl documentation
+of `cperl-mode', and \"PerlStyle\" follows the Perl documentation
in perlstyle. The other styles have been developed for other
programming languages, mostly C."
:type '(choice (const "PBP")
@@ -232,7 +232,7 @@ to the right of the start of its line."
:group 'cperl-indentation-details)
(defcustom cperl-continued-brace-offset 0
"Extra indent for substatements that start with open-braces.
-This is in addition to cperl-continued-statement-offset."
+This is in addition to `cperl-continued-statement-offset'."
:type 'integer
:group 'cperl-indentation-details)
(defcustom cperl-close-paren-offset -1
@@ -819,7 +819,7 @@ B) Speed of editing operations.
of, say, long POD sections.")
(defvar cperl-tips-faces 'please-ignore-this-line
- "CPerl mode uses following faces for highlighting:
+ "CPerl mode uses the following faces for highlighting:
`cperl-array-face' Array names
`cperl-hash-face' Hash names
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 574e8571cc8..5845aff39b7 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -494,7 +494,7 @@ If this variable's value can also be an alist ((COMMAND .
ACTION)
...) where COMMAND is a symbol designating a command, such as
`eglot-rename', `eglot-code-actions',
`eglot-code-action-quickfix', etc. ACTION is one of the symbols
-described above. The value `t' for COMMAND is accepted and its
+described above. The value t for COMMAND is accepted and its
ACTION is the default value for commands not in the alist."
:type (let ((basic-choices
'((const :tag "Use diff" diff)
@@ -1415,7 +1415,7 @@ INTERACTIVE is ignored and provided for backward
compatibility."
(unless (or (null current-server)
(y-or-n-p "\
[eglot] Shut down current connection before attempting new one?"))
- (user-error "[eglot] Connection attempt aborted by user."))
+ (user-error "[eglot] Connection attempt aborted by user"))
(prog1 (append (eglot--guess-contact t) '(t))
(when current-server (ignore-errors (eglot-shutdown current-server))))))
(eglot--connect (eglot--ensure-list managed-major-modes)
@@ -3935,7 +3935,7 @@ If NOERROR, return predicate, else erroring function."
;;; List connections mode
(define-derived-mode eglot-list-connections-mode tabulated-list-mode
- "" "Eglot mode for listing server connections
+ "" "Eglot mode for listing server connections.
\\{eglot-list-connections-mode-map}"
:interactive nil
(setq-local tabulated-list-format
@@ -3977,12 +3977,12 @@ If NOERROR, return predicate, else erroring function."
"Face used for parameter inlay hint overlays.")
(defvar-local eglot--outstanding-inlay-hints-region (cons nil nil)
- "Jit-lock-calculated (FROM . TO) region with potentially outdated hints")
+ "Jit-lock-calculated (FROM . TO) region with potentially outdated hints.")
(defvar-local eglot--outstanding-inlay-hints-last-region nil)
(defvar-local eglot--outstanding-inlay-regions-timer nil
- "Helper timer for `eglot--update-hints'")
+ "Helper timer for `eglot--update-hints'.")
(defun eglot--update-hints (from to)
"Jit-lock function for Eglot inlay hints."
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 597612196fd..d3eb0d46e9b 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1364,7 +1364,7 @@ hits the start of file."
(cond (line (progn (goto-char (point-min))
(forward-line (1- line))))
(startpos (goto-char startpos))
- (t (error "etags.el BUG: bogus direct file tag")))
+ (t (error "etags.el: BUG: bogus direct file tag")))
;; This constant is 1/2 the initial search window.
;; There is no sense in making it too small,
;; since just going around the loop once probably
@@ -2182,7 +2182,7 @@ file name, add `tag-partial-file-name-match-p' to the
list value.")
(when (symbolp symbs)
(if (boundp symbs)
(setq symbs (symbol-value symbs))
- (warn "symbol `%s' has no value" symbs)
+ (warn "Symbol `%s' has no value" symbs)
(setq symbs nil))
(if (obarrayp symbs)
(mapatoms add-xref symbs)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6301b77beca..e72f25fd0cd 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -218,7 +218,7 @@ this is used."
(face :tag "Face"))))
(defcustom flymake-autoresize-margins t
- "If non-nil, automatically resize margin-width calling
flymake--resize-margins.
+ "If non-nil, automatically resize margin-width calling
`flymake--resize-margins'.
Only relevant if `flymake-indicator-type' is set to margins."
:version "30.1"
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 0ce5e1df794..2981965ee0c 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1285,8 +1285,8 @@ no input, and GDB is waiting for input."
(defun gdb-mouse-until (event)
"Continue running until a source line past the current line.
The destination source line can be selected either by clicking
-with mouse-3 on the fringe/margin or dragging the arrow
-with mouse-1 (default bindings)."
+with \\`mouse-3' on the fringe/margin or dragging the arrow
+with \\`mouse-1' (default bindings)."
(interactive "e")
(let ((start (event-start event))
(end (event-end event)))
@@ -1302,8 +1302,8 @@ with mouse-1 (default bindings)."
(defun gdb-mouse-jump (event)
"Set execution address/line.
-The destination source line can be selected either by clicking with C-mouse-3
-on the fringe/margin or dragging the arrow with C-mouse-1 (default bindings).
+The destination source line can be selected either by clicking with
\\`C-mouse-3'
+on the fringe/margin or dragging the arrow with \\`C-mouse-1' (default
bindings).
Unlike `gdb-mouse-until' the destination address can be before the current
line, and no execution takes place."
(interactive "e")
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 98e567299a1..9bcac0d8dc5 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -2407,7 +2407,7 @@ first arg will be `hif-etc'."
'c99 t)))
((eq token 'hif-comma)
(if etc
- (error "Syntax error: no comma allowed after `...'.")))
+ (error "Syntax error: no comma allowed after `...'")))
(t
(push token result))))
(setq result (nreverse result))
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 7bed69a738b..c311e1c5377 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -62,8 +62,8 @@ is used in preference to the old
`idlwave-html-help-location'."
(if (memq system-type '(ms-dos windows-nt))
nil
"/usr/local/etc/")
- "The directory where the idl_html_help/ dir lives. Obsolete for IDL
-6.2 or later (see `idlwave-html-system-help-location')."
+ "The directory where the idl_html_help/ dir lives.
+Obsolete for IDL 6.2 or later (see `idlwave-html-system-help-location')."
:type 'directory)
(defcustom idlwave-help-use-assistant t
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 30442fa0d34..b3e9eb58196 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -798,7 +798,7 @@ upper case, regardless of this variable."
(defcustom idlwave-reserved-word-upcase nil
"Non-nil means, reserved words will be made upper case via abbrev expansion.
If nil case of reserved words is controlled by `idlwave-abbrev-change-case'.
-Has effect only if in abbrev-mode."
+Has effect only if in `abbrev-mode'."
:group 'idlwave-abbrev-and-indent-action
:type 'boolean)
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index bb4a7df3340..4ceb211ade1 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -155,8 +155,8 @@
"Java operators for tree-sitter font-locking.")
(defun java-ts-mode--string-highlight-helper ()
-"Returns, for strings, a query based on what is supported by
-the available version of Tree-sitter for java."
+ "Return, for strings, a query based on what is supported by
+the available version of Tree-sitter for Java."
(condition-case nil
(progn (treesit-query-capture 'java '((text_block)
@font-lock-string-face))
`((string_literal) @font-lock-string-face
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 31e8f2924ac..f8140c14a49 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2493,7 +2493,7 @@ Returns t if successful, nil if no term was found."
t)))
(defun js--chained-expression-p ()
- "A helper for js--proper-indentation that handles chained expressions.
+ "Helper for `js--proper-indentation' that handles chained expressions.
A chained expression is when the current line starts with '.' and the
previous line also has a '.' expression.
This function returns the indentation for the current line if it is
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index bd39b64aefc..802c02dcfa4 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -297,7 +297,8 @@ are handled in another way, and should not be added to this
list."
;;;###autoload
(define-derived-mode pascal-mode prog-mode "Pascal"
- "Major mode for editing Pascal code.\\<pascal-mode-map>
+ "Major mode for editing Pascal code.
+\\<pascal-mode-map>
TAB indents for Pascal code. Delete converts tabs to spaces as it moves back.
\\[completion-at-point] completes the word around current point with respect \
@@ -333,7 +334,7 @@ Variables controlling indentation/edit style:
regardless of where in the line point is when the TAB command is used.
`pascal-auto-endcomments' (default t)
Non-nil means a comment { ... } is set after the ends which ends cases and
- functions. The name of the function or case will be set between the braces.
+ functions. The name of the function or case will be set between the
braces.
`pascal-auto-lineup' (default t)
List of contexts where auto lineup of :'s or ='s should be done.
@@ -496,7 +497,8 @@ This puts the mark at the end, and point at the beginning."
(pascal-beg-of-defun))
(defun pascal-comment-area (start end)
- "Put the region into a Pascal comment.\\<pascal-mode-map>
+ "Put the region into a Pascal comment.
+\\<pascal-mode-map>
The comments that are in this area are \"deformed\":
`*)' becomes `!(*' and `}' becomes `!{'.
These deformed comments are returned to normal if you use
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 73d6bdd2d2d..a00289d6de9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1140,8 +1140,8 @@ fontified."
For example, Lvl1 | Lvl2[Lvl3[Lvl4[Lvl5 | None]], Lvl2]. This
structure is represented via nesting binary_operator and
subscript nodes. This function iterates over all levels and
-highlight identifier nodes. If TYPE-REGEX is not nil fontify type
-identifier only if it matches against TYPE-REGEX. NODE is the
+highlight identifier nodes. If TYPE-REGEX is not nil fontify type
+identifier only if it matches against TYPE-REGEX. NODE is the
binary_operator node. OVERRIDE is the override flag described in
`treesit-font-lock-rules'. START and END mark the region to be
fontified."
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index f6ef175e11e..3bcfa9ee7df 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -336,7 +336,7 @@ Only has effect when `ruby-use-smie' is t."
"If non-nil, align chained method calls.
Each method call on a separate line will be aligned to the column
-of its parent. Example:
+of its parent. Example:
my_array.select { |str| str.size > 5 }
.map { |str| str.downcase }
@@ -386,7 +386,7 @@ Only has effect when `ruby-use-smie' is t."
"Non-nil to align the body of a block to the statement's start.
The body and the closer will be aligned to the column where the
-statement containing the block starts. Example:
+statement containing the block starts. Example:
foo.bar
.each do
@@ -2557,7 +2557,7 @@ If there is no Rubocop config file, Rubocop will be
passed a flag
"Non-nil with allow `ruby-flymake-rubocop' to use `bundle exec'.
When the value is `check', it will first see whether Gemfile exists in
the same directory as the configuration file, and whether it mentions
-the gem \"rubocop\". When t, it's used unconditionally. "
+the gem \"rubocop\". When t, it is used unconditionally."
:type '(choice (const :tag "Always" t)
(const :tag "No" nil)
(const :tag "If rubocop is in Gemfile" check))
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index cdbf381d023..b7a52b06b24 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -431,7 +431,7 @@ delimiters < and >'s."
(?> '(5 . ?<))))))))
(defun rust-ts-mode--prettify-symbols-compose-p (start end match)
- "Return true iff the symbol MATCH should be composed.
+ "Return non-nil if the symbol MATCH should be composed.
See `prettify-symbols-compose-predicate'."
(and (fboundp 'prettify-symbols-default-compose-p)
(prettify-symbols-default-compose-p start end match)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index a83bad0e8ed..65545d523a8 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -9950,7 +9950,7 @@ For example if declare A A (.B(SIG)) then B will be
included in the list."
(setq sig-list (cons (list (match-string-no-properties 1) nil nil)
sig-list))))
sig-list)))
-(defvar verilog-cache-has-lisp nil "True if any AUTO_LISP in buffer.")
+(defvar verilog-cache-has-lisp nil "Non-nil if any AUTO_LISP in buffer.")
(make-variable-buffer-local 'verilog-cache-has-lisp)
(defun verilog-read-auto-lisp-present ()
@@ -14043,7 +14043,7 @@ Typing \\[verilog-auto] will call
my-verilog-insert-hello and
expand the above into:
/*AUTOINSERTLISP(my-verilog-insert-hello \"world\")*/
- // Beginning of automatic insert lisp
+ // Beginning of automatic insert Lisp
initial $write(\"hello world\");
// End of automatics
@@ -15400,7 +15400,7 @@ and the case items."
(defun verilog-highlight-region (beg end _old-len)
"Colorize included files and modules in the (changed?) region.
-Clicking on the middle-mouse button loads them in a buffer (as in dired)."
+Clicking on the middle-mouse button loads them in a buffer (as in Dired)."
(when (or verilog-highlight-includes
verilog-highlight-modules)
(save-excursion
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 710293b8dbc..5ecb8664da0 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -487,7 +487,7 @@ Override existing value with NEW-VALUE if NEW-VALUE is set."
(set-window-parameter w 'xref--history (xref--make-xref-history))))))
(defun xref--get-history ()
- "Return xref history using xref-history-storage."
+ "Return xref history using `xref-history-storage'."
(funcall xref-history-storage))
(defun xref--push-backward (m)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index bf77179e039..8074bed7a47 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -330,6 +330,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/method:1.2.3.4:"))
(should (tramp-tramp-file-p "/method:user@1.2.3.4:"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/method:1.2.3.4#1234:"))
+ (should (tramp-tramp-file-p "/method:user@1.2.3.4#1234:"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/method:[::1]:"))
(should (tramp-tramp-file-p "/method:user@[::1]:"))
@@ -338,6 +342,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/method:[::ffff:1.2.3.4]:"))
(should (tramp-tramp-file-p "/method:user@[::ffff:1.2.3.4]:"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/method:[::1]#1234:"))
+ (should (tramp-tramp-file-p "/method:user@[::1]#1234:"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/method:::"))
(should (tramp-tramp-file-p "/method::/:"))
@@ -418,6 +426,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/1.2.3.4:"))
(should (tramp-tramp-file-p "/user@1.2.3.4:"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/1.2.3.4#1234:"))
+ (should (tramp-tramp-file-p "/user@1.2.3.4#1234:"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/[::1]:"))
(should (tramp-tramp-file-p "/user@[::1]:"))
@@ -426,6 +438,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[::ffff:1.2.3.4]:"))
(should (tramp-tramp-file-p "/user@[::ffff:1.2.3.4]:"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/[::1]#1234:"))
+ (should (tramp-tramp-file-p "/user@[::1]#1234:"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/host::"))
(should (tramp-tramp-file-p "/host:/:"))
@@ -472,6 +488,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[method/1.2.3.4]"))
(should (tramp-tramp-file-p "/[method/user@1.2.3.4]"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/[method/1.2.3.4#1234]"))
+ (should (tramp-tramp-file-p "/[method/user@1.2.3.4#1234]"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/[method/::1]"))
(should (tramp-tramp-file-p "/[method/user@::1]"))
@@ -480,6 +500,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[method/::ffff:1.2.3.4]"))
(should (tramp-tramp-file-p "/[method/user@::ffff:1.2.3.4]"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/[method/::1#1234]"))
+ (should (tramp-tramp-file-p "/[method/user@::1#1234]"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/[method/]"))
(should (tramp-tramp-file-p "/[method/]/:"))