Merge remote-tracking branch 'savannah/master' into HEAD

17 files changed, 63 insertions, 120 deletions

diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 50c00c95320..e66adb43e75 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -408,57 +408,43 @@ be in `artist-spray-chars', or spraying will behave strangely.")
 
 ;; Internal variables
 ;;
-(defvar artist-mode nil
-  "Non-nil to enable `artist-mode' and nil to disable.")
-(make-variable-buffer-local 'artist-mode)
-
 (defvar artist-mode-name " Artist"
   "Name of Artist mode beginning with a space (appears in the mode-line).")
 
-(defvar artist-curr-go 'pen-line
+(defvar-local artist-curr-go 'pen-line
   "Current selected graphics operation.")
-(make-variable-buffer-local 'artist-curr-go)
 
-(defvar artist-line-char-set nil
+(defvar-local artist-line-char-set nil
   "Boolean to tell whether user has set some char to use when drawing lines.")
-(make-variable-buffer-local 'artist-line-char-set)
 
-(defvar artist-line-char nil
+(defvar-local artist-line-char nil
   "Char to use when drawing lines.")
-(make-variable-buffer-local 'artist-line-char)
 
-(defvar artist-fill-char-set nil
+(defvar-local artist-fill-char-set nil
   "Boolean to tell whether user has set some char to use when filling.")
-(make-variable-buffer-local 'artist-fill-char-set)
 
-(defvar artist-fill-char nil
+(defvar-local artist-fill-char nil
   "Char to use when filling.")
-(make-variable-buffer-local 'artist-fill-char)
 
-(defvar artist-erase-char ?\s
+(defvar-local artist-erase-char ?\s
   "Char to use when erasing.")
-(make-variable-buffer-local 'artist-erase-char)
 
-(defvar artist-default-fill-char ?.
+(defvar-local artist-default-fill-char ?.
   "Char to use when a fill-char is required but none is set.")
-(make-variable-buffer-local 'artist-default-fill-char)
 
 ; This variable is not buffer local
 (defvar artist-copy-buffer nil
   "Copy buffer.")
 
-(defvar artist-draw-region-min-y 0
+(defvar-local artist-draw-region-min-y 0
   "Line-number for top-most visited line for draw operation.")
-(make-variable-buffer-local 'artist-draw-region-min-y)
 
-(defvar artist-draw-region-max-y 0
+(defvar-local artist-draw-region-max-y 0
   "Line-number for bottom-most visited line for draw operation.")
-(make-variable-buffer-local 'artist-draw-region-max-y)
 
-(defvar artist-borderless-shapes nil
+(defvar-local artist-borderless-shapes nil
   "When non-nil, draw shapes without border.
 The fill char is used instead, if it is set.")
-(make-variable-buffer-local 'artist-borderless-shapes)
 
 (defvar artist-prev-next-op-alist nil
   "Assoc list for looking up next and/or previous draw operation.
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 1e22287d32e..ec21987bbf5 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -1,4 +1,4 @@
-;;; bib-mode.el --- major mode for editing bib files
+;;; bib-mode.el --- major mode for editing bib files  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc.
 
@@ -39,13 +39,11 @@
 
 (defcustom bib-file "~/my-bibliography.bib"
   "Default name of file used by `addbib'."
-    :type 'file
-    :group 'bib)
+    :type 'file)
 
 (defcustom unread-bib-file "~/to-be-read.bib"
    "Default name of file used by `unread-bib' in Bib mode."
-   :type 'file
-   :group 'bib)
+   :type 'file)
 
 (defvar bib-mode-map
   (let ((map (make-sparse-keymap)))
@@ -138,8 +136,7 @@ with the cdr.")
 
 (defcustom bib-auto-capitalize t
   "True to automatically capitalize appropriate fields in Bib mode."
-  :type 'boolean
-  :group 'bib)
+  :type 'boolean)
 
 (defconst bib-capitalized-fields "%[AETCBIJR]")
 
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 9186e520086..622853da456 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -71,9 +71,8 @@
     "while")
   "Additional identifiers that appear in the form @foo in SCSS.")
 
-(defvar css--at-ids css-at-ids
+(defvar-local css--at-ids css-at-ids
   "List of at-rules for the current mode.")
-(make-variable-buffer-local 'css--at-ids)
 
 (defconst css-bang-ids
   '("important")
@@ -83,9 +82,8 @@
   '("default" "global" "optional")
   "Additional identifiers that appear in the form !foo in SCSS.")
 
-(defvar css--bang-ids css-bang-ids
+(defvar-local css--bang-ids css-bang-ids
   "List of bang-rules for the current mode.")
-(make-variable-buffer-local 'css--bang-ids)
 
 (defconst css-descriptor-ids
   '("ascent" "baseline" "bbox" "cap-height" "centerline" "definition-src"
@@ -1374,9 +1372,8 @@ the string PROPERTY."
   "List of HTML tags.
 Used to provide completion of HTML tags in selectors.")
 
-(defvar css--nested-selectors-allowed nil
+(defvar-local css--nested-selectors-allowed nil
   "Non-nil if nested selectors are allowed in the current mode.")
-(make-variable-buffer-local 'css--nested-selectors-allowed)
 
 (defvar css-class-list-function #'ignore
   "Called to provide completions of class names.
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 23a622992ad..f1a7517192f 100644
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -1,4 +1,4 @@
-;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
+;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2000-2001, 2004-2021 Free Software Foundation, Inc.
 
@@ -70,23 +70,19 @@
 
 (defface dns-mode-control-entity '((t :inherit font-lock-keyword-face))
   "Face used for DNS control entities, e.g. $ORIGIN."
-  :version "26.1"
-  :group 'dns-mode)
+  :version "26.1")
 
 (defface dns-mode-bad-control-entity '((t :inherit font-lock-warning-face))
   "Face used for non-standard DNS control entities, e.g. $FOO."
-  :version "26.1"
-  :group 'dns-mode)
+  :version "26.1")
 
 (defface dns-mode-type '((t :inherit font-lock-type-face))
   "Face used for DNS types, e.g., SOA."
-  :version "26.1"
-  :group 'dns-mode)
+  :version "26.1")
 
 (defface dns-mode-class '((t :inherit font-lock-constant-face))
   "Face used for DNS classes, e.g., IN."
-  :version "26.1"
-  :group 'dns-mode)
+  :version "26.1")
 
 (defvar dns-mode-control-entity-face ''dns-mode-control-entity
   "Name of face used for control entities, e.g. $ORIGIN.")
@@ -121,8 +117,7 @@
     (,(regexp-opt dns-mode-types) 0 ,dns-mode-type-face))
   "Font lock keywords used to highlight text in DNS master file mode."
   :version "26.1"
-  :type 'sexp
-  :group 'dns-mode)
+  :type 'sexp)
 
 (defcustom dns-mode-soa-auto-increment-serial t
   "Whether to increment the SOA serial number automatically.
@@ -134,8 +129,7 @@ manually with \\[dns-mode-soa-increment-serial]."
   :type '(choice (const :tag "Always" t)
 		 (const :tag "Ask" ask)
 		 (const :tag "Never" nil))
-  :safe 'symbolp
-  :group 'dns-mode)
+  :safe 'symbolp)
 
 ;; Syntax table.
 
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 1aac96413e4..fe92d603065 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -165,10 +165,9 @@ execute malicious Lisp code, if that code came from an external source."
   :version "26.1"
   :group 'enriched)
 
-(defvar enriched-old-bindings nil
+(defvar-local enriched-old-bindings nil
   "Store old variable values that we change when entering mode.
 The value is a list of \(VAR VALUE VAR VALUE...).")
-(make-variable-buffer-local 'enriched-old-bindings)
 
 ;; The next variable is buffer local if and only if Enriched mode is
 ;; enabled.  The buffer local value records whether
@@ -187,7 +186,6 @@ The value is a list of \(VAR VALUE VAR VALUE...).")
 
 (defvar enriched-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map [remap move-beginning-of-line] 'beginning-of-line-text)
     (define-key map "\C-m" 'reindent-then-newline-and-indent)
     (define-key map
       [remap newline-and-indent] 'reindent-then-newline-and-indent)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index d8503168846..83dba7177ab 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -304,12 +304,11 @@ If this variable is nil, all regions are treated as small."
 (define-obsolete-variable-alias 'flyspell-generic-check-word-p
   'flyspell-generic-check-word-predicate "25.1")
 
-(defvar flyspell-generic-check-word-predicate nil
+(defvar-local flyspell-generic-check-word-predicate nil
   "Function providing per-mode customization over which words are flyspelled.
 Returns t to continue checking, nil otherwise.
 Flyspell mode sets this variable to whatever is the `flyspell-mode-predicate'
 property of the major mode name.")
-(make-variable-buffer-local 'flyspell-generic-check-word-predicate)
 
 ;;*--- mail mode -------------------------------------------------------*/
 (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -466,13 +465,10 @@ If this is set, also unbind `mouse-2'."
   :version "28.1")
 
 ;; dash character machinery
-(defvar flyspell-consider-dash-as-word-delimiter-flag nil
+(defvar-local flyspell-consider-dash-as-word-delimiter-flag nil
   "Non-nil means that the `-' char is considered as a word delimiter.")
-(make-variable-buffer-local 'flyspell-consider-dash-as-word-delimiter-flag)
-(defvar flyspell-dash-dictionary nil)
-(make-variable-buffer-local 'flyspell-dash-dictionary)
-(defvar flyspell-dash-local-dictionary nil)
-(make-variable-buffer-local 'flyspell-dash-local-dictionary)
+(defvar-local flyspell-dash-dictionary nil)
+(defvar-local flyspell-dash-local-dictionary nil)
 
 ;;*---------------------------------------------------------------------*/
 ;;*    Highlighting                                                     */
@@ -714,14 +710,10 @@ has been used, the current word is not checked."
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-word-cache ...                                          */
 ;;*---------------------------------------------------------------------*/
-(defvar flyspell-word-cache-start  nil)
-(defvar flyspell-word-cache-end    nil)
-(defvar flyspell-word-cache-word   nil)
-(defvar flyspell-word-cache-result '_)
-(make-variable-buffer-local 'flyspell-word-cache-start)
-(make-variable-buffer-local 'flyspell-word-cache-end)
-(make-variable-buffer-local 'flyspell-word-cache-word)
-(make-variable-buffer-local 'flyspell-word-cache-result)
+(defvar-local flyspell-word-cache-start  nil)
+(defvar-local flyspell-word-cache-end    nil)
+(defvar-local flyspell-word-cache-word   nil)
+(defvar-local flyspell-word-cache-result '_)
 
 ;;*---------------------------------------------------------------------*/
 ;;*    The flyspell pre-hook, store the current position. In the        */
@@ -827,8 +819,7 @@ before the current command."
 ;;*    the post command hook, we will check, if the word at this        */
 ;;*    position has to be spell checked.                                */
 ;;*---------------------------------------------------------------------*/
-(defvar flyspell-changes nil)
-(make-variable-buffer-local 'flyspell-changes)
+(defvar-local flyspell-changes nil)
 
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-after-change-function ...                               */
@@ -1894,14 +1885,10 @@ as returned by `ispell-parse-output'."
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-auto-correct-cache ...                                  */
 ;;*---------------------------------------------------------------------*/
-(defvar flyspell-auto-correct-pos nil)
-(defvar flyspell-auto-correct-region nil)
-(defvar flyspell-auto-correct-ring nil)
-(defvar flyspell-auto-correct-word nil)
-(make-variable-buffer-local 'flyspell-auto-correct-pos)
-(make-variable-buffer-local 'flyspell-auto-correct-region)
-(make-variable-buffer-local 'flyspell-auto-correct-ring)
-(make-variable-buffer-local 'flyspell-auto-correct-word)
+(defvar-local flyspell-auto-correct-pos nil)
+(defvar-local flyspell-auto-correct-region nil)
+(defvar-local flyspell-auto-correct-ring nil)
+(defvar-local flyspell-auto-correct-word nil)
 
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-check-previous-highlighted-word ...                     */
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 8d49a7c54c8..ea46270508e 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -351,9 +351,8 @@ If nil, the default personal dictionary for your spelling checker is used."
   :type 'boolean
   :group 'ispell)
 
-(defvar ispell-local-dictionary-overridden nil
+(defvar-local ispell-local-dictionary-overridden nil
   "Non-nil means the user has explicitly set this buffer's Ispell dictionary.")
-(make-variable-buffer-local 'ispell-local-dictionary-overridden)
 
 (defcustom ispell-local-dictionary nil
   "If non-nil, the dictionary to be used for Ispell commands in this buffer.
@@ -1748,7 +1747,7 @@ Note - substrings of other matches must come last
  (e.g. \"<[tT][tT]/\" and \"<[^ \\t\\n>]\").")
 (put 'ispell-html-skip-alists 'risky-local-variable t)
 
-(defvar ispell-local-pdict ispell-personal-dictionary
+(defvar-local ispell-local-pdict ispell-personal-dictionary
   "A buffer local variable containing the current personal dictionary.
 If non-nil, the value must be a string, which is a file name.
 
@@ -1758,18 +1757,15 @@ to calling \\[ispell-change-dictionary].  This variable is automatically
 set when defined in the file with either `ispell-pdict-keyword' or the
 local variable syntax.")
 
-(make-variable-buffer-local 'ispell-local-pdict)
 ;;;###autoload(put 'ispell-local-pdict 'safe-local-variable 'stringp)
 
 (defvar ispell-buffer-local-name nil
   "Contains the buffer name if local word definitions were used.
 Ispell is then restarted because the local words could conflict.")
 
-(defvar ispell-buffer-session-localwords nil
+(defvar-local ispell-buffer-session-localwords nil
   "List of words accepted for session in this buffer.")
 
-(make-variable-buffer-local 'ispell-buffer-session-localwords)
-
 (defvar ispell-parser 'use-mode-name
   "Indicates whether ispell should parse the current buffer as TeX Code.
 Special value `use-mode-name' tries to guess using the name of `major-mode'.
diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el
index 9cacc175ba9..24ccb3ce980 100644
--- a/lisp/textmodes/less-css-mode.el
+++ b/lisp/textmodes/less-css-mode.el
@@ -73,7 +73,6 @@
 
 (require 'compile)
 (require 'css-mode)
-(require 'derived)
 (eval-when-compile (require 'subr-x))
 
 (defgroup less-css nil
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index fe70e925b05..e7d852be3c8 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -316,7 +316,7 @@ otherwise off."
 	 (save-buffer))
     (if viewbuf
 	(kill-buffer viewbuf))
-    (Man-getpage-in-background file)))
+    (Man-getpage-in-background (shell-quote-argument file))))
 
 (provide 'nroff-mode)
 
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 6edd9aeb7ef..8f4f3c5a231 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -88,10 +88,9 @@
 ;;;   "Refilling paragraphs on changes."
 ;;;   :group 'fill)
 
-(defvar refill-ignorable-overlay nil
+(defvar-local refill-ignorable-overlay nil
   "Portion of the most recently filled paragraph not needing filling.
 This is used to optimize refilling.")
-(make-variable-buffer-local 'refill-ignorable-overlay)
 
 (defun refill-adjust-ignorable-overlay (overlay afterp beg end &optional len)
   "Adjust OVERLAY to not include the about-to-be-modified region."
@@ -149,7 +148,7 @@ This is used to optimize refilling.")
   "Like `fill-paragraph' but don't delete whitespace at paragraph end."
   (refill-fill-paragraph-at (point) arg))
 
-(defvar refill-doit nil
+(defvar-local refill-doit nil
   "Non-nil tells `refill-post-command-function' to do its processing.
 Set by `refill-after-change-function' in `after-change-functions' and
 unset by `refill-post-command-function' in `post-command-hook', and
@@ -157,7 +156,6 @@ sometimes `refill-pre-command-function' in `pre-command-hook'.  This
 ensures refilling is only done once per command that causes a change,
 regardless of the number of after-change calls from commands doing
 complex processing.")
-(make-variable-buffer-local 'refill-doit)
 
 (defun refill-after-change-function (beg end len)
   "Function for `after-change-functions' which just sets `refill-doit'."
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 18341716e3a..2b31e7ed612 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -3627,10 +3627,7 @@ Region is from BEG to END.  With WITH-EMPTY prefix empty lines too."
                         "customize the face `rst-definition' instead."
                         "24.1")
 
-;; XEmacs compatibility (?).
-(defface rst-directive (if (boundp 'font-lock-builtin-face)
-                           '((t :inherit font-lock-builtin-face))
-                         '((t :inherit font-lock-preprocessor-face)))
+(defface rst-directive '((t :inherit font-lock-builtin-face))
   "Face used for directives and roles."
   :version "24.1"
   :group 'rst-faces)
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index c50c544cb54..7051f520b90 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -510,10 +510,12 @@ an optional alist of possible values."
 (with-no-warnings (defvar v2))				; free for skeleton
 
 (defun sgml-comment-indent-new-line (&optional soft)
-  (let ((comment-start "-- ")
-	(comment-start-skip "\\(<!\\)?--[ \t]*")
-	(comment-end " --")
-	(comment-style 'plain))
+  (if (ppss-comment-depth (syntax-ppss))
+      (let ((comment-start "-- ")
+	    (comment-start-skip "\\(<!\\)?--[ \t]*")
+	    (comment-end " --")
+	    (comment-style 'plain))
+        (comment-indent-new-line soft))
     (comment-indent-new-line soft)))
 
 (defun sgml-mode-facemenu-add-face-function (face _end)
@@ -2290,19 +2292,17 @@ This takes effect when first loading the library.")
 	 nil t)
 	(match-string-no-properties 1))))
 
-(defvar html--buffer-classes-cache nil
+(defvar-local html--buffer-classes-cache nil
   "Cache for `html-current-buffer-classes'.
 When set, this should be a cons cell where the CAR is the
 buffer's tick counter (as produced by `buffer-modified-tick'),
 and the CDR is the list of class names found in the buffer.")
-(make-variable-buffer-local 'html--buffer-classes-cache)
 
-(defvar html--buffer-ids-cache nil
+(defvar-local html--buffer-ids-cache nil
   "Cache for `html-current-buffer-ids'.
 When set, this should be a cons cell where the CAR is the
 buffer's tick counter (as produced by `buffer-modified-tick'),
 and the CDR is the list of class names found in the buffer.")
-(make-variable-buffer-local 'html--buffer-ids-cache)
 
 (declare-function libxml-parse-html-region "xml.c"
                   (start end &optional base-url discard-comments))
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 071684d3c4d..06785e458b2 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -859,11 +859,10 @@ cell to cache and cache to cell.")
   "Non-nil inhibits auto fill paragraph when `table-with-cache-buffer' exits.
 This is always set to nil at the entry to `table-with-cache-buffer' before
 executing body forms.")
-(defvar table-mode-indicator nil
+(defvar-local table-mode-indicator nil
   "For mode line indicator")
 ;; This is not a real minor-mode but placed in the minor-mode-alist
 ;; so that we can show the indicator on the mode line handy.
-(make-variable-buffer-local 'table-mode-indicator)
 (unless (assq table-mode-indicator minor-mode-alist)
   (push '(table-mode-indicator (table-fixed-width-mode " Fixed-Table" " Table"))
         minor-mode-alist))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ce665e61656..d5a79ad0ac5 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2044,8 +2044,7 @@ In the tex shell buffer this command behaves like `comint-send-input'."
     (with-current-buffer buffer
       (setq default-directory directory))))
 
-(defvar tex-send-command-modified-tick 0)
-(make-variable-buffer-local 'tex-send-command-modified-tick)
+(defvar-local tex-send-command-modified-tick 0)
 
 (defun tex-shell-proc ()
   (or (tex-shell-running) (error "No TeX subprocess")))
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index ed0a367d01d..fe052e32414 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -28,10 +28,12 @@
 ;;; Emacs lisp functions to convert Texinfo files to Info files.
 
 (defvar texinfmt-version "2.42 of  7 Jul 2006")
+(make-obsolete-variable 'texinfmt-version 'emacs-version "28.1")
 
 (defun texinfmt-version (&optional here)
   "Show the version of texinfmt.el in the minibuffer.
 If optional argument HERE is non-nil, insert info at point."
+  (declare (obsolete emacs-version "28.1"))
   (interactive "P")
   (let ((version-string
          (format-message "Version of `texinfmt.el': %s" texinfmt-version)))
@@ -345,8 +347,8 @@ converted to Info is stored in a temporary buffer."
 			 (file-name-nondirectory
 			  (buffer-file-name input-buffer))))
 	      (format-message "buffer `%s'" (buffer-name input-buffer)))
-            (format-message "\nusing `texinfmt.el' version ")
-            texinfmt-version
+            (format-message "\nusing `texinfmt.el' on Emacs version ")
+            emacs-version
             ".\n\n")
 
     ;; Now convert for real.
@@ -489,8 +491,8 @@ if large.  You can use `Info-split' to do this manually."
                          (file-name-nondirectory
                           (buffer-file-name input-buffer))))
               (format-message "buffer `%s'" (buffer-name input-buffer)))
-            (format-message "\nusing `texinfmt.el' version ")
-            texinfmt-version
+            (format-message "\nusing `texinfmt.el' on Emacs version ")
+            emacs-version
             ".\n\n")
     ;; Return data for indices.
     (list outfile
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 1432ab6a300..ab9f7b9c7c0 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -169,8 +169,6 @@ both existing buffers and buffers that you subsequently create."
 	     (if enable-mode "enabled" "disabled"))))
 
 
-(define-key facemenu-keymap "\eS" 'center-paragraph)
-
 (defun center-paragraph ()
   "Center each nonblank line in the paragraph at or after point.
 See `center-line' for more info."
@@ -198,8 +196,6 @@ See `center-line' for more info."
 	    (center-line))
 	(forward-line 1)))))
 
-(define-key facemenu-keymap "\es" 'center-line)
-
 (defun center-line (&optional nlines)
   "Center the line point is on, within the width specified by `fill-column'.
 This means adjusting the indentation so that it equals
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 36aad84c0e6..d072ab16c3c 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -218,15 +218,13 @@ minus this value."
 ;; Markers seem to be the only buffer-id not affected by renaming a buffer.
 ;; This nevertheless loses when a buffer is killed.  The variable-name is
 ;; required by `describe-mode'.
-(defvar 2C-mode nil
+(defvar-local 2C-mode nil
   "Marker to the associated buffer, if non-nil.")
-(make-variable-buffer-local '2C-mode)
 (put '2C-mode 'permanent-local t)
 
 (setq minor-mode-alist (cons '(2C-mode " 2C") minor-mode-alist))
 
-(defvar 2C-autoscroll-start nil)
-(make-variable-buffer-local '2C-autoscroll-start)
+(defvar-local 2C-autoscroll-start nil)
 
 ;;;;; base functions ;;;;;