diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-23 11:38:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-23 11:38:23 -0400 |
| commit | dc5d230cac26a7ad04afd63bfc8db7c3df529fba (patch) | |
| tree | dbe754c92c664a8bce769174e97e5660380df0c4 /lisp/help-fns.el | |
| parent | e8c1cabf0330c190594cb77942a5690afee9e926 (diff) | |
| download | emacs-dc5d230cac26a7ad04afd63bfc8db7c3df529fba.tar.gz | |
Miscellaneous minor cleanups and simplifications.
* lisp/help-fns.el (describe-variable): Don't croak when doc is not found.
* lisp/vc/pcvs.el (cvs-retrieve-revision): Avoid toggle-read-only.
* lisp/menu-bar.el (menu-bar-line-wrapping-menu): Purecopy a tiny bit more.
* lisp/emacs-lisp/syntax.el (syntax-ppss): Simplify with new `if' place.
* lisp/emacs-lisp/smie.el (smie-next-sexp): CSE.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Fix edebug spec and avoid
((lambda ..) ..).
* lisp/emacs-lisp/eieio.el (eieio-oref, slot-value): Use simpler defsetf.
Diffstat (limited to 'lisp/help-fns.el')
| -rw-r--r-- | lisp/help-fns.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 72b494f9800..555bdbb69ce 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -806,8 +806,12 @@ it is displayed along with the global value." (obsolete (get variable 'byte-obsolete-variable)) (use (car obsolete)) (safe-var (get variable 'safe-local-variable)) - (doc (or (documentation-property variable 'variable-documentation) - (documentation-property alias 'variable-documentation))) + (doc (condition-case err + (or (documentation-property + variable 'variable-documentation) + (documentation-property + alias 'variable-documentation)) + (error (format "Doc not found: %S" err)))) (extra-line nil)) ;; Add a note for variables that have been make-var-buffer-local. (when (and (local-variable-if-set-p variable) |