Mercurial > emacs
comparison lisp/doc-view.el @ 109444:11d5817a8846
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Fri, 16 Jul 2010 12:36:52 +0000 |
| parents | fa4400531412 |
| children | 6957ace4e43f |
comparison
equal
deleted
inserted
replaced
| 109390:f1045a53471c | 109444:11d5817a8846 |
|---|---|
| 1347 (dired doc-view-cache-directory)) | 1347 (dired doc-view-cache-directory)) |
| 1348 | 1348 |
| 1349 | 1349 |
| 1350 ;;;; Bookmark integration | 1350 ;;;; Bookmark integration |
| 1351 | 1351 |
| 1352 (declare-function bookmark-make-record-default "bookmark" | 1352 (declare-function bookmark-make-record-default |
| 1353 (&optional point-only)) | 1353 "bookmark" (&optional no-file no-context posn)) |
| 1354 (declare-function bookmark-prop-get "bookmark" (bookmark prop)) | 1354 (declare-function bookmark-prop-get "bookmark" (bookmark prop)) |
| 1355 (declare-function bookmark-default-handler "bookmark" (bmk)) | 1355 (declare-function bookmark-default-handler "bookmark" (bmk)) |
| 1356 | 1356 |
| 1357 (defun doc-view-bookmark-make-record () | 1357 (defun doc-view-bookmark-make-record () |
| 1358 (nconc (bookmark-make-record-default) | 1358 (nconc (bookmark-make-record-default) |