Mercurial > emacs
comparison lisp/help.el @ 90314:d1c5430c5bff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 97-112)
- Update from CVS
- Merge from erc--emacs--0
- Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 37)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 22 Feb 2006 06:54:10 +0000 |
parents | 9e490faa9f6b f8759a14f4cd |
children | 34c8b755296d |
comparison
equal
deleted
inserted
replaced
90313:496f6d9b9d20 | 90314:d1c5430c5bff |
---|---|
577 (setq saved-yank-menu (copy-sequence yank-menu)) | 577 (setq saved-yank-menu (copy-sequence yank-menu)) |
578 (menu-bar-update-yank-menu "(any string)" nil)) | 578 (menu-bar-update-yank-menu "(any string)" nil)) |
579 (setq key (read-key-sequence "Describe key (or click or menu item): ")) | 579 (setq key (read-key-sequence "Describe key (or click or menu item): ")) |
580 (list | 580 (list |
581 key | 581 key |
582 (prefix-numeric-value current-prefix-arg) | 582 (if current-prefix-arg (prefix-numeric-value current-prefix-arg)) |
583 ;; If KEY is a down-event, read the corresponding up-event | 583 1)) |
584 ;; and use it as the third argument. | |
585 (if (and (consp key) (symbolp (car key)) | |
586 (memq 'down (cdr (get (car key) 'event-symbol-elements)))) | |
587 (read-event)))) | |
588 ;; Put yank-menu back as it was, if we changed it. | 584 ;; Put yank-menu back as it was, if we changed it. |
589 (when saved-yank-menu | 585 (when saved-yank-menu |
590 (setq yank-menu (copy-sequence saved-yank-menu)) | 586 (setq yank-menu (copy-sequence saved-yank-menu)) |
591 (fset 'yank-menu (cons 'keymap yank-menu)))))) | 587 (fset 'yank-menu (cons 'keymap yank-menu)))))) |
592 (if (numberp untranslated) | 588 (if (numberp untranslated) |