From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Scholtes Newsgroups: gmane.emacs.devel Subject: Re: completion-list-mode-map Date: Wed, 13 Jul 2011 20:19:15 -0600 Message-ID: <4E1E5223.3020409@gmail.com> References: <4DEA3F21.2020302@gmail.com> <4E07B9F0.3080102@gmail.com> <4E0F40A1.3020503@gmail.com> <4E0FB543.9040608@gmail.com> <4E13BC5A.2070007@gmail.com> <4E191159.1080501@gmail.com> <86oc10w2nc.fsf@googlemail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1310610035 2206 80.91.229.12 (14 Jul 2011 02:20:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 14 Jul 2011 02:20:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 14 04:20:29 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QhBXP-0000o9-No for ged-emacs-devel@m.gmane.org; Thu, 14 Jul 2011 04:20:27 +0200 Original-Received: from localhost ([::1]:37768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhBXO-0005En-Dg for ged-emacs-devel@m.gmane.org; Wed, 13 Jul 2011 22:20:26 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:39141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhBWS-00053R-OT for emacs-devel@gnu.org; Wed, 13 Jul 2011 22:19:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QhBWN-0006fL-H7 for emacs-devel@gnu.org; Wed, 13 Jul 2011 22:19:28 -0400 Original-Received: from mail-iy0-f169.google.com ([209.85.210.169]:49768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhBWN-0006f9-4R for emacs-devel@gnu.org; Wed, 13 Jul 2011 22:19:23 -0400 Original-Received: by iyl8 with SMTP id 8so7100159iyl.0 for ; Wed, 13 Jul 2011 19:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=2CuUe6kudptqA8S2Tk5/Idlx8D3csX1FScBBlzclBWE=; b=Y3TrQ1Va3MkAHdI4cC0gel02C3R0kmJoEHbJx4Da0lrssP/O9GdevPtdR/ksdq5oHN iETPVKSLz2oqEG5kMbRrUbnkE1TrpJ4g35hPax6wgaIPpMDstmNJKj4paE+Oq6BvpfiT DJqIgeh8BUFPc56PmfSXCykbcoYgLspu9SqsE= Original-Received: by 10.231.112.88 with SMTP id v24mr1600960ibp.80.1310609960770; Wed, 13 Jul 2011 19:19:20 -0700 (PDT) Original-Received: from [192.168.1.4] (71-208-199-22.hlrn.qwest.net [71.208.199.22]) by mx.google.com with ESMTPS id y3sm4408422iba.38.2011.07.13.19.19.18 (version=SSLv3 cipher=OTHER); Wed, 13 Jul 2011 19:19:19 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:5.0) Gecko/20110624 Thunderbird/5.0 In-Reply-To: <86oc10w2nc.fsf@googlemail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:142019 Archived-At: Sorry, does this look OK to commit? Christoph On 7/11/2011 10:20 PM, Christoph Scholtes wrote: > Here is the updated patch with Changelog entry. > > === modified file 'lisp/ChangeLog' > --- lisp/ChangeLog 2011-07-06 22:43:46 +0000 > +++ lisp/ChangeLog 2011-07-12 04:12:27 +0000 > @@ -1,3 +1,12 @@ > +2011-07-12 Christoph Scholtes > + > + * help-mode.el (help-mode-map): Add special-mode-map to parent map. > + (help-mode): Derive help-mode from special-mode. Don't invoke > + view-mode from help-mode. > + (help-xref-override-view-map): Remove. > + (help-make-xrefs): Remove minor-mode-overriding-map-alist since > + view-mode is not used anymore. > + > 2011-07-06 Richard Stallman > > * mail/rmailmm.el (rmail-mime-process): Use markers for buf positions. > > === modified file 'lisp/help-mode.el' > --- lisp/help-mode.el 2011-06-13 13:14:42 +0000 > +++ lisp/help-mode.el 2011-07-12 03:41:40 +0000 > @@ -35,13 +35,12 @@ > > (defvar help-mode-map > (let ((map (make-sparse-keymap))) > - (set-keymap-parent map button-buffer-map) > - > + (set-keymap-parent map (make-composed-keymap button-buffer-map > + special-mode-map)) > (define-key map [mouse-2] 'help-follow-mouse) > (define-key map "\C-c\C-b" 'help-go-back) > (define-key map "\C-c\C-f" 'help-go-forward) > (define-key map "\C-c\C-c" 'help-follow-symbol) > - ;; Documentation only, since we use minor-mode-overriding-map-alist. > (define-key map "\r" 'help-follow) > map) > "Keymap for help mode.") > @@ -266,37 +265,13 @@ > 'help-function 'customize-create-theme > 'help-echo (purecopy "mouse-2, RET: edit this theme file")) > > -;;;###autoload > -(defun help-mode () > +(define-derived-mode help-mode special-mode "Help" > "Major mode for viewing help text and navigating references in it. > Entry to this mode runs the normal hook `help-mode-hook'. > Commands: > \\{help-mode-map}" > - (interactive) > - (kill-all-local-variables) > - (use-local-map help-mode-map) > - (setq mode-name "Help") > - (setq major-mode 'help-mode) > - > - (view-mode) > - (set (make-local-variable 'view-no-disable-on-exit) t) > - ;; With Emacs 22 `view-exit-action' could delete the selected window > - ;; disregarding whether the help buffer was shown in that window at > - ;; all. Since `view-exit-action' is called with the help buffer as > - ;; argument it seems more appropriate to have it work on the buffer > - ;; only and leave it to `view-mode-exit' to delete any associated > - ;; window(s). > - (setq view-exit-action > - (lambda (buffer) > - ;; Use `with-current-buffer' to make sure that `bury-buffer' > - ;; also removes BUFFER from the selected window. > - (with-current-buffer buffer > - (bury-buffer)))) > - > (set (make-local-variable 'revert-buffer-function) > - 'help-mode-revert-buffer) > - > - (run-mode-hooks 'help-mode-hook)) > + 'help-mode-revert-buffer)) > > ;;;###autoload > (defun help-mode-setup () > @@ -403,13 +378,6 @@ > (error "Current buffer is not in Help mode")) > (current-buffer)))) > > -(defvar help-xref-override-view-map > - (let ((map (make-sparse-keymap))) > - (set-keymap-parent map view-mode-map) > - (define-key map "\r" nil) > - map) > - "Replacement keymap for `view-mode' in help buffers.") > - > ;;;###autoload > (defun help-make-xrefs (&optional buffer) > "Parse and hyperlink documentation cross-references in the given BUFFER. > @@ -594,9 +562,6 @@ > (current-buffer))) > (when (or help-xref-stack help-xref-forward-stack) > (insert "\n"))) > - ;; View mode steals RET from us. > - (set (make-local-variable 'minor-mode-overriding-map-alist) > - (list (cons 'view-mode help-xref-override-view-map))) > (set-buffer-modified-p old-modified))))) > > ;;;###autoload