From 41a59fc6b5ca398db09d5620607f859b70d18994 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 4 Aug 2022 14:37:17 +0200 Subject: [PATCH] Fix namespace problem in meta-mode.el * lisp/progmodes/meta-mode.el (meta-font-lock-match-declaration-item-and-skip-to-next): Rename from 'font-lock-match-meta-declaration-item-and-skip-to-next'. Retain old name as an obsolete alias. --- lisp/progmodes/meta-mode.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index f0fd23f3bc3..37dff599f2f 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -156,14 +156,14 @@ (cons (concat "\\<" type-keywords "\\>" "\\([ \t\f]+\\(\\sw+\\)\\)*") '((1 font-lock-type-face) - (font-lock-match-meta-declaration-item-and-skip-to-next + (meta-font-lock-match-declaration-item-and-skip-to-next (goto-char (match-end 1)) nil (1 font-lock-variable-name-face nil t)))) ;; argument declarations: expr, suffix, text, ... (cons (concat "\\<" args-keywords "\\>" "\\([ \t\f]+\\(\\sw+\\|\\s_+\\)\\)*") '((1 font-lock-type-face) - (font-lock-match-meta-declaration-item-and-skip-to-next + (meta-font-lock-match-declaration-item-and-skip-to-next (goto-char (match-end 1)) nil (1 font-lock-variable-name-face nil t)))) ;; special case of arguments: expr x of y @@ -193,8 +193,7 @@ )) "Default expressions to highlight in Metafont or MetaPost mode.") - -(defun font-lock-match-meta-declaration-item-and-skip-to-next (limit) +(defun meta-font-lock-match-declaration-item-and-skip-to-next (limit) ;; Match and move over Metafont/MetaPost declaration item after point. ;; ;; The expected syntax of an item is either "word" or "symbol", @@ -936,6 +935,10 @@ The environment marked is the one that contains point or follows point." (list (list "\\<\\(\\sw+\\)" 1 'meta-symbol-list) (list "" 'ispell-complete-word)))) +(define-obsolete-function-alias + 'font-lock-match-meta-declaration-item-and-skip-to-next + #'meta-font-lock-match-declaration-item-and-skip-to-next "29.1") + (provide 'meta-mode) (run-hooks 'meta-mode-load-hook) -- 2.39.2