 (setq desktop-load-locked-desktop nil)  ;do not load desktop if locked
 (add-to-list 'desktop-globals-to-save 'query-replace-history)  ;C-%
 (add-to-list 'desktop-globals-to-save 'log-edit-comment-ring)  ;*VC-log*
+
+
+;;;; Bookmarks
+(setq bookmark-default-file (concat emacs-var-directory "emacs.bmk"))
+(global-set-key (kbd "<kp-1>") 'bookmark-bmenu-list)
+(global-set-key (kbd "<kp-2>") 'bookmark-set)
+(global-set-key (kbd "<kp-3>") 'bookmark-jump)
 
 
 ;;;; Web browsing

  (add-to-list 'desktop-buffer-mode-handlers '(w3m-mode . w3m-restore-desktop-buffer)))


;;;; Editor behavior

;;; We don't need to see the startup message.
(setq inhibit-startup-message t)

;;; Turn off the toolbar.
(tool-bar-mode -1)

;;; Turn off blinking cursor.
(blink-cursor-mode 0)

;;; Respawn the scratch buffer if it is killed (C-x k).
(defun kill-scratch-buffer ()

  nil)
(setq initial-scratch-message nil)  ;we know what the scratch buffer is for
(kill-scratch-buffer)  ;install the hook


;;;; Editor behavior

;;; We don't need to see the startup message.
(setq inhibit-startup-message t)

;;; Turn off the toolbar.
(tool-bar-mode -1)

;;; Turn off blinking cursor.
(blink-cursor-mode 0)

;;; Set default major mode to be text-mode instead of fundamental-mode.
;;; Although the doc says that default-major-mode is obsolete since
