Changeset 3988 for vendor/emacs-CVS_HEAD/lisp/bookmark.el

Timestamp:

11/26/05 08:33:26 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• vendor/emacs-CVS_HEAD/lisp/bookmark.el (modified) (5 diffs)

vendor/emacs-CVS_HEAD/lisp/bookmark.el

@@ -718 +718 @@
-
-
+;;; Generic helpers.
+
+(defun bookmark-maybe-message (fmt &rest args)
+  "Apply `message' to FMT and ARGS, but only if the display is fast enough."
+  (if (>= baud-rate 9600)
+      (apply 'message fmt args)))
+
+
-;;; Core code:
-
@@ -1351 +1359 @@
-  (save-excursion
-    (save-window-excursion
-
-
-
-
+
+
-      (goto-char (point-min))
+      (delete-region (point-min) (point-max))
-      (let ((print-length nil)
-            (print-level nil))
-        (delete-region (point-min) (point-max))
-        (bookmark-insert-file-format-version-stamp)
-        (pp bookmark-alist (current-buffer))
@@ -1369 +1375 @@
-                 t))))
-          (condition-case nil
-file
+region (point-min) (point-max)
-            (file-error (message "Can't write %s" file)))
-          (kill-buffer (current-buffer))
-
-             (message "Saving bookmarks to file %s...done" file)
+
+           "Saving bookmarks to file %s...done" file
-
-
@@ -1439 +1445 @@
-      (save-excursion
-        (save-window-excursion
-and (null no-msg) (>= baud-rate 9600)
-
+null no-msg
+bookmark-maybe-
-          (set-buffer (let ((enable-local-variables nil))
-                        (find-file-noselect file)))
@@ -1463 +1469 @@
-              (error "Invalid bookmark list in %s" file)))
-          (kill-buffer (current-buffer)))
-and (null no-msg) (>= baud-rate 9600)
-
+null no-msg
+bookmark-maybe-
-    (error "Cannot read bookmark file %s" file)))
-