Mercurial > emacs
comparison lisp/gnus/gnus-sum.el @ 109831:aa32976d0c44
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 18 Aug 2010 06:23:18 +0000 |
parents | 23ac97042af1 |
children | 6c405a2a9f8e |
comparison
equal
deleted
inserted
replaced
109830:46f382b913d6 | 109831:aa32976d0c44 |
---|---|
12625 "bookmark" (&optional no-file no-context posn)) | 12625 "bookmark" (&optional no-file no-context posn)) |
12626 (declare-function bookmark-prop-get "bookmark" (bookmark prop)) | 12626 (declare-function bookmark-prop-get "bookmark" (bookmark prop)) |
12627 (declare-function bookmark-default-handler "bookmark" (bmk)) | 12627 (declare-function bookmark-default-handler "bookmark" (bmk)) |
12628 (declare-function bookmark-get-bookmark-record "bookmark" (bmk)) | 12628 (declare-function bookmark-get-bookmark-record "bookmark" (bmk)) |
12629 (defvar bookmark-yank-point) | 12629 (defvar bookmark-yank-point) |
12630 (defvar bookmark-current-bookmark) | 12630 (defvar bookmark-current-buffer) |
12631 | 12631 |
12632 (defun gnus-summary-bookmark-make-record () | 12632 (defun gnus-summary-bookmark-make-record () |
12633 "Make a bookmark entry for a Gnus summary buffer." | 12633 "Make a bookmark entry for a Gnus summary buffer." |
12634 (let (pos buf) | 12634 (let (pos buf) |
12635 (unless (and (derived-mode-p 'gnus-summary-mode) gnus-article-current) | 12635 (unless (and (derived-mode-p 'gnus-summary-mode) gnus-article-current) |