comparison lisp/desktop.el @ 112330:56d3e9c28eb0

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 17 Jan 2011 11:01:01 -0800
parents ef719132ddfa
children
comparison
equal deleted inserted replaced
112329:e36b2f5d36cd 112330:56d3e9c28eb0
1310 (desktop-read) 1310 (desktop-read)
1311 (setq inhibit-startup-screen t)))) 1311 (setq inhibit-startup-screen t))))
1312 1312
1313 (provide 'desktop) 1313 (provide 'desktop)
1314 1314
1315 ;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9
1316 ;;; desktop.el ends here 1315 ;;; desktop.el ends here