Mercurial > emacs
view lisp/eshell/em-script.el @ 83619:5da6a46ddbd6
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 19 May 2007 19:08:02 +0000 |
parents | 7a3f13e2dd57 |
children | a1e8300d3c55 95d0cdf160ea |
line wrap: on
line source
;;; em-script.el --- Eshell script files ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. (provide 'em-script) (eval-when-compile (require 'esh-maint)) (require 'eshell) (defgroup eshell-script nil "This module allows for the execution of files containing Eshell commands, as a script file." :tag "Running script files." :group 'eshell-module) ;;; Commentary: ;;; User Variables: (defcustom eshell-script-load-hook '(eshell-script-initialize) "*A list of functions to call when loading `eshell-script'." :type 'hook :group 'eshell-script) (defcustom eshell-login-script (concat eshell-directory-name "login") "*If non-nil, a file to invoke when starting up Eshell interactively. This file should be a file containing Eshell commands, where comment lines begin with '#'." :type 'file :group 'eshell-script) (defcustom eshell-rc-script (concat eshell-directory-name "profile") "*If non-nil, a file to invoke whenever Eshell is started. This includes when running `eshell-command'." :type 'file :group 'eshell-script) ;;; Functions: (defun eshell-script-initialize () "Initialize the script parsing code." (make-local-variable 'eshell-interpreter-alist) (setq eshell-interpreter-alist (cons '((lambda (file) (string= (file-name-nondirectory file) "eshell")) . eshell/source) eshell-interpreter-alist)) (make-local-variable 'eshell-complex-commands) (setq eshell-complex-commands (append '("source" ".") eshell-complex-commands)) ;; these two variables are changed through usage, but we don't want ;; to ruin it for other modules (let (eshell-inside-quote-regexp eshell-outside-quote-regexp) (and (not eshell-non-interactive-p) eshell-login-script (file-readable-p eshell-login-script) (eshell-do-eval (list 'eshell-commands (catch 'eshell-replace-command (eshell-source-file eshell-login-script))) t)) (and eshell-rc-script (file-readable-p eshell-rc-script) (eshell-do-eval (list 'eshell-commands (catch 'eshell-replace-command (eshell-source-file eshell-rc-script))) t)))) (defun eshell-source-file (file &optional args subcommand-p) "Execute a series of Eshell commands in FILE, passing ARGS. Comments begin with '#'." (interactive "f") (let ((orig (point)) (here (point-max)) (inhibit-point-motion-hooks t) after-change-functions) (goto-char (point-max)) (insert-file-contents file) (goto-char (point-max)) (throw 'eshell-replace-command (prog1 (list 'let (list (list 'eshell-command-name (list 'quote file)) (list 'eshell-command-arguments (list 'quote args))) (let ((cmd (eshell-parse-command (cons here (point))))) (if subcommand-p (setq cmd (list 'eshell-as-subcommand cmd))) cmd)) (delete-region here (point)) (goto-char orig))))) (defun eshell/source (&rest args) "Source a file in a subshell environment." (eshell-eval-using-options "source" args '((?h "help" nil nil "show this usage screen") :show-usage :usage "FILE [ARGS] Invoke the Eshell commands in FILE in a subshell, binding ARGS to $1, $2, etc.") (eshell-source-file (car args) (cdr args) t))) (put 'eshell/source 'eshell-no-numeric-conversions t) (defun eshell/. (&rest args) "Source a file in the current environment." (eshell-eval-using-options "." args '((?h "help" nil nil "show this usage screen") :show-usage :usage "FILE [ARGS] Invoke the Eshell commands in FILE within the current shell environment, binding ARGS to $1, $2, etc.") (eshell-source-file (car args) (cdr args)))) (put 'eshell/. 'eshell-no-numeric-conversions t) ;;; Code: ;;; arch-tag: a346439d-5ba8-4faf-ac2b-3aacfeaa4647 ;;; em-script.el ends here