Commit 76b0b55f authored by Glenn Morris's avatar Glenn Morris

Ulf Jasper <ulf.jasper at web.de>:

(icalendar-version): Increase to 0.15.
(icalendar--get-unfolded-buffer): Define actual arguments rather
than just using &rest.  Check replace-in-string is fbound.
(icalendar-import-buffer): Doc fix.
(icalendar--convert-ical-to-diary): Set diary-file.  Check
diary-file before inserting final newline.
(icalendar--add-diary-entry): Return diary-file.
parent 04171c28
......@@ -10,8 +10,6 @@ make sure all the pages really look ok in the manual as formatted.
** Cleanup temporary +++/--- lines in etc/NEWS.
** Regenerate the postscript files of the reference cards in etc.
As of 2007/2/26, only ps files older than the associated tex files are:
cs-dired-ref.ps sk-dired-ref.ps
** Ask maintainers of refcard translations to update them.
......@@ -20,7 +18,7 @@ Requests to have been sent out on 2006-05-23 (Reiner Steib).
LANG Translator Status
cs Pavel Janík Can't work on it now.
de Sven Joachim Done
fr Eric Jacoboni Done (layout might be improved)
fr Eric Jacoboni Done
pl Włodek Bzyl Done
pt-br Rodrigo Real Done
ru Alex Ott Done
......@@ -49,13 +47,11 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
** flyspell and check-comments
** lennart.borgman@gmail.com, Feb 22: C-h k does not catch text properies keymaps
** lennart.borgman@gmail.com, Feb 22: C-h k does not catch text properties keymaps
Update: Problem is only seen when viper-mode is enabled.
* DOCUMENTATION
** Fix overfull lines p3 fr-refcard.ps
** Check the Emacs Tutorial.
The first line of every tutorial must begin with text ending in a
......
2007-03-21 Glenn Morris <rgm@gnu.org>
* fr-refcard.tex (\metax): Tweak \hsize to avoid overfull columns.
(\shortcopyrightnotice): Do not display in middle of file.
Numerous \cr and \hskip hacks to avoid overfull columns.
* fr-refcard.ps: Regenerate.
2007-03-19 Chong Yidong <cyd@stupidchicken.com>
* dired-ref.tex:
* fr-drdref.tex:
* fr-drdref.tex:
* cs-dired-ref.tex:
* sk-dired-ref.tex: Emacs 21 -> 22.
* dired-ref.ps:
* fr-drdref.ps:
* fr-drdref.ps:
* cs-dired-ref.ps:
* sk-dired-ref.ps: Regenerate.
......
2007-03-21 Ulf Jasper <ulf.jasper@web.de>
* calendar/icalendar.el (icalendar-version): Increase to 0.15.
(icalendar--get-unfolded-buffer): Define actual arguments rather
than just using &rest. Check replace-in-string is fbound.
(icalendar-import-buffer): Doc fix.
(icalendar--convert-ical-to-diary): Set diary-file. Check
diary-file before inserting final newline.
(icalendar--add-diary-entry): Return diary-file.
2007-03-21 Glenn Morris <rgm@gnu.org>
* calendar/calendar.el (diary-set-maybe-redraw): Autoload it.
......@@ -101,7 +101,7 @@
;;; Code:
(defconst icalendar-version "0.14"
(defconst icalendar-version "0.15"
"Version number of icalendar.el.")
;; ======================================================================
......@@ -226,16 +226,17 @@ buffer."
(replace-match "" nil nil)))
unfolded-buffer))
(defsubst icalendar--rris (&rest args)
(defsubst icalendar--rris (regexp rep string &optional fixedcase literal)
"Replace regular expression in string.
Pass ARGS to `replace-regexp-in-string' (Emacs) or to
`replace-in-string' (XEmacs)."
(if (fboundp 'replace-regexp-in-string)
;; Emacs:
(apply 'replace-regexp-in-string args)
;; XEmacs:
(save-match-data ;; apparently XEmacs needs save-match-data
(apply 'replace-in-string args))))
Pass arguments REGEXP REP STRING FIXEDCASE LITERAL to
`replace-regexp-in-string' (Emacs) or to `replace-in-string' (XEmacs)."
(cond ((fboundp 'replace-regexp-in-string)
;; Emacs:
(replace-regexp-in-string regexp rep string fixedcase literal))
((fboundp 'replace-in-string)
;; XEmacs:
(save-match-data ;; apparently XEmacs needs save-match-data
(replace-in-string string regexp rep literal)))))
(defun icalendar--read-element (invalue inparams)
"Recursively read the next iCalendar element in the current buffer.
......@@ -1472,8 +1473,8 @@ object, reads it and adds all VEVENT elements to the diary
DIARY-FILE.
It will ask for each appointment whether to add it to the diary
when DO-NOT-ASK is non-nil. When called interactively,
DO-NOT-ASK is set to t, so that you are asked fore each event.
unless DO-NOT-ASK is non-nil. When called interactively,
DO-NOT-ASK is nil, so that you are asked for each event.
NON-MARKING determines whether diary events are created as
non-marking.
......@@ -1669,8 +1670,11 @@ written into the buffer `*icalendar-errors*'."
(concat diary-string " "
(icalendar--format-ical-event e)))
(if do-not-ask (setq summary nil))
(icalendar--add-diary-entry diary-string diary-file
non-marking summary))
;; add entry to diary and store actual name of diary
;; file (in case it was nil)
(setq diary-file
(icalendar--add-diary-entry diary-string diary-file
non-marking summary)))
;; event was not ok
(setq found-error t)
(setq error-string
......@@ -1684,13 +1688,15 @@ written into the buffer `*icalendar-errors*'."
(setq error-string (format "%s\n%s\nCannot handle this event: %s"
error-val error-string e))
(message "%s" error-string))))
;; insert final newline
(let ((b (find-buffer-visiting diary-file)))
(when b
(save-current-buffer
(set-buffer b)
(goto-char (point-max))
(insert "\n"))))
(if diary-file
(let ((b (find-buffer-visiting diary-file)))
(when b
(save-current-buffer
(set-buffer b)
(goto-char (point-max))
(insert "\n")))))
(if found-error
(save-current-buffer
(set-buffer (get-buffer-create "*icalendar-errors*"))
......@@ -1943,7 +1949,9 @@ the entry."
(setq diary-file
(read-file-name "Add appointment to this diary file: ")))
;; Note: make-diary-entry will add a trailing blank char.... :(
(make-diary-entry string non-marking diary-file))))
(make-diary-entry string non-marking diary-file)))
;; return diary-file in case it has been changed interactively
diary-file)
(provide 'icalendar)
......
2007-03-21 Glenn Morris <rgm@gnu.org>
* eshell.texi (Known problems): Emacs 22 comes with eshell 2.4.2.
2007-03-19 Chong Yidong <cyd@stupidchicken.com>
* eshell.texi (Known problems): Emacs 21 -> 22.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment