ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-04-09 14:56:00 +02:00
parent 814b767608 5c5468dc60
commit a8a436317c
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/lisp/org-contacts.el
View File

@ -37,9 +37,7 @@
;;; Code: ;;; Code:
(eval-and-compile (eval-and-compile
(require 'org) (require 'org))
(require 'gnus)
(require 'gnus-art))
(defgroup org-contacts nil (defgroup org-contacts nil
"Options concerning contacts management." "Options concerning contacts management."
@ -253,8 +251,6 @@ If both match values are nil, return all contacts."
;; show the next heading ;; show the next heading
(org-flag-heading nil))))))) (org-flag-heading nil)))))))
(define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
(defun org-contacts-anniversaries (&optional field format) (defun org-contacts-anniversaries (&optional field format)
"Compute FIELD anniversary for each contact, returning FORMAT. "Compute FIELD anniversary for each contact, returning FORMAT.
Default FIELD value is \"BIRTHDAY\". Default FIELD value is \"BIRTHDAY\".
@ -323,8 +319,6 @@ This function should be called from `gnus-article-prepare-hook'."
(link (gnus-with-article-buffer (org-store-link nil)))) (link (gnus-with-article-buffer (org-store-link nil))))
(org-set-property org-contacts-last-read-mail-property link))))))) (org-set-property org-contacts-last-read-mail-property link)))))))
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail)
(defun org-contacts-icon-as-string () (defun org-contacts-icon-as-string ()
(let ((image (org-contacts-get-icon))) (let ((image (org-contacts-get-icon)))
(concat (concat
@ -386,7 +380,17 @@ This function should be called from `gnus-article-prepare-hook'."
(org-with-point-at marker (org-with-point-at marker
(org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email))))))) (org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email)))))))
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address) (defun org-contacts-gnus-insinuate ()
"Add some hooks for Gnus user.
This adds `org-contacts-gnus-check-mail-address' and
`org-contacts-gnus-store-last-mail' to
`gnus-article-prepare-hook'. It also adds a binding on `;' in
`gnus-summary-mode-map' to `org-contacts-gnus-article-from-goto'"
(require 'gnus)
(require 'gnus-art)
(define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address)
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail))
(defun org-contacts-view-send-email (&optional ask) (defun org-contacts-view-send-email (&optional ask)
"Send email to the contact at point. "Send email to the contact at point.

6
lisp/org-table.el
View File

@ -3702,14 +3702,14 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(defun org-table-cleanup-narrow-column-properties () (defun org-table-cleanup-narrow-column-properties ()
"Remove all properties related to narrow-column invisibility." "Remove all properties related to narrow-column invisibility."
(let ((s 1)) (let ((s (point-min)))
(while (setq s (text-property-any s (point-max) (while (setq s (text-property-any s (point-max)
'display org-narrow-column-arrow)) 'display org-narrow-column-arrow))
(remove-text-properties s (1+ s) '(display t))) (remove-text-properties s (1+ s) '(display t)))
(setq s 1) (setq s (point-min))
(while (setq s (text-property-any s (point-max) 'org-cwidth 1)) (while (setq s (text-property-any s (point-max) 'org-cwidth 1))
(remove-text-properties s (1+ s) '(org-cwidth t))) (remove-text-properties s (1+ s) '(org-cwidth t)))
(setq s 1) (setq s (point-min))
(while (setq s (text-property-any s (point-max) 'invisible 'org-cwidth)) (while (setq s (text-property-any s (point-max) 'invisible 'org-cwidth))
(remove-text-properties s (1+ s) '(invisible t))))) (remove-text-properties s (1+ s) '(invisible t)))))