diff options
| author | Juanma Barranquero | 2006-02-10 11:07:50 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-02-10 11:07:50 +0000 |
| commit | be617bbf58e60b314cda414491ba5fc8bf798099 (patch) | |
| tree | 95d5a6abaa71ef757ca005855259ccfbf6bb728b | |
| parent | 54068eae538e88f96058e159adb754e3ea76126a (diff) | |
| download | emacs-be617bbf58e60b314cda414491ba5fc8bf798099.tar.gz emacs-be617bbf58e60b314cda414491ba5fc8bf798099.zip | |
(desktop-outvar): Fix typo.
(desktop-save-buffer-p): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/desktop.el | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 226aba7a7ea..950b1e70872 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-02-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * desktop.el (desktop-outvar): Fix typo. | ||
| 4 | (desktop-save-buffer-p): Doc fix. | ||
| 5 | |||
| 1 | 2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2006-02-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * frame.el (select-frame-set-input-focus): Call x-focus-frame also | 8 | * frame.el (select-frame-set-input-focus): Call x-focus-frame also |
diff --git a/lisp/desktop.el b/lisp/desktop.el index 8e37d5d0d36..f56e2204e78 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -57,17 +57,17 @@ | |||
| 57 | ;; are supplied to handle special major and minor modes respectively. | 57 | ;; are supplied to handle special major and minor modes respectively. |
| 58 | ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions | 58 | ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions |
| 59 | ;; to restore a desktop buffer. Elements must have the form | 59 | ;; to restore a desktop buffer. Elements must have the form |
| 60 | ;; | 60 | ;; |
| 61 | ;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION). | 61 | ;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION). |
| 62 | ;; | 62 | ;; |
| 63 | ;; Functions listed are called by `desktop-create-buffer' when `desktop-read' | 63 | ;; Functions listed are called by `desktop-create-buffer' when `desktop-read' |
| 64 | ;; evaluates the desktop file. Buffers with a major mode not specified here, | 64 | ;; evaluates the desktop file. Buffers with a major mode not specified here, |
| 65 | ;; are restored by the default handler `desktop-restore-file-buffer'. | 65 | ;; are restored by the default handler `desktop-restore-file-buffer'. |
| 66 | ;; `desktop-minor-mode-handlers' is an alist of functions to restore | 66 | ;; `desktop-minor-mode-handlers' is an alist of functions to restore |
| 67 | ;; non-standard minor modes. Elements must have the form | 67 | ;; non-standard minor modes. Elements must have the form |
| 68 | ;; | 68 | ;; |
| 69 | ;; (MINOR-MODE . RESTORE-FUNCTION). | 69 | ;; (MINOR-MODE . RESTORE-FUNCTION). |
| 70 | ;; | 70 | ;; |
| 71 | ;; Functions are called by `desktop-create-buffer' to restore minor modes. | 71 | ;; Functions are called by `desktop-create-buffer' to restore minor modes. |
| 72 | ;; Minor modes not specified here, are restored by the standard minor mode | 72 | ;; Minor modes not specified here, are restored by the standard minor mode |
| 73 | ;; function. If you write a module that defines a major or minor mode that | 73 | ;; function. If you write a module that defines a major or minor mode that |
| @@ -661,7 +661,7 @@ Not all types of values are supported." | |||
| 661 | (defun desktop-outvar (varspec) | 661 | (defun desktop-outvar (varspec) |
| 662 | "Output a setq statement for variable VAR to the desktop file. | 662 | "Output a setq statement for variable VAR to the desktop file. |
| 663 | The argument VARSPEC may be the variable name VAR (a symbol), | 663 | The argument VARSPEC may be the variable name VAR (a symbol), |
| 664 | or a cons cell of the form (VAR . MAX-SIZE), | 664 | or a cons cell of the form (VAR . MAX-SIZE), |
| 665 | which means to truncate VAR's value to at most MAX-SIZE elements | 665 | which means to truncate VAR's value to at most MAX-SIZE elements |
| 666 | \(if the value is a list) before saving the value." | 666 | \(if the value is a list) before saving the value." |
| 667 | (let (var size) | 667 | (let (var size) |
| @@ -684,7 +684,8 @@ which means to truncate VAR's value to at most MAX-SIZE elements | |||
| 684 | (defun desktop-save-buffer-p (filename bufname mode &rest dummy) | 684 | (defun desktop-save-buffer-p (filename bufname mode &rest dummy) |
| 685 | "Return t if buffer should have its state saved in the desktop file. | 685 | "Return t if buffer should have its state saved in the desktop file. |
| 686 | FILENAME is the visited file name, BUFNAME is the buffer name, and | 686 | FILENAME is the visited file name, BUFNAME is the buffer name, and |
| 687 | MODE is the major mode." | 687 | MODE is the major mode. |
| 688 | \n\(fn FILENAME BUFNAME MODE)" | ||
| 688 | (let ((case-fold-search nil)) | 689 | (let ((case-fold-search nil)) |
| 689 | (and (not (string-match desktop-buffers-not-to-save bufname)) | 690 | (and (not (string-match desktop-buffers-not-to-save bufname)) |
| 690 | (not (memq mode desktop-modes-not-to-save)) | 691 | (not (memq mode desktop-modes-not-to-save)) |