diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
| commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
| tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /lisp/eshell/em-unix.el | |
| parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
| parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
| download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.bz2 emacs-5db5064395c251a822e429e19ddecb74a974b6ef.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/eshell/em-unix.el')
| -rw-r--r-- | lisp/eshell/em-unix.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 2d6bd32b5a2..7e48a9c7578 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -1,6 +1,6 @@ ;;; em-unix.el --- UNIX command aliases -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> @@ -169,7 +169,8 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." `info' => goes to top info window `info arg1' => IF arg1 is a file, then visits arg1 `info arg1' => OTHERWISE goes to top info window and then menu item arg1 - `info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and then menu item arg2 + `info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and + then menu item arg2 etc." (eval-and-compile (require 'info)) (let ((file (cond |