Mercurial > emacs
comparison lisp/help-fns.el @ 112098:40af77a50adc
Merge changes from emacs-23 branch
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 02 Jan 2011 15:28:40 -0500 |
| parents | 79209520f4c4 d75c0dfd5c92 |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 112045:52100bac91db | 112098:40af77a50adc |
|---|---|
| 637 (princ "It is void as a variable.") | 637 (princ "It is void as a variable.") |
| 638 (princ "Its "))) | 638 (princ "Its "))) |
| 639 (if valvoid | 639 (if valvoid |
| 640 (princ " is void as a variable.") | 640 (princ " is void as a variable.") |
| 641 (princ "'s ")))) | 641 (princ "'s ")))) |
| 642 (if valvoid | 642 (unless valvoid |
| 643 nil | |
| 644 (with-current-buffer standard-output | 643 (with-current-buffer standard-output |
| 645 (setq val-start-pos (point)) | 644 (setq val-start-pos (point)) |
| 646 (princ "value is ") | 645 (princ "value is ") |
| 647 (terpri) | |
| 648 (let ((from (point))) | 646 (let ((from (point))) |
| 647 (terpri) | |
| 649 (pp val) | 648 (pp val) |
| 650 ;; Hyperlinks in variable's value are quite frequently | 649 (if (< (point) (+ 68 (line-beginning-position 0))) |
| 651 ;; inappropriate e.g C-h v <RET> features <RET> | 650 (delete-region from (1+ from)) |
| 652 ;; (help-xref-on-pp from (point)) | 651 (delete-region (1- from) from)) |
| 653 (if (< (point) (+ from 20)) | |
| 654 (delete-region (1- from) from)) | |
| 655 (let* ((sv (get variable 'standard-value)) | 652 (let* ((sv (get variable 'standard-value)) |
| 656 (origval (and (consp sv) | 653 (origval (and (consp sv) |
| 657 (condition-case nil | 654 (condition-case nil |
| 658 (eval (car sv)) | 655 (eval (car sv)) |
| 659 (error :help-eval-error))))) | 656 (error :help-eval-error))))) |
| 664 (setq from (point)) | 661 (setq from (point)) |
| 665 (pp origval) | 662 (pp origval) |
| 666 (if (< (point) (+ from 20)) | 663 (if (< (point) (+ from 20)) |
| 667 (delete-region (1- from) from))))))) | 664 (delete-region (1- from) from))))))) |
| 668 (terpri) | 665 (terpri) |
| 669 | |
| 670 (when locus | 666 (when locus |
| 671 (if (bufferp locus) | 667 (if (bufferp locus) |
| 672 (princ (format "%socal in buffer %s; " | 668 (princ (format "%socal in buffer %s; " |
| 673 (if (get variable 'permanent-local) | 669 (if (get variable 'permanent-local) |
| 674 "Permanently l" "L") | 670 "Permanently l" "L") |