Skip to content

Commit e003e90

Browse files
committed
Remove more XEmacs compat code from eshell
* lisp/eshell/em-glob.el (eshell-extended-glob): * lisp/eshell/em-ls.el (eshell-do-ls): * lisp/eshell/em-unix.el (eshell/du, eshell-mvcpln-template): * lisp/eshell/esh-util.el (eshell-file-attributes): Remove more XEmacs compat code; no longer let-bind the unused variable ange-cache.
1 parent 0d6c513 commit e003e90

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

lisp/eshell/em-glob.el

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ resulting regular expression."
232232
(regexp-quote (substring pattern matched-in-pattern))
233233
"\\'")))
234234

235-
(defvar ange-cache) ; XEmacs? See esh-util
236-
237235
(defun eshell-extended-glob (glob)
238236
"Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY.
239237
This function almost fully supports zsh style filename generation
@@ -252,7 +250,7 @@ the form:
252250
253251
(INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))"
254252
(let ((paths (eshell-split-path glob))
255-
eshell-glob-matches message-shown ange-cache)
253+
eshell-glob-matches message-shown)
256254
(unwind-protect
257255
(if (and (cdr paths)
258256
(file-name-absolute-p (car paths)))

lisp/eshell/em-ls.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ scope during the evaluation of TEST-SEXP."
239239
(defvar show-recursive)
240240
(defvar show-size)
241241
(defvar sort-method)
242-
(defvar ange-cache)
243242
(defvar dired-flag)
244243

245244
;;; Functions:
@@ -406,7 +405,7 @@ Sort entries alphabetically across.")
406405
(setq listing-style 'by-columns))
407406
(unless args
408407
(setq args (list ".")))
409-
(let ((eshell-ls-exclude-regexp eshell-ls-exclude-regexp) ange-cache)
408+
(let ((eshell-ls-exclude-regexp eshell-ls-exclude-regexp))
410409
(when ignore-pattern
411410
(unless (eshell-using-module 'eshell-glob)
412411
(error (concat "-I option requires that `eshell-glob'"

lisp/eshell/em-unix.el

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ Remove the DIRECTORY(ies), if they are empty.")
469469
(eshell-parse-command
470470
(format "tar %s %s" tar-args archive) args))))
471471

472-
(defvar ange-cache) ; XEmacs? See esh-util
473-
474472
;; this is to avoid duplicating code...
475473
(defmacro eshell-mvcpln-template (command action func query-var
476474
force-var &optional preserve)
@@ -488,8 +486,7 @@ Remove the DIRECTORY(ies), if they are empty.")
488486
(or (not no-dereference)
489487
(not (file-symlink-p (car args)))))))
490488
(eshell-shorthand-tar-command ,command args)
491-
(let ((target (car (last args)))
492-
ange-cache)
489+
(let ((target (car (last args))))
493490
(setcdr (last args 2) nil)
494491
(eshell-shuffle-files
495492
,command ,action args target ,func nil
@@ -924,7 +921,7 @@ Summarize disk usage of each FILE, recursively for directories.")
924921
;; filesystem support means nothing under Windows
925922
(if (eshell-under-windows-p)
926923
(setq only-one-filesystem nil))
927-
(let ((size 0.0) ange-cache)
924+
(let ((size 0.0))
928925
(while args
929926
(if only-one-filesystem
930927
(setq only-one-filesystem

lisp/eshell/esh-util.el

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -647,14 +647,8 @@ gid format. Valid values are `string' and `integer', defaulting to
647647
(let ((base (file-name-nondirectory file))
648648
(dir (file-name-directory file)))
649649
(if (string-equal "" base) (setq base "."))
650-
(if (boundp 'ange-cache)
651-
(setq entry (cdr (assoc base (cdr (assoc dir ange-cache))))))
652650
(unless entry
653651
(setq entry (eshell-parse-ange-ls dir))
654-
(if (boundp 'ange-cache)
655-
(setq ange-cache
656-
(cons (cons dir entry)
657-
ange-cache)))
658652
(if entry
659653
(let ((fentry (assoc base (cdr entry))))
660654
(if fentry

0 commit comments

Comments
 (0)