Mercurial > emacs
diff lisp/help-macro.el @ 88155:d7ddb3e565de
sync with trunk
| author | Henrik Enberg <henrik.enberg@telia.com> |
|---|---|
| date | Mon, 16 Jan 2006 00:03:54 +0000 |
| parents | 253f761ad37b |
| children |
line wrap: on
line diff
--- a/lisp/help-macro.el Sun Jan 15 23:02:10 2006 +0000 +++ b/lisp/help-macro.el Mon Jan 16 00:03:54 2006 +0000 @@ -1,6 +1,7 @@ ;;; help-macro.el --- makes command line help such as help-for-help -;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lynn Slater <lrs@indetech.com> ;; Maintainer: FSF @@ -21,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -121,7 +122,7 @@ (if three-step-help (progn (setq key (let ((overriding-local-map local-map)) - (read-key-sequence nil))) + (read-key-sequence nil))) ;; Make the HELP key translate to C-h. (if (lookup-key function-key-map key) (setq key (lookup-key function-key-map key))) @@ -138,12 +139,13 @@ (setq new-frame (window-frame (selected-window)) config nil)) (setq buffer-read-only nil) - (erase-buffer) - (insert help-screen) + (let ((inhibit-read-only t)) + (erase-buffer) + (insert help-screen)) (help-mode) (goto-char (point-min)) (while (or (memq char (append help-event-list - (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace vertical-scroll-bar ?\M-v)))) + (cons help-char '(?? ?\C-v ?\s ?\177 delete backspace vertical-scroll-bar ?\M-v)))) (eq (car-safe char) 'switch-frame) (equal key "\M-v")) (condition-case nil @@ -196,4 +198,5 @@ (provide 'help-macro) +;;; arch-tag: 59fee949-1686-485a-8a05-83418073e257 ;;; help-macro.el ends here