mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-22 10:49:19 +00:00
6e534f9c61
This fixes a wrong merge that should not have happened: commit 7e903a merges the master branch into the maint branch, while we really want to keep the maint branch a bugfix-only branch. This commit reverts back the maint branch to its state before merging the master branch. From there, we will fix remaining problems with the maint branch (e.g. copyright issues) then release this maint branch as Org-mode 7.8.05.
89 lines
2.9 KiB
EmacsLisp
89 lines
2.9 KiB
EmacsLisp
;;; org-bookmark.el - Support for links to bookmark
|
|
;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Tokuya Kameshima <kames AT fa2.so-net.ne.jp>
|
|
;; Version: 1.0
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;; 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, 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.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
;; Boston, MA 02110-1301, USA.
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
(require 'org)
|
|
(require 'bookmark)
|
|
|
|
(defgroup org-bookmark nil
|
|
"Options concerning the bookmark link."
|
|
:tag "Org Startup"
|
|
:group 'org-link)
|
|
|
|
(defcustom org-bookmark-in-dired nil
|
|
"Use org-bookmark in dired."
|
|
:group 'org-bookmark
|
|
:type 'boolean)
|
|
|
|
(defcustom org-bookmark-when-visiting-a-file nil
|
|
"Use org-bookmark in any buffer visiting a file."
|
|
:group 'org-bookmark
|
|
:type 'boolean)
|
|
|
|
(defcustom org-bookmark-use-first-bookmark nil
|
|
"If several bookmarks links to the buffer, take the first one.
|
|
Otherwise prompt the user for the right bookmark to use."
|
|
:group 'org-bookmark
|
|
:type 'boolean)
|
|
|
|
(org-add-link-type "bookmark" 'org-bookmark-open)
|
|
(add-hook 'org-store-link-functions 'org-bookmark-store-link)
|
|
|
|
(defun org-bookmark-open (bookmark)
|
|
"Visit the bookmark BOOKMARK."
|
|
(bookmark-jump bookmark))
|
|
|
|
(defun org-bookmark-store-link ()
|
|
"Store a link to the current line's bookmark in bookmark list."
|
|
(let (file bookmark bmks)
|
|
(cond ((and org-bookmark-in-dired
|
|
(eq major-mode 'dired-mode))
|
|
(setq file (abbreviate-file-name (dired-get-filename))))
|
|
((and org-bookmark-when-visiting-a-file
|
|
(buffer-file-name (buffer-base-buffer)))
|
|
(setq file (abbreviate-file-name
|
|
(buffer-file-name (buffer-base-buffer))))))
|
|
(if (not file)
|
|
(when (eq major-mode 'bookmark-bmenu-mode)
|
|
(setq bookmark (bookmark-bmenu-bookmark)))
|
|
(when (and (setq bmks
|
|
(mapcar (lambda (name)
|
|
(if (equal file
|
|
(abbreviate-file-name
|
|
(bookmark-location name)))
|
|
name))
|
|
(bookmark-all-names)))
|
|
(setq bmks (delete nil bmks)))
|
|
(setq bookmark
|
|
(if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark)
|
|
(car bmks)
|
|
(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))
|
|
(if bookmark
|
|
(org-store-link-props :link (org-make-link "bookmark:" bookmark)
|
|
:description bookmark))))
|
|
|
|
(provide 'org-bookmark)
|
|
|
|
;;; org-bookmark.el ends here
|