# HG changeset patch # User Eric S. Raymond # Date 711778962 0 # Node ID 20674ae6bf52bca52395fda96b6006cefa4e5a00 # Parent 213978acbc1e9ebf454d67065704025214bc4175 *** empty log message *** diff -r 213978acbc1e -r 20674ae6bf52 lisp/=cl.el --- a/lisp/=cl.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=cl.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; cl.el --- Common-Lisp extensions for GNU Emacs Lisp. +;; Copyright (C) 1987, 1988, 1989 Free Software Foundation, Inc. + ;; Author: Cesar Quiroz -;; Last-Modified: 16 Mar 1992 ;; Keywords: extensions (defvar cl-version "2.0 beta 29 October 1989") -;; Copyright (C) 1987, 1988, 1989 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/=diary-lib.el --- a/lisp/=diary-lib.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=diary-lib.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; diary.el --- diary functions. +;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. + ;; Author: Edward M. Reingold -;; Last-Modified: 30 Jun 1992 ;; Keyword: calendar -;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/=gnus.el --- a/lisp/=gnus.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=gnus.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; gnus.el --- GNUS: an NNTP-based News Reader for GNU Emacs +;; Copyright (C) 1987, 1988, 1989, 1990 Free Software Foundation, Inc. + ;; Author: Masanobu UMEDA -;; Last-Modified: 10 Jun 1992 ;; Keywords: news ;; $Header: gnus.el,v 3.13 90/03/23 13:24:27 umerin Locked $ -;; Copyright (C) 1987, 1988, 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=gnusmail.el --- a/lisp/=gnusmail.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=gnusmail.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; gnusmail.el --- mail reply commands for GNUS newsreader +;; Copyright (C) 1990 Free Software Foundation, Inc. + ;; Author: Masanobu UMEDA -;; Last-Modified: 10 Jun 1992 ;; Keywords: news ;; $Header: gnusmail.el,v 1.1 90/03/23 13:24:39 umerin Locked $ -;; Copyright (C) 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=gnusmisc.el --- a/lisp/=gnusmisc.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=gnusmisc.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; gnusmisc.el --- miscellaneous commands for GNUS newsreader +;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. + ;; Author: Masanobu UMEDA -;; Last-Modified: 10 Jun 1992 ;; Keywords: news ;; $Header: gnusmisc.el,v 1.2 90/03/23 13:25:04 umerin Locked $ -;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=gnuspost.el --- a/lisp/=gnuspost.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=gnuspost.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; gnuspost.el --- post news commands for GNUS newsreader +;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. + ;; Author: Masanobu UMEDA -;; Last-Modified: 10 Jun 1992 ;; Keywords: news ;; $Header: gnuspost.el,v 1.2 90/03/23 13:25:16 umerin Locked $ -;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=isearch-old.el --- a/lisp/=isearch-old.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=isearch-old.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; isearch.el --- incremental search commands +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 30 Jun 1992 - -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/=medit.el --- a/lisp/=medit.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=medit.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;;; medit.el --- front-end to the MEDIT package for editing MDL +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Author: K. Shane Hartman ;; Maintainer: FSF -;; Last-Modified: 05 Apr 1991 ;; Keywords: languages -;; Copyright (C) 1985 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=mh-e.el --- a/lisp/=mh-e.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=mh-e.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,15 +1,14 @@ ;;; mh-e.el --- GNU Emacs interface to the MH mailer +;;; Copyright (C) 1985, 86, 87, 88, 89, 92 Free Software Foundation + ;; Author: James Larus ;; Version: 3.7 -;; Last-Modified: 30 Jun 1992 ;; Keywords: mail (defvar mh-e-RCS-id) (setq mh-e-RCS-id "$Header: /var/home/larus/lib/emacs/RCS/mh-e.el,v 3.1 90/09/28 15:47:58 larus Exp Locker: larus $") -;;; Copyright (C) 1985, 86, 87, 88, 89, 92 Free Software Foundation - ;; GNU Emacs is distributed in the hope that it will be useful, ;; but without any warranty. No author or distributor ;; accepts responsibility to anyone for the consequences of using it diff -r 213978acbc1e -r 20674ae6bf52 lisp/=netunam.el --- a/lisp/=netunam.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=netunam.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;;; netunam.el --- HP-UX RFA Commands +;; Copyright (C) 1988 Free Software Foundation, Inc. + ;; Author: Chris Hanson -;; Last-Modified: 31 Oct 1989 ;;; $Header: netunam.el,v 1.3 88/12/21 16:32:23 GMT cph Exp $ -;; Copyright (C) 1988 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/=nnspool.el --- a/lisp/=nnspool.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=nnspool.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,14 +1,13 @@ ;;; nnspool.el --- spool access using NNTP for GNU Emacs +;; Copyright (C) 1988, 1989 Fujitsu Laboratories LTD. +;; Copyright (C) 1988, 1989, 1990 Masanobu UMEDA + ;; Author: Masanobu UMEDA -;; Last-Modified: 16 Mar 1992 ;; Keywords: news ;; $Header: nnspool.el,v 1.10 90/03/23 13:25:25 umerin Locked $ -;; Copyright (C) 1988, 1989 Fujitsu Laboratories LTD. -;; Copyright (C) 1988, 1989, 1990 Masanobu UMEDA - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/=nntp.el --- a/lisp/=nntp.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/=nntp.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,14 +1,13 @@ ;;; nntp.el --- NNTP (RFC977) Interface for GNU Emacs +;; Copyright (C) 1987, 1988, 1989 Fujitsu Laboratories LTD. +;; Copyright (C) 1987, 1988, 1989, 1990 Masanobu UMEDA + ;; Author: Masanobu UMEDA -;; Last-Modified: 16 Mar 1992 ;; Keywords: news ;; $Header: nntp.el,v 3.10 90/03/23 13:25:27 umerin Locked $ -;; Copyright (C) 1987, 1988, 1989 Fujitsu Laboratories LTD. -;; Copyright (C) 1987, 1988, 1989, 1990 Masanobu UMEDA - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/abbrev.el --- a/lisp/abbrev.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/abbrev.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; abbrev.el --- abbrev mode commands for Emacs +;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 09 Jul 1992 - -;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/add-log.el --- a/lisp/add-log.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/add-log.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,7 +1,5 @@ ;;; add-log.el --- change log maintenance commands for Emacs -;; Maintainer: FSF - ;; Copyright (C) 1985, 86, 87, 88, 89, 90, 91, 1992 ;; Free Software Foundation, Inc. diff -r 213978acbc1e -r 20674ae6bf52 lisp/byte-run.el --- a/lisp/byte-run.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/byte-run.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;; byte-run.el --- byte-compiler support for inlining +;; Copyright (C) 1992 Free Software Foundation, Inc. + ;; Author: Jamie Zawinski ;; Hallvard Furuseth -;; Last-Modified: 13 Jul 1992 ;; Keywords: internal -;; Copyright (C) 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/calendar/appt.el --- a/lisp/calendar/appt.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/calendar/appt.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;;; appt.el --- appointment notification functions. +;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. + ;; Author: Neil Mager ;; Version: 2.1 -;; Last-Modified: 14 Jul 1992 ;; Keywords: calendar -;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/calendar/calendar.el --- a/lisp/calendar/calendar.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/calendar/calendar.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; calendar.el --- Calendar functions. +;;; Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc. + ;; Author: Edward M. Reingold -;; Last-Modified: 30 Jun 1992 ;; Keyword: calendar (defconst calendar-version "Version 4.02, released June 14, 1992") -;;; Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/calendar/holidays.el --- a/lisp/calendar/holidays.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/calendar/holidays.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; holidays.el --- holiday functions for the calendar package +;;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. + ;; Author: Edward M. Reingold -;; Last-Modified: 14 Jul 1992 ;; Keywords: calendar -;;; Copyright (C) 1989, 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, diff -r 213978acbc1e -r 20674ae6bf52 lisp/case-table.el --- a/lisp/case-table.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/case-table.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,10 @@ ;;; case-table.el ---code to extend the character set and support case tables. +;; Copyright (C) 1988 Free Software Foundation, Inc. + ;; Author: Howard Gayle ;; Maintainer: FSF -;; Last-Modified: 16 Mar 1992 - -;; Copyright (C) 1988 Free Software Foundation, Inc. +;; Keywords: i14n ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/cmuscheme.el --- a/lisp/cmuscheme.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/cmuscheme.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,7 +1,6 @@ ;;; cmuscheme.el -- Scheme process in a buffer. Adapted from tea.el. ;; Author: Olin Shivers -;; Last-Modified: 16 Mar 1992 ;; Keyword: processes, lisp ;;; Copyright Olin Shivers (1988) diff -r 213978acbc1e -r 20674ae6bf52 lisp/comint.el --- a/lisp/comint.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/comint.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;;; comint.el --- general command interpreter in a window stuff +;;; Copyright Olin Shivers (1988). + ;; Maintainer: Olin Shivers -;; Last-Modified: 16 Jul 1992 ;; Version: 2.03 ;; Keyword: estensions, processes -;;; Copyright Olin Shivers (1988). - ;;; This file is part of GNU Emacs. ;;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/dabbrev.el --- a/lisp/dabbrev.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/dabbrev.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,11 @@ ;;; dabbrev.el --- dynamic abbreviation package for GNU Emacs. +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + +;; Last-Modified: 16 Mar 1992 +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 16 Mar 1992 - -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/diff.el --- a/lisp/diff.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/diff.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; diff.el --- "DIFF" mode for handling output from unix diff utility. +;; Copyright (C) 1990 Free Software Foundation, Inc. + ;; Author: Frank P. Bresz ;; Maintainer: FSF ;; Created: 27 Jan 1989 -;; Last-Modified: 21 Dec 1992 ;; Keyword: unix, tools -;; Copyright (C) 1990 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/dired-aux.el --- a/lisp/dired-aux.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/dired-aux.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;; dired-aux.el --- directory browsing command support +;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + ;; Author: Sebastian Kremer . ;; Version: 5.234 -;; Last-Modified: 14 Jul 1992 - -;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/ebuff-menu.el --- a/lisp/ebuff-menu.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/ebuff-menu.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; ebuff-menu.el --- electric-buffer-list mode +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + ;; Author: Richard Mlynarik -;; Last-Modified: 21 Dec 1991 - -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/echistory.el --- a/lisp/echistory.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/echistory.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;;; echistory.el --- Electric Command History Mode +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Author: K. Shane Hartman ;; Maintainer: FSF -;; Last-Modified: 09 May 1991 - -;; Copyright (C) 1985 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/ehelp.el --- a/lisp/ehelp.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/ehelp.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; ehelp.el --- bindings for electric-help mode +;; Copyright (C) 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 16 Mar 1992 ;; Keywords: help, extensions -;; Copyright (C) 1986 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/emacs-lisp/autoload.el --- a/lisp/emacs-lisp/autoload.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emacs-lisp/autoload.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; autoload.el --- maintain autoloads in loaddefs.el. -;; Author: Roland McGrath -;; Last-Modified: 24 Jun 1992 -;; Keyword: internal - ;;; Copyright (C) 1991, 1992 Free Software Foundation, Inc. ;;; +;; Author: Roland McGrath +;; Keyword: internal + ;;; This program 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) diff -r 213978acbc1e -r 20674ae6bf52 lisp/emacs-lisp/bytecomp.el --- a/lisp/emacs-lisp/bytecomp.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,16 +1,15 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code. +;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. + ;; Author: Jamie Zawinski ;; Hallvard Furuseth -;; Last-Modified: 15 Jul 1992 ;; Keywords: internal ;; Subsequently modified by RMS. (defconst byte-compile-version "FSF 2.1") -;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify @@ -245,8 +244,17 @@ (defconst byte-compile-warning-types '(redefine callargs free-vars unresolved)) (defvar byte-compile-warnings (not noninteractive) "*List of warnings that the byte-compiler should issue (t for all). -Valid elements of this list are `callargs', `redefine', `free-vars', -and `unresolved'.") +Valid elements of this list are: +`free-vars' (references to variables not in the + current lexical scope) +`unresolved' (calls to unknown functions) +`callargs' (lambda calls with args that don't + match the lambda's definition) +`redefine' (function cell redefined from + a macro to a lambda or vice versa, + or redefined to take other args) +This variable defaults to nil in -batch mode, which is +slightly faster.") (defvar byte-compile-generate-call-tree nil "*Non-nil means collect call-graph information when compiling. diff -r 213978acbc1e -r 20674ae6bf52 lisp/emacs-lisp/edebug.el --- a/lisp/emacs-lisp/edebug.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emacs-lisp/edebug.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,7 +1,10 @@ -;;; edebug.el --- a source-level debugger for emacs lisp. +;;; edebug.el --- a source-level debugger for emacs lisp ;; Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc +;; Author: Daniel LaLiberte +;; Keywords: lisp, tools + ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -19,8 +22,9 @@ ;; file named COPYING. Among other things, the copyright notice ;; and this notice must be preserved on all copies. -;;;================================================================ -;;; This minor mode allows programmers to step through elisp source +;;;; Commentary: + +;;; This minor mode allows programmers to step through Emacs Lisp source ;;; code while executing, set breakpoints, etc. See the texinfo ;;; document (being constructed...) for more detailed instructions ;;; than contained here. Send me your enhancement, ideas, bugs, or @@ -152,7 +156,7 @@ ;;; ;;; Revision 1.4 89/02/14 22:58:34 liberte ;;; Fix broken breakpointing. -;;; Temporarily widen elisp buffer during edebug. +;;; Temporarily widen Emacs Lisp buffer during edebug. ;;; ;;; Revision 1.3 89/01/30 00:26:09 liberte ;;; More bug fixes for cond and let. @@ -186,6 +190,8 @@ ;; Use the "?" command in edebug to describe other commands. ;; See edebug.texinfo for more instructions. +;;; Code: + ;;; Options ;;; ------- @@ -198,7 +204,7 @@ uses edebug-defun. eval-region is called by eval-defun, eval-last-sexp, and eval-print-last-sexp. -You may wish to make this variable local to each elisp buffer by calling +You may wish to make this variable local to each Emacs Lisp buffer by calling (make-local-variable 'edebug-all-defuns) in your emacs-lisp-mode-hook. You can use the function edebug-all-defuns to toggle its value.") @@ -266,7 +272,7 @@ (defun edebug-last-sexp () "Return the last sexp before point in current buffer. -Assumes elisp syntax is active." +Assumes Emacs Lisp syntax is active." (car (read-from-string (buffer-substring @@ -852,7 +858,7 @@ (throw 'no-match nil)) (edebug-syntax-error "%s is not %s" form arg)))) -;; for loop defined in elisp manual +;; for loop defined in Emacs Lisp manual (put 'for 'edebug-form-hook '(symbolp 'from form 'to form 'do &rest form)) @@ -2243,7 +2249,7 @@ (defun edebug-mode () - "Mode for elisp buffers while in edebug. Under construction. + "Mode for Emacs Lisp buffers while in edebug. Under construction. There are both buffer local and global key bindings to several functions. E.g. edebug-step-through is bound to diff -r 213978acbc1e -r 20674ae6bf52 lisp/emacs-lisp/lisp-mode.el --- a/lisp/emacs-lisp/lisp-mode.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands. +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 03 Jun 1992 ;; Keywords: lisp, languages -;; Copyright (C) 1985 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/emacs-lisp/ring.el --- a/lisp/emacs-lisp/ring.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emacs-lisp/ring.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; ring.el --- handle rings of marks +;; Copyright (C) 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 22 Apr 1991 ;; Keywords: extensions -;; Copyright (C) 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/emulation/edt.el --- a/lisp/emulation/edt.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/emulation/edt.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,13 @@ ;;; edt.el --- EDT emulation in Emacs +;; Copyright (C) 1986 Free Software Foundation, Inc. + ;; Author: Mike Clarkson ;; Maintainer: FSF ;; Created: 27 Aug 1986 -;; Last-Modified: 09 May 1991 ;; Keywords: emulations -;; Copyright (C) 1986 Free Software Foundation, Inc. -;; It started from public domain code by Mike Clarkson +;; This started from public domain code by Mike Clarkson ;; but has been greatly altered. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/files.el --- a/lisp/files.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/files.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; files.el --- file input and output commands for Emacs +;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 09 Jul 92 - -;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/find-dired.el --- a/lisp/find-dired.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/find-dired.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,16 +1,15 @@ ;; find-dired.el --- run a `find' command and dired the output +;;; Copyright (C) 1991 Roland McGrath + ;; Author: Roland McGrath ;; Sebastian Kremer ;; Maintainer: Roland McGrath -;; Last-Modified: 16 Mar 1992 ;; Keywords: unix (defconst find-dired-version (substring "$Revision: 1.9 $" 11 -2) "$Id: find-dired.el,v 1.9 1991/11/11 13:24:31 sk Exp $") -;;; Copyright (C) 1991 Roland McGrath - ;;; This program 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) diff -r 213978acbc1e -r 20674ae6bf52 lisp/flow-ctrl.el --- a/lisp/flow-ctrl.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/flow-ctrl.el Wed Jul 22 04:22:42 1992 +0000 @@ -2,11 +2,13 @@ ;;; Copyright (C) 1990 Free Software Foundation, Inc. ;;; Copyright (C) 1991 Kevin Gallagher + ;; Author Kevin Gallagher ;; Maintainer: FSF ;; Adapted-By: ESR ;; Keywords: hardware +;;; This file is part of GNU Emacs. ;;; ;;; GNU Emacs is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY. No author or distributor accepts diff -r 213978acbc1e -r 20674ae6bf52 lisp/frame.el --- a/lisp/frame.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/frame.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; frame.el --- multi-frame management independent of window systems. +;;;; Copyright (C) 1990, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 09 Jul 92 ;; Keywords: internal -;;;; Copyright (C) 1990, 1992 Free Software Foundation, Inc. - ;;; This file is part of GNU Emacs. ;;; ;;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/help.el --- a/lisp/help.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/help.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; help.el --- help commands for Emacs +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 30 Jun 1992 ;; Keywords: help, internal -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/hexl.el --- a/lisp/hexl.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/hexl.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; hexl-mode.el --- edit a file in a hex dump format using the hexl filter. +;; Copyright (C) 1989 Free Software Foundation, Inc. + ;; Author: Keith Gabryelski -;; Last-Modified: 06 Mar 1991 - -;; Copyright (C) 1989 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/info.el --- a/lisp/info.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/info.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; info.el --- info package for Emacs. +;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 30 Jun 1992 ;; Keywords: help -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/informat.el --- a/lisp/informat.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/informat.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; informat.el --- info support functions package for Emacs +;; Copyright (C) 1986 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 09 May 1991 ;; Keywords: help -;; Copyright (C) 1986 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/isearch.el --- a/lisp/isearch.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/isearch.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;; isearch-mode.el --- incremental search minor mode. +;; Copyright (C) 1992 Free Software Foundation, Inc. + ;; Author: Daniel LaLiberte ;; Version: 1.2 -;; Last-Modified: 27 May 1992 - -;; Copyright (C) 1992 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/kermit.el --- a/lisp/kermit.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/kermit.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;;; kermit.el --- additions to shell mode for use with kermit, etc. +;; Copyright (C) 1988 Free Software Foundation, Inc. + ;; Author: Jeff Norden ;; Created: 15 Feb 1988 -;; Last-modified: 12 Mar 1992 - -;; Copyright (C) 1988 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/ledit.el --- a/lisp/ledit.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/ledit.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; ledit.el --- Emacs side of ledit interface +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 13 May 1991 ;; Keyord: languages -;; Copyright (C) 1985 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/lpr.el --- a/lisp/lpr.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/lpr.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; lpr.el --- print Emacs buffer on line printer. +;; Copyright (C) 1985, 1988, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 19 Apr 1992 ;; Keywords: unix -;; Copyright (C) 1985, 1988, 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/mail-extr.el --- a/lisp/mail/mail-extr.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/mail-extr.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; mail-extr.el --- extract full name and address from RFC 822 mail header. +;; Copyright (C) 1992 Free Software Foundation, Inc. + ;; Author: Joe Wells -;; Last-Modified: 7 Apr 1992 ;; Version: 1.0 ;; Adapted-By: ESR ;; Keywords: mail -;; Copyright (C) 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/mailabbrev.el --- a/lisp/mail/mailabbrev.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/mailabbrev.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,14 +1,13 @@ ;;; mailabbrev.el --- abbrev-expansion of mail aliases. +;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. + ;; Author: Jamie Zawinski ;; Roland McGrath ;; Created: 19 Oct 90 -;; Last-Modified: 13 Jun 92 ;; Keywords: mail ;;; ??? We must get papers for this or delete it. -;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. - ;;; This file is part of GNU Emacs. ;;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/mailalias.el --- a/lisp/mail/mailalias.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/mailalias.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; mailalias.el --- expand mailing address aliases defined in ~/.mailrc. +;; Copyright (C) 1985, 1987 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 01 Jun 1992 ;; Keywords: mail -;; Copyright (C) 1985, 1987 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/rmail.el --- a/lisp/mail/rmail.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/rmail.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs. +;; Copyright (C) 1985, 1986, 1987, 1988, 1991, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 24 Apr 1992 ;; Keywords: mail -;; Copyright (C) 1985, 1986, 1987, 1988, 1991, 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/rnewspost.el --- a/lisp/mail/rnewspost.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/rnewspost.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs +;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 30 May 1992 ;; Keywords: mail, news -;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/mail/sendmail.el --- a/lisp/mail/sendmail.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/mail/sendmail.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; sendmail.el --- mail sending commands for Emacs. +;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 24 Jun 1992 ;; Keywords: mail -;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/paths.el --- a/lisp/paths.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/paths.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; paths.el --- define pathnames for use by various Emacs commands. +;; Copyright (C) 1986, 1988 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 05 Dec 1991 ;; Keywords: internal -;; Copyright (C) 1986, 1988 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/play/gomoku.el --- a/lisp/play/gomoku.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/play/gomoku.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,11 @@ ;;; gomoku.el --- Gomoku game between you and Emacs +;; Copyright (C) 1988 Free Software Foundation, Inc. + ;; Author: Phillippe Schnoebelen -;; Last-Modified: 16 Mar 1992 ;; Adapted-By: ESR ;; Keywords: games -;; Copyright (C) 1988 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/play/life.el --- a/lisp/play/life.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/play/life.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs +;; Copyright (C) 1988 Free Software Foundation, Inc. + ;; Author: Kyle Jones -;; Last-Modified: 16 Mar 1992 ;; Keyword: games -;; Copyright (C) 1988 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/play/meese.el --- a/lisp/play/meese.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/play/meese.el Wed Jul 22 04:22:42 1992 +0000 @@ -3,6 +3,8 @@ ;; Maintainer: FSF ;; Keywords: games +;;; Code: + (defun protect-innocence-hook () (if (and (equal (file-name-nondirectory buffer-file-name) "sex.6") (not (y-or-n-p "Are you over 18? "))) diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/c-mode.el --- a/lisp/progmodes/c-mode.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/c-mode.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; c-mode.el --- C code editing commands for Emacs +;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 11 Jul 1992 ;; Keywords: c -;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/compile.el --- a/lisp/progmodes/compile.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/compile.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,14 +1,13 @@ ;;; compile.el --- run compiler as inferior of Emacs, parse error messages. +;; Copyright (C) 1985, 86, 87, 92 Free Software Foundation, Inc. + ;; Author: Roland McGrath ;; Maintainer: FSF -;; Last-Modified: 05 Jul 1992 ;; Keyword: tools, processes ;;;!!! dup removal is broken. -;; Copyright (C) 1985, 86, 87, 92 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/cplus-md.el --- a/lisp/progmodes/cplus-md.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/cplus-md.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,10 @@ ;;; c++-mode.el --- C++ code editing commands for Emacs +;; Copyright (C) 1985 Richard M. Stallman. + ;; Author: Dave Detlefs ;; Stewart Clamen ;; Maintainer: Dave Detlefs -;; Last-Modified: 09 May 1991 ;; Keywords: c ;;; Commentary: @@ -11,8 +12,6 @@ ;; 1987 Dave Detlefs (dld@cs.cmu.edu) ;; and Stewart Clamen (clamen@cs.cmu.edu). ;; Done by fairly faithful modification of: -;; c-mode.el, Copyright (C) 1985 Richard M. Stallman. - ;;; Change Log: ;; Feb, 1990 (Dave Detlefs, dld@cs.cmu.edu) @@ -99,13 +98,11 @@ (define-key c++-mode-map "\e\C-q" 'indent-c++-exp) (define-key c++-mode-map "\177" 'backward-delete-char-untabify) (define-key c++-mode-map "\t" 'c++-indent-command) - (define-key c++-mode-map "\C-c\C-i" 'c++-insert-header) - (define-key c++-mode-map "\C-c\C-\\" 'c++-macroize-region) - (define-key c++-mode-map "\C-c\C-c" 'c++-comment-region) - (define-key c++-mode-map "\C-c\C-u" 'c++-uncomment-region) - (define-key c++-mode-map "\e\C-a" 'c++-beginning-of-defun) - (define-key c++-mode-map "\e\C-e" 'c++-end-of-defun) - (define-key c++-mode-map "\e\C-x" 'c++-indent-defun)) +;; (define-key c++-mode-map "\C-c\C-i" 'c++-insert-header) + (define-key c++-mode-map "\C-c\C-\\" 'c-backslash-region) +;; (define-key c++-mode-map "\e\C-a" 'c++-beginning-of-defun) +;; (define-key c++-mode-map "\e\C-e" 'c++-end-of-defun) +;; (define-key c++-mode-map "\e\C-x" 'c++-indent-defun)) (defvar c++-mode-syntax-table nil "Syntax table used in C++ mode.") @@ -119,7 +116,7 @@ (defvar c++-continued-member-init-offset nil "*Extra indent for continuation lines of member inits; -NIL means to align with previous initializations rather than +nil means to align with previous initializations rather than with the colon on the first line.") (defvar c++-member-init-indent 0 "*Indentation level of member initializations in function declarations.") @@ -569,8 +566,8 @@ (looking-at "\\*/"))) (search-backward "/*" lim 'move)) ((and - (search-backward "//" (max (point-bol) lim) 'move) - (not (within-string-p (point) opoint)))) + (search-backward "//" (max (c++-point-bol) lim) 'move) + (not (c++-within-string-p (point) opoint)))) (t (beginning-of-line) (skip-chars-forward " \t") (if (looking-at "#") @@ -644,16 +641,16 @@ (>= (car indent-stack) 0)) ;; Line is on an existing nesting level. ;; Lines inside parens are handled specially. - (if (/= (char-after (car contain-stack)) ?{) + (if (/= (char-after (car contain-stack)) ?\{) (setq this-indent (car indent-stack)) ;; Line is at statement level. ;; Is it a new statement? Is it an else? ;; Find last non-comment character before this line (save-excursion (setq at-else (looking-at "else\\W")) - (setq at-brace (= (following-char) ?{)) + (setq at-brace (= (following-char) ?\{)) (c++-backward-to-noncomment opoint) - (if (not (memq (preceding-char) '(nil ?\, ?\; ?} ?: ?{))) + (if (not (memq (preceding-char) '(nil ?\, ?\; ?\} ?: ?\{))) ;; Preceding line did not end in comma or semi; ;; indent this line c-continued-statement-offset ;; more than previous. @@ -688,9 +685,9 @@ (setq this-indent (max 1 (+ this-indent c-label-offset)))) (if (looking-at "friend[ \t]class[ \t]") (setq this-indent (+ this-indent c++-friend-offset))) - (if (= (following-char) ?}) + (if (= (following-char) ?\}) (setq this-indent (- this-indent c-indent-level))) - (if (= (following-char) ?{) + (if (= (following-char) ?\{) (setq this-indent (+ this-indent c-brace-offset))) ;; Put chosen indentation into effect. (or (= (current-column) this-indent) @@ -706,8 +703,10 @@ (progn (indent-for-comment) (beginning-of-line)))))))))) - -(defun fill-C-comment () + +(defun fill-c++-comment () + "Fill a comment contained in consecutive lines containing point. +The fill lines remain a comment." (interactive) (save-excursion (let ((save fill-prefix)) @@ -726,28 +725,28 @@ (delete-char -1) (setq fill-prefix save)))) -(defun point-bol () +(defun c++-point-bol () "Returns the value of the point at the beginning of the current line." (save-excursion (beginning-of-line) (point))) -(defun c++-insert-header () - "Insert header denoting C++ code at top of buffer." - (interactive) - (save-excursion - (goto-char (point-min)) - (insert "// " - "This may look like C code, but it is really " - "-*- C++ -*-" - "\n\n"))) +;; (defun c++-insert-header () +;; "Insert header denoting C++ code at top of buffer." +;; (interactive) +;; (save-excursion +;; (goto-char (point-min)) +;; (insert "// " +;; "This may look like C code, but it is really " +;; "-*- C++ -*-" +;; "\n\n"))) -(defun within-string-p (point1 point2) +(defun c++-within-string-p (point1 point2) "Returns true if number of double quotes between two points is odd." (let ((s (buffer-substring point1 point2))) - (not (zerop (mod (count-char-in-string ?\" s) 2))))) + (not (zerop (% (c++-count-char-in-string ?\" s) 2))))) -(defun count-char-in-string (c s) +(defun c++-count-char-in-string (c s) (let ((count 0) (pos 0)) (while (< pos (length s)) @@ -755,227 +754,147 @@ (setq pos (1+ pos))) count)) -;;; This page covers "macroization;" making C++ parameterized types -;;; via macros. - -(defvar c++-default-macroize-column 78 - "Place to insert backslashes.") - -(defun c++-macroize-region (from to arg) - "Insert backslashes at end of every line in region. Useful for defining cpp -macros. If called with negative argument, will remove trailing backslashes, -so that indentation will work right." - (interactive "r\np") - (save-excursion - (goto-char from) - (beginning-of-line 1) - (let ((line (count-lines (point-min) (point))) - (to-line (save-excursion (goto-char to) - (count-lines (point-min) (point))))) - (while (< line to-line) - (backslashify-current-line (> arg 0)) - (next-line 1) (setq line (1+ line)))))) +;; rms: This page is creeping featurism, and not worth having. -(defun backslashify-current-line (doit) - (end-of-line 1) - (cond - (doit - ;; Note that "\\\\" is needed to get one backslash. - (if (not (save-excursion (forward-char -1) (looking-at "\\\\"))) - (progn - (if (>= (current-column) c++-default-macroize-column) - (insert " \\") - (while (<= (current-column) c++-default-macroize-column) - (insert "\t") (end-of-line)) - (delete-char -1) - (while (< (current-column) c++-default-macroize-column) - (insert " ") (end-of-line)) - (insert "\\"))))) - (t - (forward-char -1) - (if (looking-at "\\\\") - (progn (skip-chars-backward " \t") - (kill-line)))))) - - -;;; This page covers commenting out multiple lines. - -(defun c++-comment-region () - "Comment out all lines in a region between mark and current point. -Inserts \"// \" (`comment-start') in front of each line." - (interactive) - (let* ((m (if (eq (mark) nil) (error "Mark is not set!") (mark))) - (start (if (< (point) m) (point) m)) - (end (if (> (point) m) (point) m)) - (mymark (copy-marker end))) - (save-excursion - (goto-char start) - (while (< (point) (marker-position mymark)) - (beginning-of-line) - (insert comment-start) - (beginning-of-line) - (next-line 1))))) - -(defun c++-uncomment-region () - "Uncomment all lines in region between mark and current point. -Deletes the leading \"// \" (`comment-start') from each line, if any." - (interactive) - (let* ((m (if (eq (mark) nil) (error "Mark is not set!") (mark))) - (start (if (< (point) m) (point) m)) - (end (if (> (point) m) (point) m)) - (mymark (copy-marker end)) - (len (length comment-start)) - (char (string-to-char comment-start))) - (save-excursion - (goto-char start) - (while (< (point) (marker-position mymark)) - (beginning-of-line) - (if (looking-at (concat " *" comment-start)) - (progn - (zap-to-char 1 char) - (delete-char len))) - (beginning-of-line) - (next-line 1))))) - ;;; Below are two regular expressions that attempt to match defuns ;;; "strongly" and "weakly." The strong one almost reconstructs the ;;; grammar of C++; the weak one just figures anything id or curly on ;;; the left begins a defun. The constant "c++-match-header-strongly" ;;; determines which to use; the default is the weak one. -(defvar c++-match-header-strongly nil - "*If nil, use `c++-defun-header-weak' to identify beginning of definitions. -If non-nil, use `c++-defun-header-strong'.") - -(defvar c++-defun-header-strong-struct-equivs "\\(class\\|struct\\|enum\\)" - "Regexp to match names of structure declaration blocks in C++.") - -(defconst c++-defun-header-strong - (let* - (; valid identifiers - ;; There's a real wierdness here -- if I switch the below - (id "\\(\\w\\|_\\)+") - ;; to be - ;; (id "\\(_\\|\\w\\)+") - ;; things no longer work right. Try it and see! - - ; overloadable operators - (op-sym1 - "[---+*/%^&|~!=<>]\\|[---+*/%^&|<>=!]=\\|<<=?\\|>>=?") - (op-sym2 - "&&\\|||\\|\\+\\+\\|--\\|()\\|\\[\\]") - (op-sym (concat "\\(" op-sym1 "\\|" op-sym2 "\\)")) - ; whitespace - (middle "[^\\*]*\\(\\*+[^/\\*][^\\*]*\\)*") - (c-comment (concat "/\\*" middle "\\*+/")) - (wh (concat "\\(\\s \\|\n\\|//.*$\\|" c-comment "\\)")) - (wh-opt (concat wh "*")) - (wh-nec (concat wh "+")) - (oper (concat "\\(" "operator" "\\(" - wh-opt op-sym "\\|" wh-nec id "\\)" "\\)")) - (dcl-list "([^():]*)") - (func-name (concat "\\(" oper "\\|" id "::" id "\\|" id "\\)")) - (inits - (concat "\\(:" - "\\(" wh-opt id "(.*\\()" wh-opt "," "\\)\\)*" - wh-opt id "(.*)" wh-opt "{" - "\\|" wh-opt "{\\)")) - (type-name (concat - "\\(" c++-defun-header-strong-struct-equivs wh-nec "\\)?" - id)) - (type (concat "\\(const" wh-nec "\\)?" - "\\(" type-name "\\|" type-name wh-opt "\\*+" "\\|" - type-name wh-opt "&" "\\)")) - (modifier "\\(inline\\|virtual\\|overload\\|auto\\|static\\)") - (modifiers (concat "\\(" modifier wh-nec "\\)*")) - (func-header - ;; type arg-dcl - (concat modifiers type wh-nec func-name wh-opt dcl-list wh-opt inits)) - (inherit (concat "\\(:" wh-opt "\\(public\\|private\\)?" - wh-nec id "\\)")) - (cs-header (concat - c++-defun-header-strong-struct-equivs - wh-nec id wh-opt inherit "?" wh-opt "{"))) - (concat "^\\(" func-header "\\|" cs-header "\\)")) - "Strongly-defined regexp to match beginning of structure or function def.") - - -;; This part has to do with recognizing defuns. - -;; The weak convention we will use is that a defun begins any time -;; there is a left curly brace, or some identifier on the left margin, -;; followed by a left curly somewhere on the line. (This will also -;; incorrectly match some continued strings, but this is after all -;; just a weak heuristic.) Suggestions for improvement (short of the -;; strong scheme shown above) are welcomed. - -(defconst c++-defun-header-weak "^{\\|^[_a-zA-Z].*{" - "Weakly-defined regexp to match beginning of structure or function def.") - -(defun c++-beginning-of-defun (arg) - (interactive "p") - (let ((c++-defun-header (if c++-match-header-strongly - c++-defun-header-strong - c++-defun-header-weak))) - (cond ((or (= arg 0) (and (> arg 0) (bobp))) nil) - ((and (not (looking-at c++-defun-header)) - (let ((curr-pos (point)) - (open-pos (if (search-forward "{" nil 'move) - (point))) - (beg-pos - (if (re-search-backward c++-defun-header nil 'move) - (match-beginning 0)))) - (if (and open-pos beg-pos - (< beg-pos curr-pos) - (> open-pos curr-pos)) - (progn - (goto-char beg-pos) - (if (= arg 1) t nil));; Are we done? - (goto-char curr-pos) - nil)))) - (t - (if (and (looking-at c++-defun-header) (not (bobp))) - (forward-char (if (< arg 0) 1 -1))) - (and (re-search-backward c++-defun-header nil 'move (or arg 1)) - (goto-char (match-beginning 0))))))) - - -(defun c++-end-of-defun (arg) - (interactive "p") - (let ((c++-defun-header (if c++-match-header-strongly - c++-defun-header-strong - c++-defun-header-weak))) - (if (and (eobp) (> arg 0)) - nil - (if (and (> arg 0) (looking-at c++-defun-header)) (forward-char 1)) - (let ((pos (point))) - (c++-beginning-of-defun - (if (< arg 0) - (- (- arg (if (eobp) 0 1))) - arg)) - (if (and (< arg 0) (bobp)) - t - (if (re-search-forward c++-defun-header nil 'move) - (progn (forward-char -1) - (forward-sexp) - (beginning-of-line 2))) - (if (and (= pos (point)) - (re-search-forward c++-defun-header nil 'move)) - (c++-end-of-defun 1)))) - t))) - -(defun c++-indent-defun () - "Indents the current function definition, struct or class declaration." - (interactive) - (let ((restore (point))) - (c++-end-of-defun 1) - (beginning-of-line 1) - (let ((end (point))) - (c++-beginning-of-defun 1) - (while (<= (point) end) - (c++-indent-line) - (next-line 1) - (beginning-of-line 1))) - (goto-char restore))) +;; (defvar c++-match-header-strongly nil +;; "*If nil, use `c++-defun-header-weak' to identify beginning of definitions. +;; If non-nil, use `c++-defun-header-strong'.") +;; +;; (defvar c++-defun-header-strong-struct-equivs "\\(class\\|struct\\|enum\\)" +;; "Regexp to match names of structure declaration blocks in C++.") +;; +;; (defconst c++-defun-header-strong +;; (let* +;; (; valid identifiers +;; ;; There's a real wierdness here -- if I switch the below +;; (id "\\(\\w\\|_\\)+") +;; ;; to be +;; ;; (id "\\(_\\|\\w\\)+") +;; ;; things no longer work right. Try it and see! +;; +;; ; overloadable operators +;; (op-sym1 +;; "[---+*/%^&|~!=<>]\\|[---+*/%^&|<>=!]=\\|<<=?\\|>>=?") +;; (op-sym2 +;; "&&\\|||\\|\\+\\+\\|--\\|()\\|\\[\\]") +;; (op-sym (concat "\\(" op-sym1 "\\|" op-sym2 "\\)")) +;; ; whitespace +;; (middle "[^\\*]*\\(\\*+[^/\\*][^\\*]*\\)*") +;; (c-comment (concat "/\\*" middle "\\*+/")) +;; (wh (concat "\\(\\s \\|\n\\|//.*$\\|" c-comment "\\)")) +;; (wh-opt (concat wh "*")) +;; (wh-nec (concat wh "+")) +;; (oper (concat "\\(" "operator" "\\(" +;; wh-opt op-sym "\\|" wh-nec id "\\)" "\\)")) +;; (dcl-list "([^():]*)") +;; (func-name (concat "\\(" oper "\\|" id "::" id "\\|" id "\\)")) +;; (inits +;; (concat "\\(:" +;; "\\(" wh-opt id "(.*\\()" wh-opt "," "\\)\\)*" +;; wh-opt id "(.*)" wh-opt "{" +;; "\\|" wh-opt "{\\)")) +;; (type-name (concat +;; "\\(" c++-defun-header-strong-struct-equivs wh-nec "\\)?" +;; id)) +;; (type (concat "\\(const" wh-nec "\\)?" +;; "\\(" type-name "\\|" type-name wh-opt "\\*+" "\\|" +;; type-name wh-opt "&" "\\)")) +;; (modifier "\\(inline\\|virtual\\|overload\\|auto\\|static\\)") +;; (modifiers (concat "\\(" modifier wh-nec "\\)*")) +;; (func-header +;; ;; type arg-dcl +;; (concat modifiers type wh-nec func-name wh-opt dcl-list wh-opt inits)) +;; (inherit (concat "\\(:" wh-opt "\\(public\\|private\\)?" +;; wh-nec id "\\)")) +;; (cs-header (concat +;; c++-defun-header-strong-struct-equivs +;; wh-nec id wh-opt inherit "?" wh-opt "{"))) +;; (concat "^\\(" func-header "\\|" cs-header "\\)")) +;; "Strongly-defined regexp to match beginning of structure or function def.") +;; +;; +;; ;; This part has to do with recognizing defuns. +;; +;; ;; The weak convention we will use is that a defun begins any time +;; ;; there is a left curly brace, or some identifier on the left margin, +;; ;; followed by a left curly somewhere on the line. (This will also +;; ;; incorrectly match some continued strings, but this is after all +;; ;; just a weak heuristic.) Suggestions for improvement (short of the +;; ;; strong scheme shown above) are welcomed. +;; +;; (defconst c++-defun-header-weak "^{\\|^[_a-zA-Z].*{" +;; "Weakly-defined regexp to match beginning of structure or function def.") +;; +;; (defun c++-beginning-of-defun (arg) +;; (interactive "p") +;; (let ((c++-defun-header (if c++-match-header-strongly +;; c++-defun-header-strong +;; c++-defun-header-weak))) +;; (cond ((or (= arg 0) (and (> arg 0) (bobp))) nil) +;; ((and (not (looking-at c++-defun-header)) +;; (let ((curr-pos (point)) +;; (open-pos (if (search-forward "{" nil 'move) +;; (point))) +;; (beg-pos +;; (if (re-search-backward c++-defun-header nil 'move) +;; (match-beginning 0)))) +;; (if (and open-pos beg-pos +;; (< beg-pos curr-pos) +;; (> open-pos curr-pos)) +;; (progn +;; (goto-char beg-pos) +;; (if (= arg 1) t nil));; Are we done? +;; (goto-char curr-pos) +;; nil)))) +;; (t +;; (if (and (looking-at c++-defun-header) (not (bobp))) +;; (forward-char (if (< arg 0) 1 -1))) +;; (and (re-search-backward c++-defun-header nil 'move (or arg 1)) +;; (goto-char (match-beginning 0))))))) +;; +;; +;; (defun c++-end-of-defun (arg) +;; (interactive "p") +;; (let ((c++-defun-header (if c++-match-header-strongly +;; c++-defun-header-strong +;; c++-defun-header-weak))) +;; (if (and (eobp) (> arg 0)) +;; nil +;; (if (and (> arg 0) (looking-at c++-defun-header)) (forward-char 1)) +;; (let ((pos (point))) +;; (c++-beginning-of-defun +;; (if (< arg 0) +;; (- (- arg (if (eobp) 0 1))) +;; arg)) +;; (if (and (< arg 0) (bobp)) +;; t +;; (if (re-search-forward c++-defun-header nil 'move) +;; (progn (forward-char -1) +;; (forward-sexp) +;; (beginning-of-line 2))) +;; (if (and (= pos (point)) +;; (re-search-forward c++-defun-header nil 'move)) +;; (c++-end-of-defun 1)))) +;; t))) +;; +;; (defun c++-indent-defun () +;; "Indents the current function definition, struct or class declaration." +;; (interactive) +;; (let ((restore (point))) +;; (c++-end-of-defun 1) +;; (beginning-of-line 1) +;; (let ((end (point))) +;; (c++-beginning-of-defun 1) +;; (while (<= (point) end) +;; (c++-indent-line) +;; (next-line 1) +;; (beginning-of-line 1))) +;; (goto-char restore))) ;;; c++-mode.el ends here diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/etags.el --- a/lisp/progmodes/etags.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/etags.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,11 @@ ;; etags.el --- etags facility for Emacs +;; Copyright (C) 1985, 1986, 1988, 1989, 1991, 1992 +;; Free Software Foundation, Inc. + ;; Author: Roland McGrath ;; Keywords: tools -;; Copyright (C) 1985, 1986, 1988, 1989, 1991, 1992 -;; Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/hideif.el --- a/lisp/progmodes/hideif.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/hideif.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; hide-ifdef-mode.el --- hides selected code within ifdef. +;;; Copyright (C) 1988 Brian Marick and Daniel LaLiberte + ;; Author: Dan LaLiberte -;; Last-Modified: 06 Mar 1991 ;; Keywords: c ;;; $Header: hide-ifdef-mode.el,v 1.7 88/02/16 03:12:58 liberte Exp $ -;;; Copyright (C) 1988 Brian Marick and Daniel LaLiberte - ;;; Commentary: ;;; Written by Brian Marick, at Gould, Computer Systems Division, Urbana IL. diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/inf-lisp.el --- a/lisp/progmodes/inf-lisp.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/inf-lisp.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,10 @@ ;;; inf-lisp.el --- an inferior-lisp mode +;;; Copyright Olin Shivers (1988). + ;; Author: Olin Shivers -;; Last-Modified: 16 Jul 1992 ;; Keyword: processes, lisp -;;; Copyright Olin Shivers (1988). - ;;; This file is part of GNU Emacs. ;;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/perl-mode.el --- a/lisp/progmodes/perl-mode.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/perl-mode.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,12 +1,12 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs +;; Copyright (C) 1990 William F. Mann + ;; Author: William F. Mann ;; Maintainer: FSF -;; Last-Modified: 21 Dec 1991 ;; Adapted-By: ESR ;; Keywords: languages -;; Copyright (C) 1990 William F. Mann ;; Adapted from C code editing commands 'c-mode.el', Copyright 1987 by the ;; Free Software Foundation, under terms of its General Public License. diff -r 213978acbc1e -r 20674ae6bf52 lisp/progmodes/scheme.el --- a/lisp/progmodes/scheme.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/progmodes/scheme.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,13 +1,12 @@ ;;; scheme.el --- Scheme mode, and its idiosyncratic commands. +;; Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. + ;; Author: Bill Rozas -;; Last-Modified: 16 Mar 1992 ;; Keywords: languages, lisp ;;; $Header: scheme.el,v 1.7 88/07/15 20:20:00 GMT cph Exp $ -;; Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/replace.el --- a/lisp/replace.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/replace.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; replace.el --- replace commands for Emacs. +;; Copyright (C) 1985, 86, 87, 88, 89, 90, 91, 92 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 09 Jul 1992 - -;; Copyright (C) 1985, 86, 87, 88, 89, 90, 91, 92 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/reposition.el --- a/lisp/reposition.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/reposition.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;;; reposition.el --- center a Lisp function or comment on the screen +;; Copyright (C) 1991 Free Software Foundation, Inc. + ;; Author: Michael D. Ernst ;; Maintainer: FSF -;; Last-Modified: 13 May 1991 - -;; Copyright (C) 1991 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/simple.el --- a/lisp/simple.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/simple.el Wed Jul 22 04:22:42 1992 +0000 @@ -6,7 +6,7 @@ ;; 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 1, or (at your option) +;; 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, @@ -18,6 +18,7 @@ ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; Code: (defun open-line (arg) "Insert a newline and leave point before it. If there is a fill @@ -237,10 +238,17 @@ (/ (buffer-size) 10)) (/ (* (buffer-size) (prefix-numeric-value arg)) 10))) (point-max))) + ;; If we went to a place in the middle of the buffer, + ;; adjust it to the beginning of a line. (if arg (forward-line 1) - ;; Scroll to put point near bottom--show nearly maximum amount of text, - ;; but leave room to add something. - (recenter -3))) + ;; If the end of the buffer is not already on the screen, + ;; then scroll specially to put it near, but not at, the bottom. + (if (let ((old-point (point))) + (save-excursion + (goto-char (window-start)) + (vertical-motion (window-height)) + (< (point) old-point))) + (recenter -3)))) (defun mark-whole-buffer () "Put point at beginning and mark at end of buffer. @@ -854,20 +862,21 @@ "Save the region as if killed, but don't kill it." (interactive "r") (copy-region-as-kill beg end) - (save-excursion - (let ((other-end (if (= (point) beg) end beg))) - (if (pos-visible-in-window-p other-end (selected-window)) - (progn - (goto-char other-end) - (sit-for 1)) - (let* ((killed-text (current-kill 0)) - (message-len (min (length killed-text) 40))) - (message - (if (= (point) beg) - (format "Killed until \"%s\"" - (substring killed-text (- message-len))) - (format "Killed from \"%s\"" - (substring killed-text 0 message-len))))))))) + (if (interactive-p) + (save-excursion + (let ((other-end (if (= (point) beg) end beg))) + (if (pos-visible-in-window-p other-end (selected-window)) + (progn + (goto-char other-end) + (sit-for 1)) + (let* ((killed-text (current-kill 0)) + (message-len (min (length killed-text) 40))) + (if (= (point) beg) + ;; Don't say "killed"; that is misleading. + (message "Saved text until \"%s\"" + (substring killed-text (- message-len))) + (message "Saved text from \"%s\"" + (substring killed-text 0 message-len))))))))) (defun append-next-kill () "Cause following command, if kill, to append to previous kill." @@ -1701,7 +1710,10 @@ (defun set-variable (var val) "Set VARIABLE to VALUE. VALUE is a Lisp object. When using this interactively, supply a Lisp expression for VALUE. -If you want VALUE to be a string, you must surround it with doublequotes." +If you want VALUE to be a string, you must surround it with doublequotes. + +If VARIABLE has a `variable-interactive' property, that is used as if +it were the arg to `interactive' (which see) to interactively read the value." (interactive (let* ((var (read-variable "Set variable: ")) (minibuffer-help-form @@ -1720,89 +1732,14 @@ (prin1 (symbol-value var)))) nil))))) (list var - (eval-minibuffer (format "Set %s to value: " var))))) + (let ((prop (get var 'variable-interactive))) + (if prop + ;; Use VAR's `variable-interactive' property + ;; as an interactive spec for prompting. + (call-interactively (list 'lambda '(arg) + (list 'interactive prop) + 'arg)) + (eval-minibuffer (format "Set %s to value: " var))))))) (set var val)) - -;These commands are defined in editfns.c -;but they are not assigned to keys there. -(put 'narrow-to-region 'disabled t) -(define-key ctl-x-map "n" 'narrow-to-region) -(define-key ctl-x-map "w" 'widen) - -(define-key global-map "\C-j" 'newline-and-indent) -(define-key global-map "\C-m" 'newline) -(define-key global-map "\C-o" 'open-line) -(define-key esc-map "\C-o" 'split-line) -(define-key global-map "\C-q" 'quoted-insert) -(define-key esc-map "^" 'delete-indentation) -(define-key esc-map "\\" 'delete-horizontal-space) -(define-key esc-map "m" 'back-to-indentation) -(define-key ctl-x-map "\C-o" 'delete-blank-lines) -(define-key esc-map " " 'just-one-space) -(define-key esc-map "z" 'zap-to-char) -(define-key esc-map "=" 'count-lines-region) -(define-key ctl-x-map "=" 'what-cursor-position) -(define-key esc-map "\e" 'eval-expression) -(define-key ctl-x-map "\e" 'repeat-complex-command) -(define-key ctl-x-map "u" 'advertised-undo) -(define-key global-map "\C-_" 'undo) -(define-key esc-map "!" 'shell-command) -(define-key esc-map "|" 'shell-command-on-region) - -(define-key global-map "\C-u" 'universal-argument) -(let ((i ?0)) - (while (<= i ?9) - (define-key esc-map (char-to-string i) 'digit-argument) - (setq i (1+ i)))) -(define-key esc-map "-" 'negative-argument) - -(define-key global-map "\C-k" 'kill-line) -(define-key global-map "\C-w" 'kill-region) -(define-key esc-map "w" 'kill-ring-save) -(define-key esc-map "\C-w" 'append-next-kill) -(define-key global-map "\C-y" 'yank) -(define-key esc-map "y" 'yank-pop) - -(define-key ctl-x-map "a" 'append-to-buffer) - -(define-key global-map "\C-@" 'set-mark-command) -(define-key ctl-x-map "\C-x" 'exchange-point-and-mark) - -(define-key global-map "\C-n" 'next-line) -(define-key global-map "\C-p" 'previous-line) -(define-key ctl-x-map "\C-n" 'set-goal-column) - -(define-key global-map [up] 'previous-line) -(define-key global-map [down] 'next-line) -(define-key global-map [left] 'backward-char) -(define-key global-map [right] 'forward-char) - -(define-key global-map "\C-t" 'transpose-chars) -(define-key esc-map "t" 'transpose-words) -(define-key esc-map "\C-t" 'transpose-sexps) -(define-key ctl-x-map "\C-t" 'transpose-lines) - -(define-key esc-map ";" 'indent-for-comment) -(define-key esc-map "j" 'indent-new-comment-line) -(define-key esc-map "\C-j" 'indent-new-comment-line) -(define-key ctl-x-map ";" 'set-comment-column) -(define-key ctl-x-map "f" 'set-fill-column) -(define-key ctl-x-map "$" 'set-selective-display) - -(define-key esc-map "@" 'mark-word) -(define-key esc-map "f" 'forward-word) -(define-key esc-map "b" 'backward-word) -(define-key esc-map "d" 'kill-word) -(define-key esc-map "\177" 'backward-kill-word) - -(define-key esc-map "<" 'beginning-of-buffer) -(define-key esc-map ">" 'end-of-buffer) -(define-key ctl-x-map "h" 'mark-whole-buffer) -(define-key esc-map "\\" 'delete-horizontal-space) - -(fset 'mode-specific-command-prefix (make-sparse-keymap)) -(defconst mode-specific-map (symbol-function 'mode-specific-command-prefix) - "Keymap for characters following C-c.") -(define-key global-map "\C-c" 'mode-specific-command-prefix) ;;; simple.el ends here diff -r 213978acbc1e -r 20674ae6bf52 lisp/textmodes/fill.el --- a/lisp/textmodes/fill.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/textmodes/fill.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,11 +1,9 @@ ;;; fill.el --- fill commands for Emacs -;; Maintainer: FSF -;; Last-Modified: 24 Jun 1992 +;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + ;; Keywords: wp -;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff -r 213978acbc1e -r 20674ae6bf52 lisp/textmodes/page.el --- a/lisp/textmodes/page.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/textmodes/page.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,9 +1,8 @@ ;;; page.el --- page motion commands for emacs. +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Maintainer: FSF -;; Last-Modified: 01 May 1992 - -;; Copyright (C) 1985 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -r 213978acbc1e -r 20674ae6bf52 lisp/textmodes/picture.el --- a/lisp/textmodes/picture.el Wed Jul 22 04:22:30 1992 +0000 +++ b/lisp/textmodes/picture.el Wed Jul 22 04:22:42 1992 +0000 @@ -1,10 +1,9 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model. +;; Copyright (C) 1985 Free Software Foundation, Inc. + ;; Author: K. Shane Hartman ;; Maintainer: FSF -;; Last-Modified: 16 Mar 1992 - -;; Copyright (C) 1985 Free Software Foundation, Inc. ;; This file is part of GNU Emacs.