diff options
| author | Karl Fogel | 2007-12-03 21:37:30 +0000 |
|---|---|---|
| committer | Karl Fogel | 2007-12-03 21:37:30 +0000 |
| commit | bedb08d44f3c32dae97693e3f095f1cfdfc66622 (patch) | |
| tree | 4cb7ce736e5ccaf9118989b345e76f027fda61e6 | |
| parent | ca2fbc2e0ba41b7dba2aab5dadf25537cea83203 (diff) | |
| download | emacs-bedb08d44f3c32dae97693e3f095f1cfdfc66622.tar.gz emacs-bedb08d44f3c32dae97693e3f095f1cfdfc66622.zip | |
* emacs-cvs/lisp/saveplace.el (save-place-quiet): Remove, reverting 2007-12-02T19:54:46Z!kfogel@red-bean.com.
(save-place-alist-to-file, load-save-place-alist-from-file): Don't
print non-error messages at all, there's really no need. Do print
if there's a problem, and clarify message in that case.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/saveplace.el | 18 |
2 files changed, 10 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73d10be0259..71e4aa2bc12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2007-12-03 Karl Fogel <kfogel@red-bean.com> | ||
| 2 | |||
| 3 | * saveplace.el (save-place-quiet): Remove, reverting 2007-12-02T19:54:46Z!kfogel@red-bean.com. | ||
| 4 | (save-place-alist-to-file, load-save-place-alist-from-file): | ||
| 5 | Don't print non-error messages at all, there's really no need. | ||
| 6 | Do print if there's a problem, and clarify message in that case. | ||
| 7 | |||
| 1 | 2007-12-03 Dan Nicolaescu <dann@ics.uci.edu> | 8 | 2007-12-03 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 9 | ||
| 3 | * ediff-util.el (ediff-setup): | 10 | * ediff-util.el (ediff-setup): |
diff --git a/lisp/saveplace.el b/lisp/saveplace.el index e846ea844fe..df2deb6c14c 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el | |||
| @@ -119,10 +119,6 @@ be checked, based on said regexp, and instead saved or forgotten based | |||
| 119 | on this flag." | 119 | on this flag." |
| 120 | :type 'boolean :group 'save-place) | 120 | :type 'boolean :group 'save-place) |
| 121 | 121 | ||
| 122 | (defcustom save-place-quiet nil | ||
| 123 | "If non-nil, suppress messages about loading and saving `save-place-alist'." | ||
| 124 | :type 'boolean :group 'save-place) | ||
| 125 | |||
| 126 | (defcustom save-place-skip-check-regexp | 122 | (defcustom save-place-skip-check-regexp |
| 127 | ;; thanks to ange-ftp-name-format | 123 | ;; thanks to ange-ftp-name-format |
| 128 | "\\`/\\(?:cdrom\\|floppy\\|mnt\\|\\(?:[^@/:]*@\\)?[^@/:]*[^@/:.]:\\)" | 124 | "\\`/\\(?:cdrom\\|floppy\\|mnt\\|\\(?:[^@/:]*@\\)?[^@/:]*[^@/:.]:\\)" |
| @@ -212,8 +208,6 @@ may have changed\) back to `save-place-alist'." | |||
| 212 | (let ((file (expand-file-name save-place-file)) | 208 | (let ((file (expand-file-name save-place-file)) |
| 213 | (coding-system-for-write 'utf-8)) | 209 | (coding-system-for-write 'utf-8)) |
| 214 | (save-excursion | 210 | (save-excursion |
| 215 | (unless save-place-quiet | ||
| 216 | (message "Saving places to %s..." file)) | ||
| 217 | (set-buffer (get-buffer-create " *Saved Places*")) | 211 | (set-buffer (get-buffer-create " *Saved Places*")) |
| 218 | (delete-region (point-min) (point-max)) | 212 | (delete-region (point-min) (point-max)) |
| 219 | (when save-place-forget-unreadable-files | 213 | (when save-place-forget-unreadable-files |
| @@ -233,10 +227,8 @@ may have changed\) back to `save-place-alist'." | |||
| 233 | (condition-case nil | 227 | (condition-case nil |
| 234 | ;; Don't use write-file; we don't want this buffer to visit it. | 228 | ;; Don't use write-file; we don't want this buffer to visit it. |
| 235 | (write-region (point-min) (point-max) file) | 229 | (write-region (point-min) (point-max) file) |
| 236 | (file-error (message "Can't write %s" file))) | 230 | (file-error (message "Saving places: can't write %s" file))) |
| 237 | (kill-buffer (current-buffer)) | 231 | (kill-buffer (current-buffer)))))) |
| 238 | (unless save-place-quiet | ||
| 239 | (message "Saving places to %s...done" file)))))) | ||
| 240 | 232 | ||
| 241 | (defun load-save-place-alist-from-file () | 233 | (defun load-save-place-alist-from-file () |
| 242 | (if (not save-place-loaded) | 234 | (if (not save-place-loaded) |
| @@ -247,8 +239,6 @@ may have changed\) back to `save-place-alist'." | |||
| 247 | ;; load it if it exists: | 239 | ;; load it if it exists: |
| 248 | (if (file-readable-p file) | 240 | (if (file-readable-p file) |
| 249 | (save-excursion | 241 | (save-excursion |
| 250 | (unless save-place-quiet | ||
| 251 | (message "Loading places from %s..." file)) | ||
| 252 | ;; don't want to use find-file because we have been | 242 | ;; don't want to use find-file because we have been |
| 253 | ;; adding hooks to it. | 243 | ;; adding hooks to it. |
| 254 | (set-buffer (get-buffer-create " *Saved Places*")) | 244 | (set-buffer (get-buffer-create " *Saved Places*")) |
| @@ -276,9 +266,7 @@ may have changed\) back to `save-place-alist'." | |||
| 276 | (setq count (1+ count))) | 266 | (setq count (1+ count))) |
| 277 | (setq s (cdr s)))))) | 267 | (setq s (cdr s)))))) |
| 278 | 268 | ||
| 279 | (kill-buffer (current-buffer)) | 269 | (kill-buffer (current-buffer)))) |
| 280 | (unless save-place-quiet | ||
| 281 | (message "Loading places from %s...done" file)))) | ||
| 282 | nil)))) | 270 | nil)))) |
| 283 | 271 | ||
| 284 | (defun save-places-to-alist () | 272 | (defun save-places-to-alist () |