mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(diary-list-entries): Prevent infloop when diary does not end in a

Browse Source 
newline.  Do not assume a blank line at the start of the diary file.
This commit is contained in:
Glenn Morris 2005-10-25 07:33:34 +00:00
parent 3e99f6ee19
commit f77b652537
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/calendar/diary-lib.el
View File

@ -439,10 +439,20 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list."
date-start temp)
(re-search-backward "\^M\\|\n\\|\\`")
(setq date-start (point))
(re-search-forward "\^M\\|\n" nil t 2)
;; When selective display (rather than
;; overlays) was used, diary file used to
;; start in a blank line and end in a
;; newline. Now that neither of these
;; need be true, 'move handles the latter
;; and 1/2 kludge the former.
(re-search-forward
"\^M\\|\n" nil 'move
(if (and (bobp) (not (looking-at "\^M\\|\n")))
1
2))
(while (looking-at " \\|\^I")
(re-search-forward "\^M\\|\n" nil t))
(backward-char 1)
(re-search-forward "\^M\\|\n" nil 'move))
(unless (eobp) (backward-char 1))
(unless list-only
(remove-overlays date-start (point)
'invisible 'diary))