From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 4 Aug 2022 07:40:40 +0000 (+0200)
Subject: Rename nil-blank-string to eshell-nil-blank-string
X-Git-Tag: emacs-29.0.90~1447^2~480
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7471781dda49b927b4282fae24a4daab962c3266;p=emacs.git

Rename nil-blank-string to eshell-nil-blank-string

* lisp/eshell/em-unix.el (eshell-nil-blank-string): Rename from
'nil-blank-string'.  Retain old name as an obsolete function alias.
---

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 3967817b0ed..68276b22d95 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -968,7 +968,7 @@ Show wall-clock time elapsed during execution of COMMAND.")
   (if eshell-diff-window-config
       (set-window-configuration eshell-diff-window-config)))
 
-(defun nil-blank-string (string)
+(defun eshell-nil-blank-string (string)
   "Return STRING, or nil if STRING contains only blank characters."
   (cond
     ((string-match "[^[:blank:]]" string) string)
@@ -999,7 +999,7 @@ Show wall-clock time elapsed during execution of COMMAND.")
 	    (condition-case nil
 		(diff-no-select
 		 old new
-		 (nil-blank-string (eshell-flatten-and-stringify args)))
+                 (eshell-nil-blank-string (eshell-flatten-and-stringify args)))
 	      (error
 	       (throw 'eshell-replace-command
 		      (eshell-parse-command "*diff" orig-args))))
@@ -1049,6 +1049,8 @@ Show wall-clock time elapsed during execution of COMMAND.")
 
 (put 'eshell/occur 'eshell-no-numeric-conversions t)
 
+(define-obsolete-function-alias 'nil-blank-string #'eshell-nil-blank-string "29.1")
+
 (provide 'em-unix)
 
 ;; Local Variables: