emacs: lisp/desktop.el comparison

comparison lisp/desktop.el @ 5314:e65e125e5334

Add keywords. (desktop-outvar): clean-up output using fewer quotes and \n for newlines. (desktop-save): print buffer information using \n for newlines. (desktop-save-buffer-p): doc fix. (desktop-save): bug in mark-activity saving. (desktop-buffer-rmail): doc fix. (desktop-buffer-rmail, desktop-buffer-dired, desktop-buffer): Use `eq' instead of `equal'. (desktop-clear): end up with one window.

author	Richard M. Stallman <rms@gnu.org>
date	Thu, 23 Dec 1993 04:59:47 +0000
parents	a61307ac474e
children	9fcfca1caec7

comparison

equal deleted inserted replaced

-:3189e46001fd
+:e65e125e5334
 ;;; desktop.el --- save partial status of Emacs when killed
 ;; Copyright (C) 1993 Free Software Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
-;; Version: 2.02
+;; Version: 2.03
+;; Keywords: customization
+;; Favourite-brand-of-beer: None, I hate beer.
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 	;; Feature: saving kill-ring implies saving kill-ring-yank-pointer
 	;; 'kill-ring
 	'tags-file-name
 	'tags-table-list
 	;; 'desktop-globals-to-save	; Itself!
 	)
 "List of global variables to save when killing Emacs.")
 ;; We skip .log files because they are normally temporary.
 ;;         (ftp) files because they require passwords and whatsnot.
 ;;         TAGS files to save time (tags-file-name is saved instead).
 (defun desktop-clear () "Empty the Desktop."
 (interactive)
 (setq kill-ring nil)
 (setq kill-ring-yank-pointer nil)
-(mapcar (function kill-buffer) (buffer-list)))
+(mapcar (function kill-buffer) (buffer-list))
+(delete-other-windows))
 ;; ----------------------------------------------------------------------------
 ;; This is a bit dirty for version 18 because that version of Emacs was not
 ;; toilet-trained considering hooks.
 (if (not (boundp 'desktop-kill))
 (if postv18
 (defun desktop-kill ()
 (if desktop-dirname
 (progn
 	(desktop-save desktop-dirname))))
 ;; ----------------------------------------------------------------------------
-(defun desktop-outvar (VAR)
+(defun desktop-outvar (var)
 "Output a setq statement for VAR to the desktop file."
-(if (boundp VAR)
+(if (boundp var)
-(progn
+(let ((print-escape-newlines t)
+	    (val (symbol-value var)))
 	(insert "(setq ")
-	(prin1 VAR (current-buffer))
+	(prin1 var (current-buffer))
-	(insert " '")
+	;; symbols are needed for cons cells and for symbols except
-	(prin1 (symbol-value VAR) (current-buffer))
+	;; `t' and `nil'.
+	(if (or (consp val)
+		(and (symbolp val) val (not (eq t val))))
+	    (insert " '")
+	  (insert " "))
+	(prin1 val (current-buffer))
 	(insert ")\n"))))
 ;; ----------------------------------------------------------------------------
 (defun desktop-save-buffer-p (filename bufname mode)
-"Return t if should record a particular buffer for next startup.
+"Return t if the desktop should record a particular buffer for next startup.
 FILENAME is the visited file name, BUFNAME is the buffer name, and
 MODE is the major mode."
 (or (and filename
 	   (not (string-match desktop-buffers-not-to-save bufname)))
 (and (null filename)
 	   (memq mode '(Info-mode dired-mode rmail-mode)))))
 ;; ----------------------------------------------------------------------------
 						 (if postv18
 						     auto-fill-function
 						   auto-fill-hook)))))
 			       (point)
 			       (if postv18
-				   (list 'quote (mark t) mark-active)
+				   (list 'quote (list (mark t) mark-active))
 				 (mark))
 			       buffer-read-only
 			       truncate-lines
 			       fill-column
 			       case-fold-search
 		  (int-to-string
 		   (- (length kill-ring) (length kill-ring-yank-pointer)))
 		  " kill-ring))\n"))
 (insert "\n;; Buffer section:\n")
-(mapcar
+(let ((print-escape-newlines t))
-(function (lambda (l)
+	(mapcar
-		   (if (desktop-save-buffer-p
+	 (function (lambda (l)
-			(car l)
+		     (if (desktop-save-buffer-p
-			(nth 1 l)
+			  (car l)
-			(nth 1 (nth 2 l)))
+			  (nth 1 l)
-		       (progn
+			  (nth 1 (nth 2 l)))
-			 (insert "(desktop-buffer")
+			 (progn
-			 (mapcar
+			   (insert "(desktop-buffer")
-			  (function (lambda (e)
+			   (mapcar
-				      (insert "\n  ")
+			    (function (lambda (e)
-				      (prin1 e (current-buffer))))
+					(insert "\n  ")
-			  l)
+					(prin1 e (current-buffer))))
-			 (insert ")\n\n")))))
+			    l)
-info)
+			   (insert ")\n\n")))))
+	 info))
 (setq default-directory dirname)
 (if (file-exists-p filename) (delete-file filename))
 (write-region (point-min) (point-max) filename nil 'nomessage)))
 (setq desktop-dirname dirname))
 ;; ----------------------------------------------------------------------------
 (progn
 	(require 'info)
 	(Info-find-node (nth 0 misc) (nth 1 misc))
 	t)))
 ;; ----------------------------------------------------------------------------
-(defun desktop-buffer-rmail () "Load a RMAIL file."
+(defun desktop-buffer-rmail () "Load an RMAIL file."
-(if (equal 'rmail-mode mam)
+(if (eq 'rmail-mode mam)
 (progn (rmail-input fn) t)))
 ;; ----------------------------------------------------------------------------
 (defun desktop-buffer-dired () "Load a directory using dired."
-(if (equal 'dired-mode mam)
+(if (eq 'dired-mode mam)
 (progn
 	(dired (car misc))
 	(mapcar (function dired-maybe-insert-subdir) (cdr misc))
 	t)))
 ;; ----------------------------------------------------------------------------
 	(handler))
 (while (and (not result) hlist)
 (setq handler (car hlist))
 (setq result (funcall handler))
 (setq hlist (cdr hlist)))
-(if (equal result t)
+(if (eq result t)
 	(progn
 	  (if (not (equal (buffer-name) bn))
 	      (rename-buffer bn))
 	  (if (nth 0 mim)
 	      (overwrite-mode 1)
 	  ))))
 ;; ----------------------------------------------------------------------------
 (provide 'desktop)
 ;; desktop.el ends here.

Mercurial > emacs

comparison lisp/desktop.el @ 5314:e65e125e5334