Mercurial > emacs
annotate lisp/eshell/em-dirs.el @ 101661:26b8d12cf7a4
(rmail-reply): Handle empty folders.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 30 Jan 2009 03:46:31 +0000 |
parents | a9dc0e7c3f2b |
children | 48428e99bf83 |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37661
diff
changeset
|
1 ;;; em-dirs.el --- directory navigation commands |
29876 | 2 |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
100908 | 4 ;; 2008, 2009 Free Software Foundation, Inc. |
29876 | 5 |
32526 | 6 ;; Author: John Wiegley <johnw@gnu.org> |
7 | |
29876 | 8 ;; This file is part of GNU Emacs. |
9 | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
29876 | 11 ;; it under the terms of the GNU General Public License as published by |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; (at your option) any later version. |
29876 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
29876 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;; The only special feature that Eshell offers in the last-dir-ring. | |
26 ;; To view the ring, enter: | |
27 ;; | |
28 ;; cd = | |
29 ;; | |
30 ;; Changing to an index within the ring is done using: | |
31 ;; | |
32 ;; cd - ; same as cd -0 | |
33 ;; cd -4 | |
34 ;; | |
35 ;; Or, it is possible to change the first member in the ring which | |
36 ;; matches a regexp: | |
37 ;; | |
38 ;; cd =bcc ; change to the last directory visited containing "bcc" | |
39 ;; | |
40 ;; This ring is maintained automatically, and is persisted across | |
41 ;; Eshell sessions. It is a separate mechanism from `pushd' and | |
42 ;; `popd', and the two may be used at the same time. | |
43 | |
87066
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
44 ;;; Code: |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
45 |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
46 (require 'eshell) |
29876 | 47 (require 'ring) |
48 (require 'esh-opt) | |
49 | |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
50 ;;;###autoload |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
51 (eshell-defgroup eshell-dirs nil |
87066
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
52 "Directory navigation involves changing directories, examining the |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
53 current directory, maintaining a directory stack, and also keeping |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
54 track of a history of the last directory locations the user was in. |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
55 Emacs does provide standard Lisp definitions of `pwd' and `cd', but |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
56 they lack somewhat in feel from the typical shell equivalents." |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
57 :tag "Directory navigation" |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
58 :group 'eshell-module) |
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
59 |
29876 | 60 ;;; User Variables: |
61 | |
62 (defcustom eshell-dirs-load-hook '(eshell-dirs-initialize) | |
63 "*A hook that gets run when `eshell-dirs' is loaded." | |
64 :type 'hook | |
65 :group 'eshell-dirs) | |
66 | |
67 (defcustom eshell-pwd-convert-function (if (eshell-under-windows-p) | |
68 'expand-file-name | |
69 'identity) | |
70 "*The function used to normalize the value of Eshell's `pwd'. | |
71 The value returned by `pwd' is also used when recording the | |
72 last-visited directory in the last-dir-ring, so it will affect the | |
73 form of the list used by 'cd ='." | |
74 :type '(radio (function-item file-truename) | |
75 (function-item expand-file-name) | |
76 (function-item identity) | |
77 (function :tag "Other")) | |
78 :group 'eshell-dirs) | |
79 | |
80 (defcustom eshell-ask-to-save-last-dir 'always | |
81 "*Determine if the last-dir-ring should be automatically saved. | |
82 The last-dir-ring is always preserved when exiting an Eshell buffer. | |
83 However, when Emacs is being shut down, this variable determines | |
84 whether to prompt the user, or just save the ring. | |
85 If set to nil, it means never ask whether to save the last-dir-ring. | |
86 If set to t, always ask if any Eshell buffers are open at exit time. | |
87 If set to `always', the list-dir-ring will always be saved, silently." | |
88 :type '(choice (const :tag "Never" nil) | |
89 (const :tag "Ask" t) | |
90 (const :tag "Always save" always)) | |
91 :group 'eshell-dirs) | |
92 | |
93 (defcustom eshell-cd-shows-directory nil | |
94 "*If non-nil, using `cd' will report the directory it changes to." | |
95 :type 'boolean | |
96 :group 'eshell-dirs) | |
97 | |
98 (defcustom eshell-cd-on-directory t | |
99 "*If non-nil, do a cd if a directory is in command position." | |
100 :type 'boolean | |
101 :group 'eshell-dirs) | |
102 | |
103 (defcustom eshell-directory-change-hook nil | |
104 "*A hook to run when the current directory changes." | |
105 :type 'hook | |
106 :group 'eshell-dirs) | |
107 | |
108 (defcustom eshell-list-files-after-cd nil | |
109 "*If non-nil, call \"ls\" with any remaining args after doing a cd. | |
110 This is provided for convenience, since the same effect is easily | |
111 achieved by adding a function to `eshell-directory-change-hook' that | |
112 calls \"ls\" and references `eshell-last-arguments'." | |
113 :type 'boolean | |
114 :group 'eshell-dirs) | |
115 | |
116 (defcustom eshell-pushd-tohome nil | |
117 "*If non-nil, make pushd with no arg behave as 'pushd ~' (like `cd'). | |
118 This mirrors the optional behavior of tcsh." | |
119 :type 'boolean | |
120 :group 'eshell-dirs) | |
121 | |
122 (defcustom eshell-pushd-dextract nil | |
123 "*If non-nil, make \"pushd +n\" pop the nth dir to the stack top. | |
124 This mirrors the optional behavior of tcsh." | |
125 :type 'boolean | |
126 :group 'eshell-dirs) | |
127 | |
128 (defcustom eshell-pushd-dunique nil | |
129 "*If non-nil, make pushd only add unique directories to the stack. | |
130 This mirrors the optional behavior of tcsh." | |
131 :type 'boolean | |
132 :group 'eshell-dirs) | |
133 | |
134 (defcustom eshell-dirtrack-verbose t | |
135 "*If non-nil, show the directory stack following directory change. | |
136 This is effective only if directory tracking is enabled." | |
137 :type 'boolean | |
138 :group 'eshell-dirs) | |
139 | |
140 (defcustom eshell-last-dir-ring-file-name | |
141 (concat eshell-directory-name "lastdir") | |
142 "*If non-nil, name of the file to read/write the last-dir-ring. | |
143 See also `eshell-read-last-dir-ring' and `eshell-write-last-dir-ring'. | |
144 If it is nil, the last-dir-ring will not be written to disk." | |
145 :type 'file | |
146 :group 'eshell-dirs) | |
147 | |
148 (defcustom eshell-last-dir-ring-size 32 | |
149 "*If non-nil, the size of the directory history ring. | |
150 This ring is added to every time `cd' or `pushd' is used. It simply | |
151 stores the most recent directory locations Eshell has been in. To | |
152 return to the most recent entry, use 'cd -' (equivalent to 'cd -0'). | |
153 To return to an older entry, use 'cd -N', where N is an integer less | |
154 than `eshell-last-dir-ring-size'. To return to the last directory | |
155 matching a particular regexp, use 'cd =REGEXP'. To display the | |
156 directory history list, use 'cd ='. | |
157 | |
158 This mechanism is very similar to that provided by `pushd', except | |
159 it's far more automatic. `pushd' allows the user to decide which | |
160 directories gets pushed, and its size is unlimited. | |
161 | |
162 `eshell-last-dir-ring' is meant for users who don't use `pushd' | |
163 explicity very much, but every once in a while would like to return to | |
164 a previously visited directory without having to type in the whole | |
165 thing again." | |
166 :type 'integer | |
167 :group 'eshell-dirs) | |
168 | |
169 (defcustom eshell-last-dir-unique t | |
170 "*If non-nil, `eshell-last-dir-ring' contains only unique entries." | |
171 :type 'boolean | |
172 :group 'eshell-dirs) | |
173 | |
46082
6303529069a9
Removed an extraneous space character from a comment.
John Wiegley <johnw@newartisans.com>
parents:
43327
diff
changeset
|
174 ;;; Internal Variables: |
29876 | 175 |
176 (defvar eshell-dirstack nil | |
177 "List of directories saved by pushd in the Eshell buffer. | |
178 Thus, this does not include the current directory.") | |
179 | |
180 (defvar eshell-last-dir-ring nil | |
181 "The last directory that eshell was in.") | |
182 | |
183 ;;; Functions: | |
184 | |
185 (defun eshell-dirs-initialize () | |
186 "Initialize the builtin functions for Eshell." | |
187 (make-local-variable 'eshell-variable-aliases-list) | |
188 (setq eshell-variable-aliases-list | |
189 (append | |
190 eshell-variable-aliases-list | |
191 '(("-" (lambda (indices) | |
192 (if (not indices) | |
193 (unless (ring-empty-p eshell-last-dir-ring) | |
194 (expand-file-name | |
195 (ring-ref eshell-last-dir-ring 0))) | |
196 (expand-file-name | |
197 (eshell-apply-indices eshell-last-dir-ring indices))))) | |
198 ("+" "PWD") | |
199 ("PWD" (lambda (indices) | |
200 (expand-file-name (eshell/pwd))) t) | |
201 ("OLDPWD" (lambda (indices) | |
202 (unless (ring-empty-p eshell-last-dir-ring) | |
203 (expand-file-name | |
204 (ring-ref eshell-last-dir-ring 0)))) t)))) | |
205 | |
206 (when eshell-cd-on-directory | |
207 (make-local-variable 'eshell-interpreter-alist) | |
208 (setq eshell-interpreter-alist | |
209 (cons (cons 'eshell-lone-directory-p | |
210 'eshell-dirs-substitute-cd) | |
211 eshell-interpreter-alist))) | |
212 | |
213 (add-hook 'eshell-parse-argument-hook | |
214 'eshell-parse-user-reference nil t) | |
215 (if (eshell-under-windows-p) | |
216 (add-hook 'eshell-parse-argument-hook | |
217 'eshell-parse-drive-letter nil t)) | |
218 | |
219 (when (eshell-using-module 'eshell-cmpl) | |
220 (add-hook 'pcomplete-try-first-hook | |
221 'eshell-complete-user-reference nil t)) | |
222 | |
223 (make-local-variable 'eshell-dirstack) | |
224 (make-local-variable 'eshell-last-dir-ring) | |
225 | |
226 (if eshell-last-dir-ring-file-name | |
227 (eshell-read-last-dir-ring)) | |
228 (unless eshell-last-dir-ring | |
229 (setq eshell-last-dir-ring (make-ring eshell-last-dir-ring-size))) | |
230 | |
231 (add-hook 'eshell-exit-hook 'eshell-write-last-dir-ring nil t) | |
232 | |
233 (add-hook 'kill-emacs-hook 'eshell-save-some-last-dir)) | |
234 | |
235 (defun eshell-save-some-last-dir () | |
236 "Save the list-dir-ring for any open Eshell buffers." | |
237 (eshell-for buf (buffer-list) | |
238 (if (buffer-live-p buf) | |
239 (with-current-buffer buf | |
240 (if (and eshell-mode | |
241 eshell-ask-to-save-last-dir | |
242 (or (eq eshell-ask-to-save-last-dir 'always) | |
243 (y-or-n-p | |
244 (format "Save last dir ring for Eshell buffer `%s'? " | |
245 (buffer-name buf))))) | |
246 (eshell-write-last-dir-ring)))))) | |
247 | |
248 (defun eshell-lone-directory-p (file) | |
249 "Test whether FILE is just a directory name, and not a command name." | |
250 (and (file-directory-p file) | |
251 (or (file-name-directory file) | |
252 (not (eshell-search-path file))))) | |
253 | |
254 (defun eshell-dirs-substitute-cd (&rest args) | |
255 "Substitute the given command for a call to `cd' on that name." | |
256 (if (> (length args) 1) | |
257 (error "%s: command not found" (car args)) | |
258 (throw 'eshell-replace-command | |
31240 | 259 (eshell-parse-command "cd" (eshell-flatten-list args))))) |
29876 | 260 |
261 (defun eshell-parse-user-reference () | |
262 "An argument beginning with ~ is a filename to be expanded." | |
263 (when (and (not eshell-current-argument) | |
264 (eq (char-after) ?~)) | |
265 (add-to-list 'eshell-current-modifiers 'expand-file-name) | |
266 (forward-char) | |
267 (char-to-string (char-before)))) | |
268 | |
269 (defun eshell-parse-drive-letter () | |
270 "An argument beginning X:[^/] is a drive letter reference." | |
271 (when (and (not eshell-current-argument) | |
272 (looking-at "\\([A-Za-z]:\\)\\([^/\\\\]\\|\\'\\)")) | |
273 (goto-char (match-end 1)) | |
274 (let* ((letter (match-string 1)) | |
275 (regexp (concat "\\`" letter)) | |
276 (path (eshell-find-previous-directory regexp))) | |
62915
b89e30bcd2bb
Changed all uses of `directory-sep-char' to ?/, and all uses of
John Wiegley <johnw@newartisans.com>
parents:
55195
diff
changeset
|
277 (concat (or path letter) "/")))) |
29876 | 278 |
279 (defun eshell-complete-user-reference () | |
280 "If there is a user reference, complete it." | |
281 (let ((arg (pcomplete-actual-arg))) | |
282 (when (string-match "\\`~[a-z]*\\'" arg) | |
283 (setq pcomplete-stub (substring arg 1) | |
284 pcomplete-last-completion-raw t) | |
285 (throw 'pcomplete-completions | |
286 (progn | |
287 (eshell-read-user-names) | |
288 (pcomplete-uniqify-list | |
289 (mapcar | |
290 (function | |
291 (lambda (user) | |
292 (file-name-as-directory (cdr user)))) | |
293 eshell-user-names))))))) | |
294 | |
33020 | 295 (defun eshell/pwd (&rest args) |
29876 | 296 "Change output from `pwd` to be cleaner." |
297 (let* ((path default-directory) | |
298 (len (length path))) | |
299 (if (and (> len 1) | |
62915
b89e30bcd2bb
Changed all uses of `directory-sep-char' to ?/, and all uses of
John Wiegley <johnw@newartisans.com>
parents:
55195
diff
changeset
|
300 (eq (aref path (1- len)) ?/) |
29876 | 301 (not (and (eshell-under-windows-p) |
302 (string-match "\\`[A-Za-z]:[\\\\/]\\'" path)))) | |
303 (setq path (substring path 0 (1- (length path))))) | |
304 (if eshell-pwd-convert-function | |
33020 | 305 (funcall eshell-pwd-convert-function path) |
306 path))) | |
29876 | 307 |
308 (defun eshell-expand-multiple-dots (path) | |
309 "Convert '...' to '../..', '....' to '../../..', etc.. | |
310 | |
311 With the following piece of advice, you can make this functionality | |
312 available in most of Emacs, with the exception of filename completion | |
313 in the minibuffer: | |
314 | |
315 (defadvice expand-file-name | |
316 (before translate-multiple-dots | |
317 (filename &optional directory) activate) | |
318 (setq filename (eshell-expand-multiple-dots filename)))" | |
79351
e0ca14d507a5
Change regexp to match dir like 'a...b'
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78220
diff
changeset
|
319 (while (string-match "\\(?:^\\|/\\)\\.\\.\\(\\.+\\)\\(?:$\\|/\\)" path) |
29876 | 320 (let* ((extra-dots (match-string 1 path)) |
321 (len (length extra-dots)) | |
322 replace-text) | |
323 (while (> len 0) | |
62915
b89e30bcd2bb
Changed all uses of `directory-sep-char' to ?/, and all uses of
John Wiegley <johnw@newartisans.com>
parents:
55195
diff
changeset
|
324 (setq replace-text (concat replace-text "/..") |
29876 | 325 len (1- len))) |
326 (setq path | |
327 (replace-match replace-text t t path 1)))) | |
328 path) | |
329 | |
330 (defun eshell-find-previous-directory (regexp) | |
331 "Find the most recent last-dir matching REGEXP." | |
332 (let ((index 0) | |
333 (len (ring-length eshell-last-dir-ring)) | |
334 oldpath) | |
335 (if (> (length regexp) 0) | |
336 (while (< index len) | |
337 (setq oldpath (ring-ref eshell-last-dir-ring index)) | |
338 (if (string-match regexp oldpath) | |
339 (setq index len) | |
340 (setq oldpath nil | |
341 index (1+ index))))) | |
342 oldpath)) | |
343 | |
95619
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
344 (defvar dired-directory) |
29876 | 345 |
346 (defun eshell/cd (&rest args) ; all but first ignored | |
347 "Alias to extend the behavior of `cd'." | |
31240 | 348 (setq args (eshell-flatten-list args)) |
29876 | 349 (let ((path (car args)) |
350 (subpath (car (cdr args))) | |
46852
6eb625bead4f
Removed eshell-under-cygwin-p, and all uses of it.
John Wiegley <johnw@newartisans.com>
parents:
46820
diff
changeset
|
351 (case-fold-search (eshell-under-windows-p)) |
29876 | 352 handled) |
353 (if (numberp path) | |
354 (setq path (number-to-string path))) | |
355 (if (numberp subpath) | |
356 (setq subpath (number-to-string subpath))) | |
357 (cond | |
358 (subpath | |
359 (let ((curdir (eshell/pwd))) | |
360 (if (string-match path curdir) | |
361 (setq path (replace-match subpath nil nil curdir)) | |
362 (error "Path substring '%s' not found" path)))) | |
363 ((and path (string-match "^-\\([0-9]*\\)$" path)) | |
364 (let ((index (match-string 1 path))) | |
365 (setq path | |
366 (ring-remove eshell-last-dir-ring | |
367 (if index | |
62915
b89e30bcd2bb
Changed all uses of `directory-sep-char' to ?/, and all uses of
John Wiegley <johnw@newartisans.com>
parents:
55195
diff
changeset
|
368 (string-to-number index) |
29876 | 369 0))))) |
370 ((and path (string-match "^=\\(.*\\)$" path)) | |
371 (let ((oldpath (eshell-find-previous-directory | |
372 (match-string 1 path)))) | |
373 (if oldpath | |
374 (setq path oldpath) | |
375 (let ((len (ring-length eshell-last-dir-ring)) | |
376 (index 0)) | |
377 (if (= len 0) | |
378 (error "Directory ring empty")) | |
31241 | 379 (eshell-init-print-buffer) |
29876 | 380 (while (< index len) |
31241 | 381 (eshell-buffered-print |
29876 | 382 (concat (number-to-string index) ": " |
31241 | 383 (ring-ref eshell-last-dir-ring index) "\n")) |
29876 | 384 (setq index (1+ index))) |
31241 | 385 (eshell-flush) |
29876 | 386 (setq handled t))))) |
387 (path | |
388 (setq path (eshell-expand-multiple-dots path)))) | |
389 (unless handled | |
390 (setq dired-directory (or path "~")) | |
391 (let ((curdir (eshell/pwd))) | |
392 (unless (equal curdir dired-directory) | |
393 (eshell-add-to-dir-ring curdir)) | |
394 (let ((result (cd dired-directory))) | |
395 (and eshell-cd-shows-directory | |
396 (eshell-printn result))) | |
397 (run-hooks 'eshell-directory-change-hook) | |
398 (if eshell-list-files-after-cd | |
399 (throw 'eshell-replace-command | |
400 (eshell-parse-command "ls" (cdr args)))) | |
401 nil)))) | |
402 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
403 (put 'eshell/cd 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
404 |
29876 | 405 (defun eshell-add-to-dir-ring (path) |
406 "Add PATH to the last-dir-ring, if applicable." | |
407 (unless (and (not (ring-empty-p eshell-last-dir-ring)) | |
408 (equal path (ring-ref eshell-last-dir-ring 0))) | |
409 (if eshell-last-dir-unique | |
410 (let ((index 0) | |
411 (len (ring-length eshell-last-dir-ring))) | |
412 (while (< index len) | |
413 (if (equal (ring-ref eshell-last-dir-ring index) path) | |
414 (ring-remove eshell-last-dir-ring index) | |
415 (setq index (1+ index)))))) | |
416 (ring-insert eshell-last-dir-ring path))) | |
417 | |
418 ;;; pushd [+n | dir] | |
419 (defun eshell/pushd (&rest args) ; all but first ignored | |
420 "Implementation of pushd in Lisp." | |
421 (let ((path (car args))) | |
422 (cond | |
423 ((null path) | |
424 ;; no arg -- swap pwd and car of stack unless eshell-pushd-tohome | |
425 (cond (eshell-pushd-tohome | |
426 (eshell/pushd "~")) | |
427 (eshell-dirstack | |
428 (let ((old (eshell/pwd))) | |
429 (eshell/cd (car eshell-dirstack)) | |
430 (setq eshell-dirstack (cons old (cdr eshell-dirstack))) | |
431 (eshell/dirs t))) | |
432 (t | |
433 (error "pushd: No other directory")))) | |
434 ((string-match "^\\+\\([0-9]\\)" path) | |
435 ;; pushd +n | |
436 (setq path (string-to-number (match-string 1 path))) | |
437 (cond ((> path (length eshell-dirstack)) | |
438 (error "Directory stack not that deep")) | |
439 ((= path 0) | |
440 (error "Couldn't cd")) | |
441 (eshell-pushd-dextract | |
442 (let ((dir (nth (1- path) eshell-dirstack))) | |
443 (eshell/popd path) | |
444 (eshell/pushd (eshell/pwd)) | |
445 (eshell/cd dir) | |
446 (eshell/dirs t))) | |
447 (t | |
448 (let* ((ds (cons (eshell/pwd) eshell-dirstack)) | |
449 (dslen (length ds)) | |
450 (front (nthcdr path ds)) | |
451 (back (nreverse (nthcdr (- dslen path) (reverse ds)))) | |
452 (new-ds (append front back))) | |
453 (eshell/cd (car new-ds)) | |
454 (setq eshell-dirstack (cdr new-ds)) | |
455 (eshell/dirs t))))) | |
456 (t | |
457 ;; pushd <dir> | |
458 (let ((old-wd (eshell/pwd))) | |
459 (eshell/cd path) | |
460 (if (or (null eshell-pushd-dunique) | |
461 (not (member old-wd eshell-dirstack))) | |
462 (setq eshell-dirstack (cons old-wd eshell-dirstack))) | |
463 (eshell/dirs t))))) | |
464 nil) | |
465 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
466 (put 'eshell/pushd 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
467 |
29876 | 468 ;;; popd [+n] |
469 (defun eshell/popd (&rest args) | |
470 "Implementation of popd in Lisp." | |
471 (let ((ref (or (car args) "+0"))) | |
472 (unless (and (stringp ref) | |
473 (string-match "\\`\\([+-][0-9]+\\)\\'" ref)) | |
474 (error "popd: bad arg `%s'" ref)) | |
475 (setq ref (string-to-number (match-string 1 ref))) | |
476 (cond ((= ref 0) | |
477 (unless eshell-dirstack | |
478 (error "popd: Directory stack empty")) | |
479 (eshell/cd (car eshell-dirstack)) | |
480 (setq eshell-dirstack (cdr eshell-dirstack)) | |
481 (eshell/dirs t)) | |
482 ((<= (abs ref) (length eshell-dirstack)) | |
483 (let* ((ds (cons nil eshell-dirstack)) | |
484 (cell (nthcdr (if (> ref 0) | |
485 (1- ref) | |
486 (+ (length eshell-dirstack) ref)) ds)) | |
487 (dir (cadr cell))) | |
488 (eshell/cd dir) | |
489 (setcdr cell (cdr (cdr cell))) | |
490 (setq eshell-dirstack (cdr ds)) | |
491 (eshell/dirs t))) | |
492 (t | |
493 (error "Couldn't popd")))) | |
494 nil) | |
495 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
496 (put 'eshell/popd 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
33020
diff
changeset
|
497 |
29876 | 498 (defun eshell/dirs (&optional if-verbose) |
499 "Implementation of dirs in Lisp." | |
500 (when (or (not if-verbose) eshell-dirtrack-verbose) | |
501 (let* ((msg "") | |
502 (ds (cons (eshell/pwd) eshell-dirstack)) | |
503 (home (expand-file-name "~/")) | |
504 (homelen (length home))) | |
505 (while ds | |
506 (let ((dir (car ds))) | |
507 (and (>= (length dir) homelen) | |
508 (string= home (substring dir 0 homelen)) | |
509 (setq dir (concat "~/" (substring dir homelen)))) | |
510 (setq msg (concat msg (directory-file-name dir) " ")) | |
511 (setq ds (cdr ds)))) | |
512 msg))) | |
513 | |
514 (defun eshell-read-last-dir-ring () | |
515 "Sets the buffer's `eshell-last-dir-ring' from a history file." | |
516 (let ((file eshell-last-dir-ring-file-name)) | |
517 (cond | |
518 ((or (null file) | |
519 (equal file "") | |
520 (not (file-readable-p file))) | |
521 nil) | |
522 (t | |
523 (let* ((count 0) | |
524 (size eshell-last-dir-ring-size) | |
525 (ring (make-ring size))) | |
526 (with-temp-buffer | |
527 (insert-file-contents file) | |
528 ;; Save restriction in case file is already visited... | |
529 ;; Watch for those date stamps in history files! | |
530 (goto-char (point-max)) | |
531 (while (and (< count size) | |
532 (re-search-backward "^\\([^\n].*\\)$" nil t)) | |
533 (ring-insert-at-beginning ring (match-string 1)) | |
534 (setq count (1+ count))) | |
535 ;; never allow the top element to equal the current | |
536 ;; directory | |
537 (while (and (not (ring-empty-p ring)) | |
538 (equal (ring-ref ring 0) (eshell/pwd))) | |
539 (ring-remove ring 0))) | |
540 (setq eshell-last-dir-ring ring)))))) | |
541 | |
542 (defun eshell-write-last-dir-ring () | |
543 "Writes the buffer's `eshell-last-dir-ring' to a history file." | |
544 (let ((file eshell-last-dir-ring-file-name)) | |
545 (cond | |
546 ((or (null file) | |
547 (equal file "") | |
548 (null eshell-last-dir-ring) | |
549 (ring-empty-p eshell-last-dir-ring)) | |
550 nil) | |
551 ((not (file-writable-p file)) | |
552 (message "Cannot write last-dir-ring file %s" file)) | |
553 (t | |
554 (let* ((ring eshell-last-dir-ring) | |
555 (index (ring-length ring))) | |
556 (with-temp-buffer | |
557 (while (> index 0) | |
558 (setq index (1- index)) | |
559 (insert (ring-ref ring index) ?\n)) | |
560 (insert (eshell/pwd) ?\n) | |
561 (eshell-with-private-file-modes | |
562 (write-region (point-min) (point-max) file nil | |
563 'no-message)))))))) | |
564 | |
87066
14174df2455d
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
79351
diff
changeset
|
565 (provide 'em-dirs) |
29876 | 566 |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
567 ;; Local Variables: |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
568 ;; generated-autoload-file: "esh-groups.el" |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
569 ;; End: |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
570 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
571 ;; arch-tag: 1e9c5a95-f1bd-45f8-ad36-55aac706e787 |
29876 | 572 ;;; em-dirs.el ends here |