Mercurial > emacs
comparison lisp/calendar/icalendar.el @ 107638:772da445ced7
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 06 Mar 2010 05:16:27 -0500 |
| parents | 2da9673fc448 |
| children | 111f90199914 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 107637:59df2de8b31d | 107638:772da445ced7 |
|---|---|
| 2244 (funcall (if (fboundp 'diary-make-entry) | 2244 (funcall (if (fboundp 'diary-make-entry) |
| 2245 'diary-make-entry | 2245 'diary-make-entry |
| 2246 'make-diary-entry) | 2246 'make-diary-entry) |
| 2247 string non-marking diary-file))) | 2247 string non-marking diary-file))) |
| 2248 ;; Würgaround to remove the trailing blank char | 2248 ;; Würgaround to remove the trailing blank char |
| 2249 (save-excursion | 2249 (with-current-buffer (find-file diary-file) |
| 2250 (set-buffer (find-file diary-file)) | |
| 2251 (goto-char (point-max)) | 2250 (goto-char (point-max)) |
| 2252 (if (= (char-before) ? ) | 2251 (if (= (char-before) ? ) |
| 2253 (delete-char -1))) | 2252 (delete-char -1))) |
| 2254 ;; return diary-file in case it has been changed interactively | 2253 ;; return diary-file in case it has been changed interactively |
| 2255 diary-file) | 2254 diary-file) |