comparison lisp/saveplace.el @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
author Miles Bader <miles@gnu.org>
date Wed, 20 Sep 2006 06:04:23 +0000
parents c5406394f567 4ec3fdbaa1ab
children 95d0cdf160ea
comparison
equal deleted inserted replaced
90601:a1a25ac6c88a 90602:b5c13d1564a9
236 (let ((file (expand-file-name save-place-file))) 236 (let ((file (expand-file-name save-place-file)))
237 ;; make sure that the alist does not get overwritten, and then 237 ;; make sure that the alist does not get overwritten, and then
238 ;; load it if it exists: 238 ;; load it if it exists:
239 (if (file-readable-p file) 239 (if (file-readable-p file)
240 (save-excursion 240 (save-excursion
241 (message "Loading places from %s..." save-place-file) 241 (message "Loading places from %s..." file)
242 ;; don't want to use find-file because we have been 242 ;; don't want to use find-file because we have been
243 ;; adding hooks to it. 243 ;; adding hooks to it.
244 (set-buffer (get-buffer-create " *Saved Places*")) 244 (set-buffer (get-buffer-create " *Saved Places*"))
245 (delete-region (point-min) (point-max)) 245 (delete-region (point-min) (point-max))
246 (insert-file-contents file) 246 (insert-file-contents file)