X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-bookmark.el;h=e26c78b65c5dc1815e860a7c4155e4010547bc2d;hp=7ba1163f0fa6e65cc232ec51a32ae3d237e45ae4;hb=91bfdfbc3e77a244efc8af47a47b30b10f48ec87;hpb=8a6fc8fdc11a2421298865d02b90c9dabe62ad08 diff --git a/lisp/gnus-bookmark.el b/lisp/gnus-bookmark.el index 7ba1163f0..e26c78b65 100644 --- a/lisp/gnus-bookmark.el +++ b/lisp/gnus-bookmark.el @@ -1,36 +1,34 @@ -;;; gnus-bookmark.el --- Set real bookmarks in Gnus +;;; gnus-bookmark.el --- Bookmarks in Gnus + +;; Copyright (C) 2006-2015 Free Software Foundation, Inc. + +;; Author: Bastien Guerry +;; Keywords: news + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. -;; Copyright 2006 Bastien Guerry -;; -;; Author: bzg AT altern DOT org -;; Version: $Id: gnus-bookmark.el,v 0.5 2006/06/19 10:52:08 guerry Exp guerry $ -;; Keywords: Gnus bookmark -;; Time-stamp: <2006-06-19 11:54:04 guerry> -;; X-URL: - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 2, or (at -;; your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, but -;; WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. -;; ;; You should have received a copy of the GNU General Public License -;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: -;; This file implements real bookmarks for Gnus, closely following the -;; way bookmark.el handles bookmarks. Most of the code comes from -;; bookmark.el. +;; This file implements real bookmarks for Gnus, closely following the way +;; `bookmark.el' handles bookmarks. Most of the code comes from +;; `bookmark.el'. ;; ;; Set a Gnus bookmark: ;; M-x `gnus-bookmark-set' from the summary buffer. -;; +;; ;; Jump to a Gnus bookmark: ;; M-x `gnus-bookmark-jump'. ;; @@ -49,19 +47,12 @@ ;; - renaming bookmarks in gnus-bookmark-bmenu-list ;; - better (formatted string) display in bmenu-list -;; Put this file into your load-path and the following into your -;; ~/.emacs: (require 'gnus-bookmark) - - -;;; History: -;; -;; Started in 04/2006. +;; - Integrate the `gnus-summary-*-bookmark' functionality +;; - Initialize defcustoms from corresponding `bookmark.el' variables? ;;; Code: -(provide 'gnus-bookmark) -(eval-when-compile - (require 'cl)) +(require 'gnus-sum) ;; FIXME: should avoid using C-c (no?) ;; (define-key gnus-summary-mode-map "\C-crm" 'gnus-bookmark-set) @@ -69,17 +60,33 @@ ;; (define-key global-map "\C-crj" 'gnus-bookmark-jump) ;; (define-key global-map "\C-crl" 'gnus-bookmark-bmenu-list) +;; FIXME: Add keybindings, see +;; http://thread.gmane.org/gmane.emacs.gnus.general/63101/focus=63379 +;; http://thread.gmane.org/v9fxx9fkm4.fsf@marauder.physik.uni-ulm.de + +;; FIXME: Check if `gnus-bookmark.el' should use +;; `bookmark-make-cell-function'. +;; Cf. http://article.gmane.org/gmane.emacs.gnus.general/66076 + (defgroup gnus-bookmark nil "Setting, annotation and jumping to Gnus bookmarks." :group 'gnus) - (defcustom gnus-bookmark-default-file - (concat (getenv "HOME") "/.gnus.bmk") + (cond + ;; Backward compatibility with previous versions: + ((file-exists-p "~/.gnus.bmk") "~/.gnus.bmk") + (t (nnheader-concat gnus-directory "bookmarks.el"))) "The default Gnus bookmarks file." :type 'string :group 'gnus-bookmark) +(defcustom gnus-bookmark-file-coding-system + (if (mm-coding-system-p 'iso-2022-7bit) + 'iso-2022-7bit) + "Coding system used for writing Gnus bookmark files." + :type '(symbol :tag "Coding system") + :group 'gnus-bookmark) (defcustom gnus-bookmark-sort-flag t "Non-nil means Gnus bookmarks are sorted by bookmark names. @@ -88,7 +95,6 @@ most recently set ones come first, oldest ones come last)." :type 'boolean :group 'gnus-bookmark) - (defcustom gnus-bookmark-bmenu-toggle-infos t "Non-nil means show details when listing Gnus bookmarks. List of details is defined in `gnus-bookmark-bookmark-inline-details'. @@ -99,20 +105,17 @@ following in your `.emacs' file: :type 'boolean :group 'gnus-bookmark) - (defcustom gnus-bookmark-bmenu-file-column 30 - "*Column at which to display details in a buffer listing Gnus bookmarks. + "Column at which to display details in a buffer listing Gnus bookmarks. You can toggle whether details are shown with \\\\[gnus-bookmark-bmenu-toggle-infos]." :type 'integer :group 'gnus-bookmark) - (defcustom gnus-bookmark-use-annotations nil - "*If non-nil, ask for an annotation when setting a bookmark." + "If non-nil, ask for an annotation when setting a bookmark." :type 'boolean :group 'gnus-bookmark) - (defcustom gnus-bookmark-bookmark-inline-details '(author) "Details to be shown with `gnus-bookmark-bmenu-toggle-infos'. The default value is \(subject\)." @@ -125,7 +128,6 @@ The default value is \(subject\)." (const :tag "Message-id" message-id))) :group 'gnus-bookmark) - (defcustom gnus-bookmark-bookmark-details '(author subject date group annotation) "Details to be shown with `gnus-bookmark-bmenu-show-details'. @@ -140,28 +142,20 @@ The default value is \(author subject date group annotation\)." (const :tag "Annotation" annotation))) :group 'gnus-bookmark) - (defface gnus-bookmark-menu-heading '((t (:inherit font-lock-type-face))) "Face used to highlight the heading in Gnus bookmark menu buffers." - :group 'gnus-bookmark - :version "22.1") - + :version "23.1" ;; No Gnus + :group 'gnus-bookmark) (defconst gnus-bookmark-end-of-version-stamp-marker "-*- End Of Bookmark File Format Version Stamp -*-\n" "This string marks the end of the version stamp in a Gnus bookmark file.") - (defconst gnus-bookmark-file-format-version 0 "The current version of the format used by bookmark files. You should never need to change this.") - -(defvar gnus-bookmark-after-jump-hook nil - "Hook run after `gnus-bookmark-jump' jumps to a Gnus bookmark.") - - (defvar gnus-bookmark-alist () "Association list of Gnus bookmarks and their records. The format of the alist is @@ -180,12 +174,23 @@ where each BMK is of the form So the cdr of each bookmark is an alist too.") +(defmacro gnus-bookmark-mouse-available-p () + "Return non-nil if a mouse is available." + (if (featurep 'xemacs) + '(device-on-window-system-p) + '(display-mouse-p))) + +(defun gnus-bookmark-remove-properties (string) + "Remove all text properties from STRING." + (set-text-properties 0 (length string) nil string) + string) + ;;;###autoload (defun gnus-bookmark-set () "Set a bookmark for this article." (interactive) (gnus-bookmark-maybe-load-default-file) - (if (or (not (eq major-mode 'gnus-summary-mode)) + (if (or (not (derived-mode-p 'gnus-summary-mode)) (not gnus-article-current)) (error "Please select an article in the Gnus summary buffer") (let* ((group (car gnus-article-current)) @@ -204,38 +209,35 @@ So the cdr of each bookmark is an alist too.") ;; Set the bookmark list (setq gnus-bookmark-alist (cons - (list bmk-name - (gnus-bookmark-make-cell + (list (gnus-bookmark-remove-properties bmk-name) + (gnus-bookmark-make-record group message-id author date subject annotation)) gnus-bookmark-alist)))) (gnus-bookmark-bmenu-surreptitiously-rebuild-list) (gnus-bookmark-write-file)) - -(defun gnus-bookmark-make-cell +(defun gnus-bookmark-make-record (group message-id author date subject annotation) "Return the record part of a new bookmark, given GROUP MESSAGE-ID AUTHOR DATE SUBJECT and ANNOTATION." (let ((the-record - `((group . ,group) - (message-id . ,message-id) - (author . ,author) - (date . ,date) - (subject . ,subject) - (annotation . ,annotation)))) + `((group . ,(gnus-bookmark-remove-properties group)) + (message-id . ,(gnus-bookmark-remove-properties message-id)) + (author . ,(gnus-bookmark-remove-properties author)) + (date . ,(gnus-bookmark-remove-properties date)) + (subject . ,(gnus-bookmark-remove-properties subject)) + (annotation . ,(gnus-bookmark-remove-properties annotation))))) the-record)) - (defun gnus-bookmark-set-bookmark-name (group author subject) "Set bookmark name from GROUP AUTHOR and SUBJECT." (let* ((subject (split-string subject)) - (default-name-0 - (concat (car (reverse (split-string group "[\\.:]" t))) "-" - (car (split-string author)) "-" - (concat (car subject) "-" - (cadr subject)))) + (default-name-0 ;; Should be merged with -1? + (concat (car (nreverse (delete "" (split-string group "[\\.:]")))) + "-" (car (split-string author)) + "-" (car subject) "-" (cadr subject))) (default-name-1 ;; Strip "[]" chars from the bookmark name: - (replace-regexp-in-string "[]_[]" "" default-name-0)) + (gnus-replace-in-string default-name-0 "[]_[]" "")) (name (read-from-minibuffer (format "Set bookmark (%s): " default-name-1) nil nil nil nil @@ -244,22 +246,21 @@ So the cdr of each bookmark is an alist too.") default-name-1 name))) - (defun gnus-bookmark-write-file () "Write currently defined Gnus bookmarks into `gnus-bookmark-default-file'." (interactive) (save-excursion (save-window-excursion - ;; Avoir warnings? + ;; Avoid warnings? ;; (message "Saving Gnus bookmarks to file %s..." gnus-bookmark-default-file) (set-buffer (get-buffer-create " *Gnus bookmarks*")) - (goto-char (point-min)) - (delete-region (point-min) (point-max)) + (erase-buffer) (gnus-bookmark-insert-file-format-version-stamp) (pp gnus-bookmark-alist (current-buffer)) (condition-case nil - (write-region (point-min) (point-max) - gnus-bookmark-default-file) + (let ((coding-system-for-write gnus-bookmark-file-coding-system)) + (write-region (point-min) (point-max) + gnus-bookmark-default-file)) (file-error (message "Can't write %s" gnus-bookmark-default-file))) (kill-buffer (current-buffer)) @@ -267,31 +268,37 @@ So the cdr of each bookmark is an alist too.") "Saving Gnus bookmarks to file %s...done" gnus-bookmark-default-file)))) - (defun gnus-bookmark-insert-file-format-version-stamp () "Insert text indicating current version of Gnus bookmark file format." (insert - (format ";;;; Gnus Bookmark Format Version %d ;;;;\n" - gnus-bookmark-file-format-version)) + (format ";;;; Gnus Bookmark Format Version %d %s;;;;\n" + gnus-bookmark-file-format-version + (if gnus-bookmark-file-coding-system + (concat "-*- coding: " + (symbol-name gnus-bookmark-file-coding-system) + "; -*- ") + ""))) (insert ";;; This format is meant to be slightly human-readable;\n" ";;; nevertheless, you probably don't want to edit it.\n" ";;; " gnus-bookmark-end-of-version-stamp-marker)) - ;;;###autoload (defun gnus-bookmark-jump (&optional bmk-name) "Jump to a Gnus bookmark (BMK-NAME)." (interactive) (gnus-bookmark-maybe-load-default-file) (let* ((bookmark (or bmk-name - (completing-read "Jump to bookmarked article: " - (mapcar 'car gnus-bookmark-alist)))) - (bmk-cell (cadr (assoc bookmark gnus-bookmark-alist))) - (group (cdr (assoc 'group bmk-cell))) - (message-id (cdr (assoc 'message-id bmk-cell)))) - (require 'gnus) - (if group (gnus-fetch-group group)) + (gnus-completing-read "Jump to bookmarked article" + (mapcar 'car gnus-bookmark-alist)))) + (bmk-record (cadr (assoc bookmark gnus-bookmark-alist))) + (group (cdr (assoc 'group bmk-record))) + (message-id (cdr (assoc 'message-id bmk-record)))) + (when group + (unless (get-buffer gnus-group-buffer) + (gnus-no-server)) + (gnus-activate-group group) + (gnus-group-quick-select-group 0 group)) (if message-id (or (gnus-summary-goto-article message-id nil 'force) (if (fboundp 'gnus-summary-insert-cached-articles) @@ -300,10 +307,8 @@ So the cdr of each bookmark is an alist too.") (gnus-summary-goto-article message-id nil 'force)) (message "Message could not be found.")))))) - (defvar gnus-bookmark-already-loaded nil) - (defun gnus-bookmark-alist-from-buffer () "Return a `gnus-bookmark-alist' from the current buffer. The buffer must of course contain Gnus bookmark format information. @@ -317,7 +322,6 @@ affect point." ;; Else no hope of getting information here. (error "Not Gnus bookmark format")))) - (defun gnus-bookmark-load (file) "Load Gnus bookmarks from FILE (which must be in bookmark format)." (interactive @@ -338,7 +342,6 @@ affect point." (setq gnus-bookmark-alist blist)) (error "Not Gnus bookmark format"))))))) - (defun gnus-bookmark-maybe-load-default-file () "Maybe load Gnus bookmarks in `gnus-bookmark-alist'." (and (not gnus-bookmark-already-loaded) @@ -346,16 +349,15 @@ affect point." (file-readable-p (expand-file-name gnus-bookmark-default-file)) (gnus-bookmark-load gnus-bookmark-default-file))) - (defun gnus-bookmark-maybe-sort-alist () "Return the gnus-bookmark-alist for display. -If the gnus-bookmark-sort-flag is non-nil, then return a sorted copy of the alist." - (if gnus-bookmark-sort-flag - (setq gnus-bookmark-alist - (sort (copy-alist gnus-bookmark-alist) - (function - (lambda (x y) (string-lessp (car x) (car y)))))))) - +If the gnus-bookmark-sort-flag is non-nil, then return a sorted +copy of the alist." + (when gnus-bookmark-sort-flag + (setq gnus-bookmark-alist + (sort (copy-alist gnus-bookmark-alist) + (function + (lambda (x y) (string-lessp (car x) (car y)))))))) ;;;###autoload (defun gnus-bookmark-bmenu-list () @@ -365,10 +367,11 @@ The leftmost column displays a D if the bookmark is flagged for deletion, or > if it is flagged for displaying." (interactive) (gnus-bookmark-maybe-load-default-file) - (if (interactive-p) + (if (gmm-called-interactively-p 'any) (switch-to-buffer (get-buffer-create "*Gnus Bookmark List*")) (set-buffer (get-buffer-create "*Gnus Bookmark List*"))) - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + alist name start end) (erase-buffer) (insert "% Gnus Bookmark\n- --------\n") (add-text-properties (point-min) (point) @@ -376,36 +379,35 @@ deletion, or > if it is flagged for displaying." ;; sort before displaying (gnus-bookmark-maybe-sort-alist) ;; Display gnus bookmarks - (mapcar - (lambda (full-record) - ;; if a Gnus bookmark has an annotation, prepend a "*" - ;; in the list of bookmarks. - (let ((annotation (gnus-bookmark-get-annotation - (gnus-bookmark-name-from-full-record full-record)))) - (if (and annotation (not (string-equal annotation ""))) - (insert " *") - (insert " ")) - (let ((start (point))) - (insert (gnus-bookmark-name-from-full-record full-record)) - (if (and (display-color-p) (display-mouse-p)) - (add-text-properties - start - (save-excursion (re-search-backward - "[^ \t]") - (1+ (point))) - '(mouse-face highlight - follow-link t - help-echo "mouse-2: go to this article"))) - (insert "\n") - ))) - gnus-bookmark-alist) + (setq alist gnus-bookmark-alist) + (while alist + (setq name (gnus-bookmark-name-from-full-record (pop alist))) + ;; if a Gnus bookmark has an annotation, prepend a "*" + ;; in the list of bookmarks. + (insert (if (member (gnus-bookmark-get-annotation name) (list nil "")) + " " + " *")) + (if (gnus-bookmark-mouse-available-p) + (add-text-properties + (prog1 + (point) + (insert name)) + (let ((end (point))) + (prog2 + (re-search-backward "[^ \t]") + (1+ (point)) + (goto-char end) + (insert "\n"))) + `(mouse-face highlight follow-link t + help-echo ,(format "%s: go to this article" + (aref gnus-mouse-2 0)))) + (insert name "\n"))) (goto-char (point-min)) (forward-line 2) (gnus-bookmark-bmenu-mode) (if gnus-bookmark-bmenu-toggle-infos (gnus-bookmark-bmenu-toggle-infos t)))) - (defun gnus-bookmark-bmenu-surreptitiously-rebuild-list () "Rebuild the Bookmark List if it exists. Don't affect the buffer ring order." @@ -414,25 +416,21 @@ Don't affect the buffer ring order." (save-window-excursion (gnus-bookmark-bmenu-list))))) - (defun gnus-bookmark-get-annotation (bookmark) "Return the annotation of Gnus BOOKMARK, or nil if none." (cdr (assq 'annotation (gnus-bookmark-get-bookmark-record bookmark)))) - (defun gnus-bookmark-get-bookmark (bookmark) - "Return the full entry for Gnus BOOKMARK in `guns-bmk-alist'. + "Return the full entry for Gnus BOOKMARK in `gnus-bookmark-alist'. If BOOKMARK is not a string, return nil." (when (stringp bookmark) - (assoc-string bookmark gnus-bookmark-alist t))) - + (assoc bookmark gnus-bookmark-alist))) (defun gnus-bookmark-get-bookmark-record (bookmark) "Return the guts of the entry for Gnus BOOKMARK in `gnus-bookmark-alist'. That is, all information but the name." (car (cdr (gnus-bookmark-get-bookmark bookmark)))) - (defun gnus-bookmark-name-from-full-record (full-record) "Return name of FULL-RECORD \(an alist element instead of a string\)." (car full-record)) @@ -445,7 +443,9 @@ That is, all information but the name." nil (setq gnus-bookmark-bmenu-mode-map (make-keymap)) (suppress-keymap gnus-bookmark-bmenu-mode-map t) - (define-key gnus-bookmark-bmenu-mode-map "q" 'quit-window) + (define-key gnus-bookmark-bmenu-mode-map "q" (if (fboundp 'quit-window) + 'quit-window + 'bury-buffer)) (define-key gnus-bookmark-bmenu-mode-map "\C-m" 'gnus-bookmark-bmenu-select) (define-key gnus-bookmark-bmenu-mode-map "v" 'gnus-bookmark-bmenu-select) (define-key gnus-bookmark-bmenu-mode-map "d" 'gnus-bookmark-bmenu-delete) @@ -463,7 +463,8 @@ That is, all information but the name." (define-key gnus-bookmark-bmenu-mode-map "s" 'gnus-bookmark-bmenu-save) (define-key gnus-bookmark-bmenu-mode-map "t" 'gnus-bookmark-bmenu-toggle-infos) (define-key gnus-bookmark-bmenu-mode-map "a" 'gnus-bookmark-bmenu-show-details) - (define-key gnus-bookmark-bmenu-mode-map [mouse-2] 'gnus-bookmark-bmenu-select)) + (define-key gnus-bookmark-bmenu-mode-map gnus-mouse-2 + 'gnus-bookmark-bmenu-select-by-mouse)) ;; Bookmark Buffer Menu mode is suitable only for specially formatted ;; data. @@ -472,7 +473,7 @@ That is, all information but the name." ;; Been to lazy to use gnus-bookmark-save... (defalias 'gnus-bookmark-bmenu-save 'gnus-bookmark-write-file) -(defun gnus-bookmark-bmenu-mode () +(define-derived-mode gnus-bookmark-bmenu-mode fundamental-mode "Bookmark Menu" "Major mode for editing a list of Gnus bookmarks. Each line describes one of the bookmarks in Gnus. Letters do not insert themselves; instead, they are commands. @@ -496,13 +497,8 @@ Gnus bookmarks names preceded by a \"*\" have annotations. in another buffer. \\[gnus-bookmark-bmenu-show-all-annotations] -- show the annotations of all bookmarks in another buffer. \\[gnus-bookmark-bmenu-edit-annotation] -- edit the annotation for the current bookmark." - (kill-all-local-variables) - (use-local-map gnus-bookmark-bmenu-mode-map) (setq truncate-lines t) - (setq buffer-read-only t) - (setq major-mode 'gnus-bookmark-bmenu-mode) - (setq mode-name "Bookmark Menu") - (run-mode-hooks 'gnus-bookmark-bmenu-mode-hook)) + (setq buffer-read-only t)) ;; avoid compilation warnings (defvar gnus-bookmark-bmenu-toggle-infos nil) @@ -523,7 +519,6 @@ Optional argument SHOW means show them unconditionally." (gnus-bookmark-bmenu-show-infos) (setq gnus-bookmark-bmenu-toggle-infos t)))) - (defun gnus-bookmark-bmenu-show-infos (&optional force) "Show infos in bmenu, maybe FORCE display of infos." (if (and (not force) gnus-bookmark-bmenu-toggle-infos) @@ -538,10 +533,10 @@ Optional argument SHOW means show them unconditionally." (let ((bmrk (gnus-bookmark-bmenu-bookmark))) (setq gnus-bookmark-bmenu-hidden-bookmarks (cons bmrk gnus-bookmark-bmenu-hidden-bookmarks)) - (let ((start (save-excursion (end-of-line) (point)))) + (let ((start (point-at-eol))) (move-to-column gnus-bookmark-bmenu-file-column t) ;; Strip off `mouse-face' from the white spaces region. - (if (and (display-color-p) (display-mouse-p)) + (if (gnus-bookmark-mouse-available-p) (remove-text-properties start (point) '(mouse-face nil help-echo nil)))) (delete-region (point) (progn (end-of-line) (point))) @@ -550,7 +545,6 @@ Optional argument SHOW means show them unconditionally." (gnus-bookmark-insert-details bmrk) (forward-line 1)))))))) - (defun gnus-bookmark-insert-details (bmk-name) "Insert the details of the article associated with BMK-NAME." (let ((start (point))) @@ -558,26 +552,24 @@ Optional argument SHOW means show them unconditionally." (insert (gnus-bookmark-get-details bmk-name gnus-bookmark-bookmark-inline-details)) - (if (and (display-color-p) (display-mouse-p)) + (if (gnus-bookmark-mouse-available-p) (add-text-properties start (save-excursion (re-search-backward "[^ \t]") (1+ (point))) - '(mouse-face highlight + `(mouse-face highlight follow-link t - help-echo "mouse-2: go to this article")))))) - + help-echo ,(format "%s: go to this article" + (aref gnus-mouse-2 0)))))))) (defun gnus-bookmark-kill-line (&optional newline-too) "Kill from point to end of line. If optional arg NEWLINE-TOO is non-nil, delete the newline too. Does not affect the kill ring." - (let ((eol (save-excursion (end-of-line) (point)))) - (delete-region (point) eol) - (if (and newline-too (looking-at "\n")) - (delete-char 1)))) - + (delete-region (point) (point-at-eol)) + (if (and newline-too (looking-at "\n")) + (delete-char 1))) (defun gnus-bookmark-get-details (bmk-name details-list) "Get details for a Gnus BMK-NAME depending on DETAILS-LIST." @@ -587,7 +579,6 @@ Does not affect the kill ring." (cdr (assoc info details))) details-list " | "))) - (defun gnus-bookmark-bmenu-hide-infos (&optional force) "Hide infos in bmenu, maybe FORCE." (if (and (not force) gnus-bookmark-bmenu-toggle-infos) @@ -610,21 +601,21 @@ Does not affect the kill ring." (gnus-bookmark-kill-line) (let ((start (point))) (insert (car gnus-bookmark-bmenu-hidden-bookmarks)) - (if (and (display-color-p) (display-mouse-p)) + (if (gnus-bookmark-mouse-available-p) (add-text-properties start (save-excursion (re-search-backward "[^ \t]") (1+ (point))) - '(mouse-face highlight + `(mouse-face highlight follow-link t help-echo - "mouse-2: go to this bookmark in other window")))) + ,(format "%s: go to this bookmark in other window" + (aref gnus-mouse-2 0)))))) (setq gnus-bookmark-bmenu-hidden-bookmarks (cdr gnus-bookmark-bmenu-hidden-bookmarks)) (forward-line 1)))))))) - (defun gnus-bookmark-bmenu-check-position () "Return non-nil if on a line with a bookmark. The actual value returned is gnus-bookmark-alist. Else @@ -639,7 +630,6 @@ reposition and try again, else return nil." (t gnus-bookmark-alist))) - (defun gnus-bookmark-bmenu-bookmark () "Return a string which is bookmark of this line." (if (gnus-bookmark-bmenu-check-position) @@ -664,25 +654,21 @@ reposition and try again, else return nil." (if gnus-bookmark-bmenu-toggle-infos (gnus-bookmark-bmenu-toggle-infos t)))))) - (defun gnus-bookmark-show-details (bookmark) "Display the annotation for BOOKMARK in a buffer." (let ((record (gnus-bookmark-get-bookmark-record bookmark)) - (details-list gnus-bookmark-bookmark-details)) + (old-buf (current-buffer)) + (details gnus-bookmark-bookmark-details) + detail) (save-excursion - (let ((old-buf (current-buffer))) - (pop-to-buffer (get-buffer-create "*Gnus Bookmark Annotation*") t) - (delete-region (point-min) (point-max)) - (mapcar - (lambda (detail) - (when (not (equal (cdr (assoc detail record)) "")) - (insert (concat (symbol-name detail) ": " - (cdr (assoc detail record)) - "\n")))) - gnus-bookmark-bookmark-details) - (goto-char (point-min)) - (pop-to-buffer old-buf))))) - + (pop-to-buffer (get-buffer-create "*Gnus Bookmark Annotation*") t) + (erase-buffer) + (while details + (setq detail (pop details)) + (unless (equal (cdr (assoc detail record)) "") + (insert (symbol-name detail) ": " (cdr (assoc detail record)) "\n"))) + (goto-char (point-min)) + (pop-to-buffer old-buf)))) (defun gnus-bookmark-bmenu-show-details () "Show the annotation for the current bookmark in another window." @@ -691,7 +677,6 @@ reposition and try again, else return nil." (if (gnus-bookmark-bmenu-check-position) (gnus-bookmark-show-details bookmark)))) - (defun gnus-bookmark-bmenu-mark () "Mark bookmark on this line to be displayed by \\\\[gnus-bookmark-bmenu-select]." (interactive) @@ -703,7 +688,6 @@ reposition and try again, else return nil." (forward-line 1) (gnus-bookmark-bmenu-check-position)))) - (defun gnus-bookmark-bmenu-unmark (&optional backup) "Cancel all requested operations on bookmark on this line and move down. Optional BACKUP means move up." @@ -720,7 +704,6 @@ Optional BACKUP means move up." (forward-line (if backup -1 1)) (gnus-bookmark-bmenu-check-position)))) - (defun gnus-bookmark-bmenu-backup-unmark () "Move up and cancel all requested operations on bookmark on line above." (interactive) @@ -731,7 +714,6 @@ Optional BACKUP means move up." (forward-line -1) (gnus-bookmark-bmenu-check-position)))) - (defun gnus-bookmark-bmenu-delete () "Mark Gnus bookmark on this line to be deleted. To carry out the deletions that you've marked, use @@ -745,7 +727,6 @@ To carry out the deletions that you've marked, use (forward-line 1) (gnus-bookmark-bmenu-check-position)))) - (defun gnus-bookmark-bmenu-delete-backwards () "Mark bookmark on this line to be deleted, then move up one line. To carry out the deletions that you've marked, use @@ -757,7 +738,6 @@ To carry out the deletions that you've marked, use (forward-line 1)) (gnus-bookmark-bmenu-check-position)) - (defun gnus-bookmark-bmenu-select () "Select this line's bookmark; also display bookmarks marked with `>'. You can mark bookmarks with the @@ -772,6 +752,10 @@ command." (gnus-bookmark-jump bmrk) (bury-buffer menu)))) +(defun gnus-bookmark-bmenu-select-by-mouse (event) + (interactive "e") + (mouse-set-point event) + (gnus-bookmark-bmenu-select)) (defun gnus-bookmark-bmenu-load () "Load the Gnus bookmark file and rebuild the bookmark menu-buffer." @@ -782,7 +766,6 @@ command." ;; This will call `gnus-bookmark-bmenu-list' (call-interactively 'gnus-bookmark-load))))) - (defun gnus-bookmark-bmenu-execute-deletions () "Delete Gnus bookmarks marked with \\\\[Buffer-menu-delete] commands." (interactive) @@ -818,7 +801,6 @@ command." (gnus-bookmark-write-file) (message "Deleting bookmarks...done"))) - (defun gnus-bookmark-delete (bookmark &optional batch) "Delete BOOKMARK from the bookmark list. Removes only the first instance of a bookmark with that name. If @@ -835,14 +817,6 @@ probably because we were called from there." nil (gnus-bookmark-bmenu-surreptitiously-rebuild-list))) - - -;;;;########################################################################## -;;;; User Options, Variables -;;;;########################################################################## - - - - +(provide 'gnus-bookmark) ;;; gnus-bookmark.el ends here