[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104486: * lisp/shell.el: Require and
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104486: * lisp/shell.el: Require and use pcomplete. |
Date: |
Sat, 04 Jun 2011 09:31:34 -0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104486
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2011-06-04 09:31:34 -0300
message:
* lisp/shell.el: Require and use pcomplete.
(shell-dynamic-complete-functions): Add pcomplete-completions-at-point.
(shell-completion-vars): Set pcomplete-default-completion-function.
modified:
etc/NEWS
lisp/ChangeLog
lisp/shell.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2011-06-01 15:34:41 +0000
+++ b/etc/NEWS 2011-06-04 12:31:34 +0000
@@ -85,6 +85,8 @@
error, its exit status is 1.
** Completion
+*** shell-mode uses pcomplete rules, with the standard completion UI.
+
*** Many packages have been changed to use completion-at-point rather than
their own completion code.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-04 11:02:37 +0000
+++ b/lisp/ChangeLog 2011-06-04 12:31:34 +0000
@@ -1,3 +1,9 @@
+2011-06-04 Stefan Monnier <address@hidden>
+
+ * shell.el: Require and use pcomplete.
+ (shell-dynamic-complete-functions): Add pcomplete-completions-at-point.
+ (shell-completion-vars): Set pcomplete-default-completion-function.
+
2011-06-04 Deniz Dogan <address@hidden>
* iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2011-05-27 01:54:56 +0000
+++ b/lisp/shell.el 2011-06-04 12:31:34 +0000
@@ -98,6 +98,7 @@
(eval-when-compile (require 'cl))
(require 'comint)
+(require 'pcomplete)
;;; Customization and Buffer Variables
@@ -186,7 +187,9 @@
shell-environment-variable-completion
shell-command-completion
shell-c-a-p-replace-by-expanded-directory
+ pcomplete-completions-at-point
shell-filename-completion
+ ;; Not sure when this one would still be useful. --Stef
comint-filename-completion)
"List of functions called to perform completion.
This variable is used to initialize `comint-dynamic-complete-functions' in the
@@ -380,7 +383,6 @@
:group 'shell
:type '(choice (const nil) regexp))
-(defvar pcomplete-parse-arguments-function)
(defun shell-completion-vars ()
"Setup completion vars for `shell-mode' and `read-shell-command'."
@@ -396,6 +398,9 @@
(set (make-local-variable 'pcomplete-parse-arguments-function)
;; FIXME: This function should be moved to shell.el.
#'pcomplete-parse-comint-arguments)
+ ;; Don't use pcomplete's defaulting mechanism, rely on
+ ;; shell-dynamic-complete-functions instead.
+ (set (make-local-variable 'pcomplete-default-completion-function) #'ignore)
(setq comint-input-autoexpand shell-input-autoexpand)
;; Not needed in shell-mode because it's inherited from comint-mode, but
;; placed here for read-shell-command.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104486: * lisp/shell.el: Require and use pcomplete.,
Stefan Monnier <=