; Fix many typos in symbols in docs and comments

54 files changed, 79 insertions, 77 deletions

diff --git a/lisp/allout.el b/lisp/allout.el
index 174f1e3dc21..6a7ecbb1ef1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -247,7 +247,7 @@ prevails."
   "Allout-mode functions bound to keys without any added prefix.
 
 This is in contrast to the majority of allout-mode bindings on
-`allout-prefixed-bindings', whose bindings are created with a
+`allout-prefixed-keybindings', whose bindings are created with a
 preceding command key.
 
 Use vector format for the keys:
@@ -1536,7 +1536,7 @@ topic prefix.
 Entries must be symbols that are bound to the desired regexp values.
 
 Encryptions that result in matches will be retried, up to
-`allout-encryption-ciphertext-rejection-limit' times, after which
+`allout-encryption-ciphertext-rejection-ceiling' times, after which
 an error is raised.")
 
 (make-variable-buffer-local 'allout-encryption-ciphertext-rejection-regexps)
@@ -4785,7 +4785,7 @@ this function."
 
 This is a way to give restricted peek at a concealed locality without the
 expense of exposing its context, but can leave the outline with aberrant
-exposure.  `allout-show-offshoot' should be used after the peek to rectify
+exposure.  `allout-show-to-offshoot' should be used after the peek to rectify
 the exposure."
 
   (interactive)
@@ -6883,7 +6883,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
     (allout-tests-obliterate-variable 'allout-tests-locally-true)
     (allout-do-resumptions))
   )
