bug#13774: [patch] Use `completion-at-point' instead of `comint-dynamic-complete'

[Xue Fuqiao]

Since `comint-dynamic-complete' is obsolete since 24.1, I made the
following patch:

*** trunk/lisp/ChangeLog.orig   2013-02-17 22:42:17.309803000 +0800
--- trunk/lisp/ChangeLog        2013-02-21 14:42:36.373241996 +0800
***************
*** 1,3 ****
--- 1,9 ----
+ 2013-02-21  Xue Fuqiao  <xfq.free@gmail.com>
+ 
+       * comint.el: Remove `comint-dynamic-complete'.
+ 
+       * ielm.el: Remove `comint-dynamic-complete'.
+ 
  2013-02-17  Glenn Morris  <rgm@gnu.org>
  
        * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry.


*** trunk/lisp/comint.el.orig   2013-02-03 09:46:50.383143000 +0800
--- trunk/lisp/comint.el        2013-02-21 14:34:18.066771022 +0800
*************** This mirrors the optional behavior of tc
*** 213,219 ****
  If the value is `input', then the expansion is seen on input.
  If the value is `history', then the expansion is only when inserting
  into the buffer's input ring.  See also `comint-magic-space' and
! `comint-dynamic-complete'.
  
  This variable is buffer-local."
    :type '(choice (const :tag "off" nil)
--- 213,219 ----
  If the value is `input', then the expansion is seen on input.
  If the value is `history', then the expansion is only when inserting
  into the buffer's input ring.  See also `comint-magic-space' and
! `completion-at-point'.
  
  This variable is buffer-local."
    :type '(choice (const :tag "off" nil)
*************** text matching `comint-prompt-regexp', de
*** 371,377 ****
    '(comint-c-a-p-replace-by-expanded-history
comint-filename-completion) "List of functions called to perform
completion. Works like `completion-at-point-functions'.
! See also `comint-dynamic-complete'.
  
  This is a good thing to set in mode hooks.")
  
--- 371,377 ----
    '(comint-c-a-p-replace-by-expanded-history
comint-filename-completion) "List of functions called to perform
completion. Works like `completion-at-point-functions'.
! See also `completion-at-point'.
  
  This is a good thing to set in mode hooks.")
  
*************** Input ring expansion is controlled by th
*** 616,622 ****
  and addition is controlled by the variable `comint-input-ignoredups'.
  
  Commands with no default key bindings include `send-invisible',
! `comint-dynamic-complete',
`comint-dynamic-list-filename-completions', and `comint-magic-space'.
  
  Input to, and output from, the subprocess can cause the window to
scroll to
--- 616,622 ----
  and addition is controlled by the variable `comint-input-ignoredups'.
  
  Commands with no default key bindings include `send-invisible',
! `completion-at-point', `comint-dynamic-list-filename-completions', and
  `comint-magic-space'.
  
  Input to, and output from, the subprocess can cause the window to
scroll to *************** its response can be seen."
*** 2892,2898 ****
  ;; Useful completion functions, courtesy of the Ergo group.
  
  ;; Six commands:
! ;; comint-dynamic-complete            Complete or expand command,
filename, ;;                                     history at point.
  ;; comint-dynamic-complete-filename   Complete filename at point.
  ;; comint-dynamic-list-filename-completions List completions in help
buffer.
--- 2892,2898 ----
  ;; Useful completion functions, courtesy of the Ergo group.
  
  ;; Six commands:
! ;; completion-at-point                Complete or expand command,
filename, ;;                                     history at point.
  ;; comint-dynamic-complete-filename   Complete filename at point.
  ;; comint-dynamic-list-filename-completions List completions in help
buffer. *************** its response can be seen."
*** 2901,2907 ****
  
  ;; These are not installed in the comint-mode keymap.  But they are
  ;; available for people who want them.  Shell-mode installs them:
! ;; (define-key shell-mode-map "\t" 'comint-dynamic-complete)
  ;; (define-key shell-mode-map "\M-?"
  ;;             'comint-dynamic-list-filename-completions)))
  ;;
--- 2901,2907 ----
  
  ;; These are not installed in the comint-mode keymap.  But they are
  ;; available for people who want them.  Shell-mode installs them:
! ;; (define-key shell-mode-map "\t" 'completion-at-point)
  ;; (define-key shell-mode-map "\M-?"
  ;;             'comint-dynamic-list-filename-completions)))
  ;;
*************** REGEXP-GROUP is the regular expression g
*** 3812,3818 ****
  ;;        (setq shell-mode-map (copy-keymap comint-mode-map))
  ;;        (define-key shell-mode-map "\C-c\C-f"
'shell-forward-command) ;;        (define-key shell-mode-map "\C-c\C-b"
'shell-backward-command) ! ;;        (define-key shell-mode-map "\t"
'comint-dynamic-complete) ;;        (define-key shell-mode-map "\M-?"
  ;;          'comint-dynamic-list-filename-completions)))
  ;;
--- 3812,3818 ----
  ;;        (setq shell-mode-map (copy-keymap comint-mode-map))
  ;;        (define-key shell-mode-map "\C-c\C-f"
'shell-forward-command) ;;        (define-key shell-mode-map "\C-c\C-b"
'shell-backward-command) ! ;;        (define-key shell-mode-map "\t"
'completion-at-point) ;;        (define-key shell-mode-map "\M-?"
  ;;          'comint-dynamic-list-filename-completions)))
  ;;


*** trunk/lisp/ielm.el.orig     2013-02-21 14:45:23.078068628 +0800
--- trunk/lisp/ielm.el  2013-02-21 14:39:44.452389458 +0800
*************** This variable is buffer-local.")
*** 167,177 ****
  
  (defvar ielm-map
    (let ((map (make-sparse-keymap)))
!     (define-key map "\t" 'comint-dynamic-complete)
      (define-key map "\C-m" 'ielm-return)
      (define-key map "\C-j" 'ielm-send-input)
      (define-key map "\e\C-x" 'eval-defun)         ; for consistency
with
-     (define-key map "\e\t" 'completion-at-point)  ;
lisp-interaction-mode ;; These bindings are from `lisp-mode-shared-map'
-- can you inherit ;; from more than one keymap??
      (define-key map "\e\C-q" 'indent-sexp)
--- 167,176 ----
  
  (defvar ielm-map
    (let ((map (make-sparse-keymap)))
!     (define-key map "\t" 'completion-at-point)
      (define-key map "\C-m" 'ielm-return)
      (define-key map "\C-j" 'ielm-send-input)
      (define-key map "\e\C-x" 'eval-defun)         ; for consistency
with ;; These bindings are from `lisp-mode-shared-map' -- can you
inherit ;; from more than one keymap??
      (define-key map "\e\C-q" 'indent-sexp)

-- 
Best regards, Xue Fuqiao.
http://www.emacswiki.org/emacs/XueFuqiao