aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEdward M. Reingold1998-06-09 21:50:58 +0000
committerEdward M. Reingold1998-06-09 21:50:58 +0000
commit892e6825a09fabe72e6eb83bd244f9d9a6051855 (patch)
tree30efe061be57ae00a2445c1bd956d2afcff0c9fd /lisp
parent5135279640195ab28e51ec5e12b0de008d35858d (diff)
downloademacs-892e6825a09fabe72e6eb83bd244f9d9a6051855.tar.gz
emacs-892e6825a09fabe72e6eb83bd244f9d9a6051855.zip
Don't overide default value of diary-file.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/calendar/diary-lib.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 003deeea27c..eb6f63d189f 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -72,7 +72,7 @@ in the displayed three-month calendar."
72 (error "Diary file is not readable!")) 72 (error "Diary file is not readable!"))
73 (error "You don't have a diary file!")))) 73 (error "You don't have a diary file!"))))
74 74
75(defun view-other-diary-entries (arg diary-file) 75(defun view-other-diary-entries (arg d-file)
76 "Prepare and display buffer of diary entries from an alternative diary file. 76 "Prepare and display buffer of diary entries from an alternative diary file.
77Prompts for a file name and searches that file for entries that match ARG 77Prompts for a file name and searches that file for entries that match ARG
78days starting with the date indicated by the cursor position in the displayed 78days starting with the date indicated by the cursor position in the displayed
@@ -81,9 +81,9 @@ three-month calendar."
81 (list (cond ((null current-prefix-arg) 1) 81 (list (cond ((null current-prefix-arg) 1)
82 ((listp current-prefix-arg) (car current-prefix-arg)) 82 ((listp current-prefix-arg) (car current-prefix-arg))
83 (t current-prefix-arg)) 83 (t current-prefix-arg))
84 (setq diary-file (read-file-name "Enter diary file name: " 84 (read-file-name "Enter diary file name: " default-directory nil t)))
85 default-directory nil t)))) 85 (let ((diary-file d-file))
86 (view-diary-entries arg)) 86 (view-diary-entries arg)))
87 87
88(autoload 'check-calendar-holidays "holidays" 88(autoload 'check-calendar-holidays "holidays"
89 "Check the list of holidays for any that occur on DATE. 89 "Check the list of holidays for any that occur on DATE.