From 7c8332e096ab92546db38ae27b582971b26cfdfd Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 6 Aug 2022 17:00:13 +0200
Subject: [PATCH] Fix namespacing problem in allout.el

* lisp/allout.el (allout-outlinify-sticky): Rename from
'outlineify-sticky'.  Make old name into obsolete alias.
(outlinify-sticky): Make into obsolete function alias for
'allout-outlinify-sticky'.
(allout-mode): Doc fix.
---
 etc/NEWS       |  4 ++++
 lisp/allout.el | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index bca3c4da787..ea26c5e6bab 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2234,6 +2234,10 @@ remote host are shown.  Alternatively, the user option
 'proced-show-remote-processes' can be set to non-nil.
 'proced-signal-function' has been marked obsolete.
 
+---
+*** 'outlineify-sticky' command is renamed to 'allout-outlinify-sticky'.
+The old name is still available as an obsolete function alias.
+
 
 * New Modes and Packages in Emacs 29.1
 
diff --git a/lisp/allout.el b/lisp/allout.el
index 7421a037380..8e303a8a02f 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1699,7 +1699,7 @@ the HOT-SPOT Operation section.
 
         Misc commands:
         -------------
-M-x outlineify-sticky       Activate outline mode for current buffer,
+\\[allout-outlinify-sticky] Activate outline mode for current buffer,
                             and establish a default file-var setting
                             for `allout-layout'.
 \\[allout-mark-topic]       `allout-mark-topic'
@@ -6184,19 +6184,18 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
 
 ;;;_ #9 miscellaneous
 ;;;_  : Mode:
-;;;_   > outlineify-sticky ()
-;; outlinify-sticky is correct spelling; provide this alias for sticklers:
+;;;_   > allout-outlinify-sticky ()
 ;;;###autoload
-(defalias 'outlinify-sticky #'outlineify-sticky)
+(define-obsolete-function-alias 'outlinify-sticky #'allout-outlinify-sticky "29.1")
 ;;;###autoload
-(defun outlineify-sticky (&optional _arg)
+(define-obsolete-function-alias 'outlineify-sticky #'allout-outlinify-sticky "29.1")
+;;;###autoload
+(defun allout-outlinify-sticky (&optional _arg)
   "Activate outline mode and establish file var so it is started subsequently.
 
 See `allout-layout' and customization of `allout-auto-activation'
 for details on preparing Emacs for automatic allout activation."
-
   (interactive "P")
-
   (if (allout-mode-p) (allout-mode))    ; deactivate so we can re-activate...
   (allout-mode)
 
-- 
2.39.2