From 3d0eb5af3af12697b858bd9d33847607d37f9ee2 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sun, 19 Jan 2014 17:02:32 +0100 Subject: Reorder functions/variables Place the internal `dreg--' functions and variables first. --- desktop-registry.el | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/desktop-registry.el b/desktop-registry.el index 7e3573f..72b5423 100644 --- a/desktop-registry.el +++ b/desktop-registry.el @@ -94,9 +94,6 @@ examples of valid functions." :group 'desktop-registry :type 'function) -(defvar dreg--history nil - "History variable for `desktop-registry'.") - (defvar desktop-registry-list-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map tabulated-list-mode-map) @@ -107,6 +104,9 @@ examples of valid functions." (define-key map "A" #'desktop-registry-add-current-desktop) map)) +(defvar dreg--history nil + "History variable for `desktop-registry'.") + (defun dreg--canonicalize-dir (dir) "Canonicalize DIR for use." (directory-file-name (expand-file-name dir))) @@ -116,6 +116,42 @@ examples of valid functions." (and (eql major-mode 'desktop-registry-list-mode) (tabulated-list-get-id))) +(defun dreg--completing-read (&optional prompt default-current) + "Ask the user to pick a desktop directory. + +PROMPT specifies the prompt to use when asking, which defaults to +\"Desktop: \". DEFAULT-CURRENT specifies whether to use the +current desktop as default value." + (let ((prompt (or prompt "Desktop: ")) + (default (and default-current + (desktop-registry-current-desktop)))) + (completing-read prompt desktop-registry-registry nil nil nil + 'dreg--history default))) + +(defun dreg--get-desktop-name (&optional prompt default-current) + "Get the name of a desktop. + +This is done by either looking at the desktop name at point, in +case `desktop-registry-list-mode' is active, or asks the user to +provide a name with completion. The parameters PROMPT and +DEFAULT-CURRENT are passed directly to `dreg--completing-read' +when no desktop is found at point." + (or (dreg--desktop-in-row) + (dreg--completing-read prompt default-current))) + +(defun dreg--prepare-row (data) + "Format a row of DATA for `tabulated-list-entries'." + (let* ((name (car data)) + (dir (cdr data)) + (existsp (and (file-exists-p dir) + (file-directory-p dir)))) + (list name (vector name (if existsp "yes" "no") dir)))) + +(defun dreg--refresh-list () + "Fill `tabulated-list-entries' with registered desktops." + (setq tabulated-list-entries + (mapcar #'dreg--prepare-row desktop-registry-registry))) + ;;;###autoload (defun desktop-registry-current-desktop (&optional default) "Get the name of the currently loaded desktop. @@ -170,29 +206,6 @@ entries in `desktop-registry-registry'." (error "No desktop loaded")) (desktop-registry-add-directory desktop-dirname name)) -(defun dreg--completing-read (&optional prompt default-current) - "Ask the user to pick a desktop directory. - -PROMPT specifies the prompt to use when asking, which defaults to -\"Desktop: \". DEFAULT-CURRENT specifies whether to use the -current desktop as default value." - (let ((prompt (or prompt "Desktop: ")) - (default (and default-current - (desktop-registry-current-desktop)))) - (completing-read prompt desktop-registry-registry nil nil nil - 'dreg--history default))) - -(defun dreg--get-desktop-name (&optional prompt default-current) - "Get the name of a desktop. - -This is done by either looking at the desktop name at point, in -case `desktop-registry-list-mode' is active, or asks the user to -provide a name with completion. The parameters PROMPT and -DEFAULT-CURRENT are passed directly to `dreg--completing-read' -when no desktop is found at point." - (or (dreg--desktop-in-row) - (dreg--completing-read prompt default-current))) - ;;;###autoload (defun desktop-registry-remove-desktop (desktop) "Remove DESKTOP from the desktop registry. @@ -254,19 +267,6 @@ Enabling this global minor mode will add (remove-hook 'desktop-save-hook 'desktop-registry-add-current-desktop))) -(defun dreg--prepare-row (data) - "Format a row of DATA for `tabulated-list-entries'." - (let* ((name (car data)) - (dir (cdr data)) - (existsp (and (file-exists-p dir) - (file-directory-p dir)))) - (list name (vector name (if existsp "yes" "no") dir)))) - -(defun dreg--refresh-list () - "Fill `tabulated-list-entries' with registered desktops." - (setq tabulated-list-entries - (mapcar #'dreg--prepare-row desktop-registry-registry))) - (define-derived-mode desktop-registry-list-mode tabulated-list-mode "Desktop Registry" "Major mode for listing registered desktops. -- cgit v1.2.3-54-g00ecf