[Emacs-diffs] emacs/lisp ChangeLog eshell/em-alias.el eshell/...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/13 02:16:28

Modified files:
        lisp           : ChangeLog 
        lisp/eshell    : em-alias.el em-dirs.el em-hist.el em-script.el 

Log message:
        * eshell/em-hist.el:
        * eshell/em-dirs.el (eshell-complete-user-reference): Declare
        pcomplete functions and variables to avoid compiler warnings.
        
        * eshell/em-script.el (eshell-login-script, eshell-rc-script):
        * eshell/em-dirs.el (eshell-last-dir-ring-file-name):
        * eshell/em-alias.el (eshell-aliases-file):
        * eshell/em-hist.el (eshell-history-file-name): Use
        expand-file-name instead of concat to make file names (Bug#4308).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16155&r2=1.16156
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-alias.el?cvsroot=emacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-dirs.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-hist.el?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-script.el?cvsroot=emacs&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16155
retrieving revision 1.16156
diff -u -b -r1.16155 -r1.16156
--- ChangeLog   13 Sep 2009 02:14:25 -0000      1.16155
+++ ChangeLog   13 Sep 2009 02:16:25 -0000      1.16156
@@ -1,3 +1,17 @@
+2009-09-13  Chong Yidong  <address@hidden>
+
+       * eshell/em-hist.el:
+       * eshell/em-dirs.el (eshell-complete-user-reference): Declare
+       pcomplete functions and variables to avoid compiler warnings.
+
+2009-09-13  Leo  <address@hidden>  (tiny change)
+
+       * eshell/em-script.el (eshell-login-script, eshell-rc-script):
+       * eshell/em-dirs.el (eshell-last-dir-ring-file-name):
+       * eshell/em-alias.el (eshell-aliases-file):
+       * eshell/em-hist.el (eshell-history-file-name): Use
+       expand-file-name instead of concat to make file names (Bug#4308).
+
 2009-09-13  Glenn Morris  <address@hidden>
 
        * ediff-merg.el (ediff-do-merge):

Index: eshell/em-alias.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-alias.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- eshell/em-alias.el  5 Jan 2009 03:21:42 -0000       1.23
+++ eshell/em-alias.el  13 Sep 2009 02:16:28 -0000      1.24
@@ -102,7 +102,7 @@
   ;; :link '(info-link "(eshell)Command aliases")
   :group 'eshell-module)
 
-(defcustom eshell-aliases-file (concat eshell-directory-name "alias")
+(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

Index: eshell/em-dirs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-dirs.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- eshell/em-dirs.el   5 Jan 2009 03:21:43 -0000       1.29
+++ eshell/em-dirs.el   13 Sep 2009 02:16:28 -0000      1.30
@@ -138,7 +138,7 @@
   :group 'eshell-dirs)
 
 (defcustom eshell-last-dir-ring-file-name
-  (concat eshell-directory-name "lastdir")
+  (expand-file-name "lastdir" eshell-directory-name)
   "*If non-nil, name of the file to read/write the last-dir-ring.
 See also `eshell-read-last-dir-ring' and `eshell-write-last-dir-ring'.
 If it is nil, the last-dir-ring will not be written to disk."
@@ -276,6 +276,11 @@
           (path (eshell-find-previous-directory regexp)))
       (concat (or path letter) "/"))))
 
+(defvar pcomplete-stub)
+(defvar pcomplete-last-completion-raw)
+(declare-function pcomplete-actual-arg "pcomplete")
+(declare-function pcomplete-uniqify-list "pcomplete")
+
 (defun eshell-complete-user-reference ()
   "If there is a user reference, complete it."
   (let ((arg (pcomplete-actual-arg)))

Index: eshell/em-hist.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-hist.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- eshell/em-hist.el   5 Jan 2009 03:21:43 -0000       1.32
+++ eshell/em-hist.el   13 Sep 2009 02:16:28 -0000      1.33
@@ -86,7 +86,7 @@
   :group 'eshell-hist)
 
 (defcustom eshell-history-file-name
-  (concat eshell-directory-name "history")
+  (expand-file-name "history" eshell-directory-name)
   "*If non-nil, name of the file to read/write input history.
 See also `eshell-read-history' and `eshell-write-history'.
 If it is nil, Eshell will use the value of HISTFILE."
@@ -583,6 +583,10 @@
                  posb (cdr posb)
                  pose (cdr pose))))))))
 
+(defvar pcomplete-stub)
+(defvar pcomplete-last-completion-raw)
+(declare-function pcomplete-actual-arg "pcomplete")
+
 (defun eshell-complete-history-reference ()
   "Complete a history reference, by completing the event designator."
   (let ((arg (pcomplete-actual-arg)))

Index: eshell/em-script.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-script.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- eshell/em-script.el 5 Jan 2009 03:21:45 -0000       1.20
+++ eshell/em-script.el 13 Sep 2009 02:16:28 -0000      1.21
@@ -40,14 +40,14 @@
   :type 'hook
   :group 'eshell-script)
 
-(defcustom eshell-login-script (concat eshell-directory-name "login")
+(defcustom eshell-login-script (expand-file-name "login" eshell-directory-name)
   "*If non-nil, a file to invoke when starting up Eshell interactively.
 This file should be a file containing Eshell commands, where comment
 lines begin with '#'."
   :type 'file
   :group 'eshell-script)
 
-(defcustom eshell-rc-script (concat eshell-directory-name "profile")
+(defcustom eshell-rc-script (expand-file-name "profile" eshell-directory-name)
   "*If non-nil, a file to invoke whenever Eshell is started.
 This includes when running `eshell-command'."
   :type 'file