-;;;_  % Run unit tests if `allout-run-unit-tests-after-load' is true:
+;;;_  % Run unit tests if `allout-run-unit-tests-on-load' is true:
 (when allout-run-unit-tests-on-load
   (allout-run-unit-tests))
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 1ae39445680..83e7976125f 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1088,7 +1088,7 @@ calendar."
   "Name of buffer used for sunrise/sunset times.")
 
 (defconst calendar-hebrew-yahrzeit-buffer "*Yahrzeits*"
-  "Name of the buffer used by `list-yahrzeit-dates'.")
+  "Name of the buffer used by `calendar-hebrew-list-yahrzeits'.")
 
 (defmacro calendar-increment-month (mon yr n &optional nmonths)
   "Increment the variables MON and YR by N months.
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index f3a5d9cd60d..ca9f16ef20b 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -553,7 +553,7 @@ relative only to the time worked today, and not to past time."
 OLD-DEFAULT hours are set for every day that has no number indicated."
   (interactive "P")
   (if old-default (setq old-default (prefix-numeric-value old-default))
-    (error "`timelog-make-hours-explicit' requires an explicit argument"))
+    (error "`timeclock-make-hours-explicit' requires an explicit argument"))
   (let ((extant-timelog (find-buffer-visiting timeclock-file))
 	current-date)
     (with-current-buffer (find-file-noselect timeclock-file t)
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index e9dd48c8ab5..409e35ef900 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -215,7 +215,7 @@ the ordering list `autoconf-preferred-macro-order'."
 (defun autoconf-insert-new-macro (macro &optional param)
   "Add a call to MACRO in the current autoconf file.
 Deals with macro order.  See `autoconf-preferred-macro-order' and
-`autoconf-multi-macros'.
+`autoconf-multiple-macros'.
 Optional argument PARAM is the parameter to pass to the macro as one string."
   (cond ((member macro autoconf-multiple-macros)
 	 ;; This occurs multiple times
diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el
index b870624f9a1..3e4499cd39e 100644
--- a/lisp/cedet/ede/detect.el
+++ b/lisp/cedet/ede/detect.el
@@ -25,7 +25,7 @@
 ;;
 ;; Detection comes in multiple forms:
 ;;
-;; `ede-detect-scan-directory-for-project' -
+;; `ede--detect-scan-directory-for-project' -
 ;;        Scan for a project via the file system.
 ;; `ede-detect-directory-for-project' -
 ;;        Check our file cache for a project.  If that fails, use
diff --git a/lisp/color.el b/lisp/color.el
index 560631ae66d..48f150de70c 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -50,7 +50,7 @@ numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive.
 Optional argument FRAME specifies the frame where the color is to be
 displayed.  If FRAME is omitted or nil, use the selected frame.
 If FRAME cannot display COLOR, return nil."
-  ;; `colors-values' maximum value is either 65535 or 65280 depending on the
+  ;; `color-values' maximum value is either 65535 or 65280 depending on the
   ;; display system.  So we use a white conversion to get the max value.
   (let ((valmax (float (car (color-values "#ffffffffffff")))))
     (mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 171a939d4ec..9f5dc40ea16 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -511,7 +511,7 @@ Typically \"page-%s.png\".")
     ;; Toggle between text and image display or editing
     (define-key map (kbd "C-c C-c") 'doc-view-toggle-display)
     map)
-  "Keymap used by `doc-minor-view-mode'.")
+  "Keymap used by `doc-view-minor-mode'.")
 
 ;;;; Navigation Commands
 
diff --git a/lisp/electric.el b/lisp/electric.el
index 7038b91c26d..50ddf525ca4 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -424,7 +424,7 @@ If multiple rules match, only first one is executed.")
                   ;;
                   ;; FIXME: when `newline'ing, we exceptionally
                   ;; prevent a specific behavior of
-                  ;; `eletric-pair-mode', that of opening an extra
+                  ;; `electric-pair-mode', that of opening an extra
                   ;; newline between newly inserted matching paris.
                   ;; In theory that behavior should be provided by
                   ;; `electric-layout-mode' instead, which should be
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 2cb1f614ce3..f6746eb981f 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -201,7 +201,7 @@ This is used with the `object-write' method.")
 	       "Saving this object should make backup files.
 Setting to nil will mean no backups are made."))
   "This special class enables persistence through save files
-Use the `object-save' method to write this object to disk.  The save
+Use the `object-write' method to write this object to disk.  The save
 format is Emacs Lisp code which calls the constructor for the saved
 object.  For this reason, only slots which do not have an `:initarg'
 specified will not be saved."
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 764354b03b7..3c4891b49ae 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -729,7 +729,7 @@ run.  ARGS are the arguments to `debugger'."
               ;; This means we have to limit `print-level' and
               ;; `print-length' when printing result objects.  That
               ;; might not be worth while when we can also use
-              ;; `ert-results-rerun-test-debugging-errors-at-point',
+              ;; `ert-results-rerun-test-at-point-debugging-errors',
               ;; (i.e., when running interactively) but having the
               ;; backtrace ready for printing is important for batch
               ;; use.
@@ -951,7 +951,7 @@ Selectors that do not, such as (member ...), just return the
 set implied by them without checking whether it is really
 contained in UNIVERSE."
   ;; This code needs to match the cases in
-  ;; `ert-insert-human-readable-selector'.
+  ;; `ert--insert-human-readable-selector'.
   (pcase-exhaustive selector
     ('nil nil)
     ('t (pcase-exhaustive universe
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 7d6be3cf4e2..fc8dfe12ca2 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3593,7 +3593,7 @@ This is used for `tabulated-list-format' in `package-menu-mode'."
       (string< a b))))
 
 (defun package-menu--populate-new-package-list ()
-  "Decide which packages are new in `package-archives-contents'.
+  "Decide which packages are new in `package-archive-contents'.
 Store this list in `package-menu--new-package-list'."
   ;; Find which packages are new.
   (when package-menu--old-archive-contents
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 0e1618e010a..5e01895b9fc 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -301,7 +301,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   "Keymap used by the RE Builder for the subexpression mode.")
 
 (defun reb-mode-common ()
-  "Setup functions common to functions `reb-mode' and `reb-mode-lisp'."
+  "Setup functions common to functions `reb-mode' and `reb-lisp-mode'."
 
   (setq	reb-mode-string  ""
 	reb-valid-string ""
@@ -513,7 +513,7 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
   (reb-update-overlays subexp))
 
 (defun reb-auto-update (_beg _end _lenold &optional force)
-  "Called from `after-update-functions' to update the display.
+  "Called from `after-change-functions' to update the display.
 BEG, END and LENOLD are passed in from the hook.
 An actual update is only done if the regexp has changed or if the
 optional fourth argument FORCE is non-nil."
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 41d8fc1a98f..490b2937771 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -864,7 +864,7 @@ is in `erc-mode'."
 
 (defvar erc-track-last-non-erc-buffer nil
   "Stores the name of the last buffer you were in before activating
-`erc-track-switch-buffers'.")
+`erc-track-switch-buffer'.")
 
 (defun erc-track-sort-by-activest ()
   "Sort erc-modified-channels-alist by activity.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index cfde84e19aa..3033122437a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4969,7 +4969,7 @@ information if it is not already present in the user or channel
 lists.
 
 If, and only if, changes are made, or the user is added,
-`erc-channel-members-updated-hook' is run, and t is returned.
+`erc-channel-members-changed-hook' is run, and t is returned.
 
 See also: `erc-update-user' and `erc-update-channel-member'."
   (let* (changed user-changed
@@ -6002,7 +6002,7 @@ Sets the buffer local variables:
 - `erc-session-connector'
 - `erc-session-server'
 - `erc-session-port'
-- `erc-session-full-name'
+- `erc-session-user-full-name'
 - `erc-server-current-nick'"
   (setq erc-session-connector erc-server-connect-function
         erc-session-server (erc-compute-server server)
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 0328c1f12fa..adf39061468 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -547,7 +547,7 @@ list."
 	string)))
 
 (defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
-  "Make sure to use the handler for `directory-file-and-attributes'."
+  "Make sure to use the handler for `directory-files-and-attributes'."
   (let* ((dir (expand-file-name dir)))
     (if (string-equal (file-remote-p dir 'method) "ftp")
 	(let ((files (directory-files dir full match nosort)))
diff --git a/lisp/faces.el b/lisp/faces.el
index 4d1d9561d49..48c1776648f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1773,7 +1773,7 @@ If FRAME is nil, that stands for the selected frame."
 (defun defined-colors-with-face-attributes (&optional frame)
   "Return a list of colors supported for a particular frame.
 See `defined-colors' for arguments and return value. In contrast
-to `define-colors' the elements of the returned list are color
+to `defined-colors' the elements of the returned list are color
 strings with text properties, that make the color names render
 with the color they represent as background color."
   (mapcar
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 66ef0824d8a..e60478c0b26 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -172,7 +172,7 @@ well-formed, such as \"user@host\" or \"<user@host>\"."
   :version "25.2")                      ; nil -> t
 
 (defcustom ffap-ftp-default-user "anonymous"
-  "User name in FTP file names generated by `ffap-host-to-path'.
+  "User name in FTP file names generated by `ffap-host-to-filename'.
 Note this name may be omitted if it equals the default
 \(either `efs-default-user' or `ange-ftp-default-user')."
   :type 'string
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 3c07a494206..b2d3bea8aaf 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -46,7 +46,7 @@
 ;;   * `file-cache-add-file-list': Adds a list of files to the cache
 ;;
 ;; The following functions use the regular expressions in
-;; `file-cache-delete-regexps' to eliminate unwanted files:
+;; `file-cache-filter-regexps' to eliminate unwanted files:
 ;;
 ;;   * `file-cache-add-directory': Adds the files in a directory to the
 ;;     cache.  You can also specify a regular expression to match the files
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 9834bcf0587..c43c468ead3 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -52,7 +52,7 @@
 
 ;; BTW, if you close a fileset, files, which have been changed, will
 ;; be silently saved.  Change this behavior by setting
-;; `filesets-save-buffer-fn'.
+;; `filesets-save-buffer-function'.
 
 ;;; Supported modes for inclusion groups (`filesets-ingroup-patterns'):
 ;; - Elisp
diff --git a/lisp/follow.el b/lisp/follow.el
index d499da7a8dc..f1d823d9f03 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -113,7 +113,7 @@
 ;; whatever you would like to do.  These functions are then added to
 ;; a hook.
 ;;
-;; The keymap `follow-key-map' contains key bindings activated by
+;; The keymap `follow-mode-map' contains key bindings activated by
 ;; `follow-mode'.
 ;;
 ;; Example:
@@ -356,7 +356,7 @@ property `follow-mode-use-cache' to non-nil.")
 Used by `follow-window-size-change'.")
 
 (defvar follow-windows-start-end-cache nil
-  "Cache used by `follow-window-start-end'.")
+  "Cache used by `follow-window-start' and `follow-window-end'.")
 
 (defvar follow-fixed-window nil
   "If non-nil, the current window must not be scrolled.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 506c888ff64..30edebb4e68 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -821,7 +821,7 @@ happens, so the major mode can be corrected."
 	     ;; `font-lock-keywords-alist'.
 	     (when top-cell
 	       (dolist (keyword-list-how-pair (cdr top-cell))
-		 ;; `keywords-list-how-pair' is a cons with a list of
+                 ;; `keyword-list-how-pair' is a cons with a list of
 		 ;; keywords in the car top-cell and the original how
 		 ;; argument in the cdr top-cell.
 		 (setcar keyword-list-how-pair
diff --git a/lisp/forms.el b/lisp/forms.el
index fcb6075f94b..3f9f1c9980f 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -286,7 +286,7 @@
 ;; record.
 ;;
 ;; `write-file-functions' is defined to save the actual data file
-;; instead of the buffer data, `revert-file-hook' is defined to
+;; instead of the buffer data, `revert-buffer-function' is defined to
 ;; revert a forms to original.
 
 ;;; Code:
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 3429d6560b7..f255cfc74a0 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1379,7 +1379,7 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
 (autoload 'ido-completing-read "ido")
 (defun gnus-ido-completing-read (prompt collection &optional require-match
                                         initial-input history def)
-  "Call `ido-completing-read-function'."
+  "Call `ido-completing-read'."
   (ido-completing-read prompt collection nil require-match
 		       initial-input history def))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index cbdd329f3ec..6c425b0ea16 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8019,7 +8019,7 @@ See `gmm-tool-bar-from-list' for the format of the list."
 		  (library image &optional path no-error))
 
 (defun message-make-tool-bar (&optional force)
-  "Make a message mode tool bar from `message-tool-bar-list'.
+  "Make a message mode tool bar from `message-tool-bar'.
 When FORCE, rebuild the tool bar."
   (when (and (boundp 'tool-bar-mode)
 	     tool-bar-mode
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 24a3df1e27a..a7657c68556 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -178,7 +178,7 @@ The hook functions will be called with the full group name as argument."
 (define-obsolete-variable-alias 'nndiary-request-update-info-hooks
   'nndiary-request-update-info-functions "24.3")
 (defcustom nndiary-request-update-info-functions nil
-  "Hook run after `nndiary-request-update-info-group' is executed.
+  "Hook run after `nndiary-request-update-info' is executed.
 The hook functions will be called with the full group name as argument."
   :group 'nndiary
   :type 'hook)
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index b0e79d4f238..9cf766ee465 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -1761,7 +1761,7 @@ This variable is set by `nnmaildir-request-article'.")
 	  nnmaildir--cur-server nil)
 
     ;; This slightly obscure invocation of `alist-get' removes SERVER from
-    ;; `nnmaildir-servers'.
+    ;; `nnmaildir--servers'.
     (setf (alist-get (nnmaildir--srv-address server)
 		     nnmaildir--servers server 'remove #'equal)
 	  server))
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 768e941490d..8025060b0ea 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -65,7 +65,7 @@
 ;; * For non-lossy rotation of JPEG images, the JpegTRAN program is
 ;; needed.
 ;;
-;; * For `image-dired-get-exif-data' and `image-dired-write-exif-data' to work,
+;; * For `image-dired-get-exif-data' and `image-dired-set-exif-data' to work,
 ;; the command line tool `exiftool' is needed.  It can be found here:
 ;; http://www.sno.phy.queensu.ca/~phil/exiftool/.  These two functions
 ;; are, among other things, used for writing comments to image files
@@ -310,7 +310,7 @@ temporary file name (typically generated by pnqnq)."
   :group 'image-dired)
 
 (defcustom image-dired-cmd-optipng-options '("-o5" "%t")
-  "Arguments passed to `image-dired-optipng-program'.
+  "Arguments passed to `image-dired-cmd-optipng-program'.
 Available format specifiers are described in
 `image-dired-cmd-create-thumbnail-options'."
   :version "26.1"
diff --git a/lisp/image.el b/lisp/image.el
index 4ea8594a974..963991d6418 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -840,7 +840,7 @@ multiplication factor for the current value."
 N=0 refers to the initial animation frame.
 COUNT is the total number of frames in the animation.
 TIME-ELAPSED is the total time that has elapsed since
-`image-animate-start' was called.
+`image-animate' was called.
 LIMIT determines when to stop.  If t, loop forever.  If nil, stop
  after displaying the last animation frame.  Otherwise, stop
  after LIMIT seconds have elapsed.
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 65c0df8f57c..4567b14da11 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -240,8 +240,8 @@ JSON object.
 The caller can expect SUCCESS-FN or ERROR-FN to be called with a
 JSONRPC `:result' or `:error' object, respectively.  If this
 doesn't happen after TIMEOUT seconds (defaults to
-`jsonrpc-request-timeout'), the caller can expect TIMEOUT-FN to be
-called with no arguments. The default values of SUCCESS-FN,
+`jrpc-default-request-timeout'), the caller can expect TIMEOUT-FN
+to be called with no arguments. The default values of SUCCESS-FN,
 ERROR-FN and TIMEOUT-FN simply log the events into
 `jsonrpc-events-buffer'.
 
@@ -606,7 +606,7 @@ TIMEOUT is nil)."
       (if (jsonrpc-connection-ready-p connection deferred)
           ;; Server is ready, we jump below and send it immediately.
           (remhash (list deferred buf) (jsonrpc--deferred-actions connection))
-        ;; Otherwise, save in `eglot--deferred-actions' and exit non-locally
+        ;; Otherwise, save in `jsonrpc--deferred-actions' and exit non-locally
         (unless old-id
           (jsonrpc--debug connection `(:deferring ,method :id ,id :params
                                                   ,params)))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 3feff803e3e..5a2391d6272 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2809,7 +2809,7 @@ The current mail message becomes the message displayed."
 	(with-current-buffer rmail-view-buffer
 	  ;; We give the view buffer a buffer-local value of
 	  ;; rmail-header-style based on the binding in effect when
-	  ;; this function is called; `rmail-toggle-headers' can
+          ;; this function is called; `rmail-toggle-header' can
 	  ;; inspect this value to determine how to toggle.
 	  (set (make-local-variable 'rmail-header-style) header-style)
           ;; In case viewing the previous message sets the paragraph
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 92b7d801c7b..c02b095b2ea 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -134,7 +134,7 @@ introduced in Emacs 22."
 
 (defmacro mh-face-background (face &optional frame inherit)
   "Return the background color name of face, or nil if unspecified.
-See documentation for `back-foreground' for a description of the
+See documentation for `face-background' for a description of the
 arguments FACE, FRAME, and INHERIT.
 This macro is used by Emacs versions that lack an INHERIT argument,
 introduced in Emacs 22."
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index eea04c63783..ebc5038a194 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -58,7 +58,7 @@ program, see:
 (defun mh-blacklist-a-msg (message)
   "Blacklist MESSAGE.
 If MESSAGE is nil then the message at point is blacklisted.
-The hook `mh-blacklisted-msg-hook' is called after you mark a message
+The hook `mh-blacklist-msg-hook' is called after you mark a message
 for blacklisting."
   (save-excursion
     (if (numberp message)
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index e94947bc7f1..f84c1b3094f 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -164,7 +164,7 @@ STATUS SETTINGS.  HOST is the host domain, PORT is a TCP port
 number, STATUS is the peer status returned by
 `gnutls-peer-status', and SETTINGS is the persistent and session
 settings for the host HOST.  Please refer to the contents of
-`nsm-setting-file' for details.  If a problem is found, the check
+`nsm-settings-file' for details.  If a problem is found, the check
 function is required to return an error message, and nil
 otherwise.
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9e8a3168fd7..7adfb49a858 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -753,7 +753,7 @@ for($i = 0; $i < $n; $i++)
         $stat[1]);
 }
 printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
-  "Perl script implementing `directory-files-attributes' as Lisp `read'able
+  "Perl script implementing `directory-files-and-attributes' as Lisp `read'able
 output.
 Escape sequence %s is replaced with name of Perl binary.
 This string is passed to `format', so percent characters need to be doubled.")
diff --git a/lisp/notifications.el b/lisp/notifications.el
index e6ce9a5d76d..3c2a8cf39c0 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -108,7 +108,7 @@
 	(setq notifications-on-action-object nil)))))
 
 (defun notifications-on-closed-signal (id &optional reason)
-  "Dispatch signals to callback functions from `notifications-on-closed-map'."
+  "Dispatch signals to callback functions from `notifications-on-close-map'."
   ;; notification-daemon prior 0.4.0 does not send a reason.  So we
   ;; make it optional, and assume `undefined' as default.
   (let* ((bus (dbus-event-bus-name last-input-event))
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el
index ad6622714dd..f139d645dad 100644
--- a/lisp/org/ol-bibtex.el
+++ b/lisp/org/ol-bibtex.el
@@ -318,7 +318,7 @@ is non-nil."
   "Controls whether inherited tags are converted to bibtex keywords.
 It is relevant only if `org-bibtex-tags-are-keywords' is non-nil.
 Tag inheritance itself is controlled by `org-use-tag-inheritance'
-and `org-exclude-tags-from-inheritance'."
+and `org-tags-exclude-from-inheritance'."
   :group 'org-bibtex
   :version "26.1"
   :package-version '(Org . "8.3")
diff --git a/lisp/org/org-num.el b/lisp/org/org-num.el
index a6ddce733c8..5b8e1dbb6d1 100644
--- a/lisp/org/org-num.el
+++ b/lisp/org/org-num.el
@@ -131,7 +131,7 @@ For example, add \"ARCHIVE\" to this list to avoid numbering
 archived sub-trees.
 
 Tag in this list prevent numbering the whole sub-tree,
-irrespective to `org-use-tags-inheritance', or other means to
+irrespective to `org-use-tag-inheritance', or other means to
 control tag inheritance."
   :group 'org-appearance
   :package-version '(Org . "9.3")
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 568f5b9b873..a7502d188e2 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2059,7 +2059,7 @@ taken from the (otherwise obsolete) variable `org-todo-interpretation'."
 		   (choice
 		    :tag "Interpretation"
 		    ;;Quick and dirty way to see
-		    ;;`org-todo-interpretations'.  This takes the
+                    ;;`org-todo-interpretation'.  This takes the
 		    ;;place of item arguments
 		    :convert-widget
 		    (lambda (widget)
diff --git a/lisp/printing.el b/lisp/printing.el
index 181092ee999..0c564237da6 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -4721,7 +4721,7 @@ Each element has the form:
 
    (MENU-PART . NUMBER-OF-ITEMS)
 
-See `pr-visible-entry-alist'.")
+See `pr-visible-entry-list'.")
 
 
 (defun pr-menu-index (entry index)
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index bf56a7ee49e..e63e4d65fb5 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -1875,7 +1875,7 @@ cell where the two values determine the area inside the braces."
 (defun antlr-option-spec (level option specs existsp)
   "Return version correct option value specification.
 Return specification for option OPTION of kind level LEVEL.  SPECS
-should correspond to the VALUE-SPEC... in `antlr-option-alists'.
+should correspond to the VALUE-SPEC... in `antlr-options-alists'.
 EXISTSP determines whether the option already exists."
   (let (value)
     (while (and specs (>= antlr-tool-version (caar specs)))
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index bb780259333..c84803a3fab 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3616,7 +3616,7 @@ completion."
 ;;; Tags query replace & search
 
 (defvar ebrowse-tags-loop-form ()
-  "Form for `ebrowse-loop-continue'.
+  "Form for `ebrowse-tags-loop-continue'.
 Evaluated for each file in the tree.  If it returns nil, proceed
 with the next file.")
 
diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el
index bddd1a39fc2..1e9e25641d5 100644
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -86,7 +86,7 @@ SOURCE."
              (cond ((derived-mode-p 'c++-mode) "c++")
                    (t "c")))))
 
-(defvar-local flymake-cc--proc nil "Internal variable for `flymake-gcc'")
+(defvar-local flymake-cc--proc nil "Internal variable for `flymake-cc'")
 
 ;; forward declare this to shoosh compiler (instead of requiring
 ;; flymake-proc)
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 10416ead603..f5af277dc5e 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -250,7 +250,7 @@ Effective only if `hide-ifdef-expand-reinclusion-protection' is t."
 
 (defvar hide-ifdef-env-backup nil
   "This variable is a backup of the previously cleared `hide-ifdef-env'.
-This backup prevents any accidental clearance of `hide-fidef-env' by
+This backup prevents any accidental clearance of `hide-ifdef-env' by
 `hif-clear-all-ifdef-defined'.")
 
 (defvar hif-outside-read-only nil
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 785b941402a..2d47cdc4068 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2095,7 +2095,7 @@ virtualenv."
   :group 'python)
 
 (defcustom python-shell-setup-codes nil
-  "List of code run by `python-shell-send-setup-codes'."
+  "List of code run by `python-shell-send-setup-code'."
   :type '(repeat symbol)
   :group 'python)
 
@@ -2383,9 +2383,11 @@ regexps: `python-shell-prompt-regexp',
 
 (defun python-shell-prompt-set-calculated-regexps ()
   "Detect and set input and output prompt regexps.
-Build and set the values for `python-shell-input-prompt-regexp'
-and `python-shell-output-prompt-regexp' using the values from
-`python-shell-prompt-regexp', `python-shell-prompt-block-regexp',
+Build and set the values for
+`python-shell--prompt-calculated-input-regexp' and
+`python-shell--prompt-calculated-output-regexp' using the values
+from `python-shell-prompt-regexp',
+`python-shell-prompt-block-regexp',
 `python-shell-prompt-pdb-regexp',
 `python-shell-prompt-output-regexp',
 `python-shell-prompt-input-regexps',
@@ -2447,7 +2449,7 @@ of `python-shell-buffer-name'."
 
 (defun python-shell-internal-get-process-name ()
   "Calculate the appropriate process name for Internal Python process.
-The name is calculated from `python-shell-global-buffer-name' and
+The name is calculated from `python-shell-buffer-name' and
 the `buffer-name'."
   (format "%s[%s]" python-shell-internal-buffer-name (buffer-name)))
 
@@ -4718,7 +4720,7 @@ customize how labels are formatted."
 (defun python-imenu-create-flat-index (&optional alist prefix)
   "Return flat outline of the current Python buffer for Imenu.
 Optional argument ALIST is the tree to be flattened; when nil
-`python-imenu-build-index' is used with
+`python-imenu-create-index' is used with
 `python-imenu-format-parent-item-jump-label-function'
 `python-imenu-format-parent-item-label-function'
 `python-imenu-format-item-label-function' set to
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index a04c26d2764..7d1f5ef6544 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2866,8 +2866,8 @@ See `sql-product-alist' for a list of products and supported features."
 
 The KEYWORDS-ONLY flag is passed to font-lock to specify whether
 only keywords should be highlighted and syntactic highlighting
-skipped.  The IMENU flag indicates whether `imenu-mode' should
-also be configured."
+skipped.  The IMENU flag indicates whether `imenu' should also be
+configured."
 
   (let
       ;; Get the product-specific syntax-alist.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index ace30017814..aade09214c0 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -2198,7 +2198,7 @@ The values for `ps-line-number-start':
      `ps-line-number-step' inclusive.
 
    * If `ps-line-number-step' is set to `zebra', must be between 1 and the
-     value of `ps-zebra-strip-height' inclusive.  Use this combination if you
+     value of `ps-zebra-stripe-height' inclusive.  Use this combination if you
      wish that line number be relative to zebra stripes."
   :type '(integer :tag "Start Step Interval")
   :version "20"
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 7c688d53fa9..656ad3e79b8 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -57,7 +57,7 @@
   (interactive)
   (ps-print-message-from-summary 'rmail-summary-buffer "RMAIL"))
 
-;; Used in `ps-rmail-print-article-from-summary',
+;; Used in `ps-rmail-print-message-from-summary',
 ;; `ps-gnus-print-article-from-summary' and `ps-vm-print-message-from-summary'.
 (defun ps-print-message-from-summary (summary-buffer summary-default)
   (let ((ps-buf (or (and (boundp summary-buffer)
diff --git a/lisp/ses.el b/lisp/ses.el
index 218043f2192..b3811afd71a 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -395,7 +395,7 @@ left-justification of the result.  Set to error-signal if `ses-call-printer'
 encountered an error during printing.  Otherwise nil.")
 
 (defvar ses-start-time nil
-  "Time when current operation started.  Used by `ses-time-check' to decide
+  "Time when current operation started.  Used by `ses--time-check' to decide
 when to emit a progress message.")
 
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 364689ccdbf..c8b36e205fd 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1509,7 +1509,7 @@ Consider using a subdirectory instead, e.g.: %s"
 (defun x-apply-session-resources ()
   "Apply X resources which specify initial values for Emacs variables.
 This is called from a window-system initialization function, such
-as `x-initialize-window-system' for X, either at startup (prior
+as `window-system-initialization' for X, either at startup (prior
 to reading the init file), or afterwards when the user first
 opens a graphical frame.
 
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 7a88744540b..334e1a72d38 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -102,7 +102,7 @@
 ;; The default value (9) should be fine for most decent computers.
 ;; NOTE: This variable should not be set to a number less than 3.
 
-;; `strokes-display-strokes-buffer' will allow you to hide the strokes
+;; `strokes-use-strokes-buffer' will allow you to hide the strokes
 ;; buffer when doing simple strokes.  This is a speedup for slow
 ;; computers as well as people who don't want to see their strokes.
 
@@ -579,7 +579,7 @@ The grid is a square whose dimension is [0,GRID-RESOLUTION)."
 
 (defun strokes-fill-stroke (unfilled-stroke &optional force)
   "Fill in missing grid locations in the list of UNFILLED-STROKE.
-If FORCE is non-nil, then fill the stroke even if it's `stroke-click'.
+If FORCE is non-nil, then fill the stroke even if it's `strokes-click-p'.
 NOTE: This is where the global variable `strokes-last-stroke' is set."
   (setq strokes-last-stroke		; this is global
 	(if (and (strokes-click-p unfilled-stroke)
@@ -1629,7 +1629,7 @@ Optional FORCE non-nil will ignore the buffer's read-only status."
 	  ;; The comment below is what I'd have to do if I wanted to
 	  ;; deal with random newlines in the midst of the compressed
 	  ;; strings.  If I do this, I'll also have to change
-	  ;; `strokes-xpm-to-compress-string' to deal with the newline,
+          ;; `strokes-xpm-to-compressed-string' to deal with the newline,
 	  ;; and possibly other whitespace stuff.  YUCK!
 	  ;;      (while (re-search-forward "\\+/\\(\\w\\|\\)+/" nil t nil (get-buffer buffer))
 	  (while (with-current-buffer buffer
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 9de5ac66c7d..ea072ff9dd7 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -540,7 +540,7 @@ and insert the results."
 ;;; tempo-forward-mark
 
 (defun tempo-forward-mark ()
-  "Jump to the next mark in `tempo-forward-mark-list'."
+  "Jump to the next mark in `tempo-marks'."
   (interactive)
   (let ((next-mark (catch 'found
 		     (mapc
@@ -558,7 +558,7 @@ and insert the results."
 ;;; tempo-backward-mark
 
 (defun tempo-backward-mark ()
-  "Jump to the previous mark in `tempo-back-mark-list'."
+  "Jump to the previous mark in `tempo-marks'."
   (interactive)
   (let ((prev-mark (catch 'found
 		     (let (last)
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 9f08772ec30..eb07bb4d910 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -598,7 +598,7 @@ This variable is initialized by the `artist-make-prev-next-op-alist' function.")
     (define-key map "\C-c\C-a\C-b" 'artist-submit-bug-report)
     (define-key map [menu-bar artist] (cons "Artist" artist-menu-map))
     map)
-  "Keymap for `artist-minor-mode'.")
+  "Keymap for `artist-mode'.")
 
 (defvar artist-replacement-table (make-vector 256 0)
   "Replacement table for `artist-replace-char'.")
@@ -1963,7 +1963,8 @@ Return a list (RETURN-CODE STDOUT STDERR)."
 
 (defsubst artist-get-char-at-xy (x y)
   "Return the character found at column X, row Y.
-Also updates the variables `artist-draw-min-y' and `artist-draw-max-y'."
+Also updates the variables `artist-draw-region-min-y' and
+`artist-draw-region-max-y'."
   (artist-move-to-xy x y)
   (let ((curr-y (artist-current-line)))
     (setq artist-draw-region-min-y (min curr-y artist-draw-region-min-y))
@@ -5594,8 +5595,8 @@ The event, EV, is the mouse event."
 ;;         - artist-key-set-point-xxx for setting a point in the
 ;;           mode, to be called from `artist-key-set-point-common'.
 ;;
-;;         - artist-key-do-continuously-xxx to be called from
-;;           `artist-key-do-continuously-common' whenever the user
+;;         - artist-key-do-continously-xxx to be called from
+;;           `artist-key-do-continously-common' whenever the user
 ;;           moves around.
 ;;
 ;;         As for the artist-mouse-draw-xxx, these two functions must
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index cb0494ee91c..1e4343cc6be 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -1624,8 +1624,7 @@ With prefix argument, prompt for cvs flags."
 (defun-cvs-mode (cvs-mode-diff . DOUBLE) (flags)
   "Diff the selected files against the repository.
 This command compares the files in your working area against the
-revision which they are based upon.
-See also `cvs-diff-ignore-marks'."
+revision which they are based upon."
   (interactive
    (list (cvs-add-branch-prefix
 	  (cvs-add-secondary-branch-prefix
diff --git a/lisp/window.el b/lisp/window.el
index 5c4ff83d82d..7b75495ad84 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5404,7 +5404,7 @@ frame.  The selected window is not changed by this function."
 		(set-window-parameter
 		 (window-parent new) 'window-side window-side))))
 	   ((eq window-combination-resize 'atom)
-	    ;; Make sure `window--check-frame' won't destroy an existing
+            ;; Make sure `window--check' won't destroy an existing
 	    ;; atomic window in case the new window gets nested inside.
 	    (unless (window-parameter window 'window-atom)
 	      (set-window-parameter window 'window-atom t))