diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
| commit | e66ba1dfc4cf2e12100191d2c24436c42d097268 (patch) | |
| tree | b50b009e703fe1a9e8cb13cddf7928a97ad6210c /lisp/org/org-protocol.el | |
| parent | 88c5c7c8313162b94173fd4333e6062aa07c4d2e (diff) | |
| download | emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.tar.gz emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.tar.bz2 emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.zip | |
Merge Org 7.8.03
Diffstat (limited to 'lisp/org/org-protocol.el')
| -rw-r--r-- | lisp/org/org-protocol.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index bbb93b07fc9..8bda9556ab5 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -1,14 +1,14 @@ ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;; -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 +;; Free Software Foundation, Inc. ;; -;; Author: Bastien Guerry <bzg AT altern DOT org> +;; Author: Bastien Guerry <bzg AT gnu DOT org> ;; Author: Daniel M German <dmg AT uvic DOT org> ;; Author: Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Author: Ross Patterson <me AT rpatterson DOT net> ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Keywords: org, emacsclient, wp -;; Version: 7.7 ;; This file is part of GNU Emacs. ;; @@ -145,8 +145,8 @@ (defgroup org-protocol nil "Intercept calls from emacsclient to trigger custom actions. -This is done by advising `server-visit-files' to scan the list of filenames -for `org-protocol-the-protocol' and sub-protocols defined in +This is done by advising `server-visit-files' to scann the list of filenames +for `org-protocol-the-protocol' and sub-procols defined in `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'." :version "22.1" :group 'convenience @@ -644,5 +644,4 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse (provide 'org-protocol) - ;;; org-protocol.el ends here |