aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Malabarba2015-03-05 13:37:23 +0000
committerArtur Malabarba2015-03-05 13:37:23 +0000
commit6065fbe0d212857ecfa58e8a64fc4af3913c24e9 (patch)
tree15a34fee6aec4097bd14fa8d3e6d156f8af46011
parent17ecfea3b904c4676a52dd9d2ea33c8c3e13b870 (diff)
downloademacs-6065fbe0d212857ecfa58e8a64fc4af3913c24e9.tar.gz
emacs-6065fbe0d212857ecfa58e8a64fc4af3913c24e9.zip
desktop.el (desktop-buffer-info): Write docstring.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/desktop.el18
2 files changed, 20 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f54617b4d4..d810ee8ce59 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12015-03-05 Artur Malabarba <bruce.connor.am@gmail.com> 12015-03-05 Artur Malabarba <bruce.connor.am@gmail.com>
2 2
3 * desktop.el (desktop-buffer-info): Write docstring.
4
3 * emacs-lisp/package.el (package-refresh-contents): Update doc. 5 * emacs-lisp/package.el (package-refresh-contents): Update doc.
4 6
52015-03-05 Dmitry Gutov <dgutov@yandex.ru> 72015-03-05 Dmitry Gutov <dgutov@yandex.ru>
diff --git a/lisp/desktop.el b/lisp/desktop.el
index b85d8b257a5..8d151a74698 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -756,6 +756,24 @@ is nil, ask the user where to save the desktop."
756 756
757;; ---------------------------------------------------------------------------- 757;; ----------------------------------------------------------------------------
758(defun desktop-buffer-info (buffer) 758(defun desktop-buffer-info (buffer)
759 "Return information describing BUFFER.
760This function is not pure, as BUFFER is made current with
761`set-buffer'.
762
763Returns a list of all the necessary information to recreate the
764buffer, which is (in order):
765
766 `uniquify-buffer-base-name';
767 `buffer-file-name';
768 `buffer-name';
769 `major-mode';
770 list of minor-modes,;
771 `point';
772 `mark';
773 `buffer-read-only';
774 auxiliary information given by `desktop-save-buffer';
775 local variables;
776 auxiliary information given by `desktop-var-serdes-funs'."
759 (set-buffer buffer) 777 (set-buffer buffer)
760 (list 778 (list
761 ;; base name of the buffer; replaces the buffer name if managed by uniquify 779 ;; base name of the buffer; replaces the buffer name if managed by uniquify