Commits

Peter Szilagyi committed dbc38cf Merge

merge

  • Participants
  • Parent commits 5db02e3, 51319d2

Comments (0)

Files changed (2)

 =========
 - highlighting of long lines in Emacs 24
 - ocaml-indenter: customize-variable choice menu
+- friend commander password prompts
 
 ================================================================================
 2012-12-03 Rolled rev 79467e4aacd1 to prod

File elisp/jane/jane-micro-features.el

 
 ;; (Jane.comint)
 (defun Jane.comint ()
+  (require 'comint)
   (ansi-color-for-comint-mode-on)
   (set-custom-defaults
 
-   ;; This produces a lot of false positives.  The default is probably
-   ;; better than when this was originally set, but we may have to
-   ;; rediscover some knowledge.
-   ;;
-   ;;'(comint-password-prompt-regexp "password\\|passphrase\\|Encryption")
+   `(comint-password-prompt-regexp
+
+     ;; We had tried the following ca. 2012, but it produced a lot of
+     ;; false positives.  We had to rediscover some knowledge below,
+     ;; retaining the (mostly general Unix) knowledge encapsulated in
+     ;; the Emacs default (which covers SSH, Kerberos, Samba, etc.).
+     ;;
+     ;;'(comint-password-prompt-regexp "password\\|passphrase\\|Encryption")
+     ,(concat "\\(" comint-password-prompt-regexp
+              "\\|^Enter the \\w+ password: " ; friend commander
+              "\\)"))
 
    '(comint-buffer-maximum-size 10000)
    '(comint-move-point-for-output t)