From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xue Fuqiao Newsgroups: gmane.emacs.bugs Subject: bug#13774: [patch] Use `completion-at-point' instead of `comint-dynamic-complete' Date: Thu, 21 Feb 2013 14:46:50 +0800 Organization: The Church of Emacs Message-ID: <20130221144650.9aa0061ff0da86ac890bd565@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1361429281 4509 80.91.229.3 (21 Feb 2013 06:48:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 21 Feb 2013 06:48:01 +0000 (UTC) To: 13774@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Feb 21 07:48:23 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1U8Px8-0000hJ-Pw for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Feb 2013 07:48:23 +0100 Original-Received: from localhost ([::1]:37525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Pwo-0001uJ-J8 for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Feb 2013 01:48:02 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:35390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Pwg-0001tz-9M for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:48:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8PwZ-0007gt-L8 for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:47:54 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35716) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8PwZ-0007go-Ex for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:47:47 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1U8Pxl-0007Pw-TV for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:49:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Xue Fuqiao Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Feb 2013 06:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 13774 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.136142929828448 (code B ref -1); Thu, 21 Feb 2013 06:49:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Feb 2013 06:48:18 +0000 Original-Received: from localhost ([127.0.0.1]:41172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U8Px3-0007Om-PL for submit@debbugs.gnu.org; Thu, 21 Feb 2013 01:48:18 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:52044) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U8Px1-0007Of-0r for submit@debbugs.gnu.org; Thu, 21 Feb 2013 01:48:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8Pvm-0007Qb-GA for submit@debbugs.gnu.org; Thu, 21 Feb 2013 01:47:00 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:46890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Pvm-0007QV-DA for submit@debbugs.gnu.org; Thu, 21 Feb 2013 01:46:58 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:35172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Pvl-0001k8-0f for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:46:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8Pvj-0007Pg-1S for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:46:56 -0500 Original-Received: from mail-pb0-f51.google.com ([209.85.160.51]:49624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Pvi-0007PO-Nu for bug-gnu-emacs@gnu.org; Thu, 21 Feb 2013 01:46:54 -0500 Original-Received: by mail-pb0-f51.google.com with SMTP id un15so3328948pbc.38 for ; Wed, 20 Feb 2013 22:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:subject:message-id:organization:x-mailer :mime-version:content-type:content-transfer-encoding; bh=f337dIH2K6Xo64iz3O1PrPVj0Z8EggN8WyTMZ0d5T4A=; b=PPKZgYCSKH8oPHPZm6Zt069CwFxDlbmkdR38xWMIrBrGKtxLWZ3SkHUx70HQspCsB+ c6jTHJnV75pLY53B0jMe3F6kx+GfkGCcfoVxA3k9gs/5Lv8yWpuFdkkL0iObiB/axCZt MiqeCk8JWppOWM4fk8eutBqM+k0vEoZqSZ9ghuKEIK+7f9JM4hDiq0xGEXEV63FG/rQy nJZLCotUDeLirCqMOMZ1vHetB3vJCH2Ks5C6sNTv7B0QQ6c5B0W1wGvW3S4I219n9vDV XmVFbGl5E5tJLaGatmPfWC0/lLnGULq/jTY9ZvvwvB6DsdRO3robITgB5e7yWe0ay2JX nS4A== X-Received: by 10.66.160.9 with SMTP id xg9mr6760659pab.135.1361429213949; Wed, 20 Feb 2013 22:46:53 -0800 (PST) Original-Received: from Emacs ([219.224.52.162]) by mx.google.com with ESMTPS id ww9sm24311773pbc.41.2013.02.20.22.46.52 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Feb 2013 22:46:53 -0800 (PST) X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.13; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:71581 Archived-At: 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 + + * comint.el: Remove `comint-dynamic-complete'. + + * ielm.el: Remove `comint-dynamic-complete'. + 2013-02-17 Glenn Morris * 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