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 dd61dac05947c711e8eb1d4a55027342d6722b31..aa89177c2dec950a1775cc74974a9ef51505744a 100644 (file)
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,16 +1,15 @@
 ;;; 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 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.

 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -18,9 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -77,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


@@ -97,14 +94,16 @@
   (require 'esh-util))
 (require 'eshell)
 
   (require 'esh-util))
 (require 'eshell)
 

+;;;###autoload
+(progn

 (defgroup eshell-alias nil
   "Command aliases allow for easy definition of alternate commands."
   :tag "Command aliases"
   ;; :link '(info-link "(eshell)Command aliases")
 (defgroup eshell-alias nil
   "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 (concat eshell-directory-name "alias")
-  "*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.

 Whenever an alias is defined by the user, using the `alias' command,
 it will be written to this file.  Thus, alias definitions (and
 deletions) are always permanent.  This approach was chosen for the
 Whenever an alias is defined by the user, using the `alias' command,
 it will be written to this file.  Thus, alias definitions (and
 deletions) are always permanent.  This approach was chosen for the


@@ -114,13 +113,14 @@ gained by using this module."
   :group 'eshell-alias)
 
 (defcustom eshell-bad-command-tolerance 3
   :group 'eshell-alias)
 
 (defcustom eshell-bad-command-tolerance 3

-  "*The number of failed commands to ignore before creating an alias."
+  "The number of failed commands to ignore before creating an alias."

   :type 'integer
   ;; :link '(custom-manual "(eshell)Auto-correction of bad commands")
   :group 'eshell-alias)
 
   :type 'integer
   ;; :link '(custom-manual "(eshell)Auto-correction of bad commands")
   :group 'eshell-alias)
 

-(defcustom eshell-alias-load-hook '(eshell-alias-initialize)
-  "*A hook that gets run when `eshell-alias' is loaded."
+(defcustom eshell-alias-load-hook nil
+  "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)
 


@@ -133,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)
 


@@ -158,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


@@ -240,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))


@@ -276,5 +276,8 @@ These are all the command aliases which begin with NAME."
 
 (provide 'em-alias)
 
 
 (provide 'em-alias)
 

-;;; arch-tag: 8b018fc1-4e07-4ccc-aa73-c0a1ba361f82
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+

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