[Emacs-diffs] Changes to emacs/lisp/subr.el

[Richard M. Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.360 emacs/lisp/subr.el:1.361
*** emacs/lisp/subr.el:1.360    Mon Jul 21 14:03:06 2003
--- emacs/lisp/subr.el  Tue Aug  5 21:05:15 2003
***************
*** 1180,1189 ****
                (second (read-passwd "Confirm password: " nil default)))
            (if (equal first second)
                (progn
!                 (and (arrayp second) (fillarray second ?\0))
                  (setq success first))
!             (and (arrayp first) (fillarray first ?\0))
!             (and (arrayp second) (fillarray second ?\0))
              (message "Password not repeated accurately; please start over")
              (sit-for 1))))
        success)
--- 1180,1189 ----
                (second (read-passwd "Confirm password: " nil default)))
            (if (equal first second)
                (progn
!                 (and (arrayp second) (clear-string second))
                  (setq success first))
!             (and (arrayp first) (clear-string first))
!             (and (arrayp second) (clear-string second))
              (message "Password not repeated accurately; please start over")
              (sit-for 1))))
        success)
***************
*** 1199,1216 ****
        (clear-this-command-keys)
        (if (= c ?\C-u)
            (progn
!             (and (arrayp pass) (fillarray pass ?\0))
              (setq pass ""))
          (if (and (/= c ?\b) (/= c ?\177))
              (let* ((new-char (char-to-string c))
                     (new-pass (concat pass new-char)))
!               (and (arrayp pass) (fillarray pass ?\0))
!               (fillarray new-char ?\0)
                (setq c ?\0)
                (setq pass new-pass))
            (if (> (length pass) 0)
                (let ((new-pass (substring pass 0 -1)))
!                 (and (arrayp pass) (fillarray pass ?\0))
                  (setq pass new-pass))))))
        (message nil)
        (or pass default ""))))
--- 1199,1216 ----
        (clear-this-command-keys)
        (if (= c ?\C-u)
            (progn
!             (and (arrayp pass) (clear-string pass))
              (setq pass ""))
          (if (and (/= c ?\b) (/= c ?\177))
              (let* ((new-char (char-to-string c))
                     (new-pass (concat pass new-char)))
!               (and (arrayp pass) (clear-string pass))
!               (clear-string new-char)
                (setq c ?\0)
                (setq pass new-pass))
            (if (> (length pass) 0)
                (let ((new-pass (substring pass 0 -1)))
!                 (and (arrayp pass) (clear-string pass))
                  (setq pass new-pass))))))
        (message nil)
        (or pass default ""))))