aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward M. Reingold1995-12-27 17:36:12 +0000
committerEdward M. Reingold1995-12-27 17:36:12 +0000
commitcdfeb73f1c0128f7ee0bc18a22b78d03d0dba6d1 (patch)
tree2d641e22d3c54637bcbc5284db6cab74249526de
parentebf90a0f2ade0045e8766a8c05d3f4cd5c0cbdb5 (diff)
downloademacs-cdfeb73f1c0128f7ee0bc18a22b78d03d0dba6d1.tar.gz
emacs-cdfeb73f1c0128f7ee0bc18a22b78d03d0dba6d1.zip
Replaced all uses of get-file-buffer with find-buffer-visiting.
-rw-r--r--lisp/calendar/diary-lib.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 42ce94dfd76..5db0f6f8a1e 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -233,7 +233,7 @@ These hooks have the following distinct roles:
233 (d-file (substitute-in-file-name diary-file))) 233 (d-file (substitute-in-file-name diary-file)))
234 (message "Preparing diary...") 234 (message "Preparing diary...")
235 (save-excursion 235 (save-excursion
236 (let ((diary-buffer (get-file-buffer d-file))) 236 (let ((diary-buffer (find-buffer-visiting d-file)))
237 (set-buffer (if diary-buffer 237 (set-buffer (if diary-buffer
238 diary-buffer 238 diary-buffer
239 (find-file-noselect d-file t)))) 239 (find-file-noselect d-file t))))
@@ -364,7 +364,7 @@ changing the variable `diary-include-string'."
364 (setq diary-entries-list 364 (setq diary-entries-list
365 (append diary-entries-list 365 (append diary-entries-list
366 (list-diary-entries original-date number))) 366 (list-diary-entries original-date number)))
367 (kill-buffer (get-file-buffer diary-file))) 367 (kill-buffer (find-buffer-visiting diary-file)))
368 (beep) 368 (beep)
369 (message "Can't read included diary file %s" diary-file) 369 (message "Can't read included diary file %s" diary-file)
370 (sleep-for 2)) 370 (sleep-for 2))
@@ -399,14 +399,14 @@ changing the variable `diary-include-string'."
399 (concat "Diary for " date-string 399 (concat "Diary for " date-string
400 (if holiday-list ": " "") 400 (if holiday-list ": " "")
401 (mapconcat 'identity holiday-list "; "))) 401 (mapconcat 'identity holiday-list "; ")))
402 (display-buffer (get-file-buffer d-file)) 402 (display-buffer (find-buffer-visiting d-file))
403 (message "Preparing diary...done")))) 403 (message "Preparing diary...done"))))
404 404
405(defun fancy-diary-display () 405(defun fancy-diary-display ()
406 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. 406 "Prepare a diary buffer with relevant entries in a fancy, noneditable form.
407This function is provided for optional use as the `diary-display-hook'." 407This function is provided for optional use as the `diary-display-hook'."
408 (save-excursion;; Turn off selective-display in the diary file's buffer. 408 (save-excursion;; Turn off selective-display in the diary file's buffer.
409 (set-buffer (get-file-buffer (substitute-in-file-name diary-file))) 409 (set-buffer (find-buffer-visiting (substitute-in-file-name diary-file)))
410 (let ((diary-modified (buffer-modified-p))) 410 (let ((diary-modified (buffer-modified-p)))
411 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) 411 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
412 (setq selective-display nil) 412 (setq selective-display nil)
@@ -520,7 +520,7 @@ the actual printing."
520 (set-buffer (get-buffer fancy-diary-buffer)) 520 (set-buffer (get-buffer fancy-diary-buffer))
521 (run-hooks 'print-diary-entries-hook)) 521 (run-hooks 'print-diary-entries-hook))
522 (let ((diary-buffer 522 (let ((diary-buffer
523 (get-file-buffer (substitute-in-file-name diary-file)))) 523 (find-buffer-visiting (substitute-in-file-name diary-file))))
524 (if diary-buffer 524 (if diary-buffer
525 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*")) 525 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*"))
526 (heading)) 526 (heading))
@@ -553,7 +553,7 @@ is created."
553 (if (and d-file (file-exists-p d-file)) 553 (if (and d-file (file-exists-p d-file))
554 (if (file-readable-p d-file) 554 (if (file-readable-p d-file)
555 (save-excursion 555 (save-excursion
556 (let ((diary-buffer (get-file-buffer d-file))) 556 (let ((diary-buffer (find-buffer-visiting d-file)))
557 (set-buffer (if diary-buffer 557 (set-buffer (if diary-buffer
558 diary-buffer 558 diary-buffer
559 (find-file-noselect d-file t))) 559 (find-file-noselect d-file t)))
@@ -800,7 +800,7 @@ changing the variable `diary-include-string'."
800 (if (file-readable-p diary-file) 800 (if (file-readable-p diary-file)
801 (progn 801 (progn
802 (mark-diary-entries) 802 (mark-diary-entries)
803 (kill-buffer (get-file-buffer diary-file))) 803 (kill-buffer (find-buffer-visiting diary-file)))
804 (beep) 804 (beep)
805 (message "Can't read included diary file %s" diary-file) 805 (message "Can't read included diary file %s" diary-file)
806 (sleep-for 2)) 806 (sleep-for 2))