[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108124: Fix broken completion in sh-mode

[Leo Liu]

------------------------------------------------------------
revno: 108124
fixes bug: http://debbugs.gnu.org/12220
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-08-27 20:33:05 +0800
message:
  Fix broken completion in sh-mode
  
  See: http://debbugs.gnu.org/12220
modified:
  lisp/ChangeLog
  lisp/progmodes/sh-script.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-27 11:02:23 +0000
+++ b/lisp/ChangeLog    2012-08-27 12:33:05 +0000
@@ -1,5 +1,8 @@
 2012-08-27  Leo Liu  <address@hidden>
 
+       * progmodes/sh-script.el (sh-dynamic-complete-functions): Adapt to
+       completion-at-point.  (Bug#12220)
+
        * skeleton.el (skeleton-untabify): Change to nil (bug#12223).
 
        * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267).

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2012-08-27 10:51:17 +0000
+++ b/lisp/progmodes/sh-script.el       2012-08-27 12:33:05 +0000
@@ -202,6 +202,11 @@
   (require 'comint))
 (require 'executable)
 
+(autoload 'comint-completion-at-point "comint")
+(autoload 'comint-filename-completion "comint")
+(autoload 'shell-command-completion "shell")
+(autoload 'shell-environment-variable-completion "shell")
+
 (defvar font-lock-comment-face)
 (defvar font-lock-set-defaults)
 (defvar font-lock-string-face)
@@ -469,7 +474,6 @@
     (define-key map "`" 'skeleton-pair-insert-maybe)
     (define-key map "\"" 'skeleton-pair-insert-maybe)
 
-    (define-key map [remap complete-tag] 'comint-dynamic-complete)
     (define-key map [remap delete-backward-char]
       'backward-delete-char-untabify)
     (define-key map "\C-c:" 'sh-set-shell)
@@ -556,9 +560,9 @@
   "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.")
 
 (defcustom sh-dynamic-complete-functions
-  '(shell-dynamic-complete-environment-variable
-    shell-dynamic-complete-command
-    comint-dynamic-complete-filename)
+  '(shell-environment-variable-completion
+    shell-command-completion
+    comint-filename-completion)
   "Functions for doing TAB dynamic completion."
   :type '(repeat function)
   :group 'sh-script)
@@ -1490,6 +1494,7 @@
   (set (make-local-variable 'local-abbrev-table) sh-mode-abbrev-table)
   (set (make-local-variable 'comint-dynamic-complete-functions)
        sh-dynamic-complete-functions)
+  (add-hook 'completion-at-point-functions 'comint-completion-at-point nil t)
   ;; we can't look if previous line ended with `\'
   (set (make-local-variable 'comint-prompt-regexp) "^[ \t]*")
   (set (make-local-variable 'imenu-case-fold-search) nil)
@@ -3682,20 +3687,6 @@
 
 ;; various other commands
 
-(autoload 'comint-dynamic-complete "comint"
-  "Dynamically perform completion at point." t)
-
-(autoload 'shell-dynamic-complete-command "shell"
-  "Dynamically complete the command at point." t)
-
-(autoload 'comint-dynamic-complete-filename "comint"
-  "Dynamically complete the filename at point." t)
-
-(autoload 'shell-dynamic-complete-environment-variable "shell"
-  "Dynamically complete the environment variable at point." t)
-
-
-
 (defun sh-beginning-of-command ()
   "Move point to successive beginnings of commands."
   (interactive)