aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Távora2019-11-08 23:44:44 +0000
committerJoão Távora2019-11-09 14:55:42 +0000
commit5c74b806a6fb0a4cb237300ab0a5418a109ced5e (patch)
tree15f7fc1069a1d6bae3095f2aa6fbdaf5bb9233d7
parentd9c6b4378ac851f5e730daa0ae36c9ee2d0292fe (diff)
downloademacs-5c74b806a6fb0a4cb237300ab0a5418a109ced5e.tar.gz
emacs-5c74b806a6fb0a4cb237300ab0a5418a109ced5e.zip
Rename some commands to reflect they are fido-mode specific
* lisp/icomplete.el (icomplete-fido-kill) (icomplete-fido-delete-char, icomplete-fido-ret) (icomplete-fido-backward-updir): Rename from icomplete-magic-ido-* versions. (icomplete-fido-mode-map): Use new command names.
-rw-r--r--lisp/icomplete.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index a7f9086d828..879068e4e95 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -225,7 +225,7 @@ Last entry becomes the first and can be selected with
225 225
226;;; Helpers for `fido-mode' (or `ido-mode' emulation) 226;;; Helpers for `fido-mode' (or `ido-mode' emulation)
227;;; 227;;;
228(defun icomplete-magic-ido-kill () 228(defun icomplete-fido-kill ()
229 "Kill line or current completion, like `ido-mode'. 229 "Kill line or current completion, like `ido-mode'.
230If killing to the end of line make sense, call `kill-line', 230If killing to the end of line make sense, call `kill-line',
231otherwise kill the currently selected completion candidate. 231otherwise kill the currently selected completion candidate.
@@ -260,7 +260,7 @@ require user confirmation."
260 (cdr all))) 260 (cdr all)))
261 (message nil))))) 261 (message nil)))))
262 262
263(defun icomplete-magic-ido-delete-char () 263(defun icomplete-fido-delete-char ()
264 "Delete char or maybe call `dired', like `ido-mode'." 264 "Delete char or maybe call `dired', like `ido-mode'."
265 (interactive) 265 (interactive)
266 (let* ((beg (icomplete--field-beg)) 266 (let* ((beg (icomplete--field-beg))
@@ -272,7 +272,7 @@ require user confirmation."
272 (dired (file-name-directory (icomplete--field-string))) 272 (dired (file-name-directory (icomplete--field-string)))
273 (exit-minibuffer)))) 273 (exit-minibuffer))))
274 274
275(defun icomplete-magic-ido-ret () 275(defun icomplete-fido-ret ()
276 "Exit minibuffer or enter directory, like `ido-mode'." 276 "Exit minibuffer or enter directory, like `ido-mode'."
277 (interactive) 277 (interactive)
278 (let* ((beg (icomplete--field-beg)) 278 (let* ((beg (icomplete--field-beg))
@@ -290,7 +290,7 @@ require user confirmation."
290 (t 290 (t
291 (exit-minibuffer))))) 291 (exit-minibuffer)))))
292 292
293(defun icomplete-magic-ido-backward-updir () 293(defun icomplete-fido-backward-updir ()
294 "Delete char before or go up directory, like `ido-mode'." 294 "Delete char before or go up directory, like `ido-mode'."
295 (interactive) 295 (interactive)
296 (let* ((beg (icomplete--field-beg)) 296 (let* ((beg (icomplete--field-beg))
@@ -302,10 +302,10 @@ require user confirmation."
302 302
303(defvar icomplete-fido-mode-map 303(defvar icomplete-fido-mode-map
304 (let ((map (make-sparse-keymap))) 304 (let ((map (make-sparse-keymap)))
305 (define-key map (kbd "C-k") 'icomplete-magic-ido-kill) 305 (define-key map (kbd "C-k") 'icomplete-fido-kill)
306 (define-key map (kbd "C-d") 'icomplete-magic-ido-delete-char) 306 (define-key map (kbd "C-d") 'icomplete-fido-delete-char)
307 (define-key map (kbd "RET") 'icomplete-magic-ido-ret) 307 (define-key map (kbd "RET") 'icomplete-fido-ret)
308 (define-key map (kbd "DEL") 'icomplete-magic-ido-backward-updir) 308 (define-key map (kbd "DEL") 'icomplete-fido-backward-updir)
309 (define-key map (kbd "M-j") 'exit-minibuffer) 309 (define-key map (kbd "M-j") 'exit-minibuffer)
310 (define-key map (kbd "C-s") 'icomplete-forward-completions) 310 (define-key map (kbd "C-s") 'icomplete-forward-completions)
311 (define-key map (kbd "C-r") 'icomplete-backward-completions) 311 (define-key map (kbd "C-r") 'icomplete-backward-completions)