diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/comint.el | 6 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 21 |
3 files changed, 32 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2785d5ed315..e153fc7da77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -21,6 +21,22 @@ customization groups. Initialize value to 'unset. (display-buffer-reuse-window): Quote lambda with #'. +2011-06-05 Andreas Schwab <schwab@linux-m68k.org> + + * comint.el (comint-dynamic-complete-as-filename) + (comint-dynamic-complete-filename): Correctly call + completion-in-region. + +2011-06-05 Deniz Dogan <deniz@dogan.se> + + * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced + in last change. + +2011-06-05 Deniz Dogan <deniz@dogan.se> + + * net/rcirc.el (rcirc-prompt-for-encryption): New function. + (rcirc): Use it to prompt for encryption. + 2011-06-05 Roland Winkler <winkler@gnu.org> * textmodes/bibtex.el (bibtex-search-buffer): New variable. diff --git a/lisp/comint.el b/lisp/comint.el index e4bc530f361..5548d19ad30 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3035,7 +3035,8 @@ Returns t if successful." (when (comint--match-partial-filename) (unless (window-minibuffer-p (selected-window)) (message "Completing file name...")) - (apply #'completion-in-region (comint--complete-file-name-data)))) + (let ((data (comint--complete-file-name-data))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data))))) (defun comint-filename-completion () "Return completion data for filename at point, if any." @@ -3152,7 +3153,8 @@ in the same way as TABLE completes strings of the form (concat S2 S)." (defun comint-dynamic-complete-as-filename () "Dynamically complete at point as a filename. See `comint-dynamic-complete-filename'. Returns t if successful." - (apply #'completion-in-region (comint--complete-file-name-data))) + (let ((data (comint--complete-file-name-data))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)))) (make-obsolete 'comint-dynamic-complete-as-filename 'comint-filename-completion "24.1") diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index bd9d6846a4b..70190867e89 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -455,15 +455,7 @@ If ARG is non-nil, instead prompt for connection parameters." :channels) " ")) "[, ]+" t)) - (encryption - (intern (completing-read "Encryption (default plain): " - '("plain" "tls") - nil t - (let ((choice (plist-get server-plist - :encryption))) - (when choice - (symbol-name choice))) - nil "plain")))) + (encryption (rcirc-prompt-for-encryption server-plist))) (rcirc-connect server port nick user-name rcirc-default-full-name channels password encryption)) @@ -596,6 +588,17 @@ If ARG is non-nil, instead prompt for connection parameters." (time-to-seconds (current-time)) (float-time))) +(defun rcirc-prompt-for-encryption (server-plist) + "Prompt the user for the encryption method to use. +SERVER-PLIST is the property list for the server." + (let ((msg "Encryption (default %s): ") + (choices '("plain" "tls")) + (default (or (plist-get server-plist :encryption) + 'plain))) + (intern + (completing-read (format msg default) + choices nil t nil nil (symbol-name default))))) + (defun rcirc-keepalive () "Send keep alive pings to active rcirc processes. Kill processes that have not received a server message since the |