diff options
| author | Kenichi Handa | 2011-12-15 16:51:01 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-12-15 16:51:01 +0900 |
| commit | 6080e055498c19ebd34495f204a8ad676eb09260 (patch) | |
| tree | 19a0544bb6b87a4bd4aa3208dd24f11147bbbf7c /lisp/org | |
| parent | 5fc1c122ccc781fb93dd81aacac368ac7bd973e6 (diff) | |
| parent | bbd240ceeefcf4181aa9205f4e743b32b5c68e1f (diff) | |
| download | emacs-6080e055498c19ebd34495f204a8ad676eb09260.tar.gz emacs-6080e055498c19ebd34495f204a8ad676eb09260.zip | |
merge trunk
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-protocol.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index ca7bfe2a4d0..bbb93b07fc9 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el | |||
| @@ -546,8 +546,8 @@ as filename." | |||
| 546 | (when (string-match proto fname) | 546 | (when (string-match proto fname) |
| 547 | (let* ((func (plist-get (cdr prolist) :function)) | 547 | (let* ((func (plist-get (cdr prolist) :function)) |
| 548 | (greedy (plist-get (cdr prolist) :greedy)) | 548 | (greedy (plist-get (cdr prolist) :greedy)) |
| 549 | (splitted (split-string fname proto)) | 549 | (split (split-string fname proto)) |
| 550 | (result (if greedy restoffiles (cadr splitted)))) | 550 | (result (if greedy restoffiles (cadr split)))) |
| 551 | (when (plist-get (cdr prolist) :kill-client) | 551 | (when (plist-get (cdr prolist) :kill-client) |
| 552 | (message "Greedy org-protocol handler. Killing client.") | 552 | (message "Greedy org-protocol handler. Killing client.") |
| 553 | (server-edit)) | 553 | (server-edit)) |