Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-11-16 00:10:08 +01:00
commit 4670b0420c
1 changed files with 7 additions and 7 deletions

View File

@ -9526,13 +9526,13 @@ entries in that Org-mode file."
(message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
(read-char-exclusive)))
(cmd (cdr (assoc char
'((?d . insert-diary-entry)
(?w . insert-weekly-diary-entry)
(?m . insert-monthly-diary-entry)
(?y . insert-yearly-diary-entry)
(?a . insert-anniversary-diary-entry)
(?b . insert-block-diary-entry)
(?c . insert-cyclic-diary-entry)))))
'((?d . diary-insert-entry)
(?w . diary-insert-weekly-entry)
(?m . diary-insert-monthly-entry)
(?y . diary-insert-yearly-entry)
(?a . diary-insert-anniversary-entry)
(?b . diary-insert-block-entry)
(?c . diary-insert-cyclic-entry)))))
(oldf (symbol-function 'calendar-cursor-to-date))
;; (buf (get-file-buffer (substitute-in-file-name diary-file)))
(point (point))