[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114250: * lisp/eshell/*.el: Use lexical-binding.
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] trunk r114250: * lisp/eshell/*.el: Use lexical-binding. |
|
Date: |
Thu, 12 Sep 2013 20:16:01 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114250
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15231
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-12 16:15:53 -0400
message:
* lisp/eshell/*.el: Use lexical-binding.
* test/automated/eshell.el: Move from test/eshell.el.
(eshell-test/for-loop, eshell-test/for-name-loop): New tests.
renamed:
test/eshell.el => test/automated/eshell.el
eshtest.el-20091113204419-o5vbwnq5f7feedwu-1875
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/eshell/em-alias.el emalias.el-20091113204419-o5vbwnq5f7feedwu-1851
lisp/eshell/em-banner.el
embanner.el-20091113204419-o5vbwnq5f7feedwu-1852
lisp/eshell/em-basic.el embasic.el-20091113204419-o5vbwnq5f7feedwu-1853
lisp/eshell/em-cmpl.el emcmpl.el-20091113204419-o5vbwnq5f7feedwu-1854
lisp/eshell/em-dirs.el emdirs.el-20091113204419-o5vbwnq5f7feedwu-1855
lisp/eshell/em-glob.el emglob.el-20091113204419-o5vbwnq5f7feedwu-1856
lisp/eshell/em-hist.el emhist.el-20091113204419-o5vbwnq5f7feedwu-1857
lisp/eshell/em-ls.el emls.el-20091113204419-o5vbwnq5f7feedwu-1858
lisp/eshell/em-pred.el empred.el-20091113204419-o5vbwnq5f7feedwu-1859
lisp/eshell/em-prompt.el
emprompt.el-20091113204419-o5vbwnq5f7feedwu-1860
lisp/eshell/em-rebind.el
emrebind.el-20091113204419-o5vbwnq5f7feedwu-1861
lisp/eshell/em-script.el
emscript.el-20091113204419-o5vbwnq5f7feedwu-1862
lisp/eshell/em-smart.el emsmart.el-20091113204419-o5vbwnq5f7feedwu-1863
lisp/eshell/em-term.el emterm.el-20091113204419-o5vbwnq5f7feedwu-1864
lisp/eshell/em-tramp.el emtramp.el-20130326220403-t1gonypc2v71gswg-1
lisp/eshell/em-unix.el emunix.el-20091113204419-o5vbwnq5f7feedwu-1865
lisp/eshell/em-xtra.el emxtra.el-20091113204419-o5vbwnq5f7feedwu-1866
lisp/eshell/esh-arg.el esharg.el-20091113204419-o5vbwnq5f7feedwu-1867
lisp/eshell/esh-cmd.el eshcmd.el-20091113204419-o5vbwnq5f7feedwu-1850
lisp/eshell/esh-ext.el eshext.el-20091113204419-o5vbwnq5f7feedwu-1868
lisp/eshell/esh-io.el eshio.el-20091113204419-o5vbwnq5f7feedwu-1870
lisp/eshell/esh-mode.el eshmode.el-20091113204419-o5vbwnq5f7feedwu-1848
lisp/eshell/esh-module.el
eshmodule.el-20091113204419-o5vbwnq5f7feedwu-1872
lisp/eshell/esh-opt.el eshopt.el-20091113204419-o5vbwnq5f7feedwu-1873
lisp/eshell/esh-proc.el eshproc.el-20091113204419-o5vbwnq5f7feedwu-1874
lisp/eshell/esh-util.el eshutil.el-20091113204419-o5vbwnq5f7feedwu-1849
lisp/eshell/esh-var.el eshvar.el-20091113204419-o5vbwnq5f7feedwu-1877
lisp/eshell/eshell.el eshell.el-20091113204419-o5vbwnq5f7feedwu-1878
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/eshell.el eshtest.el-20091113204419-o5vbwnq5f7feedwu-1875
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-09-12 14:48:18 +0000
+++ b/lisp/ChangeLog 2013-09-12 20:15:53 +0000
@@ -1,7 +1,10 @@
+2013-09-12 Stefan Monnier <address@hidden>
+
+ * eshell/*.el: Use lexical-binding (bug#15231).
+
2013-09-12 Kenichi Handa <address@hidden>
- * composite.el (compose-gstring-for-graphic): Handle enclosing
- mark.
+ * composite.el (compose-gstring-for-graphic): Handle enclosing mark.
2013-09-12 Glenn Morris <address@hidden>
=== modified file 'lisp/eshell/em-alias.el'
--- a/lisp/eshell/em-alias.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-alias.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-alias.el --- creation and management of command aliases
+;;; em-alias.el --- creation and management of command aliases -*-
lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-banner.el'
--- a/lisp/eshell/em-banner.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-banner.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-banner.el --- sample module that displays a login banner
+;;; em-banner.el --- sample module that displays a login banner -*-
lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-basic.el'
--- a/lisp/eshell/em-basic.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-basic.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-basic.el --- basic shell builtin commands
+;;; em-basic.el --- basic shell builtin commands -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el 2013-06-01 18:00:14 +0000
+++ b/lisp/eshell/em-cmpl.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-cmpl.el --- completion using the TAB key
+;;; em-cmpl.el --- completion using the TAB key -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
@@ -297,19 +297,16 @@
(define-key eshell-mode-map [(meta tab)] 'eshell-complete-lisp-symbol)
(define-key eshell-mode-map [(meta control ?i)] 'eshell-complete-lisp-symbol)
(define-key eshell-command-map [(meta ?h)] 'eshell-completion-help)
- (define-key eshell-command-map [tab] 'pcomplete-expand-and-complete)
(define-key eshell-command-map [(control ?i)]
'pcomplete-expand-and-complete)
(define-key eshell-command-map [space] 'pcomplete-expand)
(define-key eshell-command-map [? ] 'pcomplete-expand)
- (define-key eshell-mode-map [tab] 'eshell-pcomplete)
- (define-key eshell-mode-map [(control ?i)] 'eshell-pcomplete)
+ (define-key eshell-mode-map [(control ?i)] 'pcomplete)
(add-hook 'completion-at-point-functions
#'pcomplete-completions-at-point nil t)
;; jww (1999-10-19): Will this work on anything but X?
- (if (featurep 'xemacs)
- (define-key eshell-mode-map [iso-left-tab] 'pcomplete-reverse)
- (define-key eshell-mode-map [backtab] 'pcomplete-reverse))
+ (define-key eshell-mode-map (if (featurep 'xemacs) [iso-left-tab] [backtab])
+ 'pcomplete-reverse)
(define-key eshell-mode-map [(meta ??)] 'pcomplete-list))
(defun eshell-completion-command-name ()
@@ -458,16 +455,7 @@
(all-completions filename obarray 'functionp))
completions)))))))
-(defun eshell-pcomplete (&optional interactively)
- "Eshell wrapper for `pcomplete'."
- (interactive "p")
- ;; Pretend to be pcomplete so that cycling works (bug#13293).
- (setq this-command 'pcomplete)
- (condition-case nil
- (if interactively
- (call-interactively 'pcomplete)
- (pcomplete))
- (text-read-only (completion-at-point)))) ; Workaround for bug#12838.
+(define-obsolete-function-alias 'eshell-pcomplete 'completion-at-point)
(provide 'em-cmpl)
=== modified file 'lisp/eshell/em-dirs.el'
--- a/lisp/eshell/em-dirs.el 2013-06-09 06:39:40 +0000
+++ b/lisp/eshell/em-dirs.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-dirs.el --- directory navigation commands
+;;; em-dirs.el --- directory navigation commands -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-glob.el'
--- a/lisp/eshell/em-glob.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-glob.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-glob.el --- extended file name globbing
+;;; em-glob.el --- extended file name globbing -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-hist.el'
--- a/lisp/eshell/em-hist.el 2013-05-07 07:57:02 +0000
+++ b/lisp/eshell/em-hist.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-hist.el --- history list management
+;;; em-hist.el --- history list management -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-ls.el'
--- a/lisp/eshell/em-ls.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-ls.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-ls.el --- implementation of ls in Lisp
+;;; em-ls.el --- implementation of ls in Lisp -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-pred.el'
--- a/lisp/eshell/em-pred.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-pred.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-pred.el --- argument predicates and modifiers (ala zsh)
+;;; em-pred.el --- argument predicates and modifiers (ala zsh) -*-
lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-prompt.el'
--- a/lisp/eshell/em-prompt.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-prompt.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-prompt.el --- command prompts
+;;; em-prompt.el --- command prompts -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-rebind.el'
--- a/lisp/eshell/em-rebind.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-rebind.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-rebind.el --- rebind keys when point is at current input
+;;; em-rebind.el --- rebind keys when point is at current input -*-
lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-script.el'
--- a/lisp/eshell/em-script.el 2013-06-09 06:39:40 +0000
+++ b/lisp/eshell/em-script.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-script.el --- Eshell script files
+;;; em-script.el --- Eshell script files -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-smart.el'
--- a/lisp/eshell/em-smart.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-smart.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-smart.el --- smart display of output
+;;; em-smart.el --- smart display of output -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-term.el'
--- a/lisp/eshell/em-term.el 2013-06-10 02:41:49 +0000
+++ b/lisp/eshell/em-term.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-term.el --- running visual commands
+;;; em-term.el --- running visual commands -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-tramp.el'
--- a/lisp/eshell/em-tramp.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-tramp.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-tramp.el --- Eshell features that require TRAMP
+;;; em-tramp.el --- Eshell features that require TRAMP -*- lexical-binding:t
-*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-unix.el'
--- a/lisp/eshell/em-unix.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/em-unix.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-unix.el --- UNIX command aliases
+;;; em-unix.el --- UNIX command aliases -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/em-xtra.el'
--- a/lisp/eshell/em-xtra.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-xtra.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; em-xtra.el --- extra alias functions
+;;; em-xtra.el --- extra alias functions -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-arg.el'
--- a/lisp/eshell/esh-arg.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/esh-arg.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-arg.el --- argument processing
+;;; esh-arg.el --- argument processing -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-cmd.el'
--- a/lisp/eshell/esh-cmd.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/esh-cmd.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-cmd.el --- command invocation
+;;; esh-cmd.el --- command invocation -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-ext.el'
--- a/lisp/eshell/esh-ext.el 2013-06-02 09:19:09 +0000
+++ b/lisp/eshell/esh-ext.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-ext.el --- commands external to Eshell
+;;; esh-ext.el --- commands external to Eshell -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-io.el'
--- a/lisp/eshell/esh-io.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/esh-io.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-io.el --- I/O management
+;;; esh-io.el --- I/O management -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-mode.el'
--- a/lisp/eshell/esh-mode.el 2013-09-11 16:00:37 +0000
+++ b/lisp/eshell/esh-mode.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-mode.el --- user interface
+;;; esh-mode.el --- user interface -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-module.el'
--- a/lisp/eshell/esh-module.el 2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-module.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-module.el --- Eshell modules
+;;; esh-module.el --- Eshell modules -*- lexical-binding:t -*-
;; Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-opt.el'
--- a/lisp/eshell/esh-opt.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/esh-opt.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-opt.el --- command options processing
+;;; esh-opt.el --- command options processing -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-proc.el'
--- a/lisp/eshell/esh-proc.el 2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/esh-proc.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-proc.el --- process management
+;;; esh-proc.el --- process management -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-util.el'
--- a/lisp/eshell/esh-util.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/esh-util.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-util.el --- general utilities
+;;; esh-util.el --- general utilities -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/esh-var.el'
--- a/lisp/eshell/esh-var.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/esh-var.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; esh-var.el --- handling of variables
+;;; esh-var.el --- handling of variables -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el 2013-09-12 05:20:07 +0000
+++ b/lisp/eshell/eshell.el 2013-09-12 20:15:53 +0000
@@ -1,4 +1,4 @@
-;;; eshell.el --- the Emacs command shell
+;;; eshell.el --- the Emacs command shell -*- lexical-binding:t -*-
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2013-09-01 02:12:32 +0000
+++ b/test/ChangeLog 2013-09-12 20:15:53 +0000
@@ -1,3 +1,8 @@
+2013-09-12 Stefan Monnier <address@hidden>
+
+ * automated/eshell.el: Rename from eshell.el.
+ (eshell-test/for-loop, eshell-test/for-name-loop): New tests
(bug#15231).
+
2013-09-01 Glenn Morris <address@hidden>
* automated/Makefile.in (setwins): Avoid leading space in $wins.
@@ -164,25 +169,25 @@
2013-07-05 Michael Albinus <address@hidden>
* automated/file-notify-tests.el
- (file-notify-test-remote-temporary-file-directory): Use
- `null-device' on w32.
+ (file-notify-test-remote-temporary-file-directory):
+ Use `null-device' on w32.
(file-notify--test-tmpfile, file-notify--test-tmpfile1)
(file-notify--test-results, file-notify--test-event)
(file-notify--deftest-remote, file-notify--event-test)
(file-notify--test-event-handler)
- (file-notify--test-make-temp-name): Renamed, in order to mark them
+ (file-notify--test-make-temp-name): Rename, in order to mark them
internal.
(tramp-message-show-message, tramp-read-passwd): Tweak them for
better fitting in noninteractive tests.
- (file-notify-test00-availability): Renamed from `file-notify-test0'.
- (file-notify-test01-add-watch): Renamed from `file-notify-test1'.
+ (file-notify-test00-availability): Rename from `file-notify-test0'.
+ (file-notify-test01-add-watch): Rename from `file-notify-test1'.
Use `temporary-file-directory '.
(file-notify-test01-add-watch-remote): New test.
- (file-notify-test02-events): Renamed from `file-notify-test2'.
- (file-notify-test02-events-remote): Renamed from `file-notify-test3'.
- (file-notify-test03-autorevert): Renamed from
+ (file-notify-test02-events): Rename from `file-notify-test2'.
+ (file-notify-test02-events-remote): Rename from `file-notify-test3'.
+ (file-notify-test03-autorevert): Rename from
`file-notify-test4'. Use timeouts.
- (file-notify-test03-autorevert-remote): Renamed from
+ (file-notify-test03-autorevert-remote): Rename from
`file-notify-test5'.
2013-07-04 Michael Albinus <address@hidden>
@@ -192,7 +197,7 @@
2013-06-28 Kenichi Handa <address@hidden>
* automated/decoder-tests.el (decoder-tests-gen-file): New arg FILE.
- (decoder-tests-ao-gen-file): Renamed from decoder-tests-filename.
+ (decoder-tests-ao-gen-file): Rename from decoder-tests-filename.
Callers changed.
(decoder-tests-filename): New function.
(decoder-tests-prefer-utf-8-read)
=== renamed file 'test/eshell.el' => 'test/automated/eshell.el'
--- a/test/eshell.el 2013-05-26 07:54:01 +0000
+++ b/test/automated/eshell.el 2013-09-12 20:15:53 +0000
@@ -62,6 +62,14 @@
"Test `eshell-command-result' with an elisp command."
(should (equal (eshell-command-result "(+ 1 2)") 3)))
+(ert-deftest eshell-test/for-loop ()
+ "Test `eshell-command-result' with an elisp command."
+ (should (equal (eshell-command-result "for foo in 5 { echo $foo }") 5)))
+
+(ert-deftest eshell-test/for-name-loop () ;Bug#15231
+ "Test `eshell-command-result' with an elisp command."
+ (should (equal (eshell-command-result "for name in 3 { echo $name }") 3)))
+
(ert-deftest eshell-test/lisp-command-args ()
"Test `eshell-command-result' with elisp and trailing args.
Test that trailing arguments outside the S-expression are
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114250: * lisp/eshell/*.el: Use lexical-binding.,
Stefan Monnier <=