diff options
| author | Eli Zaretskii | 2004-11-12 16:56:09 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2004-11-12 16:56:09 +0000 |
| commit | 63cd573484da1c6ea1859da890bbf4e3412e106f (patch) | |
| tree | 3432ec08bfa431d4de6033d3fea069367d427be5 | |
| parent | d8dfe1878a866482e1a20639d8a7a814bb25c057 (diff) | |
| download | emacs-63cd573484da1c6ea1859da890bbf4e3412e106f.tar.gz emacs-63cd573484da1c6ea1859da890bbf4e3412e106f.zip | |
(desktop-create-buffer, desktop-save): Avoid some consing by using mapc
instead of mapcar.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/desktop.el | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d07a3c7ffba..e867fa3de48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-11-12 Kevin Rodgers <ihs_4664@yahoo.com> (tiny change) | ||
| 2 | |||
| 3 | * desktop.el (desktop-create-buffer, desktop-save): Avoid some | ||
| 4 | consing by using mapc instead of mapcar. | ||
| 5 | |||
| 1 | 2004-11-12 Nick Roberts <nickrob@snap.net.nz> | 6 | 2004-11-12 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 7 | ||
| 3 | * tooltip.el (require): Explain why CL is needed. | 8 | * tooltip.el (require): Explain why CL is needed. |
diff --git a/lisp/desktop.el b/lisp/desktop.el index 0a423aa7c42..55ebd662df6 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -636,7 +636,7 @@ See also `desktop-base-file-name'." | |||
| 636 | ";; Desktop file format version " desktop-file-version "\n" | 636 | ";; Desktop file format version " desktop-file-version "\n" |
| 637 | ";; Emacs version " emacs-version "\n\n" | 637 | ";; Emacs version " emacs-version "\n\n" |
| 638 | ";; Global section:\n") | 638 | ";; Global section:\n") |
| 639 | (mapcar (function desktop-outvar) desktop-globals-to-save) | 639 | (mapc (function desktop-outvar) desktop-globals-to-save) |
| 640 | (if (memq 'kill-ring desktop-globals-to-save) | 640 | (if (memq 'kill-ring desktop-globals-to-save) |
| 641 | (insert | 641 | (insert |
| 642 | "(setq kill-ring-yank-pointer (nthcdr " | 642 | "(setq kill-ring-yank-pointer (nthcdr " |
| @@ -644,15 +644,15 @@ See also `desktop-base-file-name'." | |||
| 644 | " kill-ring))\n")) | 644 | " kill-ring))\n")) |
| 645 | 645 | ||
| 646 | (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n") | 646 | (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n") |
| 647 | (mapcar #'(lambda (l) | 647 | (mapc #'(lambda (l) |
| 648 | (if (apply 'desktop-save-buffer-p l) | 648 | (if (apply 'desktop-save-buffer-p l) |
| 649 | (progn | 649 | (progn |
| 650 | (insert "(desktop-create-buffer " desktop-file-version) | 650 | (insert "(desktop-create-buffer " desktop-file-version) |
| 651 | (mapcar #'(lambda (e) | 651 | (mapc #'(lambda (e) |
| 652 | (insert "\n " (desktop-value-to-string e))) | 652 | (insert "\n " (desktop-value-to-string e))) |
| 653 | l) | 653 | l) |
| 654 | (insert ")\n\n")))) | 654 | (insert ")\n\n")))) |
| 655 | info) | 655 | info) |
| 656 | (setq default-directory dirname) | 656 | (setq default-directory dirname) |
| 657 | (when (file-exists-p filename) (delete-file filename)) | 657 | (when (file-exists-p filename) (delete-file filename)) |
| 658 | (let ((coding-system-for-write 'emacs-mule)) | 658 | (let ((coding-system-for-write 'emacs-mule)) |
| @@ -873,9 +873,9 @@ directory DIRNAME." | |||
| 873 | ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible | 873 | ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible |
| 874 | (auto-fill-mode 0)) | 874 | (auto-fill-mode 0)) |
| 875 | (t | 875 | (t |
| 876 | (mapcar #'(lambda (minor-mode) | 876 | (mapc #'(lambda (minor-mode) |
| 877 | (when (functionp minor-mode) (funcall minor-mode 1))) | 877 | (when (functionp minor-mode) (funcall minor-mode 1))) |
| 878 | desktop-buffer-minor-modes))) | 878 | desktop-buffer-minor-modes))) |
| 879 | ;; Even though point and mark are non-nil when written by `desktop-save' | 879 | ;; Even though point and mark are non-nil when written by `desktop-save' |
| 880 | ;; they may be modified by handlers wanting to set point or mark themselves. | 880 | ;; they may be modified by handlers wanting to set point or mark themselves. |
| 881 | (when desktop-buffer-point | 881 | (when desktop-buffer-point |