;;; ehelp.el --- bindings for electric-help mode -*- lexical-binding: t -*-
-;; Copyright (C) 1986, 1995, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1995, 2000-2016 Free Software Foundation, Inc.
;; Author: Richard Mlynarik
;; (according to ack.texi and authors.el)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; Keywords: help, extensions
;; This file is part of GNU Emacs.
;;; Commentary:
;; This package provides a pre-packaged `Electric Help Mode' for
-;; browsing on-line help screens. There is one entry point,
+;; browsing Emacs help screens. There is one entry point,
;; `with-electric-help'; all you have to give it is a no-argument
;; function that generates the actual text of the help into the current
;; buffer.
(defvar electric-help-map
(let ((map (make-keymap)))
+ ;; FIXME fragile. Should derive from help-mode-map in a smarter way.
+ (set-keymap-parent map button-buffer-map)
;; allow all non-self-inserting keys - search, scroll, etc, but
;; let M-x and C-x exit ehelp mode and retain buffer:
(suppress-keymap map)
(define-key map (char-to-string help-char) 'electric-help-help)
(define-key map "?" 'electric-help-help)
(define-key map " " 'scroll-up)
+ (define-key map [?\S-\ ] 'scroll-down)
(define-key map "\^?" 'scroll-down)
(define-key map "." 'beginning-of-buffer)
(define-key map "<" 'beginning-of-buffer)
(setq buffer-read-only t)
(setq electric-help-orig-major-mode major-mode)
(setq mode-name "Help")
- (setq major-mode 'help)
+ (setq major-mode 'help-mode)
(setq mode-line-buffer-identification '(" Help: %b"))
(use-local-map electric-help-map)
(add-hook 'mouse-leave-buffer-hook 'electric-help-retain)
(unwind-protect
(save-excursion
(when one
- (goto-char (window-start (selected-window))))
+ (goto-char (window-start)))
(let ((pop-up-windows t))
(pop-to-buffer buffer))
(with-current-buffer buffer
(catch 'exit
(if (pos-visible-in-window-p (point-max))
(progn (message "%s" (substitute-command-keys "<<< Press Space to bury the help buffer, Press \\[electric-help-retain] to retain it >>>"))
- (if (equal (setq unread-command-events (list (read-event)))
- '(?\s))
- (progn (setq unread-command-events nil)
- (throw 'exit t)))))
+ (let ((ev (read-event)))
+ (if (equal ev ?\s)
+ (throw 'exit t)
+ (push ev unread-command-events)))))
(let (up down both neither
(standard (and (eq (key-binding " " nil t)
'scroll-up)