Mercurial > emacs
view lisp/resume.el @ 42602:633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Tue, 08 Jan 2002 04:36:01 +0000 |
parents | b1a3fef3d648 |
children | e88404e8f2cf |
line wrap: on
line source
;;; resume.el --- process command line args from within a suspended Emacs job ;; Copyright (C) 1992 Free Software Foundation, Inc. ;; Author: Joe Wells <jbw@bucsf.bu.edu> ;; Adapted-By: ESR ;; Keywords: processes ;; 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., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; The purpose of this library is to handle command line arguments ;; when you resume an existing Emacs job. ;; In order to use it, you must put this code in your .emacs file. ;; (add-hook 'suspend-hook 'resume-suspend-hook) ;; (add-hook 'suspend-resume-hook 'resume-process-args) ;; You can't get the benefit of this library by using the `emacs' command, ;; since that always starts a new Emacs job. Instead you must use a ;; command called `edit' which knows how to resume an existing Emacs job ;; if you have one, or start a new Emacs job if you don't have one. ;; To define the `edit' command, run the script etc/emacs.csh (if you use CSH), ;; or etc/emacs.bash if you use BASH. You would normally do this in your ;; login script. ;; Stephan Gildea suggested bug fix (gildea@bbn.com). ;; Ideas from Michael DeCorte and other people. ;;; Code: (defvar resume-emacs-args-file (expand-file-name "~/.emacs_args") "*This file is where arguments are placed for a suspended emacs job.") (defvar resume-emacs-args-buffer " *Command Line Args*" "Buffer that is used by resume-process-args.") (defun resume-process-args () "Handler for command line args given when Emacs is resumed." (let ((start-buffer (current-buffer)) (args-buffer (get-buffer-create resume-emacs-args-buffer)) length args (command-line-default-directory default-directory)) (unwind-protect (progn (set-buffer args-buffer) (erase-buffer) ;; get the contents of resume-emacs-args-file (condition-case () (let ((result (insert-file-contents resume-emacs-args-file))) (setq length (car (cdr result)))) ;; the file doesn't exist, ergo no arguments (file-error (erase-buffer) (setq length 0))) (if (<= length 0) (setq args nil) ;; get the arguments from the buffer (goto-char (point-min)) (while (not (eobp)) (skip-chars-forward " \t\n") (let ((begin (point))) (skip-chars-forward "^ \t\n") (setq args (cons (buffer-substring begin (point)) args))) (skip-chars-forward " \t\n")) ;; arguments are now in reverse order (setq args (nreverse args)) ;; make sure they're not read again (erase-buffer)) (resume-write-buffer-to-file (current-buffer) resume-emacs-args-file) ;; if nothing was in buffer, args will be null (or (null args) (setq command-line-default-directory (file-name-as-directory (car args)) args (cdr args))) ;; actually process the arguments (command-line-1 args)) ;; If the command line args don't result in a find-file, the ;; buffer will be left in args-buffer. So we change back to the ;; original buffer. The reason I don't just use ;; (let ((default-directory foo)) ;; (command-line-1 args)) ;; in the context of the original buffer is because let does not ;; work properly with buffer-local variables. (if (eq (current-buffer) args-buffer) (set-buffer start-buffer))))) ;;;###autoload (defun resume-suspend-hook () "Clear out the file used for transmitting args when Emacs resumes." (save-excursion (set-buffer (get-buffer-create resume-emacs-args-buffer)) (erase-buffer) (resume-write-buffer-to-file (current-buffer) resume-emacs-args-file))) (defun resume-write-buffer-to-file (buffer file) "Writes the contents of BUFFER into FILE, if permissions allow." (if (not (file-writable-p file)) (error "No permission to write file %s" file)) (save-excursion (set-buffer buffer) (clear-visited-file-modtime) (save-restriction (widen) (write-region (point-min) (point-max) file nil 'quiet)) (set-buffer-modified-p nil))) (provide 'resume) ;;; resume.el ends here