diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2011-05-26 06:58:54 -0600 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2011-05-26 06:58:54 -0600 |
| commit | 75eeae086e6e992b850d7252a6a6af413f363574 (patch) | |
| tree | 17eb80353226e4f1c47f856eba96fbd13b5ac20e | |
| parent | 03aa327d7950176e50ebb779c3f153bb9192dea5 (diff) | |
| parent | ea96f4cda674d5a0231d81d68bd7a29c60d4b0de (diff) | |
| download | org-mode-75eeae086e6e992b850d7252a6a6af413f363574.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | contrib/lisp/org-contacts.el | 11 | ||||
| -rw-r--r-- | lisp/org-crypt.el | 3 | ||||
| -rw-r--r-- | lisp/org-table.el | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el index 6bb7abf..b32ee86 100644 --- a/contrib/lisp/org-contacts.el +++ b/contrib/lisp/org-contacts.el @@ -224,11 +224,6 @@ If both match values are nil, return all contacts." (when (mail-abbrev-in-expansion-header-p) (org-contacts-complete-name)))) -(add-hook 'message-mode-hook - (lambda () - (add-to-list 'completion-at-point-functions - 'org-contacts-message-complete-function))) - (defun org-contacts-gnus-get-name-email () "Get name and email address from Gnus message." (gnus-with-article-headers @@ -403,6 +398,12 @@ This adds `org-contacts-gnus-check-mail-address' and (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address) (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail)) +(when (boundp 'completion-at-point-functions) + (add-hook 'message-mode-hook + (lambda () + (add-to-list 'completion-at-point-functions + 'org-contacts-message-complete-function)))) + (defun org-contacts-wl-get-from-header-content () "Retrieve the content of the `From' header of an email. Works from wl-summary-mode and mime-view-mode - that is while viewing email. diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index b649e39..6a2517f 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -209,7 +209,8 @@ This setting can also be overridden in the CRYPTKEY property." ;; 'org-mode-hook ;; (lambda () (add-hook 'auto-save-hook 'org-encrypt-entries nil t)))) -(when (and (not (daemonp)) auto-save-default) +(when (and (functionp 'daemonp) + (not (daemonp)) auto-save-default) (message "Warning: turn auto-save-mode off in Org buffers containing crypted entries.") (sit-for 5)) diff --git a/lisp/org-table.el b/lisp/org-table.el index 0f71d57..30c4ddd 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -1141,7 +1141,8 @@ is always the old value." (let* ((pos (match-beginning 0)) (val (buffer-substring (1+ pos) (match-end 0)))) (if replace - (replace-match (concat "|" replace) t t)) + (replace-match (concat "|" (if (equal replace "") " " replace)) + t t)) (goto-char (min (point-at-eol) (+ 2 pos))) val) (forward-char 1) "")) |