# HG changeset patch # User Edward M. Reingold # Date 818204496 0 # Node ID 9a985bcde00e142664a8e9a349b76b706c9166e3 # Parent 6e3b9c9595eb6d5cae7c5ecc7cf1850c374f9617 Chnaged all occurrences of buffer-substring to buffer-substring-no-properties. diff -r 6e3b9c9595eb -r 9a985bcde00e lisp/calendar/diary-lib.el --- a/lisp/calendar/diary-lib.el Tue Dec 05 22:55:22 1995 +0000 +++ b/lisp/calendar/diary-lib.el Tue Dec 05 23:01:36 1995 +0000 @@ -307,7 +307,9 @@ (subst-char-in-region date-start (point) ?\^M ?\n t) (add-to-diary-list - date (buffer-substring entry-start (point))))))) + date + (buffer-substring-no-properties + entry-start (point))))))) (setq d (cdr d))) (or entry-found (not diary-list-include-blanks) @@ -346,7 +348,8 @@ " \"\\([^\"]*\\)\"") nil t) (let ((diary-file (substitute-in-file-name - (buffer-substring (match-beginning 2) (match-end 2)))) + (buffer-substring-no-properties + (match-beginning 2) (match-end 2)))) (diary-list-include-blanks nil) (list-diary-entries-hook 'include-other-diary-files) (diary-display-hook 'ignore) @@ -639,28 +642,28 @@ (while (re-search-forward regexp nil t) (let* ((dd-name (if d-name-pos - (buffer-substring + (buffer-substring-no-properties (match-beginning d-name-pos) (match-end d-name-pos)))) (mm-name (if m-name-pos - (buffer-substring + (buffer-substring-no-properties (match-beginning m-name-pos) (match-end m-name-pos)))) (mm (string-to-int (if m-pos - (buffer-substring + (buffer-substring-no-properties (match-beginning m-pos) (match-end m-pos)) ""))) (dd (string-to-int (if d-pos - (buffer-substring + (buffer-substring-no-properties (match-beginning d-pos) (match-end d-pos)) ""))) (y-str (if y-pos - (buffer-substring + (buffer-substring-no-properties (match-beginning y-pos) (match-end y-pos)))) (yy (if (not y-str) @@ -744,7 +747,7 @@ (entry-start) (line-start)) (forward-sexp) - (setq sexp (buffer-substring sexp-start (point))) + (setq sexp (buffer-substring-no-properties sexp-start (point))) (save-excursion (re-search-backward "\^M\\|\n\\|\\`") (setq line-start (point))) @@ -760,7 +763,7 @@ (while (looking-at " \\|\^I") (re-search-forward "\^M\\|\n" nil t)) (backward-char 1) - (setq entry (buffer-substring entry-start (point))) + (setq entry (buffer-substring-no-properties entry-start (point))) (while (string-match "[\^M]" entry) (aset entry (match-beginning 0) ?\n ))) (calendar-for-loop date from first-date to last-date do @@ -786,7 +789,8 @@ " \"\\([^\"]*\\)\"") nil t) (let ((diary-file (substitute-in-file-name - (buffer-substring (match-beginning 2) (match-end 2)))) + (buffer-substring-no-properties + (match-beginning 2) (match-end 2)))) (mark-diary-entries-hook 'mark-included-diary-files)) (if (file-exists-p diary-file) (if (file-readable-p diary-file) @@ -1051,7 +1055,7 @@ (entry-start) (line-start)) (forward-sexp) - (setq sexp (buffer-substring sexp-start (point))) + (setq sexp (buffer-substring-no-properties sexp-start (point))) (save-excursion (re-search-backward "\^M\\|\n\\|\\`") (setq line-start (point))) @@ -1067,7 +1071,7 @@ (while (looking-at " \\|\^I") (re-search-forward "\^M\\|\n" nil t)) (backward-char 1) - (setq entry (buffer-substring entry-start (point))) + (setq entry (buffer-substring-no-properties entry-start (point))) (while (string-match "[\^M]" entry) (aset entry (match-beginning 0) ?\n ))) (let ((diary-entry (diary-sexp-entry sexp entry date)))