Modify last change acc to comments

* lisp/simple.el (read-passwd-mode): Change `text' entry of icons.
(read-passwd-toggle-visibility): Rename.
(read-passwd-mode):
* lisp/subr.el (read-passwd-map): Adapt callees.

(cherry picked from commit e02c4a864f02787f0e194c9e8a6d4ab0b18ca39f)

diff --git a/lisp/simple.el b/lisp/simple.el
index 965a1f3e82ef90826ade60abc3c0698849eb07ed..c885d5640f532862fab586dbe85b6211533b7a90 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10846,7 +10846,7 @@ and setting it to nil."
 (defvar read-passwd--mode-line-icon nil
   "Propertized mode line icon for showing/hiding passwords.")
 
-(defun read-passwd--toggle-visibility ()
+(defun read-passwd-toggle-visibility ()
   "Toggle minibuffer contents visibility.
 Adapt also mode line."
   (interactive)
@@ -10863,7 +10863,7 @@ Adapt also mode line."
             mouse-face mode-line-highlight
             local-map
             (keymap
-             (mode-line keymap (mouse-1 . read-passwd--toggle-visibility)))))
+             (mode-line keymap (mouse-1 . read-passwd-toggle-visibility)))))
     (force-mode-line-update))
   (read-passwd--hide-password))
 
@@ -10882,7 +10882,7 @@ Adapt also mode line."
   (define-icon read-passwd--show-password-icon nil
     '((image "reveal.svg" "reveal.pbm" :height (0.8 . em))
       (symbol "👁")
-      (text "o"))
+      (text "<o>"))
     "Mode line icon to show a hidden password."
     :group mode-line-faces
     :version "30.1"
@@ -10890,7 +10890,7 @@ Adapt also mode line."
   (define-icon read-passwd--hide-password-icon nil
     '((image "conceal.svg" "conceal.pbm" :height (0.8 . em))
       (symbol "⦵")
-      (text "x"))
+      (text "<\\>"))
     "Mode line icon to hide a visible password."
     :group mode-line-faces
     :version "30.1"
@@ -10917,7 +10917,7 @@ Adapt also mode line."
         (setq mode-line-format (cdr mode-line-format)))))
 
   (when read-passwd-mode
-    (read-passwd--toggle-visibility)))
+    (read-passwd-toggle-visibility)))
 
 \f
 (defvar messages-buffer-mode-map

diff --git a/lisp/subr.el b/lisp/subr.el
index 37d6d6540714de586c85a95b69e744d3ff660f6f..4d93e7ed64015ffabd259379fb4903ca25bc24e9 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3382,7 +3382,7 @@ with Emacs.  Do not call it directly in your own packages."
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map minibuffer-local-map)
     (define-key map "\C-u" #'delete-minibuffer-contents) ;bug#12570
-    (define-key map "\t" #'read-passwd--toggle-visibility)
+    (define-key map "\t" #'read-passwd-toggle-visibility)
     map)
   "Keymap used while reading passwords.")