Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / eshell / em-alias.el

diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 6b24c269b306995dc471b0f3744e6f1be62046dc..aa89177c2dec950a1775cc74974a9ef51505744a 100644 (file)
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,7 +1,6 @@
 ;;; em-alias.el --- creation and management of command aliases
 
 ;;; em-alias.el --- creation and management of command aliases
 

-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.

 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 
 ;; Author: John Wiegley <johnw@gnu.org>
 


@@ -75,7 +74,7 @@
 ;; session, it is likely that they are experiencing a spelling
 ;; difficulty associated with a certain command.  To combat this,
 ;; Eshell will offer to automatically define an alias for that
 ;; session, it is likely that they are experiencing a spelling
 ;; difficulty associated with a certain command.  To combat this,
 ;; Eshell will offer to automatically define an alias for that

-;; mispelled command, once a given tolerance threshold has been
+;; misspelled command, once a given tolerance threshold has been

 ;; reached.
 
 ;; Whenever the same bad command name is encountered
 ;; reached.
 
 ;; Whenever the same bad command name is encountered


@@ -96,11 +95,12 @@
 (require 'eshell)
 
 ;;;###autoload
 (require 'eshell)
 
 ;;;###autoload

-(eshell-defgroup eshell-alias nil
+(progn
+(defgroup eshell-alias nil

   "Command aliases allow for easy definition of alternate commands."
   :tag "Command aliases"
   ;; :link '(info-link "(eshell)Command aliases")
   "Command aliases allow for easy definition of alternate commands."
   :tag "Command aliases"
   ;; :link '(info-link "(eshell)Command aliases")

-  :group 'eshell-module)
+  :group 'eshell-module))

 
 (defcustom eshell-aliases-file (expand-file-name "alias" eshell-directory-name)
   "The file in which aliases are kept.
 
 (defcustom eshell-aliases-file (expand-file-name "alias" eshell-directory-name)
   "The file in which aliases are kept.


@@ -118,8 +118,9 @@ gained by using this module."
   ;; :link '(custom-manual "(eshell)Auto-correction of bad commands")
   :group 'eshell-alias)
 
   ;; :link '(custom-manual "(eshell)Auto-correction of bad commands")
   :group 'eshell-alias)
 

-(defcustom eshell-alias-load-hook '(eshell-alias-initialize)
+(defcustom eshell-alias-load-hook nil

   "A hook that gets run when `eshell-alias' is loaded."
   "A hook that gets run when `eshell-alias' is loaded."

+  :version "24.1"                      ; removed eshell-alias-initialize

   :type 'hook
   :group 'eshell-alias)
 
   :type 'hook
   :group 'eshell-alias)
 


@@ -132,10 +133,10 @@ Each element of this alias is a list of the form:
 Where NAME is the textual name of the alias, and DEFINITION is the
 command string to replace that command with.
 
 Where NAME is the textual name of the alias, and DEFINITION is the
 command string to replace that command with.
 

-Note: this list should not be modified in your '.emacs' file.  Rather,
-any desired alias definitions should be declared using the `alias'
-command, which will automatically write them to the file named by
-`eshell-aliases-file'.")
+Note: this list should not be modified in your init file.
+Rather, any desired alias definitions should be declared using
+the `alias' command, which will automatically write them to the
+file named by `eshell-aliases-file'.")

 
 (put 'eshell-command-aliases-list 'risky-local-variable t)
 
 
 (put 'eshell-command-aliases-list 'risky-local-variable t)
 


@@ -157,7 +158,7 @@ command, which will automatically write them to the file named by
 (defun eshell/alias (&optional alias &rest definition)
   "Define an ALIAS in the user's alias list using DEFINITION."
   (if (not alias)
 (defun eshell/alias (&optional alias &rest definition)
   "Define an ALIAS in the user's alias list using DEFINITION."
   (if (not alias)

-      (eshell-for alias eshell-command-aliases-list
+      (dolist (alias eshell-command-aliases-list)

        (eshell-print (apply 'format "alias %s %s\n" alias)))
     (if (not definition)
        (setq eshell-command-aliases-list
        (eshell-print (apply 'format "alias %s %s\n" alias)))
     (if (not definition)
        (setq eshell-command-aliases-list


@@ -239,7 +240,7 @@ command, which will automatically write them to the file named by
   "Find all possible completions for NAME.
 These are all the command aliases which begin with NAME."
   (let (completions)
   "Find all possible completions for NAME.
 These are all the command aliases which begin with NAME."
   (let (completions)

-    (eshell-for alias eshell-command-aliases-list
+    (dolist (alias eshell-command-aliases-list)

       (if (string-match (concat "^" name) (car alias))
          (setq completions (cons (car alias) completions))))
     completions))
       (if (string-match (concat "^" name) (car alias))
          (setq completions (cons (car alias) completions))))
     completions))


@@ -279,5 +280,4 @@ These are all the command aliases which begin with NAME."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 

-;; arch-tag: 8b018fc1-4e07-4ccc-aa73-c0a1ba361f82

 ;;; em-alias.el ends here
 ;;; em-alias.el ends here