From: Juanma Barranquero Date: Fri, 10 Feb 2006 11:07:50 +0000 (+0000) Subject: (desktop-outvar): Fix typo. X-Git-Tag: emacs-pretest-22.0.90~4232 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be617bbf58e60b314cda414491ba5fc8bf798099;p=emacs.git (desktop-outvar): Fix typo. (desktop-save-buffer-p): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 226aba7a7ea..950b1e70872 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Juanma Barranquero + + * desktop.el (desktop-outvar): Fix typo. + (desktop-save-buffer-p): Doc fix. + 2006-02-10 YAMAMOTO Mitsuharu * 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 @@ ;; are supplied to handle special major and minor modes respectively. ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions ;; to restore a desktop buffer. Elements must have the form -;; +;; ;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION). -;; +;; ;; Functions listed are called by `desktop-create-buffer' when `desktop-read' ;; evaluates the desktop file. Buffers with a major mode not specified here, ;; are restored by the default handler `desktop-restore-file-buffer'. ;; `desktop-minor-mode-handlers' is an alist of functions to restore ;; non-standard minor modes. Elements must have the form -;; +;; ;; (MINOR-MODE . RESTORE-FUNCTION). -;; +;; ;; Functions are called by `desktop-create-buffer' to restore minor modes. ;; Minor modes not specified here, are restored by the standard minor mode ;; 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." (defun desktop-outvar (varspec) "Output a setq statement for variable VAR to the desktop file. The argument VARSPEC may be the variable name VAR (a symbol), -or a cons cell of the form (VAR . MAX-SIZE), +or a cons cell of the form (VAR . MAX-SIZE), which means to truncate VAR's value to at most MAX-SIZE elements \(if the value is a list) before saving the value." (let (var size) @@ -684,7 +684,8 @@ which means to truncate VAR's value to at most MAX-SIZE elements (defun desktop-save-buffer-p (filename bufname mode &rest dummy) "Return t if buffer should have its state saved in the desktop file. FILENAME is the visited file name, BUFNAME is the buffer name, and -MODE is the major mode." +MODE is the major mode. +\n\(fn FILENAME BUFNAME MODE)" (let ((case-fold-search nil)) (and (not (string-match desktop-buffers-not-to-save bufname)) (not (memq mode desktop-modes-not-to-save))