diff options
Diffstat (limited to 'lisp/emacs-lisp')
62 files changed, 129 insertions, 113 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 9f6a0b782ac..480c838b878 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1,6 +1,7 @@ ;;; advice.el --- an overloading mechanism for Emacs Lisp functions -;; Copyright (C) 1993,1994,2000,01,2004,2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2000, 2001, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el index 35cfba617c3..d12b1dcbcb5 100644 --- a/lisp/emacs-lisp/assoc.el +++ b/lisp/emacs-lisp/assoc.el @@ -1,6 +1,6 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index ca28fc06783..ec5446eef38 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: Kim F. Storm <storm@cua.dk> diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 852c33cb41b..3cd6fe53bad 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1,7 +1,7 @@ ;; autoload.el --- maintain autoloads in loaddefs.el ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Keywords: maint diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el index 7c7023fc85e..627c2cfdbc7 100644 --- a/lisp/emacs-lisp/backquote.el +++ b/lisp/emacs-lisp/backquote.el @@ -1,6 +1,7 @@ ;;; backquote.el --- implement the ` Lisp construct -;; Copyright (C) 1990, 92, 1994, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rick Sladkey <jrs@world.std.com> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 6de2eef53a8..c2be5a5c3b5 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -1,6 +1,6 @@ ;;; benchmark.el --- support for benchmarking code -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: lisp, extensions diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 5fa9835bea1..f2b1d19a696 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -1,6 +1,6 @@ ;;; bindat.el --- binary data structure packing and unpacking. -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Assignment name: struct.el diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 2aca0176df2..bd1938d31c0 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1,7 +1,7 @@ ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler -;; Copyright (c) 1991, 1994, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index b4af4b44009..c31036f02ed 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -1,6 +1,6 @@ ;;; byte-run.el --- byte-compiler support for inlining -;; Copyright (C) 1992, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 0dd0ead9d61..93817034c19 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1,7 +1,7 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 2ed1f9b552b..6b6d3ba4393 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1,6 +1,7 @@ ;;; checkdoc.el --- check documentation strings for style requirements -;;; Copyright (C) 1997, 1998, 2001, 2004 Free Software Foundation +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 0.6.2 diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el index 9ced7879114..66425576b5f 100644 --- a/lisp/emacs-lisp/cl-compat.el +++ b/lisp/emacs-lisp/cl-compat.el @@ -1,6 +1,6 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 16e777ed2b5..4ac1a72b0d7 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,7 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 1bcd2c72edc..2497e02dc62 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -1,6 +1,7 @@ ;;; cl-indent.el --- enhanced lisp-indent mode -;; Copyright (C) 1987, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> ;; Created: July 1987 diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 98c9a2207ee..ba7845aaa9c 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,6 +1,6 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index ac3089f2efb..650a341f955 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -1,6 +1,6 @@ ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*- -;; Copyright (C) 1993, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index d29c18dd0ff..8875366cc9c 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -1,6 +1,6 @@ ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index c1a0ad156ed..03eac0abd0a 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -1,7 +1,7 @@ ;;; copyright.el --- update the copyright notice in current buffer -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: maint, tools diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 8e52a42921a..46ae6186e44 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -1,7 +1,7 @@ ;;; crm.el --- read multiple strings with completion -;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el index 96fbe737c26..102efdae9b9 100644 --- a/lisp/emacs-lisp/cust-print.el +++ b/lisp/emacs-lisp/cust-print.el @@ -1,6 +1,6 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Adapted-By: ESR diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 4f968c60b5e..58b12376b05 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -1,7 +1,7 @@ ;;; debug.el --- debuggers and related commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2001, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, tools, maint @@ -709,7 +709,7 @@ Redefining FUNCTION also cancels it." (let ((fn (function-called-at-point)) val) (when (debugger-special-form-p fn) (setq fn nil)) - (setq val (completing-read + (setq val (completing-read (if fn (format "Debug on entry to function (default %s): " fn) "Debug on entry to function: ") diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 764f58bcd23..8e1f79f95ee 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,8 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index fa368902f69..fa0898f609e 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el @@ -1,6 +1,7 @@ ;;; disass.el --- disassembler for compiled Emacs Lisp code -;; Copyright (C) 1986, 1991, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1991, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Doug Cutting <doug@csli.stanford.edu> ;; Jamie Zawinski <jwz@lucid.com> diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 09abd272e53..da0ca735efd 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -194,28 +194,20 @@ For example, you could write Use the command `%s' to change this variable." pretty-name mode)) (make-variable-buffer-local ',mode)) - (let ((curfile (or (and (boundp 'byte-compile-current-file) - byte-compile-current-file) - load-file-name)) - base-doc-string) - (setq base-doc-string "Non-nil if %s is enabled. -See the command `%s' for a description of this minor-mode. + (let ((base-doc-string + (concat "Non-nil if %s is enabled. +See the command `%s' for a description of this minor-mode." + (if body " Setting this variable directly does not take effect; -use either \\[customize] or the function `%s'.") - (if (null body) - (setq base-doc-string "Non-nil if %s is enabled. -See the command `%s' for a description of this minor-mode.")) - +use either \\[customize] or the function `%s'.")))) `(defcustom ,mode ,init-value ,(format base-doc-string pretty-name mode mode) ,@set ,@initialize ,@group ,@type - ,@(cond - ((not (and curfile require)) nil) - ((not (eq require t)) `(:require ,require))) - ,@(nreverse extra-keywords)))) + ,@(unless (eq require t) `(:require ,require)) + ,@(nreverse extra-keywords)))) ;; The actual function. (defun ,mode (&optional arg ,@extra-args) diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index a1a1f470c58..634c2397411 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -1,7 +1,7 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu -;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org> diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index f80e9f36dd0..765548083b5 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1,7 +1,7 @@ ;;; edebug.el --- a source-level debugger for Emacs Lisp -;; Copyright (C) 1988,89,90,91,92,93,94,95,97,1999,2000,01,03,2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 1492e29e3c6..4ae8f53a981 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,7 +1,7 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> ;; Maintainer: friedman@splode.com @@ -454,10 +454,11 @@ Emacs Lisp mode) that support Eldoc.") ;; Prime the command list. (eldoc-add-command-completions "backward-" "beginning-of-" "delete-other-windows" "delete-window" - "end-of-" "forward-" "indent-for-tab-command" "goto-" "mouse-set-point" - "next-" "other-window" "previous-" "recenter" "scroll-" - "self-insert-command" "split-window-" - "up-list" "down-list") + "end-of-" "exchange-point-and-mark" "forward-" + "indent-for-tab-command" "goto-" "mark-page" "mark-paragraph" + "mouse-set-point" "move-" "pop-global-mark" "next-" "other-window" + "previous-" "recenter" "scroll-" "self-insert-command" + "split-window-" "up-list" "down-list") (provide 'eldoc) diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 51e2ed98713..e72613695e3 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,6 +1,6 @@ ;;; elint.el --- Lint Emacs Lisp -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Peter Liljenberg <petli@lysator.liu.se> ;; Created: May 1997 diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index dbda66a2615..426c79e51c3 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -1,6 +1,7 @@ ;;; elp.el --- Emacs Lisp Profiler -;; Copyright (C) 1994,1995,1997,1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index 1984423d9dd..da9aa09119a 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -1,7 +1,7 @@ ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer -;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 04 -;; Free Software Foundation +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se> diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 945acaac73e..d860bfcd598 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -1,6 +1,7 @@ ;;; find-func.el --- find the definition of the Emacs Lisp function near point -;; Copyright (C) 1997, 1999, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp> ;; Maintainer: petersen@kurims.kyoto-u.ac.jp diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el index 8d3b0b02a4e..29e9dffbbde 100644 --- a/lisp/emacs-lisp/find-gc.el +++ b/lisp/emacs-lisp/find-gc.el @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index b07b6f837fb..1d30d60ea99 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -1,6 +1,7 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index f40b5eeb574..4dd10ad3a9c 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,6 +1,7 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Fri Sep 27 1996 @@ -101,8 +102,7 @@ (defvar generic-font-lock-keywords nil "Keywords for `font-lock-defaults' in a generic mode.") (make-variable-buffer-local 'generic-font-lock-keywords) -(defvaralias 'generic-font-lock-defaults 'generic-font-lock-keywords) -(make-obsolete-variable 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1") +(define-obsolete-variable-alias 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1") ;;;###autoload (defvar generic-mode-list nil diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el index 43311b6ff5d..6e0c4ded4dd 100644 --- a/lisp/emacs-lisp/gulp.el +++ b/lisp/emacs-lisp/gulp.el @@ -1,6 +1,6 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sam Shteingold <shteingd@math.ucla.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el index eac18a5dca1..e97491aa6bb 100644 --- a/lisp/emacs-lisp/helper.el +++ b/lisp/emacs-lisp/helper.el @@ -1,6 +1,6 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el index 87a6725f171..70961912815 100644 --- a/lisp/emacs-lisp/levents.el +++ b/lisp/emacs-lisp/levents.el @@ -1,6 +1,7 @@ ;;; levents.el --- emulate the Lucid event data type and associated functions -;; Copyright (C) 1993, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index d6c7c8c3458..b102b4da581 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -1,6 +1,7 @@ ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers -;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: FSF @@ -306,7 +307,7 @@ If FILE is nil, execute BODY in the current buffer." (insert-file-contents ,filesym) (lisp-mode) ,@body) - (save-excursion + (save-excursion ;; Switching major modes is too drastic, so just switch ;; temporarily to the Lisp mode syntax table. (with-syntax-table lisp-mode-syntax-table diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 88e6319709b..6d281e5deb2 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1,7 +1,7 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index a20b79335cb..d248882d882 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -1,7 +1,7 @@ ;;; lisp.el --- Lisp editing commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2000, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index c047e0b91e7..68d3a3de9a9 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -1,6 +1,7 @@ ;;; lmenu.el --- emulate Lucid's menubar support -;; Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: emulations obsolete @@ -31,8 +32,10 @@ ;; Arrange to use current-menubar to set up part of the menu bar. (defvar current-menubar) +(defvar lucid-menubar-map) +(defvar lucid-failing-menubar) -(setq recompute-lucid-menubar 'recompute-lucid-menubar) +(defvar recompute-lucid-menubar 'recompute-lucid-menubar) (defun recompute-lucid-menubar () (define-key lucid-menubar-map [menu-bar] (condition-case nil diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index f1d0244f0ea..38ae8b74460 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -1,6 +1,7 @@ ;;; lselect.el --- Lucid interface to X Selections -;; Copyright (C) 1990, 1993, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations @@ -101,9 +102,9 @@ (defun x-own-selection (selection &optional type) - "Make a primary X Selection of the given argument. -The argument may be a string, a cons of two markers, or an extent. -In the latter cases the selection is considered to be the text + "Make a primary X Selection of the given argument. +The argument may be a string, a cons of two markers, or an extent. +In the latter cases the selection is considered to be the text between the markers, or the between extents endpoints." (interactive (if (not current-prefix-arg) (list (read-string "Store text for pasting: ")) @@ -124,7 +125,7 @@ between the markers, or the between extents endpoints." (defun x-own-secondary-selection (selection &optional type) - "Make a secondary X Selection of the given argument. The argument may be a + "Make a secondary X Selection of the given argument. The argument may be a string or a cons of two markers (in which case the selection is considered to be the text between those markers.)" (interactive (if (not current-prefix-arg) @@ -182,7 +183,7 @@ secondary selection instead of the primary selection." ;; Random utility functions (defun x-kill-primary-selection () - "If there is a selection, delete the text it covers, and copy it to + "If there is a selection, delete the text it covers, and copy it to both the kill ring and the Clipboard." (interactive) (or (x-selection-owner-p) (error "emacs does not own the primary selection")) diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el index 3374a4d7d73..f3c9519edf0 100644 --- a/lisp/emacs-lisp/lucid.el +++ b/lisp/emacs-lisp/lucid.el @@ -1,6 +1,7 @@ ;;; lucid.el --- emulate some Lucid Emacs functions -;; Copyright (C) 1993, 1995, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 02ad05639a3..98e4f67f630 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -1,6 +1,6 @@ ;;; macroexp.el --- Additional macro-expansion support ;; -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: lisp, compiler, macros @@ -91,7 +91,7 @@ FORMS." CLAUSES is a list of lists of forms; any clause that's not a list is ignored. If SKIP is non-nil, then don't expand that many elements at the start of each clause." - (macroexp-accumulate (clause clauses) + (macroexp-accumulate (clause clauses) (if (listp clause) (macroexpand-all-forms clause skip) clause))) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 6447f7e438c..84c7ae58ced 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -1,6 +1,7 @@ ;;; map-ynp.el --- general-purpose boolean question-asker -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Maintainer: FSF @@ -102,15 +103,18 @@ Returns the number of actions taken." (let ((object (if help (capitalize (nth 0 help)))) (objects (if help (capitalize (nth 1 help)))) (action (if help (capitalize (nth 2 help))))) - (setq map `(("Yes" . act) ("No" . skip) ("Quit" . exit) - (,(if help (concat action " " object " And Quit") - "Do it and Quit") . act-and-exit) - (,(if help (concat action " All " objects) - "Do All") . automatic) + (setq map `(("Yes" . act) ("No" . skip) ,@(mapcar (lambda (elt) - (cons (capitalize (nth 2 elt)) + (cons (with-syntax-table + text-mode-syntax-table + (capitalize (nth 2 elt))) (vector (nth 1 elt)))) - action-alist)) + action-alist) + (,(if help (concat action " This But No More") + "Do This But No More") . act-and-exit) + (,(if help (concat action " All " objects) + "Do All") . automatic) + ("No For All" . exit)) use-menus t mouse-event last-nonmenu-event)) (setq user-keys (if action-alist diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index 7bbd56d8af5..542948c777c 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -1,6 +1,7 @@ ;;; pp.el --- pretty printer for Emacs Lisp -;; Copyright (C) 1989, 1993, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Randal Schwartz <merlyn@stonehenge.com> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index e0a3c5ed285..1d1e002cf5f 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,6 +1,7 @@ ;;; re-builder.el --- building Regexps with visual feedback -;; Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Detlev Zundel <dzu@gnu.org> ;; Keywords: matching, lisp, tools diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 0188672717c..26a4debd6f3 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -1,7 +1,7 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 7f9d313542d..4326ba37786 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -1,6 +1,6 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com> ;; Maintainer: bwarsaw@cen.com diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index 24b90650f0a..f04d98f399d 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -1,6 +1,6 @@ ;;; ring.el --- handle rings of items -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: extensions diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index c3147815fc9..f526ffae948 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -1,6 +1,6 @@ ;;; rx.el --- sexp notation for regular expressions -;; Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index b36ce4a332e..9cea82d7780 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -1,6 +1,6 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el index 84cb9785f6f..7bfa9402836 100644 --- a/lisp/emacs-lisp/sregex.el +++ b/lisp/emacs-lisp/sregex.el @@ -1,6 +1,7 @@ ;;; sregex.el --- symbolic regular expressions -;; Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Bob Glickstein <bobg+sregex@zanshin.com> ;; Maintainer: Bob Glickstein <bobg+sregex@zanshin.com> diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index bb5e782b001..a3683e82d2b 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -1,6 +1,7 @@ ;;; syntax.el --- helper functions to find syntactic context -;; Copyright (C) 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el index 4c2ee1ee33c..1374aa1fdc0 100644 --- a/lisp/emacs-lisp/tcover-ses.el +++ b/lisp/emacs-lisp/tcover-ses.el @@ -1,6 +1,6 @@ ;;;; testcover-ses.el -- Example use of `testcover' to test "SES" -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@engineer.com> ;; Maintainer: Jonathan Yavner <jyavner@engineer.com> diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index 9544bc396b4..354cfe6ab16 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el @@ -1,6 +1,6 @@ ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@engineer.com> ;; Maintainer: Jonathan Yavner <jyavner@engineer.com> diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index a5e761d9cba..c0afffdf391 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -1,6 +1,6 @@ ;;;; testcover.el -- Visual code-coverage tool -;; Copyright (C) 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org> @@ -154,15 +154,11 @@ call to one of the `testcover-1value-functions'." '((t (:background "DeepPink2"))) "Face for forms that had no hits during coverage test" :group 'testcover) -;; backward-compatibility alias -(put 'testcover-nohits-face 'face-alias 'testcover-nohits) (defface testcover-1value '((t (:background "Wheat2"))) "Face for forms that always produced the same value during coverage test" :group 'testcover) -;; backward-compatibility alias -(put 'testcover-1value-face 'face-alias 'testcover-1value) ;;;========================================================================= diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 27f14a6d3ad..83b01642c56 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -1,6 +1,6 @@ ;;; timer.el --- run a function with args at some time in future -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el index d94b4925c4d..8b1baad6596 100644 --- a/lisp/emacs-lisp/tq.el +++ b/lisp/emacs-lisp/tq.el @@ -1,6 +1,7 @@ ;;; tq.el --- utility to maintain a transaction queue -;; Copyright (C) 1985, 1986, 1987, 1992, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Scott Draves <spot@cs.cmu.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index 8cd5d0fa317..cda23f39c04 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -1,6 +1,7 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions -;; Copyright (C) 1993, 1998, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el index c59b44cddb2..4b1312d58d7 100644 --- a/lisp/emacs-lisp/unsafep.el +++ b/lisp/emacs-lisp/unsafep.el @@ -1,6 +1,6 @@ ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate -;; Copyright (C)2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org> diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 1f573673495..61f6b98005e 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el @@ -1,6 +1,6 @@ ;;; warnings.el --- log and display warnings -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal |