From c167009400f62149a6ab1568ababcfa6ce422467 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 20 Dec 2021 22:12:25 +0100 Subject: Make some variable aliases obsolete * lisp/progmodes/make-mode.el (makefile-query-one-target-method): * lisp/skeleton.el (skeleton-transformation, skeleton-filter): * lisp/textmodes/artist.el (artist-text-renderer): * lisp/textmodes/bibtex.el (bibtex-autokey-name-case-convert): (bibtex-autokey-titleword-case-convert): * lisp/textmodes/ispell.el (ispell-format-word): * lisp/textmodes/sgml-mode.el (sgml-transformation): * lisp/vc/add-log.el (change-log-time-zone-rule): Make variable aliases obsolete. --- lisp/progmodes/make-mode.el | 4 ++-- lisp/skeleton.el | 6 ++++-- lisp/textmodes/artist.el | 3 ++- lisp/textmodes/bibtex.el | 8 ++++---- lisp/textmodes/ispell.el | 3 ++- lisp/textmodes/sgml-mode.el | 3 ++- lisp/vc/add-log.el | 5 ++--- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index df17b87c013..caf8f1ea6d5 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -542,8 +542,8 @@ not be enclosed in { } or ( )." This should identify a `make' command that can handle the `-q' option." :type 'string) -(defvaralias 'makefile-query-one-target-method - 'makefile-query-one-target-method-function) +(define-obsolete-variable-alias 'makefile-query-one-target-method + 'makefile-query-one-target-method-function "29.1") (defcustom makefile-query-one-target-method-function 'makefile-query-by-make-minus-q diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 2b183996d83..36cc4239d47 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -37,7 +37,8 @@ ;; page 2: paired insertion ;; page 3: mirror-mode, an example for setting up paired insertion -(defvaralias 'skeleton-transformation 'skeleton-transformation-function) +(define-obsolete-variable-alias 'skeleton-transformation + 'skeleton-transformation-function "29.1") (defvar skeleton-transformation-function 'identity "If non-nil, function applied to literal strings before they are inserted. @@ -65,7 +66,8 @@ region.") "Hook called at end of skeleton but before going to point of interest. The variables `v1' and `v2' are still set when calling this.") -(defvaralias 'skeleton-filter 'skeleton-filter-function) +(define-obsolete-variable-alias 'skeleton-filter + 'skeleton-filter-function "29.1") ;;;###autoload (defvar skeleton-filter-function 'identity diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 25f0c35aa5d..9c9ef9fb634 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -338,7 +338,8 @@ Example: (defvar artist-pointer-shape (if (eq window-system 'x) x-pointer-crosshair nil) "If in X Windows, use this pointer shape while drawing with the mouse.") -(defvaralias 'artist-text-renderer 'artist-text-renderer-function) +(define-obsolete-variable-alias 'artist-text-renderer + 'artist-text-renderer-function "29.1") (defcustom artist-text-renderer-function 'artist-figlet "Function for doing text rendering." diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 2dd4e8e7af0..c721c035d7c 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1211,8 +1211,8 @@ See `bibtex-generate-autokey' for details." :type '(repeat (cons (regexp :tag "Old") (string :tag "New")))) -(defvaralias 'bibtex-autokey-name-case-convert - 'bibtex-autokey-name-case-convert-function) +(define-obsolete-variable-alias 'bibtex-autokey-name-case-convert + 'bibtex-autokey-name-case-convert-function "29.1") (defcustom bibtex-autokey-name-case-convert-function #'downcase "Function called for each name to perform case conversion. @@ -1286,8 +1286,8 @@ Case is significant. See `bibtex-generate-autokey' for details." :group 'bibtex-autokey :type '(repeat regexp)) -(defvaralias 'bibtex-autokey-titleword-case-convert - 'bibtex-autokey-titleword-case-convert-function) +(define-obsolete-variable-alias 'bibtex-autokey-titleword-case-convert + 'bibtex-autokey-titleword-case-convert-function "29.1") (defcustom bibtex-autokey-titleword-case-convert-function #'downcase "Function called for each titleword to perform case conversion. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 754ecb3a1d7..c4dd452c0df 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -296,7 +296,8 @@ The following values are supported: "Non-nil means suppress messages in `ispell-word'." :type 'boolean) -(defvaralias 'ispell-format-word 'ispell-format-word-function) +(define-obsolete-variable-alias 'ispell-format-word + 'ispell-format-word-function "29.1") (defcustom ispell-format-word-function (function upcase) "Formatting function for displaying word being spell checked. diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index dedc3882199..cae1fecebcc 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -75,7 +75,8 @@ a DOCTYPE or an XML declaration." :type 'boolean :version "22.1") -(defvaralias 'sgml-transformation 'sgml-transformation-function) +(define-obsolete-variable-alias 'sgml-transformation + 'sgml-transformation-function "29.1") (defcustom sgml-transformation-function 'identity "Default value for `skeleton-transformation-function' in SGML mode." diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 1290d7e03a5..6f45186837f 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -590,9 +590,8 @@ Compatibility function for \\[next-error] invocations." ["Go To Source" change-log-goto-source :help "Go to source location of ChangeLog tag near point"])) -;; It used to be called change-log-time-zone-rule but really should be -;; called add-log-time-zone-rule since it's only used from add-log-* code. -(defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule) +(define-obsolete-variable-alias 'change-log-time-zone-rule + 'add-log-time-zone-rule "29.1") (defvar add-log-time-zone-rule nil "Time zone rule used for calculating change log time stamps. If nil, use local time. If t, use Universal Time. -- cgit v1.2.3