Mercurial > emacs
comparison lisp/help-fns.el @ 104134:0bef83c2fc08
* help-fns.el (describe-variable): Treat list return values from
dir-locals-find-file properly (Bug#4005).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 02 Aug 2009 23:09:00 +0000 |
| parents | cb6235bd8c86 |
| children | 81cbeb1f6df1 |
comparison
equal
deleted
inserted
replaced
| 104133:6d40e5112f4e | 104134:0bef83c2fc08 |
|---|---|
| 717 (if (member (cons variable val) dir-local-variables-alist) | 717 (if (member (cons variable val) dir-local-variables-alist) |
| 718 (let ((file (and (buffer-file-name) | 718 (let ((file (and (buffer-file-name) |
| 719 (not (file-remote-p (buffer-file-name))) | 719 (not (file-remote-p (buffer-file-name))) |
| 720 (dir-locals-find-file (buffer-file-name))))) | 720 (dir-locals-find-file (buffer-file-name))))) |
| 721 (princ " This variable is a directory local variable") | 721 (princ " This variable is a directory local variable") |
| 722 (if file (princ (concat "\n from the file \"" file "\""))) | 722 (when file |
| 723 (princ (concat "\n from the file \"" | |
| 724 (if (consp file) | |
| 725 (car file) | |
| 726 file) | |
| 727 "\""))) | |
| 723 (princ ".\n")) | 728 (princ ".\n")) |
| 724 (princ " This variable is a file local variable.\n"))) | 729 (princ " This variable is a file local variable.\n"))) |
| 725 | 730 |
| 726 (when (memq variable ignored-local-variables) | 731 (when (memq variable ignored-local-variables) |
| 727 (setq extra-line t) | 732 (setq extra-line t) |