steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FUEL: Nothing new, just function renamings.

db4
Jose A. Ortega Ruiz 2008-12-18 17:31:52 +01:00
parent ea71c1fdd2
commit 670cbbfc9f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
misc/fuel/fuel-completion.el
View File

@ -59,7 +59,7 @@ performed."))
If this window is no longer active or displaying the completions If this window is no longer active or displaying the completions
buffer then we can ignore `fuel-completion--window-cfg'.")) buffer then we can ignore `fuel-completion--window-cfg'."))
(defun fuel-completion--maybe-save-window-configuration () (defun fuel-completion--save-window-cfg ()
"Maybe save the current window configuration. "Maybe save the current window configuration.
Return true if the configuration was saved." Return true if the configuration was saved."
(unless (or fuel-completion--window-cfg (unless (or fuel-completion--window-cfg
@ -70,17 +70,17 @@ Return true if the configuration was saved."
(defun fuel-completion--delay-restoration () (defun fuel-completion--delay-restoration ()
(add-hook 'pre-command-hook (add-hook 'pre-command-hook
'fuel-completion--maybe-restore-window-configuration 'fuel-completion--maybe-restore-window-cfg
nil t)) nil t))
(defun fuel-completion--forget-window-configuration () (defun fuel-completion--forget-window-cfg ()
(setq fuel-completion--window-cfg nil) (setq fuel-completion--window-cfg nil)
(setq fuel-completion--completions-window nil)) (setq fuel-completion--completions-window nil))
(defun fuel-completion--restore-window-configuration () (defun fuel-completion--restore-window-cfg ()
"Restore the window config if available." "Restore the window config if available."
(remove-hook 'pre-command-hook (remove-hook 'pre-command-hook
'fuel-completion--maybe-restore-window-configuration) 'fuel-completion--maybe-restore-window-cfg)
(when (and fuel-completion--window-cfg (when (and fuel-completion--window-cfg
(fuel-completion--window-active-p)) (fuel-completion--window-active-p))
(save-excursion (save-excursion
@ -89,21 +89,21 @@ Return true if the configuration was saved."
(when (buffer-live-p fuel-completion--comp-buffer) (when (buffer-live-p fuel-completion--comp-buffer)
(kill-buffer fuel-completion--comp-buffer)))) (kill-buffer fuel-completion--comp-buffer))))
(defun fuel-completion--maybe-restore-window-configuration () (defun fuel-completion--maybe-restore-window-cfg ()
"Restore the window configuration, if the following command "Restore the window configuration, if the following command
terminates a current completion." terminates a current completion."
(remove-hook 'pre-command-hook (remove-hook 'pre-command-hook
'fuel-completion--maybe-restore-window-configuration) 'fuel-completion--maybe-restore-window-cfg)
(condition-case err (condition-case err
(cond ((find last-command-char "()\"'`,# \r\n:") (cond ((find last-command-char "()\"'`,# \r\n:")
(fuel-completion--restore-window-configuration)) (fuel-completion--restore-window-cfg))
((not (fuel-completion--window-active-p)) ((not (fuel-completion--window-active-p))
(fuel-completion--forget-window-configuration)) (fuel-completion--forget-window-cfg))
(t (fuel-completion--delay-restoration))) (t (fuel-completion--delay-restoration)))
(error (error
;; Because this is called on the pre-command-hook, we mustn't let ;; Because this is called on the pre-command-hook, we mustn't let
;; errors propagate. ;; errors propagate.
(message "Error in fuel-completion--restore-window-configuration: %S" err)))) (message "Error in fuel-completion--restore-window-cfg: %S" err))))
(defun fuel-completion--window-active-p () (defun fuel-completion--window-active-p ()
"Is the completion window currently active?" "Is the completion window currently active?"
@ -112,7 +112,7 @@ terminates a current completion."
fuel-completion--comp-buffer))) fuel-completion--comp-buffer)))
(defun fuel-completion--display-comp-list (completions base) (defun fuel-completion--display-comp-list (completions base)
(let ((savedp (fuel-completion--maybe-save-window-configuration))) (let ((savedp (fuel-completion--save-window-cfg)))
(with-output-to-temp-buffer fuel-completion--comp-buffer (with-output-to-temp-buffer fuel-completion--comp-buffer
(display-completion-list completions base) (display-completion-list completions base)
(let ((offset (- (point) 1 (length base)))) (let ((offset (- (point) 1 (length base))))
@ -185,11 +185,11 @@ Perform completion similar to Emacs' complete-symbol."
(partial (cdr result))) (partial (cdr result)))
(cond ((null completions) (cond ((null completions)
(fuel--respecting-message "Can't find completion for %S" prefix) (fuel--respecting-message "Can't find completion for %S" prefix)
(fuel-completion--restore-window-configuration)) (fuel-completion--restore-window-cfg))
(t (insert-and-inherit (substring partial (length prefix))) (t (insert-and-inherit (substring partial (length prefix)))
(cond ((= (length completions) 1) (cond ((= (length completions) 1)
(fuel--respecting-message "Sole completion") (fuel--respecting-message "Sole completion")
(fuel-completion--restore-window-configuration)) (fuel-completion--restore-window-cfg))
(t (fuel--respecting-message "Complete but not unique") (t (fuel--respecting-message "Complete but not unique")
(fuel-completion--display-or-scroll completions (fuel-completion--display-or-scroll completions
partial))))))) partial)))))))