comparison lisp/help.el @ 430:a5df635868b2 r21-2-23

Import from CVS: tag r21-2-23
author cvs
date Mon, 13 Aug 2007 11:29:08 +0200
parents 3ecd8885ac67
children 8de8e3f6228a
comparison
equal deleted inserted replaced
429:8305706cbb93 430:a5df635868b2
655 (let ((heading (if mouse-only-p 655 (let ((heading (if mouse-only-p
656 (gettext "button binding\n------ -------\n") 656 (gettext "button binding\n------ -------\n")
657 (gettext "key binding\n--- -------\n"))) 657 (gettext "key binding\n--- -------\n")))
658 (buffer (current-buffer)) 658 (buffer (current-buffer))
659 (minor minor-mode-map-alist) 659 (minor minor-mode-map-alist)
660 (extent-maps (mapcar-extents
661 'extent-keymap
662 nil (current-buffer) (point) (point) nil 'keymap))
660 (local (current-local-map)) 663 (local (current-local-map))
661 (shadow '())) 664 (shadow '()))
662 (set-buffer standard-output) 665 (set-buffer standard-output)
666 (while extent-maps
667 (insert "Bindings for Text Region:\n"
668 heading)
669 (describe-bindings-internal
670 (car extent-maps) nil shadow prefix mouse-only-p)
671 (insert "\n")
672 (setq shadow (cons (car extent-maps) shadow)
673 extent-maps (cdr extent-maps)))
663 (while minor 674 (while minor
664 (let ((sym (car (car minor))) 675 (let ((sym (car (car minor)))
665 (map (cdr (car minor)))) 676 (map (cdr (car minor))))
666 (if (symbol-value-in-buffer sym buffer nil) 677 (if (symbol-value-in-buffer sym buffer nil)
667 (progn 678 (progn
935 (completing-read 946 (completing-read
936 (if fn 947 (if fn
937 (format (gettext "Describe function (default %s): ") 948 (format (gettext "Describe function (default %s): ")
938 fn) 949 fn)
939 (gettext "Describe function: ")) 950 (gettext "Describe function: "))
940 obarray 'fboundp t nil 'function-history)))) 951 obarray 'fboundp t nil 'function-history
941 (list (if (equal val "") fn (intern val))))) 952 (symbol-name fn)))))
953 (list (intern val))))
942 (with-displaying-help-buffer 954 (with-displaying-help-buffer
943 (lambda () 955 (lambda ()
944 (describe-function-1 function) 956 (describe-function-1 function)
945 ;; Return the text we displayed. 957 ;; Return the text we displayed.
946 (buffer-string nil nil standard-output)) 958 (buffer-string nil nil standard-output))
1224 (val (let ((enable-recursive-minibuffers t)) 1236 (val (let ((enable-recursive-minibuffers t))
1225 (completing-read 1237 (completing-read
1226 (if v 1238 (if v
1227 (format "Describe variable (default %s): " v) 1239 (format "Describe variable (default %s): " v)
1228 (gettext "Describe variable: ")) 1240 (gettext "Describe variable: "))
1229 obarray 'boundp t nil 'variable-history)))) 1241 obarray 'boundp t nil 'variable-history
1230 (list (if (equal val "") v (intern val))))) 1242 (symbol-name v)))))
1243 (list (intern val))))
1231 (with-displaying-help-buffer 1244 (with-displaying-help-buffer
1232 (lambda () 1245 (lambda ()
1233 (let ((origvar variable) 1246 (let ((origvar variable)
1234 aliases) 1247 aliases)
1235 (let ((print-escape-newlines t)) 1248 (let ((print-escape-newlines t))