mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-20 18:17:20 +00:00
merge from trunk
This commit is contained in:
Joakim Verona
commit
5f7470d118
@ -1,7 +1,13 @@
|
||||
2013-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* term/ns-win.el (parameters): Don't declare as dynamic.
|
||||
(before-make-frame-hook): Don't add ineffective function.
|
||||
|
||||
* eshell/*.el: Use lexical-binding (bug#15231).
|
||||
|
||||
2013-09-12 Kenichi Handa <handa@gnu.org>
|
||||
|
||||
* composite.el (compose-gstring-for-graphic): Handle enclosing
|
||||
mark.
|
||||
* composite.el (compose-gstring-for-graphic): Handle enclosing mark.
|
||||
|
||||
2013-09-12 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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 @@ to writing a completion function."
|
||||
(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 @@ to writing a completion function."
|
||||
(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)
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -556,29 +556,9 @@ unless the current buffer is a scratch buffer."
|
||||
(interactive)
|
||||
(other-frame -1))
|
||||
|
||||
;; If no position specified, make new frame offset by 25 from current.
|
||||
;; You'd think this was a window manager's job, but apparently without
|
||||
;; this, new frames open exactly on top of old ones (?).
|
||||
;; http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00988.html
|
||||
;; Note that AFAICS it is not documented that functions on
|
||||
;; before-make-frame-hook can access PARAMETERS.
|
||||
(defvar parameters) ; dynamically bound in make-frame
|
||||
(add-hook 'before-make-frame-hook
|
||||
(lambda ()
|
||||
(let ((left (cdr (assq 'left (frame-parameters))))
|
||||
(top (cdr (assq 'top (frame-parameters)))))
|
||||
(if (consp left) (setq left (cadr left)))
|
||||
(if (consp top) (setq top (cadr top)))
|
||||
(cond
|
||||
((or (assq 'top parameters) (assq 'left parameters)))
|
||||
((or (not left) (not top)))
|
||||
(t
|
||||
(setq parameters (cons (cons 'left (+ left 25))
|
||||
(cons (cons 'top (+ top 25))
|
||||
parameters))))))))
|
||||
|
||||
;; frame will be focused anyway, so select it
|
||||
;; Frame will be focused anyway, so select it
|
||||
;; (if this is not done, mode line is dimmed until first interaction)
|
||||
;; FIXME: Sounds like we're working around a bug in the underlying code.
|
||||
(add-hook 'after-make-frame-functions 'select-frame)
|
||||
|
||||
(defvar tool-bar-mode)
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2013-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* 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 <rgm@gnu.org>
|
||||
|
||||
* automated/Makefile.in (setwins): Avoid leading space in $wins.
|
||||
@ -164,25 +169,25 @@
|
||||
2013-07-05 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* 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 <michael.albinus@gmx.de>
|
||||
@ -192,7 +197,7 @@
|
||||
2013-06-28 Kenichi Handa <handa@gnu.org>
|
||||
|
||||
* 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)
|
||||
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user